]> git.sur5r.net Git - glabels/commitdiff
Imported Upstream version 3.2.1
authorJakob Haufe <sur5r@sur5r.net>
Fri, 28 Aug 2015 10:08:45 +0000 (12:08 +0200)
committerJakob Haufe <sur5r@sur5r.net>
Fri, 28 Aug 2015 10:11:11 +0000 (12:11 +0200)
132 files changed:
AUTHORS
ChangeLog
INSTALL
Makefile.in
NEWS
aclocal.m4
compile [new file with mode: 0755]
config.guess
config.sub
configure
configure.ac
data/Makefile.in
data/appdata/Makefile.in
data/desktop/Makefile.in
data/icons/16x16/Makefile.in
data/icons/22x22/Makefile.in
data/icons/24x24/Makefile.in
data/icons/32x32/Makefile.in
data/icons/48x48/Makefile.in
data/icons/Makefile.in
data/icons/scalable/Makefile.in
data/man/Makefile.in
data/mime/Makefile.in
data/pixmaps/Makefile.in
data/schemas/Makefile.in
data/ui/Makefile.in
data/ui/media-select.ui
depcomp
docs/Makefile.in
docs/libglabels/Makefile.in
docs/libglabels/html/ch01.html
docs/libglabels/html/ch02.html
docs/libglabels/html/ch03.html
docs/libglabels/html/home.png
docs/libglabels/html/index.html
docs/libglabels/html/index.sgml
docs/libglabels/html/left-insensitive.png [new file with mode: 0644]
docs/libglabels/html/left.png
docs/libglabels/html/libglabels-3.0-category.html
docs/libglabels/html/libglabels-3.0-db.html
docs/libglabels/html/libglabels-3.0-paper.html
docs/libglabels/html/libglabels-3.0-str.html
docs/libglabels/html/libglabels-3.0-template.html
docs/libglabels/html/libglabels-3.0-units.html
docs/libglabels/html/libglabels-3.0-vendor.html
docs/libglabels/html/libglabels-3.0-xml-category.html
docs/libglabels/html/libglabels-3.0-xml-paper.html
docs/libglabels/html/libglabels-3.0-xml-template.html
docs/libglabels/html/libglabels-3.0-xml-vendor.html
docs/libglabels/html/libglabels-3.0-xml.html
docs/libglabels/html/libglabels-3.0.devhelp2
docs/libglabels/html/right-insensitive.png [new file with mode: 0644]
docs/libglabels/html/right.png
docs/libglabels/html/style.css
docs/libglabels/html/up-insensitive.png [new file with mode: 0644]
docs/libglabels/html/up.png
docs/libglbarcode/Makefile.in
docs/libglbarcode/html/api.html
docs/libglbarcode/html/home.png
docs/libglbarcode/html/index.html
docs/libglbarcode/html/index.sgml
docs/libglbarcode/html/left-insensitive.png [new file with mode: 0644]
docs/libglbarcode/html/left.png
docs/libglbarcode/html/libglbarcode-3.0-lgl-barcode-create.html
docs/libglbarcode/html/libglbarcode-3.0-lgl-barcode-render-to-cairo.html
docs/libglbarcode/html/libglbarcode-3.0-lgl-barcode-type.html
docs/libglbarcode/html/libglbarcode-3.0-lgl-barcode.html
docs/libglbarcode/html/libglbarcode-3.0.devhelp2
docs/libglbarcode/html/libglbarcode-intro.html
docs/libglbarcode/html/overview.html
docs/libglbarcode/html/right-insensitive.png [new file with mode: 0644]
docs/libglbarcode/html/right.png
docs/libglbarcode/html/style.css
docs/libglbarcode/html/up-insensitive.png [new file with mode: 0644]
docs/libglbarcode/html/up.png
glabels.spec
gtk-doc.make
help/Makefile.in
help/cs/cs.po
help/el/about.page
help/el/basicusage.page
help/el/createnew.page
help/el/customize.page
help/el/customtemplate.page
help/el/editprop.page
help/el/el.po
help/el/index.page
help/el/labelprop.page
help/el/license.page
help/el/mancreate.page
help/el/merge-ex1.page
help/el/merge-ex2.page
help/el/merge-ex3.page
help/el/merge-ex4.page
help/el/merge.page
help/el/mergefeatures.page
help/el/multifile.page
help/el/newlabel.page
help/el/printfile.page
help/el/select.page
help/el/skipfields.page
help/es/es.po
help/fr/fr.po
help/fr/printfile.page
install-sh
libglabels/Makefile.in
libglbarcode/Makefile.in
ltmain.sh
missing
po/LINGUAS
po/POTFILES.in
po/cs.po
po/de.po
po/el.po
po/es.po
po/fi.po
po/id.po
po/lv.po
po/pl.po [deleted file]
po/sl.po
po/sr.po
po/sr@latin.po
src/Makefile.in
src/critical-error-handler.c
src/cursors/Makefile.in
src/label-text.c
src/pixmaps/Makefile.in
src/warning-handler.c
templates/Makefile.am
templates/Makefile.in
templates/canon-other-templates.xml [new file with mode: 0644]
templates/vendors.xml

diff --git a/AUTHORS b/AUTHORS
index acd7006d63d99cbaa1dfc12a647009dd51bd4877..6e63ae7da9a8d60112642ff38ee09a02c06c1642 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -174,5 +174,7 @@ particular products (I apologize if I have missed anybody):
        Manoj Kumar Choudhary
        Gorden Tabibi
        Gebhard Moser
+       Bao
+       Gernot Hassenpflug
        
 And many others for their many helpful suggestions and bug reports -- thanks.
index 1081541aca9bc2fc2d6bdb683f9450510c94f966..d6fca12ebda6d1074b376c12a33a73bc32cde286 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,236 @@
+commit a49a569d043ca6529b765181ba92e74b2f94c411
+Author: Jim Evins <evins@snaught.com>
+Date:   2014-11-09
+
+    Final preparation for 3.2.1.
+
+M      NEWS
+
+commit d6eff0d17c2b65524ff39484210258585b85f741
+Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
+Date:  2014-11-01
+
+    Updated Latvian translation
+
+M      po/lv.po
+
+commit 56e0713c35d2deb8eecf162b8104788833965a4d
+Author: Jim Evins <evins@snaught.com>
+Date:  2014-10-23
+
+    Preparation for 3.2.1
+
+M      NEWS
+M      configure.ac
+
+commit 165f372e3b0d3bcd1088feac3ba3ab0aa8257777
+Author: Jim Evins <evins@snaught.com>
+Date:  2014-10-23
+
+    Removed obsolete tab-hborder property from media-select UI file.
+
+    Unfortunately, beginning with gtk 3.14, rather than ignoring this
+    obsolete
+    property, having it in a UI file is considered a critical error,
+    thus crashing
+    glabels on newer distributions.
+
+M      data/ui/media-select.ui
+
+commit cd9a551899ea66a5083e68b23992a39b68e13b94
+Author: Jim Evins <evins@snaught.com>
+Date:  2014-10-23
+
+    Added dummy window as parent in warning and critical error handlers.
+
+    In gtk 3.14, creating a message dialog without a parent window
+    causes a crash.  Unfortunately this causes the original error or
+    warning message from being seen by the user.
+
+M      src/critical-error-handler.c
+M      src/warning-handler.c
+
+commit add35e12d1082e37d60a821edfb918ffdcd54eda
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:  2014-10-05
+
+    Removed Polish translation
+
+    Last updated in 2002 (that's 12 years ago) and with 68 strings
+    translated,
+    it's doing more harm than good at this point. It can always be
+    brought back
+    from git, but it's probably easier to just start from scratch,
+    if anyone's
+    interested.
+
+M      po/LINGUAS
+D      po/pl.po
+
+commit e1decb5f24d1dbd0a3c441961ae032c6312a8d73
+Author: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>
+Date:  2014-09-17
+
+    Finnish translation update
+
+M      po/fi.po
+
+commit 5521455d4d262a7f6c52d3b7ca2083ecb5910f55
+Author: Andika Triwidada <andika@gmail.com>
+Date:  2014-09-15
+
+    Updated Indonesian translation
+
+M      po/id.po
+
+commit 29299784bab3290d6cbed6d25b27efc821f5324a
+Author: Lasse Liehu <lasse.liehu@gmail.com>
+Date:  2014-05-30
+
+    Finnish translation update
+
+M      po/fi.po
+
+commit 58044cd419bd8e52ffa992b7a740ddd631c851ee
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2014-04-15
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit 3f2f50d9dd36eefce8a71394894caaceb0da8c39
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2014-04-15
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit 0354020ee833f275e06a155a2ac1eae7282c5484
+Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
+Date:  2014-03-24
+
+    Updated Serbian translation
+
+M      po/sr.po
+M      po/sr@latin.po
+
+commit 63d9bd9e61c6f13587f59396feb9578082b29bd5
+Author: Matej Urbančič <mateju@svn.gnome.org>
+Date:  2014-03-21
+
+    Updated Slovenian translation
+
+M      po/sl.po
+
+commit 6e94c99d66831bff854d6a8bed52c87092b5fd43
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:  2014-03-10
+
+    Fix a tag in French help translation
+
+M      help/fr/fr.po
+
+commit e77daa118370676556fbb27119c817492b141377
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2014-02-14
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit 8b2c53cbdbf6c2d251056c284d92a3aad3e4b6f9
+Author: Marek Černocký <marek@manet.cz>
+Date:  2014-02-13
+
+    Updated Czech translation
+
+M      po/cs.po
+
+commit 6cdc7484ffc4de7ade70aff8700269764c89c8dd
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:  2014-02-11
+
+    Updated POTFILES.in
+
+M      po/POTFILES.in
+
+commit ec145fd643e21e9f640e809b44c1d45591c682d4
+Author: Jim Evins <evins@snaught.com>
+Date:  2014-02-09
+
+    Added Canon Type J CD/DVD Tray template.
+
+M      AUTHORS
+M      templates/Makefile.am
+A      templates/canon-other-templates.xml
+M      templates/vendors.xml
+
+commit 2421012aabfe8667be83e5f307b4a147c2d70dbe
+Author: Jim Evins <evins@snaught.com>
+Date:  2014-01-25
+
+    Fix layout problems with center and right text alignment to text box.
+
+    Pango layout width should be 6 pts smaller than text object width
+    to account
+    for a 3 pt margin around layout.
+
+M      src/label-text.c
+
+commit 24efc3b2e33a23ee19315910619b49af8d8286ec
+Author: Dimitris Spingos <dmtrs32@gmail.com>
+Date:  2014-01-07
+
+    Updated Greek translation of help
+
+M      help/el/el.po
+
+commit 119b9f222803d6af816037d4f6d0cc421a99d286
+Author: Dimitris Spingos <dmtrs32@gmail.com>
+Date:  2014-01-07
+
+    Updated Greek translation
+
+M      po/el.po
+
+commit a3a084a722ff02a6d69f6a814aa0be950d9ea4e6
+Author: Marek Černocký <marek@manet.cz>
+Date:  2013-12-27
+
+    Updated Czech translation
+
+M      help/cs/cs.po
+
+commit 1f08c64b20171e47c0cef1b9f9c2ce081d413c6c
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2013-12-19
+
+    Updated Spanish translation
+
+M      help/es/es.po
+
+commit bc97c62fd56fdd83aaf0151d678ff26322775f01
+Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
+Date:  2013-11-18
+
+    Updated Serbian translation
+
+M      po/sr.po
+M      po/sr@latin.po
+
+commit e852d3973a1f05af2ee6a4ff76a5a6bc1e086a46
+Author: Martin Srebotnjak <miles@filmsi.net>
+Date:  2013-10-29
+
+    Updated Slovenian translation
+
+M      po/sl.po
+
 commit 37829049642492bdf38dc07f5e5cfe2058251583
 Author: Jim Evins <evins@snaught.com>
-Date:   2013-10-28
+Date:  2013-10-28
 
     Preparation for 3.2.0.
 
diff --git a/INSTALL b/INSTALL
index a1e89e18ad20c227845f2099cb9894c799265d19..2099840756e6302d837dcd51b5dcd6262f7adb16 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
 Inc.
 
    Copying and distribution of this file, with or without modification,
@@ -12,8 +12,8 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
@@ -309,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -367,4 +368,3 @@ operates.
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-
index 0a94ac0c4d6b1d8fbab4a2849d9fb97e726cbb75..256e34f5875098734eb9bf016fc3d4c6bcc29c49 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,11 +78,12 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-       $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-       $(srcdir)/glabels.spec.in $(top_srcdir)/configure AUTHORS \
-       COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
-       depcomp install-sh ltmain.sh missing
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+       $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+       $(top_srcdir)/configure $(am__configure_deps) \
+       $(srcdir)/config.h.in $(srcdir)/glabels.spec.in COPYING TODO \
+       compile config.guess config.sub depcomp install-sh missing \
+       ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -66,21 +94,28 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = glabels.spec
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-       html-recursive info-recursive install-data-recursive \
-       install-dvi-recursive install-exec-recursive \
-       install-html-recursive install-info-recursive \
-       install-pdf-recursive install-ps-recursive install-recursive \
-       installcheck-recursive installdirs-recursive pdf-recursive \
-       ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+       ctags-recursive dvi-recursive html-recursive info-recursive \
+       install-data-recursive install-dvi-recursive \
+       install-exec-recursive install-html-recursive \
+       install-info-recursive install-pdf-recursive \
+       install-ps-recursive install-recursive installcheck-recursive \
+       installdirs-recursive pdf-recursive ps-recursive \
+       tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -88,11 +123,33 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-       distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+       cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+       $(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -103,6 +160,7 @@ am__remove_distdir = \
       && rm -rf "$(distdir)" \
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -130,6 +188,7 @@ am__relativize = \
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -178,6 +237,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -403,8 +463,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-       @if test ! -f $@; then rm -f stamp-h1; else :; fi
-       @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+       @test -f $@ || rm -f stamp-h1
+       @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
        @rm -f stamp-h1
@@ -429,22 +489,25 @@ distclean-libtool:
        -rm -f libtool config.lt
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-       @fail= failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+       @fail=; \
+       if $(am__make_keepgoing); then \
+         failcom='fail=yes'; \
+       else \
+         failcom='exit 1'; \
+       fi; \
        dot_seen=no; \
        target=`echo $@ | sed s/-recursive//`; \
-       list='$(SUBDIRS)'; for subdir in $$list; do \
+       case "$@" in \
+         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+         *) list='$(SUBDIRS)' ;; \
+       esac; \
+       for subdir in $$list; do \
          echo "Making $$target in $$subdir"; \
          if test "$$subdir" = "."; then \
            dot_seen=yes; \
@@ -459,57 +522,12 @@ $(RECURSIVE_TARGETS):
          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
        fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-       @fail= failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
-       dot_seen=no; \
-       case "$@" in \
-         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-         *) list='$(SUBDIRS)' ;; \
-       esac; \
-       rev=''; for subdir in $$list; do \
-         if test "$$subdir" = "."; then :; else \
-           rev="$$subdir $$rev"; \
-         fi; \
-       done; \
-       rev="$$rev ."; \
-       target=`echo $@ | sed s/-recursive//`; \
-       for subdir in $$rev; do \
-         echo "Making $$target in $$subdir"; \
-         if test "$$subdir" = "."; then \
-           local_target="$$target-am"; \
-         else \
-           local_target="$$target"; \
-         fi; \
-         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-         || eval $$failcom; \
-       done && test -z "$$fail"
-tags-recursive:
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-       done
-ctags-recursive:
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-       done
+ID: $(am__tagged_files)
+       $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
        set x; \
        here=`pwd`; \
        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -525,12 +543,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
              set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
          fi; \
        done; \
-       list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       $(am__define_uniq_tagged_files); \
        shift; \
        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
          test -n "$$unique" || unique=$$empty_fix; \
@@ -542,15 +555,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
              $$unique; \
          fi; \
        fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+       $(am__define_uniq_tagged_files); \
        test -z "$(CTAGS_ARGS)$$unique" \
          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
             $$unique
@@ -559,9 +568,31 @@ GTAGS:
        here=`$(am__cd) $(top_builddir) && pwd` \
          && $(am__cd) $(top_srcdir) \
          && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+       test ! -s cscope.files \
+         || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+       -rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+       list='$(am__tagged_files)'; \
+       case "$(srcdir)" in \
+         [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+         *) sdir=$(subdir)/$(srcdir) ;; \
+       esac; \
+       for i in $$list; do \
+         if test -f "$$i"; then \
+           echo "$(subdir)/$$i"; \
+         else \
+           echo "$$sdir/$$i"; \
+         fi; \
+       done >> $(top_builddir)/cscope.files
 
 distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+       -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
        $(am__remove_distdir)
@@ -632,40 +663,42 @@ distdir: $(DISTFILES)
        || chmod -R a+r "$(distdir)"
 dist-gzip: distdir
        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-       $(am__remove_distdir)
+       $(am__post_remove_distdir)
 
 dist-bzip2: distdir
        tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-       $(am__remove_distdir)
+       $(am__post_remove_distdir)
 
 dist-lzip: distdir
        tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-       $(am__remove_distdir)
-
-dist-lzma: distdir
-       tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-       $(am__remove_distdir)
+       $(am__post_remove_distdir)
 
 dist-xz: distdir
        tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-       $(am__remove_distdir)
+       $(am__post_remove_distdir)
 
 dist-tarZ: distdir
+       @echo WARNING: "Support for shar distribution archives is" \
+                      "deprecated." >&2
+       @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-       $(am__remove_distdir)
+       $(am__post_remove_distdir)
 
 dist-shar: distdir
+       @echo WARNING: "Support for distribution archives compressed with" \
+                      "legacy program 'compress' is deprecated." >&2
+       @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
        shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-       $(am__remove_distdir)
+       $(am__post_remove_distdir)
 
 dist-zip: distdir
        -rm -f $(distdir).zip
        zip -rq $(distdir).zip $(distdir)
-       $(am__remove_distdir)
+       $(am__post_remove_distdir)
 
-dist dist-all: distdir
-       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-       $(am__remove_distdir)
+dist dist-all:
+       $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+       $(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -676,8 +709,6 @@ distcheck: dist
          GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
        *.tar.bz2*) \
          bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-       *.tar.lzma*) \
-         lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
        *.tar.lz*) \
          lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
        *.tar.xz*) \
@@ -689,18 +720,19 @@ distcheck: dist
        *.zip*) \
          unzip $(distdir).zip ;;\
        esac
-       chmod -R a-w $(distdir); chmod u+w $(distdir)
-       mkdir $(distdir)/_build
-       mkdir $(distdir)/_inst
+       chmod -R a-w $(distdir)
+       chmod u+w $(distdir)
+       mkdir $(distdir)/_build $(distdir)/_inst
        chmod a-w $(distdir)
        test -d $(distdir)/_build || exit 0; \
        dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
          && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
          && am__cwd=`pwd` \
          && $(am__cd) $(distdir)/_build \
-         && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+         && ../configure \
            $(AM_DISTCHECK_CONFIGURE_FLAGS) \
            $(DISTCHECK_CONFIGURE_FLAGS) \
+           --srcdir=.. --prefix="$$dc_install_base" \
          && $(MAKE) $(AM_MAKEFLAGS) \
          && $(MAKE) $(AM_MAKEFLAGS) dvi \
          && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -723,7 +755,7 @@ distcheck: dist
          && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
          && cd "$$am__cwd" \
          || exit 1
-       $(am__remove_distdir)
+       $(am__post_remove_distdir)
        @(echo "$(distdir) archives ready for distribution: "; \
          list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
          sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -859,25 +891,24 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-       ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-       all all-am am--refresh check check-am clean clean-generic \
-       clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-       dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \
-       dist-xz dist-zip distcheck distclean distclean-generic \
-       distclean-hdr distclean-libtool distclean-tags distcleancheck \
-       distdir distuninstallcheck dvi dvi-am html html-am info \
-       info-am install install-am install-data install-data-am \
-       install-dvi install-dvi-am install-exec install-exec-am \
-       install-html install-html-am install-info install-info-am \
-       install-man install-pdf install-pdf-am install-ps \
-       install-ps-am install-strip installcheck installcheck-am \
-       installdirs installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-       uninstall uninstall-am
+.MAKE: $(am__recursive_targets) all install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+       am--refresh check check-am clean clean-cscope clean-generic \
+       clean-libtool cscope cscopelist-am ctags ctags-am dist \
+       dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
+       dist-tarZ dist-xz dist-zip distcheck distclean \
+       distclean-generic distclean-hdr distclean-libtool \
+       distclean-tags distcleancheck distdir distuninstallcheck dvi \
+       dvi-am html html-am info info-am install install-am \
+       install-data install-data-am install-dvi install-dvi-am \
+       install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-pdf \
+       install-pdf-am install-ps install-ps-am install-strip \
+       installcheck installcheck-am installdirs installdirs-am \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags tags-am uninstall uninstall-am
 
 
 dist-hook:
diff --git a/NEWS b/NEWS
index 0f3a6297c855e4df1c29ee72c1a767aed650e965..efd4944ee46dbb1bfc63eea29762c2e418597d13 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,26 @@
+* gLabels 3.2.1 (stable) release.  Release date 2014-11-10
+
+- Fixed "new label dialog" crash introduced with Gtk 3.14
+- Fixed text box layout problems with center and right alignment
+- Updated UI translations:
+    Andika Triwidada (id)
+    Daniel Mustieles (es)
+    Dimitris Spingos (el)
+    Jiri Grönroos (fi)
+    Lasse Liehu (fi)
+    Marek Černocký (cs)
+    Mario Blättermann (de)
+    Martin Srebotnjak (sl)
+    Matej Urbančič (sl)
+    Rūdolfs Mazurs (lv)
+    Мирослав Николић (sr) (sr@latin)
+- Updated Doc translations:
+    Daniel Mustieles (es)
+    Dimitris Spingos (el)
+    Marek Černocký (cs)
+    Piotr Drąg (fr)
+
+
 * gLabels 3.2.0 (stable) release.  Release date 2013-10-28
 
 - Fixed bug causing object editor to remain active after object deleted.
index 6408298da63e358edc3125e86b8095aeacc31609..ffc6dbbcf77552ac4975713049bec3e8897a12bf 100644 (file)
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
 [m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -337,7 +337,6 @@ msgstr ""
 dnl
 glib_DEFUN([GLIB_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
    
    GLIB_LC_MESSAGES
    GLIB_WITH_NLS
@@ -457,9 +456,20 @@ sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
 fi])
 
 
+# gnome-compiler-flags.m4
+#
+# serial 2
+#
+
 dnl GNOME_COMPILE_WARNINGS
-dnl Turn on many useful compiler warnings
+dnl Turn on many useful compiler warnings and substitute the result into
+dnl WARN_CFLAGS
 dnl For now, only works on GCC
+dnl Pass the default value of the --enable-compile-warnings configure option as
+dnl the first argument to the macro, defaulting to 'yes'.
+dnl Additional warning/error flags can be passed as an optional second argument.
+dnl
+dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar])
 AC_DEFUN([GNOME_COMPILE_WARNINGS],[
     dnl ******************************
     dnl More compiler warnings
@@ -470,7 +480,6 @@ AC_DEFUN([GNOME_COMPILE_WARNINGS],[
                                  [Turn on compiler warnings]),,
                   [enable_compile_warnings="m4_default([$1],[yes])"])
 
-    warnCFLAGS=
     if test "x$GCC" != xyes; then
        enable_compile_warnings=no
     fi
@@ -478,46 +487,75 @@ AC_DEFUN([GNOME_COMPILE_WARNINGS],[
     warning_flags=
     realsave_CFLAGS="$CFLAGS"
 
+    dnl These are warning flags that aren't marked as fatal.  Can be
+    dnl overridden on a per-project basis with -Wno-foo.
+    base_warn_flags=" \
+        -Wall \
+        -Wstrict-prototypes \
+        -Wnested-externs \
+    "
+
+    dnl These compiler flags typically indicate very broken or suspicious
+    dnl code.  Some of them such as implicit-function-declaration are
+    dnl just not default because gcc compiles a lot of legacy code.
+    dnl We choose to make this set into explicit errors.
+    base_error_flags=" \
+        -Werror=missing-prototypes \
+        -Werror=implicit-function-declaration \
+        -Werror=pointer-arith \
+        -Werror=init-self \
+        -Werror=format-security \
+        -Werror=format=2 \
+        -Werror=missing-include-dirs \
+    "
+
+    dnl Additional warning or error flags provided by the module author to
+    dnl allow stricter standards to be imposed on a per-module basis.
+    dnl The author can pass -W or -Werror flags here as they see fit.
+    additional_flags="m4_default([$2],[])"
+
     case "$enable_compile_warnings" in
     no)
-       warning_flags=
-       ;;
+        warning_flags=
+        ;;
     minimum)
-       warning_flags="-Wall"
-       ;;
+        warning_flags="-Wall"
+        ;;
     yes)
-       warning_flags="-Wall -Wmissing-prototypes"
-       ;;
+        warning_flags="$base_warn_flags $base_error_flags $additional_flags"
+        ;;
     maximum|error)
-       warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-       CFLAGS="$warning_flags $CFLAGS"
-       for option in -Wno-sign-compare; do
-               SAVE_CFLAGS="$CFLAGS"
-               CFLAGS="$CFLAGS $option"
-               AC_MSG_CHECKING([whether gcc understands $option])
-               AC_TRY_COMPILE([], [],
-                       has_option=yes,
-                       has_option=no,)
-               CFLAGS="$SAVE_CFLAGS"
-               AC_MSG_RESULT($has_option)
-               if test $has_option = yes; then
-                 warning_flags="$warning_flags $option"
-               fi
-               unset has_option
-               unset SAVE_CFLAGS
-       done
-       unset option
-       if test "$enable_compile_warnings" = "error" ; then
-           warning_flags="$warning_flags -Werror"
-       fi
-       ;;
+        warning_flags="$base_warn_flags $base_error_flags $additional_flags"
+        ;;
     *)
-       AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-       ;;
+        AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
+        ;;
     esac
+
+    if test "$enable_compile_warnings" = "error" ; then
+        warning_flags="$warning_flags -Werror"
+    fi
+
+    dnl Check whether GCC supports the warning options
+    for option in $warning_flags; do
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS $option"
+       AC_MSG_CHECKING([whether gcc understands $option])
+       AC_TRY_COMPILE([], [],
+           has_option=yes,
+           has_option=no,)
+       CFLAGS="$save_CFLAGS"
+       AC_MSG_RESULT([$has_option])
+       if test $has_option = yes; then
+           tested_warning_flags="$tested_warning_flags $option"
+       fi
+       unset has_option
+       unset save_CFLAGS
+    done
+    unset option
     CFLAGS="$realsave_CFLAGS"
     AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-    AC_MSG_RESULT($warning_flags)
+    AC_MSG_RESULT($tested_warning_flags)
 
     AC_ARG_ENABLE(iso-c,
                   AC_HELP_STRING([--enable-iso-c],
@@ -540,7 +578,7 @@ AC_DEFUN([GNOME_COMPILE_WARNINGS],[
     fi
     AC_MSG_RESULT($complCFLAGS)
 
-    WARN_CFLAGS="$warning_flags $complCFLAGS"
+    WARN_CFLAGS="$tested_warning_flags $complCFLAGS"
     AC_SUBST(WARN_CFLAGS)
 ])
 
@@ -638,7 +676,7 @@ mostlyclean-am: clean-gsettings-schemas
 gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
 
 %.gschema.valid: %.gschema.xml $(gsettings__enum_file)
-       $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
+       $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@
 
 all-am: $(gsettings_SCHEMAS:.xml=.valid)
 uninstall-am: uninstall-gsettings-schemas
@@ -685,7 +723,7 @@ m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
 
 dnl -*- mode: autoconf -*-
 
-# serial 1
+# serial 2
 
 dnl Usage:
 dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
@@ -695,8 +733,24 @@ AC_DEFUN([GTK_DOC_CHECK],
   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
 
+  ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"])
+  AC_MSG_CHECKING([for gtk-doc])
+  PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no])
+  AC_MSG_RESULT($have_gtk_doc)
+
+  if test "$have_gtk_doc" = "no"; then
+      AC_MSG_WARN([
+  You will not be able to create source packages with 'make dist'
+  because $gtk_doc_requires is not found.])
+  fi
+
   dnl check for tools we added during development
-  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
+  dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that
+  dnl may not be writable by the user. Currently, automake requires that the
+  dnl test name must end in '.test'.
+  dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638
+  AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test])
+  AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check])
   AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
   AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
 
@@ -713,22 +767,22 @@ AC_DEFUN([GTK_DOC_CHECK],
                    [use gtk-doc to build documentation [[default=no]]]),,
     [enable_gtk_doc=no])
 
-  if test x$enable_gtk_doc = xyes; then
-    ifelse([$1],[],
-      [PKG_CHECK_EXISTS([gtk-doc],,
-                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
-      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
-                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
-    dnl don't check for glib if we build glib
-    if test "x$PACKAGE_NAME" != "xglib"; then
-      dnl don't fail if someone does not have glib
-      PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,)
-    fi
-  fi
-
   AC_MSG_CHECKING([whether to build gtk-doc documentation])
   AC_MSG_RESULT($enable_gtk_doc)
 
+  if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
+    AC_MSG_ERROR([
+  You must have $gtk_doc_requires installed to build documentation for
+  $PACKAGE_NAME. Please install gtk-doc or disable building the
+  documentation by adding '--disable-gtk-doc' to '[$]0'.])
+  fi
+
+  dnl don't check for glib if we build glib
+  if test "x$PACKAGE_NAME" != "xglib"; then
+    dnl don't fail if someone does not have glib
+    PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,[:])
+  fi
+
   dnl enable/disable output formats
   AC_ARG_ENABLE([gtk-doc-html],
     AS_HELP_STRING([--enable-gtk-doc-html],
@@ -743,7 +797,12 @@ AC_DEFUN([GTK_DOC_CHECK],
     enable_gtk_doc_pdf=no
   fi
 
+  if test -z "$AM_DEFAULT_VERBOSITY"; then
+    AM_DEFAULT_VERBOSITY=1
+  fi
+  AC_SUBST([AM_DEFAULT_VERBOSITY])
 
+  AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes])
   AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
   AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
   AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
@@ -2272,7 +2331,7 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -2293,7 +2352,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
                ;;
            esac
            ;;
-         ppc64-*linux*|powerpc64-*linux*)
+         powerpc64le-*)
+           LD="${LD-ld} -m elf32lppclinux"
+           ;;
+         powerpc64-*)
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
@@ -2312,7 +2374,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
            ;;
-         ppc*-*linux*|powerpc*-*linux*)
+         powerpcle-*)
+           LD="${LD-ld} -m elf64lppc"
+           ;;
+         powerpc-*)
            LD="${LD-ld} -m elf64ppc"
            ;;
          s390*-*linux*|s390*-*tpf*)
@@ -9563,7 +9628,7 @@ m4_ifndef([_LT_PROG_FC],          [AC_DEFUN([_LT_PROG_FC])])
 m4_ifndef([_LT_PROG_CXX],              [AC_DEFUN([_LT_PROG_CXX])])
 
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9809,7 +9874,8 @@ all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HEL
 .PHONY: pot
 pot: $(_HELP_POTFILE)
 $(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
-       $(AM_V_GEN)$(ITSTOOL) -o "[$]@" $(_HELP_C_FILES)
+       $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \
+       $(ITSTOOL) -o "[$]@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)")
 
 .PHONY: repo
 repo: $(_HELP_POTFILE)
@@ -9950,25 +10016,22 @@ AC_SUBST([YELP_HELP_RULES])
 m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])])
 ])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.6], [],
+m4_if([$1], [1.14.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -9984,24 +10047,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -10020,7 +10081,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -10046,22 +10107,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -10080,16 +10138,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -10099,7 +10155,7 @@ fi])])
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -10112,12 +10168,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -10125,8 +10182,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -10166,16 +10223,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -10184,8 +10241,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
        continue
       else
@@ -10193,7 +10250,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -10241,7 +10298,7 @@ AM_CONDITIONAL([am__fastdep$1], [
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -10251,9 +10308,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
@@ -10268,20 +10329,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -10294,7 +10353,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -10306,21 +10365,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -10338,7 +10395,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -10348,18 +10405,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 16
-
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -10372,7 +10432,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -10401,31 +10461,40 @@ AC_SUBST([CYGPATH_W])
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -10436,34 +10505,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
                             [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-                 [_AM_DEPENDENCIES(CC)],
-                 [define([AC_PROG_CC],
-                         defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+                 [_AM_DEPENDENCIES([CC])],
+                 [m4_define([AC_PROG_CC],
+                            m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                 [_AM_DEPENDENCIES(CXX)],
-                 [define([AC_PROG_CXX],
-                         defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+                 [_AM_DEPENDENCIES([CXX])],
+                 [m4_define([AC_PROG_CXX],
+                            m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                 [_AM_DEPENDENCIES(OBJC)],
-                 [define([AC_PROG_OBJC],
-                         defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+                 [_AM_DEPENDENCIES([OBJC])],
+                 [m4_define([AC_PROG_OBJC],
+                            m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+                 [_AM_DEPENDENCIES([OBJCXX])],
+                 [m4_define([AC_PROG_OBJCXX],
+                            m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -10485,15 +10598,12 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -10507,16 +10617,14 @@ if test x"${install_sh}" != xset; then
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -10533,20 +10641,17 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # AM_MAINTAINER_MODE([DEFAULT-MODE])
 # ----------------------------------
 # Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well.  Anyway, the user
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
 # can override the default with the --enable/--disable switch.
 AC_DEFUN([AM_MAINTAINER_MODE],
 [m4_case(m4_default([$1], [disable]),
@@ -10557,10 +10662,11 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
-[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
-                         (and sometimes confusing) to the casual installer],
-      [USE_MAINTAINER_MODE=$enableval],
-      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+      am_maintainer_other[ make rules and dependencies not useful
+      (and sometimes confusing) to the casual installer])],
+    [USE_MAINTAINER_MODE=$enableval],
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
   AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
   MAINT=$MAINTAINER_MODE_TRUE
@@ -10568,18 +10674,14 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 ]
 )
 
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
 # Check to see how 'make' treats includes.                 -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -10597,7 +10699,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -10624,15 +10726,12 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -10640,11 +10739,10 @@ AC_DEFUN([AM_MISSING_PROG],
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -10657,54 +10755,22 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
@@ -10714,7 +10780,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
 # --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
 # ------------------------
@@ -10728,24 +10794,82 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -10756,32 +10880,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \   ]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+       # -L didn't work.
+       set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+       && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+       # If neither matched, then we have a broken ls.  This can happen
+       # if, for instance, CONFIG_SHELL is bash and it inherits a
+       # broken ls alias from the environment.  This has actually
+       # happened.  Such a system could not be considered "sane".
+       AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$[2]" = conftest.file
    )
 then
@@ -10791,31 +10923,50 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
 
-# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
 dnl
-dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
 dnl do not support nested variable expansions.
 dnl See automake bug#9928 and bug#10237.
 am_make=${MAKE-make}
@@ -10833,7 +10984,7 @@ else
   am_cv_make_support_nested_variables=no
 fi])
 if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using `$V' instead of `$(V)' breaks IRIX make.
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
   AM_V='$(V)'
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
 else
@@ -10850,44 +11001,40 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -10901,18 +11048,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -10922,76 +11067,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
diff --git a/compile b/compile
new file mode 100755 (executable)
index 0000000..531136b
--- /dev/null
+++ b/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""       $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+       # lazily determine how to convert abs files
+       case `uname -s` in
+         MINGW*)
+           file_conv=mingw
+           ;;
+         CYGWIN*)
+           file_conv=cygwin
+           ;;
+         *)
+           file_conv=wine
+           ;;
+       esac
+      fi
+      case $file_conv/,$2, in
+       *,$file_conv,*)
+         ;;
+       mingw/*)
+         file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+         ;;
+       cygwin/*)
+         file=`cygpath -m "$file" || echo "$file"`
+         ;;
+       wine/*)
+         file=`winepath -w "$file" || echo "$file"`
+         ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+       -o)
+         # configure might choose to run compile as 'compile cc -o foo foo.c'.
+         eat=1
+         case $2 in
+           *.o | *.[oO][bB][jJ])
+             func_file_conv "$2"
+             set x "$@" -Fo"$file"
+             shift
+             ;;
+           *)
+             func_file_conv "$2"
+             set x "$@" -Fe"$file"
+             shift
+             ;;
+         esac
+         ;;
+       -I)
+         eat=1
+         func_file_conv "$2" mingw
+         set x "$@" -I"$file"
+         shift
+         ;;
+       -I*)
+         func_file_conv "${1#-I}" mingw
+         set x "$@" -I"$file"
+         shift
+         ;;
+       -l)
+         eat=1
+         func_cl_dashl "$2"
+         set x "$@" "$lib"
+         shift
+         ;;
+       -l*)
+         func_cl_dashl "${1#-l}"
+         set x "$@" "$lib"
+         shift
+         ;;
+       -L)
+         eat=1
+         func_cl_dashL "$2"
+         ;;
+       -L*)
+         func_cl_dashL "${1#-L}"
+         ;;
+       -static)
+         shared=false
+         ;;
+       -Wl,*)
+         arg=${1#-Wl,}
+         save_ifs="$IFS"; IFS=','
+         for flag in $arg; do
+           IFS="$save_ifs"
+           linker_opts="$linker_opts $flag"
+         done
+         IFS="$save_ifs"
+         ;;
+       -Xlinker)
+         eat=1
+         linker_opts="$linker_opts $2"
+         ;;
+       -*)
+         set x "$@" "$1"
+         shift
+         ;;
+       *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+         func_file_conv "$1"
+         set x "$@" -Tp"$file"
+         shift
+         ;;
+       *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+         func_file_conv "$1" mingw
+         set x "$@" "$file"
+         shift
+         ;;
+       *)
+         set x "$@" "$1"
+         shift
+         ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+       # configure might choose to run compile as 'compile cc -o foo foo.c'.
+       # So we strip '-o arg' only if arg is an object.
+       eat=1
+       case $2 in
+         *.o | *.obj)
+           ofile=$2
+           ;;
+         *)
+           set x "$@" -o "$2"
+           shift
+           ;;
+       esac
+       ;;
+      *.c)
+       cfile=$1
+       set x "$@" "$1"
+       shift
+       ;;
+      *)
+       set x "$@" "$1"
+       shift
+       ;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
index d622a44e551f209d5e8c5462b3fe53a162f7b330..b79252d6b1034cbcce18ed21d4ed21a405f987e9 100755 (executable)
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2013-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@ timestamp='2012-02-10'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -54,9 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+       # If the system lacks a compiler, then just pick glibc.
+       # We could probably try harder.
+       LIBC=gnu
+
+       eval $set_cc_for_build
+       cat <<-EOF > $dummy.c
+       #include <features.h>
+       #if defined(__UCLIBC__)
+       LIBC=uclibc
+       #elif defined(__dietlibc__)
+       LIBC=dietlibc
+       #else
+       LIBC=gnu
+       #endif
+       EOF
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+       ;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
        echo "${machine}-${os}${release}"
        exit ;;
+    *:Bitrig:*:*)
+       UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+       echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+       exit ;;
     *:OpenBSD:*:*)
        UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
        echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
        echo arm-acorn-riscix${UNAME_RELEASE}
        exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
        echo arm-unknown-riscos
        exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -801,6 +820,9 @@ EOF
     i*:CYGWIN*:*)
        echo ${UNAME_MACHINE}-pc-cygwin
        exit ;;
+    *:MINGW64*:*)
+       echo ${UNAME_MACHINE}-pc-mingw64
+       exit ;;
     *:MINGW*:*)
        echo ${UNAME_MACHINE}-pc-mingw32
        exit ;;
@@ -852,21 +874,21 @@ EOF
        exit ;;
     *:GNU:*:*)
        # the GNU system
-       echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+       echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
        exit ;;
     *:GNU/*:*:*)
        # other systems with GNU libc and userland
-       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
        exit ;;
     i*86:Minix:*:*)
        echo ${UNAME_MACHINE}-pc-minix
        exit ;;
     aarch64:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     aarch64_be:Linux:*:*)
        UNAME_MACHINE=aarch64_be
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     alpha:Linux:*:*)
        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -879,59 +901,54 @@ EOF
          EV68*) UNAME_MACHINE=alphaev68 ;;
        esac
        objdump --private-headers /bin/sh | grep -q ld.so.1
-       if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-       echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+       if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+       exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     arm*:Linux:*:*)
        eval $set_cc_for_build
        if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
            | grep -q __ARM_EABI__
        then
-           echo ${UNAME_MACHINE}-unknown-linux-gnu
+           echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        else
            if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
                | grep -q __ARM_PCS_VFP
            then
-               echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+               echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
            else
-               echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+               echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
            fi
        fi
        exit ;;
     avr32*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     cris:Linux:*:*)
-       echo ${UNAME_MACHINE}-axis-linux-gnu
+       echo ${UNAME_MACHINE}-axis-linux-${LIBC}
        exit ;;
     crisv32:Linux:*:*)
-       echo ${UNAME_MACHINE}-axis-linux-gnu
+       echo ${UNAME_MACHINE}-axis-linux-${LIBC}
        exit ;;
     frv:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     hexagon:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     i*86:Linux:*:*)
-       LIBC=gnu
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #ifdef __dietlibc__
-       LIBC=dietlibc
-       #endif
-EOF
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-       echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+       echo ${UNAME_MACHINE}-pc-linux-${LIBC}
        exit ;;
     ia64:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     m32r*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     m68*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
        eval $set_cc_for_build
@@ -950,54 +967,63 @@ EOF
        #endif
 EOF
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
        ;;
+    or1k:Linux:*:*)
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+       exit ;;
     or32:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     padre:Linux:*:*)
-       echo sparc-unknown-linux-gnu
+       echo sparc-unknown-linux-${LIBC}
        exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-       echo hppa64-unknown-linux-gnu
+       echo hppa64-unknown-linux-${LIBC}
        exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
        # Look for CPU level
        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-         PA7*) echo hppa1.1-unknown-linux-gnu ;;
-         PA8*) echo hppa2.0-unknown-linux-gnu ;;
-         *)    echo hppa-unknown-linux-gnu ;;
+         PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+         PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+         *)    echo hppa-unknown-linux-${LIBC} ;;
        esac
        exit ;;
     ppc64:Linux:*:*)
-       echo powerpc64-unknown-linux-gnu
+       echo powerpc64-unknown-linux-${LIBC}
        exit ;;
     ppc:Linux:*:*)
-       echo powerpc-unknown-linux-gnu
+       echo powerpc-unknown-linux-${LIBC}
+       exit ;;
+    ppc64le:Linux:*:*)
+       echo powerpc64le-unknown-linux-${LIBC}
+       exit ;;
+    ppcle:Linux:*:*)
+       echo powerpcle-unknown-linux-${LIBC}
        exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-       echo ${UNAME_MACHINE}-ibm-linux
+       echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
        exit ;;
     sh64*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     sh*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     tile*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     vax:Linux:*:*)
-       echo ${UNAME_MACHINE}-dec-linux-gnu
+       echo ${UNAME_MACHINE}-dec-linux-${LIBC}
        exit ;;
     x86_64:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     xtensa*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
        exit ;;
     i*86:DYNIX/ptx:4*:*)
        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1201,6 +1227,9 @@ EOF
     BePC:Haiku:*:*)    # Haiku running on Intel PC compatible.
        echo i586-pc-haiku
        exit ;;
+    x86_64:Haiku:*:*)
+       echo x86_64-unknown-haiku
+       exit ;;
     SX-4:SUPER-UX:*:*)
        echo sx4-nec-superux${UNAME_RELEASE}
        exit ;;
@@ -1227,19 +1256,21 @@ EOF
        exit ;;
     *:Darwin:*:*)
        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-       case $UNAME_PROCESSOR in
-           i386)
-               eval $set_cc_for_build
-               if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-                 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-                     (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-                     grep IS_64BIT_ARCH >/dev/null
-                 then
-                     UNAME_PROCESSOR="x86_64"
-                 fi
-               fi ;;
-           unknown) UNAME_PROCESSOR=powerpc ;;
-       esac
+       eval $set_cc_for_build
+       if test "$UNAME_PROCESSOR" = unknown ; then
+           UNAME_PROCESSOR=powerpc
+       fi
+       if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+           if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+               (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+               grep IS_64BIT_ARCH >/dev/null
+           then
+               case $UNAME_PROCESSOR in
+                   i386) UNAME_PROCESSOR=x86_64 ;;
+                   powerpc) UNAME_PROCESSOR=powerpc64 ;;
+               esac
+           fi
+       fi
        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
        exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1256,7 +1287,7 @@ EOF
     NEO-?:NONSTOP_KERNEL:*:*)
        echo neo-tandem-nsk${UNAME_RELEASE}
        exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
        echo nse-tandem-nsk${UNAME_RELEASE}
        exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1330,9 +1361,6 @@ EOF
        exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
index 6205f8423d6aa0bb7c642d8970fa7b41d068317f..9633db704678e91ad221adc4f30a22ce0bc61e1b 100755 (executable)
@@ -1,24 +1,18 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-04-18'
+timestamp='2013-08-10'
 
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
@@ -26,11 +20,12 @@ timestamp='2012-04-18'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -73,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,7 +116,7 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
@@ -156,7 +149,7 @@ case $os in
        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-       -apple | -axis | -knuth | -cray | -microblaze)
+       -apple | -axis | -knuth | -cray | -microblaze*)
                os=
                basic_machine=$1
                ;;
@@ -259,10 +252,12 @@ case $basic_machine in
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
        | am33_2.0 \
-       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
+       | arc | arceb \
+       | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+       | avr | avr32 \
+       | be32 | be64 \
        | bfin \
-       | c4x | clipper \
+       | c4x | c8051 | clipper \
        | d10v | d30v | dlx | dsp16xx \
        | epiphany \
        | fido | fr30 | frv \
@@ -273,7 +268,7 @@ case $basic_machine in
        | le32 | le64 \
        | lm32 \
        | m32c | m32r | m32rle | m68000 | m68k | m88k \
-       | maxq | mb | microblaze | mcore | mep | metag \
+       | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
        | mips | mipsbe | mipseb | mipsel | mipsle \
        | mips16 \
        | mips64 | mips64el \
@@ -291,16 +286,17 @@ case $basic_machine in
        | mipsisa64r2 | mipsisa64r2el \
        | mipsisa64sb1 | mipsisa64sb1el \
        | mipsisa64sr71k | mipsisa64sr71kel \
+       | mipsr5900 | mipsr5900el \
        | mipstx39 | mipstx39el \
        | mn10200 | mn10300 \
        | moxie \
        | mt \
        | msp430 \
        | nds32 | nds32le | nds32be \
-       | nios | nios2 \
+       | nios | nios2 | nios2eb | nios2el \
        | ns16k | ns32k \
        | open8 \
-       | or32 \
+       | or1k | or32 \
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle \
        | pyramid \
@@ -370,13 +366,13 @@ case $basic_machine in
        | aarch64-* | aarch64_be-* \
        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
        | avr-* | avr32-* \
        | be32-* | be64-* \
        | bfin-* | bs2000-* \
        | c[123]* | c30-* | [cjt]90-* | c4x-* \
-       | clipper-* | craynv-* | cydra-* \
+       | c8051-* | clipper-* | craynv-* | cydra-* \
        | d10v-* | d30v-* | dlx-* \
        | elxsi-* \
        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -389,7 +385,8 @@ case $basic_machine in
        | lm32-* \
        | m32c-* | m32r-* | m32rle-* \
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-       | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+       | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+       | microblaze-* | microblazeel-* \
        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
        | mips16-* \
        | mips64-* | mips64el-* \
@@ -407,12 +404,13 @@ case $basic_machine in
        | mipsisa64r2-* | mipsisa64r2el-* \
        | mipsisa64sb1-* | mipsisa64sb1el-* \
        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+       | mipsr5900-* | mipsr5900el-* \
        | mipstx39-* | mipstx39el-* \
        | mmix-* \
        | mt-* \
        | msp430-* \
        | nds32-* | nds32le-* | nds32be-* \
-       | nios-* | nios2-* \
+       | nios-* | nios2-* | nios2eb-* | nios2el-* \
        | none-* | np1-* | ns16k-* | ns32k-* \
        | open8-* \
        | orion-* \
@@ -788,11 +786,15 @@ case $basic_machine in
                basic_machine=ns32k-utek
                os=-sysv
                ;;
-       microblaze)
+       microblaze*)
                basic_machine=microblaze-xilinx
                ;;
+       mingw64)
+               basic_machine=x86_64-pc
+               os=-mingw64
+               ;;
        mingw32)
-               basic_machine=i386-pc
+               basic_machine=i686-pc
                os=-mingw32
                ;;
        mingw32ce)
@@ -828,7 +830,7 @@ case $basic_machine in
                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
                ;;
        msys)
-               basic_machine=i386-pc
+               basic_machine=i686-pc
                os=-msys
                ;;
        mvs)
@@ -1019,7 +1021,11 @@ case $basic_machine in
                basic_machine=i586-unknown
                os=-pw32
                ;;
-       rdos)
+       rdos | rdos64)
+               basic_machine=x86_64-pc
+               os=-rdos
+               ;;
+       rdos32)
                basic_machine=i386-pc
                os=-rdos
                ;;
@@ -1346,21 +1352,21 @@ case $os in
        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
              | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-             | -sym* | -kopensolaris* \
+             | -sym* | -kopensolaris* | -plan9* \
              | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
              | -aos* | -aros* \
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-             | -openbsd* | -solidbsd* \
+             | -bitrig* | -openbsd* | -solidbsd* \
              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
              | -chorusos* | -chorusrdb* | -cegcc* \
              | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -mingw32* | -linux-gnu* | -linux-android* \
-             | -linux-newlib* | -linux-uclibc* \
+             | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+             | -linux-newlib* | -linux-musl* | -linux-uclibc* \
              | -uxpv* | -beos* | -mpeix* | -udk* \
              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1492,9 +1498,6 @@ case $os in
        -aros*)
                os=-aros
                ;;
-       -kaos*)
-               os=-kaos
-               ;;
        -zvmoe)
                os=-zvmoe
                ;;
@@ -1543,6 +1546,9 @@ case $basic_machine in
        c4x-* | tic4x-*)
                os=-coff
                ;;
+       c8051-*)
+               os=-elf
+               ;;
        hexagon-*)
                os=-elf
                ;;
@@ -1586,6 +1592,9 @@ case $basic_machine in
        mips*-*)
                os=-elf
                ;;
+       or1k-*)
+               os=-elf
+               ;;
        or32-*)
                os=-coff
                ;;
index ce02a3214ccbacad3cd77c8f7245d71d67a73056..2fe6b3c64dceba273b01187a38efbbdc67eabb1e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for glabels 3.2.0.
+# Generated by GNU Autoconf 2.69 for glabels 3.2.1.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=glabels>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='glabels'
 PACKAGE_TARNAME='glabels'
-PACKAGE_VERSION='3.2.0'
-PACKAGE_STRING='glabels 3.2.0'
+PACKAGE_VERSION='3.2.1'
+PACKAGE_STRING='glabels 3.2.1'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=glabels'
 PACKAGE_URL=''
 
@@ -700,11 +700,14 @@ GTK_DOC_BUILD_HTML_FALSE
 GTK_DOC_BUILD_HTML_TRUE
 ENABLE_GTK_DOC_FALSE
 ENABLE_GTK_DOC_TRUE
+HAVE_GTK_DOC_FALSE
+HAVE_GTK_DOC_TRUE
 GTKDOC_DEPS_LIBS
 GTKDOC_DEPS_CFLAGS
 HTML_DIR
 GTKDOC_MKPDF
 GTKDOC_REBASE
+GTKDOC_CHECK_PATH
 GTKDOC_CHECK
 YELP_HELP_RULES
 XMLLINT
@@ -796,13 +799,13 @@ INTLTOOL_EXTRACT
 INTLTOOL_MERGE
 INTLTOOL_UPDATE
 USE_NLS
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
 AM_V
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
 am__untar
 am__tar
 AMTAR
@@ -867,8 +870,8 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_maintainer_mode
 enable_silent_rules
+enable_maintainer_mode
 enable_nls
 enable_dependency_tracking
 enable_shared
@@ -1461,7 +1464,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures glabels 3.2.0 to adapt to many kinds of systems.
+\`configure' configures glabels 3.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1531,7 +1534,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of glabels 3.2.0:";;
+     short | recursive ) echo "Configuration of glabels 3.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1539,13 +1542,16 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-                         (and sometimes confusing) to the casual installer
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
   --disable-nls           do not use Native Language Support
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -1688,7 +1694,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-glabels configure 3.2.0
+glabels configure 3.2.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2057,7 +2063,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by glabels $as_me 3.2.0, which was
+It was created by glabels $as_me 3.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2408,7 +2414,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-am__api_version='1.11'
+am__api_version='1.14'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2534,9 +2540,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -2547,32 +2550,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \    ]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+       # -L didn't work.
+       set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+       && test "$*" != "X conftest.file $srcdir/configure"; then
+
+       # If neither matched, then we have a broken ls.  This can happen
+       # if, for instance, CONFIG_SHELL is bash and it inherits a
+       # broken ls alias from the environment.  This has actually
+       # happened.  Such a system could not be considered "sane".
+       as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -2584,6 +2595,16 @@ Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2606,12 +2627,12 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -2623,10 +2644,10 @@ if test x"${install_sh}" != xset; then
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -2765,12 +2786,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2853,6 +2868,45 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+       @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -2874,8 +2928,9 @@ fi
 
 
 # Define the identity of the package.
+
  PACKAGE=glabels
- VERSION=3.2.0
+ VERSION=3.2.1
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2903,12 +2958,22 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
 
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
@@ -2916,6 +2981,48 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
@@ -2944,10 +3051,10 @@ if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=0;;
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
 esac
 am_make=${MAKE-make}
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
@@ -3015,7 +3122,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -3848,6 +3955,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -3859,8 +4025,8 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -3895,16 +4061,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -3913,8 +4079,8 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
        continue
       else
@@ -3922,7 +4088,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -7070,7 +7236,7 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -7095,7 +7261,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
                ;;
            esac
            ;;
-         ppc64-*linux*|powerpc64-*linux*)
+         powerpc64le-*)
+           LD="${LD-ld} -m elf32lppclinux"
+           ;;
+         powerpc64-*)
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
@@ -7114,7 +7283,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
            ;;
-         ppc*-*linux*|powerpc*-*linux*)
+         powerpcle-*)
+           LD="${LD-ld} -m elf64lppc"
+           ;;
+         powerpc-*)
            LD="${LD-ld} -m elf64ppc"
            ;;
          s390*-*linux*|s390*-*tpf*)
@@ -12380,7 +12552,8 @@ all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HEL
 .PHONY: pot
 pot: $(_HELP_POTFILE)
 $(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
-       $(AM_V_GEN)$(ITSTOOL) -o "$@" $(_HELP_C_FILES)
+       $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \
+       $(ITSTOOL) -o "$@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)")
 
 .PHONY: repo
 repo: $(_HELP_POTFILE)
@@ -12523,16 +12696,78 @@ uninstall-help:
 
 
 
-    # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+  gtk_doc_requires="gtk-doc >= 1.0"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5
+$as_echo_n "checking for gtk-doc... " >&6; }
+  if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  have_gtk_doc=yes
+else
+  have_gtk_doc=no
+fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5
+$as_echo "$have_gtk_doc" >&6; }
+
+  if test "$have_gtk_doc" = "no"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+  You will not be able to create source packages with 'make dist'
+  because $gtk_doc_requires is not found." >&5
+$as_echo "$as_me: WARNING:
+  You will not be able to create source packages with 'make dist'
+  because $gtk_doc_requires is not found." >&2;}
+  fi
+
+            # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+set dummy gtkdoc-check; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_GTKDOC_CHECK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GTKDOC_CHECK"; then
+  ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK
+if test -n "$GTKDOC_CHECK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
+$as_echo "$GTKDOC_CHECK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  # Extract the first word of "gtkdoc-check", so it can be a program name with args.
 set dummy gtkdoc-check; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GTKDOC_CHECK+:} false; then :
+if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $GTKDOC_CHECK in
+  case $GTKDOC_CHECK_PATH in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
+  ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -12542,7 +12777,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -12553,10 +12788,10 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
-if test -n "$GTKDOC_CHECK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
-$as_echo "$GTKDOC_CHECK" >&6; }
+GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH
+if test -n "$GTKDOC_CHECK_PATH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5
+$as_echo "$GTKDOC_CHECK_PATH" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -12669,18 +12904,19 @@ else
 fi
 
 
-  if test x$enable_gtk_doc = xyes; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  :
-else
-  as_fn_error $? "You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" "$LINENO" 5
-fi
-        if test "x$PACKAGE_NAME" != "xglib"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
+$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
+$as_echo "$enable_gtk_doc" >&6; }
+
+  if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
+    as_fn_error $? "
+  You must have $gtk_doc_requires installed to build documentation for
+  $PACKAGE_NAME. Please install gtk-doc or disable building the
+  documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5
+  fi
+
+    if test "x$PACKAGE_NAME" != "xglib"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5
        # Put the nasty error message in config.log where it belongs
        echo "$GTKDOC_DEPS_PKG_ERRORS" >&5
 
-       as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0) were not met:
-
-$GTKDOC_DEPS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
-and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+       :
 elif test $pkg_failed = untried; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
-and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+       :
 else
        GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS
        GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS
@@ -12772,14 +12988,8 @@ else
 $as_echo "yes" >&6; }
 
 fi
-    fi
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
-$as_echo "$enable_gtk_doc" >&6; }
-
     # Check whether --enable-gtk-doc-html was given.
 if test "${enable_gtk_doc_html+set}" = set; then :
   enableval=$enable_gtk_doc_html;
     enable_gtk_doc_pdf=no
   fi
 
+  if test -z "$AM_DEFAULT_VERBOSITY"; then
+    AM_DEFAULT_VERBOSITY=1
+  fi
+
+
+   if test x$have_gtk_doc = xyes; then
+  HAVE_GTK_DOC_TRUE=
+  HAVE_GTK_DOC_FALSE='#'
+else
+  HAVE_GTK_DOC_TRUE='#'
+  HAVE_GTK_DOC_FALSE=
+fi
 
    if test x$enable_gtk_doc = xyes; then
   ENABLE_GTK_DOC_TRUE=
@@ -13035,7 +13257,7 @@ mostlyclean-am: clean-gsettings-schemas
 gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
 
 %.gschema.valid: %.gschema.xml $(gsettings__enum_file)
-       $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@
+       $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p $(@D) && touch $@
 
 all-am: $(gsettings_SCHEMAS:.xml=.valid)
 uninstall-am: uninstall-gsettings-schemas
@@ -13670,6 +13892,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -13681,8 +13962,8 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -13717,16 +13998,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -13735,8 +14016,8 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
        continue
       else
@@ -13744,7 +14025,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -13810,7 +14091,6 @@ else
 fi
 
 
-    warnCFLAGS=
     if test "x$GCC" != xyes; then
        enable_compile_warnings=no
     fi
     warning_flags=
     realsave_CFLAGS="$CFLAGS"
 
+            base_warn_flags=" \
+        -Wall \
+        -Wstrict-prototypes \
+        -Wnested-externs \
+    "
+
+                    base_error_flags=" \
+        -Werror=missing-prototypes \
+        -Werror=implicit-function-declaration \
+        -Werror=pointer-arith \
+        -Werror=init-self \
+        -Werror=format-security \
+        -Werror=format=2 \
+        -Werror=missing-include-dirs \
+    "
+
+                additional_flags=""
+
     case "$enable_compile_warnings" in
     no)
-       warning_flags=
-       ;;
+        warning_flags=
+        ;;
     minimum)
-       warning_flags="-Wall"
-       ;;
+        warning_flags="-Wall"
+        ;;
     yes)
-       warning_flags="-Wall -Wmissing-prototypes"
-       ;;
+        warning_flags="$base_warn_flags $base_error_flags $additional_flags"
+        ;;
     maximum|error)
-       warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-       CFLAGS="$warning_flags $CFLAGS"
-       for option in -Wno-sign-compare; do
-               SAVE_CFLAGS="$CFLAGS"
-               CFLAGS="$CFLAGS $option"
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5
+        warning_flags="$base_warn_flags $base_error_flags $additional_flags"
+        ;;
+    *)
+        as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
+        ;;
+    esac
+
+    if test "$enable_compile_warnings" = "error" ; then
+        warning_flags="$warning_flags -Werror"
+    fi
+
+        for option in $warning_flags; do
+       save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS $option"
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5
 $as_echo_n "checking whether gcc understands $option... " >&6; }
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -13853,29 +14160,21 @@ else
   has_option=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-               CFLAGS="$SAVE_CFLAGS"
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
+       CFLAGS="$save_CFLAGS"
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
 $as_echo "$has_option" >&6; }
-               if test $has_option = yes; then
-                 warning_flags="$warning_flags $option"
-               fi
-               unset has_option
-               unset SAVE_CFLAGS
-       done
-       unset option
-       if test "$enable_compile_warnings" = "error" ; then
-           warning_flags="$warning_flags -Werror"
+       if test $has_option = yes; then
+           tested_warning_flags="$tested_warning_flags $option"
        fi
-       ;;
-    *)
-       as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
-       ;;
-    esac
+       unset has_option
+       unset save_CFLAGS
+    done
+    unset option
     CFLAGS="$realsave_CFLAGS"
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
 $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5
-$as_echo "$warning_flags" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tested_warning_flags" >&5
+$as_echo "$tested_warning_flags" >&6; }
 
     # Check whether --enable-iso-c was given.
 if test "${enable_iso_c+set}" = set; then :
@@ -13903,7 +14202,7 @@ $as_echo_n "checking what language compliance flags to pass to the C compiler...
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5
 $as_echo "$complCFLAGS" >&6; }
 
-    WARN_CFLAGS="$warning_flags $complCFLAGS"
+    WARN_CFLAGS="$tested_warning_flags $complCFLAGS"
 
 
 
@@ -15743,6 +16042,14 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
   ac_config_commands="$ac_config_commands po/stamp-it"
 
 
+if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16188,7 +16499,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by glabels $as_me 3.2.0, which was
+This file was extended by glabels $as_me 3.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16254,7 +16565,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-glabels config.status 3.2.0
+glabels config.status 3.2.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -17293,7 +17604,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -17306,7 +17617,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -17340,21 +17651,19 @@ $as_echo X"$mf" |
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
index f03996daf2ee35a6842bb048c609955a247bfe33..81bb2113e3c04e6a934e0aeca94580ff53cc9e9b 100644 (file)
@@ -6,7 +6,7 @@ dnl - GLABELS version
 dnl ---------------------------------------------------------------------------
 m4_define([glabels_major_version], [3])
 m4_define([glabels_minor_version], [2])
-m4_define([glabels_micro_version], [0])
+m4_define([glabels_micro_version], [1])
 
 m4_define([glabels_version],
           [glabels_major_version.glabels_minor_version.glabels_micro_version])
index eb4758220a16eebc60503aa62518051681539851..36d84067ee87f81b90520d8ec860ed1582529ce4 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -60,21 +87,28 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-       html-recursive info-recursive install-data-recursive \
-       install-dvi-recursive install-exec-recursive \
-       install-html-recursive install-info-recursive \
-       install-pdf-recursive install-ps-recursive install-recursive \
-       installcheck-recursive installdirs-recursive pdf-recursive \
-       ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+       ctags-recursive dvi-recursive html-recursive info-recursive \
+       install-data-recursive install-dvi-recursive \
+       install-exec-recursive install-html-recursive \
+       install-info-recursive install-pdf-recursive \
+       install-ps-recursive install-recursive installcheck-recursive \
+       installdirs-recursive pdf-recursive ps-recursive \
+       tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -82,9 +116,29 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
        distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -158,6 +212,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -361,22 +416,25 @@ clean-libtool:
        -rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-       @fail= failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+       @fail=; \
+       if $(am__make_keepgoing); then \
+         failcom='fail=yes'; \
+       else \
+         failcom='exit 1'; \
+       fi; \
        dot_seen=no; \
        target=`echo $@ | sed s/-recursive//`; \
-       list='$(SUBDIRS)'; for subdir in $$list; do \
+       case "$@" in \
+         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+         *) list='$(SUBDIRS)' ;; \
+       esac; \
+       for subdir in $$list; do \
          echo "Making $$target in $$subdir"; \
          if test "$$subdir" = "."; then \
            dot_seen=yes; \
@@ -391,57 +449,12 @@ $(RECURSIVE_TARGETS):
          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
        fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-       @fail= failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
-       dot_seen=no; \
-       case "$@" in \
-         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-         *) list='$(SUBDIRS)' ;; \
-       esac; \
-       rev=''; for subdir in $$list; do \
-         if test "$$subdir" = "."; then :; else \
-           rev="$$subdir $$rev"; \
-         fi; \
-       done; \
-       rev="$$rev ."; \
-       target=`echo $@ | sed s/-recursive//`; \
-       for subdir in $$rev; do \
-         echo "Making $$target in $$subdir"; \
-         if test "$$subdir" = "."; then \
-           local_target="$$target-am"; \
-         else \
-           local_target="$$target"; \
-         fi; \
-         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-         || eval $$failcom; \
-       done && test -z "$$fail"
-tags-recursive:
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-       done
-ctags-recursive:
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-       done
+ID: $(am__tagged_files)
+       $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
        set x; \
        here=`pwd`; \
        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -457,12 +470,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
              set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
          fi; \
        done; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       $(am__define_uniq_tagged_files); \
        shift; \
        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
          test -n "$$unique" || unique=$$empty_fix; \
@@ -474,15 +482,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
              $$unique; \
          fi; \
        fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+       $(am__define_uniq_tagged_files); \
        test -z "$(CTAGS_ARGS)$$unique" \
          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
             $$unique
@@ -491,6 +495,21 @@ GTAGS:
        here=`$(am__cd) $(top_builddir) && pwd` \
          && $(am__cd) $(top_srcdir) \
          && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+       list='$(am__tagged_files)'; \
+       case "$(srcdir)" in \
+         [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+         *) sdir=$(subdir)/$(srcdir) ;; \
+       esac; \
+       for i in $$list; do \
+         if test -f "$$i"; then \
+           echo "$(subdir)/$$i"; \
+         else \
+           echo "$$sdir/$$i"; \
+         fi; \
+       done >> $(top_builddir)/cscope.files
 
 distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -651,22 +670,20 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-       install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-       all all-am check check-am clean clean-generic clean-libtool \
-       ctags ctags-recursive distclean distclean-generic \
-       distclean-libtool distclean-tags distdir dvi dvi-am html \
-       html-am info info-am install install-am install-data \
-       install-data-am install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am install-info \
-       install-info-am install-man install-pdf install-pdf-am \
-       install-ps install-ps-am install-strip installcheck \
-       installcheck-am installdirs installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-       uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+       check-am clean clean-generic clean-libtool cscopelist-am ctags \
+       ctags-am distclean distclean-generic distclean-libtool \
+       distclean-tags distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am install-man \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       installdirs-am maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
index e6a67e4197045aae44bd4fe615ecda9141ebc04c..63b01cb179a6ef4ea60c5b57262b12b064fc0254 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/appdata
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -61,12 +88,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -103,6 +136,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(appdatadir)"
 DATA = $(appdata_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -148,6 +182,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -366,11 +401,11 @@ uninstall-appdataDATA:
        @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -510,16 +545,17 @@ uninstall-am: uninstall-appdataDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-appdataDATA install-data install-data-am install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am install-man \
-       install-pdf install-pdf-am install-ps install-ps-am \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       uninstall uninstall-am uninstall-appdataDATA
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-am install-appdataDATA install-data \
+       install-data-am install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-man install-pdf install-pdf-am \
+       install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+       uninstall-am uninstall-appdataDATA
 
 
 @INTLTOOL_XML_RULE@
index 4cac7163dd6aa759fe5c0423dfefe634c6f841a8..02cc90835e8d6719cb8ee53b0e13bca014c05a0a 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/desktop
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -61,12 +88,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -103,6 +136,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(desktopdir)"
 DATA = $(desktop_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -148,6 +182,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -366,11 +401,11 @@ uninstall-desktopDATA:
        @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -510,16 +545,17 @@ uninstall-am: uninstall-desktopDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-desktopDATA install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am install-man \
-       install-pdf install-pdf-am install-ps install-ps-am \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       uninstall uninstall-am uninstall-desktopDATA
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am \
+       install-desktopDATA install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-man install-pdf install-pdf-am \
+       install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+       uninstall-am uninstall-desktopDATA
 
 
 @INTLTOOL_DESKTOP_RULE@
index 0a9497a3e474839e4c23c9212759f5410e5b468c..f92944cf65359a89a5bf6b43ed6f57a339243374 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/icons/16x16
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -61,12 +88,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -104,6 +137,7 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(actioniconsdir)" \
        "$(DESTDIR)$(appiconsdir)"
 DATA = $(actionicons_DATA) $(appicons_DATA) $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -149,6 +183,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -420,11 +455,11 @@ uninstall-appiconsDATA:
        @list='$(appicons_DATA)'; test -n "$(appiconsdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(appiconsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -563,17 +598,18 @@ uninstall-am: uninstall-actioniconsDATA uninstall-appiconsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install \
-       install-actioniconsDATA install-am install-appiconsDATA \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-info install-info-am install-man install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
-       installcheck installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall \
-       uninstall-actioniconsDATA uninstall-am uninstall-appiconsDATA
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-actioniconsDATA install-am \
+       install-appiconsDATA install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am install-man \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags-am uninstall uninstall-actioniconsDATA uninstall-am \
+       uninstall-appiconsDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
index ac073efd8515ec327eaef11e61ac64c071610ede..6565830ef8852b4b3fa42b22bfd723e59092903d 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/icons/22x22
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -61,12 +88,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -104,6 +137,7 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(actioniconsdir)" \
        "$(DESTDIR)$(appiconsdir)"
 DATA = $(actionicons_DATA) $(appicons_DATA) $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -149,6 +183,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -398,11 +433,11 @@ uninstall-appiconsDATA:
        @list='$(appicons_DATA)'; test -n "$(appiconsdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(appiconsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -541,17 +576,18 @@ uninstall-am: uninstall-actioniconsDATA uninstall-appiconsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install \
-       install-actioniconsDATA install-am install-appiconsDATA \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-info install-info-am install-man install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
-       installcheck installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall \
-       uninstall-actioniconsDATA uninstall-am uninstall-appiconsDATA
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-actioniconsDATA install-am \
+       install-appiconsDATA install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am install-man \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags-am uninstall uninstall-actioniconsDATA uninstall-am \
+       uninstall-appiconsDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
index 2a6d55578e8427096eb82e1dc2fc20c91b27fab9..3cb50c5f498fe2ffe307a7de3d5d6ff93d0a7a9d 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/icons/24x24
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -61,12 +88,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -104,6 +137,7 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(actioniconsdir)" \
        "$(DESTDIR)$(appiconsdir)"
 DATA = $(actionicons_DATA) $(appicons_DATA) $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -149,6 +183,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -413,11 +448,11 @@ uninstall-appiconsDATA:
        @list='$(appicons_DATA)'; test -n "$(appiconsdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(appiconsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -556,17 +591,18 @@ uninstall-am: uninstall-actioniconsDATA uninstall-appiconsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install \
-       install-actioniconsDATA install-am install-appiconsDATA \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-info install-info-am install-man install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
-       installcheck installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall \
-       uninstall-actioniconsDATA uninstall-am uninstall-appiconsDATA
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-actioniconsDATA install-am \
+       install-appiconsDATA install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am install-man \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags-am uninstall uninstall-actioniconsDATA uninstall-am \
+       uninstall-appiconsDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
index 578fb1de047551eec0fb34146e1739a7a8a3ebf7..680bd85b8b63e8626129811d30215970d943359e 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/icons/32x32
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -61,12 +88,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -103,6 +136,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(appiconsdir)"
 DATA = $(appicons_DATA) $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -148,6 +182,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -369,11 +404,11 @@ uninstall-appiconsDATA:
        @list='$(appicons_DATA)'; test -n "$(appiconsdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(appiconsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -512,16 +547,17 @@ uninstall-am: uninstall-appiconsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-appiconsDATA install-data install-data-am install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am install-man \
-       install-pdf install-pdf-am install-ps install-ps-am \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       uninstall uninstall-am uninstall-appiconsDATA
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-am install-appiconsDATA install-data \
+       install-data-am install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-man install-pdf install-pdf-am \
+       install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+       uninstall-am uninstall-appiconsDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
index bcf5b87891e0e25f9b9a1a9353f141ec780ab643..0847c3b3cee8b86db93d79439283f6ec83d017fc 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/icons/48x48
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -61,12 +88,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -104,6 +137,7 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(appiconsdir)" \
        "$(DESTDIR)$(mimetypeiconsdir)"
 DATA = $(appicons_DATA) $(mimetypeicons_DATA) $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -149,6 +183,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -396,11 +431,11 @@ uninstall-mimetypeiconsDATA:
        @list='$(mimetypeicons_DATA)'; test -n "$(mimetypeiconsdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(mimetypeiconsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -539,17 +574,18 @@ uninstall-am: uninstall-appiconsDATA uninstall-mimetypeiconsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-appiconsDATA install-data install-data-am install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am install-man \
-       install-mimetypeiconsDATA install-pdf install-pdf-am \
-       install-ps install-ps-am install-strip installcheck \
-       installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-       uninstall-appiconsDATA uninstall-mimetypeiconsDATA
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-am install-appiconsDATA install-data \
+       install-data-am install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-man install-mimetypeiconsDATA \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags-am uninstall uninstall-am uninstall-appiconsDATA \
+       uninstall-mimetypeiconsDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
index 09db16f56ad9b59b270e7998eb8a44e247c64345..2adf2490525cc9beb5d5d3a03b5c4f14fc001295 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/icons
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -60,21 +87,28 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-       html-recursive info-recursive install-data-recursive \
-       install-dvi-recursive install-exec-recursive \
-       install-html-recursive install-info-recursive \
-       install-pdf-recursive install-ps-recursive install-recursive \
-       installcheck-recursive installdirs-recursive pdf-recursive \
-       ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+       ctags-recursive dvi-recursive html-recursive info-recursive \
+       install-data-recursive install-dvi-recursive \
+       install-exec-recursive install-html-recursive \
+       install-info-recursive install-pdf-recursive \
+       install-ps-recursive install-recursive installcheck-recursive \
+       installdirs-recursive pdf-recursive ps-recursive \
+       tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -82,9 +116,29 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
        distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -158,6 +212,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -353,22 +408,25 @@ clean-libtool:
        -rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-       @fail= failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+       @fail=; \
+       if $(am__make_keepgoing); then \
+         failcom='fail=yes'; \
+       else \
+         failcom='exit 1'; \
+       fi; \
        dot_seen=no; \
        target=`echo $@ | sed s/-recursive//`; \
-       list='$(SUBDIRS)'; for subdir in $$list; do \
+       case "$@" in \
+         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+         *) list='$(SUBDIRS)' ;; \
+       esac; \
+       for subdir in $$list; do \
          echo "Making $$target in $$subdir"; \
          if test "$$subdir" = "."; then \
            dot_seen=yes; \
@@ -383,57 +441,12 @@ $(RECURSIVE_TARGETS):
          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
        fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-       @fail= failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
-       dot_seen=no; \
-       case "$@" in \
-         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-         *) list='$(SUBDIRS)' ;; \
-       esac; \
-       rev=''; for subdir in $$list; do \
-         if test "$$subdir" = "."; then :; else \
-           rev="$$subdir $$rev"; \
-         fi; \
-       done; \
-       rev="$$rev ."; \
-       target=`echo $@ | sed s/-recursive//`; \
-       for subdir in $$rev; do \
-         echo "Making $$target in $$subdir"; \
-         if test "$$subdir" = "."; then \
-           local_target="$$target-am"; \
-         else \
-           local_target="$$target"; \
-         fi; \
-         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-         || eval $$failcom; \
-       done && test -z "$$fail"
-tags-recursive:
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-       done
-ctags-recursive:
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-       done
+ID: $(am__tagged_files)
+       $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
        set x; \
        here=`pwd`; \
        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -449,12 +462,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
              set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
          fi; \
        done; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       $(am__define_uniq_tagged_files); \
        shift; \
        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
          test -n "$$unique" || unique=$$empty_fix; \
@@ -466,15 +474,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
              $$unique; \
          fi; \
        fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+       $(am__define_uniq_tagged_files); \
        test -z "$(CTAGS_ARGS)$$unique" \
          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
             $$unique
@@ -483,6 +487,21 @@ GTAGS:
        here=`$(am__cd) $(top_builddir) && pwd` \
          && $(am__cd) $(top_srcdir) \
          && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+       list='$(am__tagged_files)'; \
+       case "$(srcdir)" in \
+         [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+         *) sdir=$(subdir)/$(srcdir) ;; \
+       esac; \
+       for i in $$list; do \
+         if test -f "$$i"; then \
+           echo "$(subdir)/$$i"; \
+         else \
+           echo "$$sdir/$$i"; \
+         fi; \
+       done >> $(top_builddir)/cscope.files
 
 distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -645,23 +664,22 @@ ps-am:
 uninstall-am:
        @$(NORMAL_INSTALL)
        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-       install-am install-data-am install-strip tags-recursive \
-       uninstall-am
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-       all all-am check check-am clean clean-generic clean-libtool \
-       ctags ctags-recursive distclean distclean-generic \
-       distclean-libtool distclean-tags distdir dvi dvi-am html \
-       html-am info info-am install install-am install-data \
-       install-data-am install-data-hook install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-info install-info-am install-man install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
-       installcheck installcheck-am installdirs installdirs-am \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       tags tags-recursive uninstall uninstall-am uninstall-hook
+.MAKE: $(am__recursive_targets) install-am install-data-am \
+       install-strip uninstall-am
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+       check-am clean clean-generic clean-libtool cscopelist-am ctags \
+       ctags-am distclean distclean-generic distclean-libtool \
+       distclean-tags distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am \
+       install-data-hook install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-man install-pdf install-pdf-am \
+       install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs installdirs-am maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+       uninstall-am uninstall-hook
 
 
 install-data-hook: update-icon-cache
index 1cd96aba520ccc20861e3a0102c30e6ac54b3082..06e602ebf74d011ecb556edff25ac8ccb150de68 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/icons/scalable
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -61,12 +88,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -104,6 +137,7 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(appiconsdir)" \
        "$(DESTDIR)$(mimetypeiconsdir)"
 DATA = $(appicons_DATA) $(mimetypeicons_DATA) $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -149,6 +183,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -396,11 +431,11 @@ uninstall-mimetypeiconsDATA:
        @list='$(mimetypeicons_DATA)'; test -n "$(mimetypeiconsdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(mimetypeiconsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -539,17 +574,18 @@ uninstall-am: uninstall-appiconsDATA uninstall-mimetypeiconsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-appiconsDATA install-data install-data-am install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am install-man \
-       install-mimetypeiconsDATA install-pdf install-pdf-am \
-       install-ps install-ps-am install-strip installcheck \
-       installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-       uninstall-appiconsDATA uninstall-mimetypeiconsDATA
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-am install-appiconsDATA install-data \
+       install-data-am install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-man install-mimetypeiconsDATA \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags-am uninstall uninstall-am uninstall-appiconsDATA \
+       uninstall-mimetypeiconsDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
index 60d0917a004cd285aa0dc64d8b750203677cadfe..07cc1c2c4832c8d0e771dea5c66e026c57b98428 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/man
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -60,12 +87,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -104,6 +137,7 @@ man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)"
 NROFF = nroff
 MANS = $(man_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -149,6 +183,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -385,27 +420,14 @@ uninstall-man1:
        } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
              -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
        dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
-       @list='$(MANS)'; if test -n "$$list"; then \
-         list=`for p in $$list; do \
-           if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-           if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-         if test -n "$$list" && \
-           grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-           echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-           grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-           echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-           echo "       typically \`make maintainer-clean' will remove them" >&2; \
-           exit 1; \
-         else :; fi; \
-       else :; fi
        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
        list='$(DISTFILES)'; \
@@ -543,16 +565,17 @@ uninstall-man: uninstall-man1
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-info install-info-am install-man install-man1 \
-       install-pdf install-pdf-am install-ps install-ps-am \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       uninstall uninstall-am uninstall-man uninstall-man1
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am install-man \
+       install-man1 install-pdf install-pdf-am install-ps \
+       install-ps-am install-strip installcheck installcheck-am \
+       installdirs maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am tags-am uninstall uninstall-am uninstall-man \
+       uninstall-man1
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
index b2a0f256e1e9bd0275cb8b633be476cbe9d71b5a..a23ce3551d1fd54b61ef945c8dafe5584a4021b9 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/mime
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -61,12 +88,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -103,6 +136,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(mimedir)"
 DATA = $(mime_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -148,6 +182,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -370,11 +405,11 @@ uninstall-mimeDATA:
        @list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(mimedir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -514,16 +549,16 @@ uninstall-am: uninstall-mimeDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-info install-info-am install-man install-mimeDATA \
-       install-pdf install-pdf-am install-ps install-ps-am \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       uninstall uninstall-am uninstall-mimeDATA
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am install-man \
+       install-mimeDATA install-pdf install-pdf-am install-ps \
+       install-ps-am install-strip installcheck installcheck-am \
+       installdirs maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am tags-am uninstall uninstall-am uninstall-mimeDATA
 
 @INTLTOOL_XML_RULE@
 
index 58c175bf83f09c27301d37f9833132e1df083d95..065454dfae0487bb68936586a55ab351e3ce7ee9 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/pixmaps
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -61,12 +88,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -103,6 +136,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(glabels_pixmapsdir)"
 DATA = $(glabels_pixmaps_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -148,6 +182,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -375,11 +410,11 @@ uninstall-glabels_pixmapsDATA:
        @list='$(glabels_pixmaps_DATA)'; test -n "$(glabels_pixmapsdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(glabels_pixmapsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -518,16 +553,17 @@ uninstall-am: uninstall-glabels_pixmapsDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-exec install-exec-am install-glabels_pixmapsDATA \
-       install-html install-html-am install-info install-info-am \
-       install-man install-pdf install-pdf-am install-ps \
-       install-ps-am install-strip installcheck installcheck-am \
-       installdirs maintainer-clean maintainer-clean-generic \
-       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-       ps ps-am uninstall uninstall-am uninstall-glabels_pixmapsDATA
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am \
+       install-glabels_pixmapsDATA install-html install-html-am \
+       install-info install-info-am install-man install-pdf \
+       install-pdf-am install-ps install-ps-am install-strip \
+       installcheck installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+       uninstall-am uninstall-glabels_pixmapsDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
index 1eb115068aac8bee7f11e018b9841f44da6e17d0..72b848ef13aa87ace8442ec63ce296aaf94c9b07 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/schemas
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(srcdir)/org.gnome.glabels-3.gschema.xml.in.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -61,12 +88,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = org.gnome.glabels-3.gschema.xml.in
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -74,6 +107,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -119,6 +153,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -330,11 +365,11 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -473,15 +508,16 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-info install-info-am install-man install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
-       installcheck installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am install-man \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags-am uninstall uninstall-am
 
 
 @INTLTOOL_XML_NOMERGE_RULE@
index 59c9d1cbf0c78e2afe292af0bb895eaf7c1836c3..cb1d68a2dce12cec1e2e2ceba8d0607d4d45a4ab 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/ui
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -61,12 +88,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -103,6 +136,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(builderdir)"
 DATA = $(builder_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -148,6 +182,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -372,11 +407,11 @@ uninstall-builderDATA:
        @list='$(builder_DATA)'; test -n "$(builderdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(builderdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -515,16 +550,17 @@ uninstall-am: uninstall-builderDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-builderDATA install-data install-data-am install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am install-man \
-       install-pdf install-pdf-am install-ps install-ps-am \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       uninstall uninstall-am uninstall-builderDATA
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-am install-builderDATA install-data \
+       install-data-am install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-man install-pdf install-pdf-am \
+       install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+       uninstall-am uninstall-builderDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
index 499ddbd3ba43b6a767a776200987f8532080acb4..ee45ec068233a0f8a5143fa1e898df13d9fa8dff 100644 (file)
@@ -18,7 +18,6 @@
         <child>
           <object class="GtkNotebook" id="notebook">
             <property name="visible">True</property>
-            <property name="tab_hborder">0</property>
             <child>
               <object class="GtkVBox" id="recent_tab_vbox">
                 <property name="height_request">320</property>
diff --git a/depcomp b/depcomp
index 25a39e6cd5c82d7276f6ccc62ef5e7ba1cc9776f..4ebd5b3a2f2d689de95251c9424e2763aa159de5 100755 (executable)
--- a/depcomp
+++ b/depcomp
@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2012-03-27.16; # UTC
+scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,9 +27,9 @@ scriptversion=2012-03-27.16; # UTC
 
 case $1 in
   '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -57,11 +56,65 @@ EOF
     ;;
 esac
 
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
 # A tabulation character.
 tab='  '
 # A newline character.
 nl='
 '
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
 
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
@@ -75,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
 
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -86,32 +142,32 @@ if test "$depmode" = hp; then
 fi
 
 if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvisualcpp
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
 fi
 
 if test "$depmode" = msvc7msys; then
-   # This is just like msvc7 but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvc7
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
 fi
 
 if test "$depmode" = xlc; then
-   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
-   gccflag=-qmakedep=gcc,-MF
-   depmode=gcc
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
 fi
 
 case "$depmode" in
@@ -134,8 +190,7 @@ gcc3)
   done
   "$@"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -143,13 +198,17 @@ gcc3)
   ;;
 
 gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
@@ -157,15 +216,14 @@ gcc)
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
 ## This next piece of magic avoids the "deleted header file" problem.
@@ -174,15 +232,15 @@ gcc)
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' "$nl" < "$tmpdepfile" |
 ## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.  hp depmode also adds that space, but also prefixes the VPATH
 ## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-      | sed -e 's/$/ :/' >> "$depfile"
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -200,8 +258,7 @@ sgi)
     "$@" -MDupdate "$tmpdepfile"
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -209,7 +266,6 @@ sgi)
 
   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
     echo "$object : \\" > "$depfile"
-
     # Clip off the initial element (the dependent).  Don't try to be
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
@@ -217,19 +273,15 @@ sgi)
     # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
     tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr "$nl" ' ' >> "$depfile"
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
-
     # The second pass generates a dummy entry for each header file.
     tr ' ' "$nl" < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
   else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile"
   ;;
@@ -247,9 +299,8 @@ aix)
   # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.u
     tmpdepfile2=$base.u
@@ -262,9 +313,7 @@ aix)
     "$@" -M
   fi
   stat=$?
-
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
@@ -273,65 +322,113 @@ aix)
   do
     test -f "$tmpdepfile" && break
   done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form 'foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # '$object: dependent.h' and one to simply 'dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
   fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
-icc)
-  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
-  # However on
-  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using '\':
+  # and will wrap long lines using '\' :
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-  # tcc 0.9.26 (FIXME still under development at the moment of writing)
-  # will emit a similar output, but also prepend the continuation lines
-  # with horizontal tabulation characters.
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form 'foo.o: dependent.h',
-  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
   # Do two passes, one to just change these to
-  # '$object: dependent.h' and one to simply 'dependent.h:'.
-  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
-    < "$tmpdepfile" > "$depfile"
-  sed '
-    s/[ '"$tab"'][ '"$tab"']*/ /g
-    s/^ *//
-    s/ *\\*$//
-    s/^[^:]*: *//
-    /^$/d
-    /:$/d
-    s/$/ :/
-  ' < "$tmpdepfile" >> "$depfile"
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -342,9 +439,8 @@ hp2)
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
   # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from  "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir.libs/$base.d
@@ -355,8 +451,7 @@ hp2)
     "$@" +Maked
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
@@ -366,76 +461,61 @@ hp2)
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
     # Add 'dependent.h:' lines.
     sed -ne '2,${
-              s/^ *//
-              s/ \\*$//
-              s/$/:/
-              p
-            }' "$tmpdepfile" >> "$depfile"
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
   else
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in 'foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
 
 msvc7)
   if test "$libtool" = yes; then
@@ -446,8 +526,7 @@ msvc7)
   "$@" $showIncludes > "$tmpdepfile"
   stat=$?
   grep -v '^Note: including file: ' "$tmpdepfile"
-  if test "$stat" = 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -473,6 +552,7 @@ $ {
   G
   p
 }' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
   rm -f "$tmpdepfile"
   ;;
 
@@ -524,13 +604,14 @@ dashmstdout)
   # in the target name.  This is to cope with DOS-style filenames:
   # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' "$nl" < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -583,10 +664,12 @@ makedepend)
   # makedepend may prepend the VPATH from the source file name to the object.
   # No need to regex-escape $object, excess matching of '.' is harmless.
   sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
@@ -622,10 +705,10 @@ cpp)
     esac
   done
 
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
+  "$@" -E \
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -657,15 +740,15 @@ msvisualcpp)
       shift
       ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-       set fnord "$@"
-       shift
-       shift
-       ;;
+        set fnord "$@"
+        shift
+        shift
+        ;;
     *)
-       set fnord "$@" "$arg"
-       shift
-       shift
-       ;;
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
     esac
   done
   "$@" -E 2>/dev/null |
index 25cb512515d7157cb7c3053e9713022d28cb1f8c..40c73e3df2dfb8f5b13b49706c809a3226953a2e 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = docs
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -60,21 +87,28 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-       html-recursive info-recursive install-data-recursive \
-       install-dvi-recursive install-exec-recursive \
-       install-html-recursive install-info-recursive \
-       install-pdf-recursive install-ps-recursive install-recursive \
-       installcheck-recursive installdirs-recursive pdf-recursive \
-       ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+       ctags-recursive dvi-recursive html-recursive info-recursive \
+       install-data-recursive install-dvi-recursive \
+       install-exec-recursive install-html-recursive \
+       install-info-recursive install-pdf-recursive \
+       install-ps-recursive install-recursive installcheck-recursive \
+       installdirs-recursive pdf-recursive ps-recursive \
+       tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -82,9 +116,29 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
        distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -158,6 +212,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -355,22 +410,25 @@ clean-libtool:
        -rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-       @fail= failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+       @fail=; \
+       if $(am__make_keepgoing); then \
+         failcom='fail=yes'; \
+       else \
+         failcom='exit 1'; \
+       fi; \
        dot_seen=no; \
        target=`echo $@ | sed s/-recursive//`; \
-       list='$(SUBDIRS)'; for subdir in $$list; do \
+       case "$@" in \
+         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+         *) list='$(SUBDIRS)' ;; \
+       esac; \
+       for subdir in $$list; do \
          echo "Making $$target in $$subdir"; \
          if test "$$subdir" = "."; then \
            dot_seen=yes; \
@@ -385,57 +443,12 @@ $(RECURSIVE_TARGETS):
          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
        fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-       @fail= failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
-       dot_seen=no; \
-       case "$@" in \
-         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-         *) list='$(SUBDIRS)' ;; \
-       esac; \
-       rev=''; for subdir in $$list; do \
-         if test "$$subdir" = "."; then :; else \
-           rev="$$subdir $$rev"; \
-         fi; \
-       done; \
-       rev="$$rev ."; \
-       target=`echo $@ | sed s/-recursive//`; \
-       for subdir in $$rev; do \
-         echo "Making $$target in $$subdir"; \
-         if test "$$subdir" = "."; then \
-           local_target="$$target-am"; \
-         else \
-           local_target="$$target"; \
-         fi; \
-         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-         || eval $$failcom; \
-       done && test -z "$$fail"
-tags-recursive:
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-       done
-ctags-recursive:
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-       done
+ID: $(am__tagged_files)
+       $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
        set x; \
        here=`pwd`; \
        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -451,12 +464,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
              set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
          fi; \
        done; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       $(am__define_uniq_tagged_files); \
        shift; \
        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
          test -n "$$unique" || unique=$$empty_fix; \
@@ -468,15 +476,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
              $$unique; \
          fi; \
        fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+       $(am__define_uniq_tagged_files); \
        test -z "$(CTAGS_ARGS)$$unique" \
          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
             $$unique
@@ -485,6 +489,21 @@ GTAGS:
        here=`$(am__cd) $(top_builddir) && pwd` \
          && $(am__cd) $(top_srcdir) \
          && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+       list='$(am__tagged_files)'; \
+       case "$(srcdir)" in \
+         [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+         *) sdir=$(subdir)/$(srcdir) ;; \
+       esac; \
+       for i in $$list; do \
+         if test -f "$$i"; then \
+           echo "$(subdir)/$$i"; \
+         else \
+           echo "$$sdir/$$i"; \
+         fi; \
+       done >> $(top_builddir)/cscope.files
 
 distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -645,22 +664,20 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-       install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-       all all-am check check-am clean clean-generic clean-libtool \
-       ctags ctags-recursive distclean distclean-generic \
-       distclean-libtool distclean-tags distdir dvi dvi-am html \
-       html-am info info-am install install-am install-data \
-       install-data-am install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am install-info \
-       install-info-am install-man install-pdf install-pdf-am \
-       install-ps install-ps-am install-strip installcheck \
-       installcheck-am installdirs installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-       uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+       check-am clean clean-generic clean-libtool cscopelist-am ctags \
+       ctags-am distclean distclean-generic distclean-libtool \
+       distclean-tags distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am install-man \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       installdirs-am maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
index a1ac97c4900d0dc7962899abbc3cba5e165a67a1..445f63c871f106da00b3b2e6d7bd7b4d0dea8b3d 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # Everything below here is generic #
 ####################################
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -56,8 +83,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-       $(top_srcdir)/gtk-doc.make
+DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \
+       $(srcdir)/Makefile.am
 subdir = docs/libglabels
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -67,12 +94,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -80,6 +113,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -125,6 +159,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -380,11 +415,47 @@ REPORT_FILES = \
        $(DOC_MODULE)-undeclared.txt \
        $(DOC_MODULE)-unused.txt
 
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
+@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
+@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
+@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
+@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
+
+#### setup ####
+GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0 = @echo "  DOC   Preparing build";
+
+#### scan ####
+GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0 = @echo "  DOC   Scanning header files";
+GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
+
+#### templates ####
+GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V))
+GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_TMPL_0 = @echo "  DOC   Rebuilding template files";
+
+#### xml ####
+GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0 = @echo "  DOC   Building XML";
+
+#### html ####
+GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0 = @echo "  DOC   Building HTML";
+GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0 = @echo "  DOC   Fixing cross-references";
+
+#### pdf ####
+GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0 = @echo "  DOC   Building PDF";
 all: all-am
 
 .SUFFIXES:
@@ -425,11 +496,11 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -467,6 +538,7 @@ distdir: $(DISTFILES)
          dist-hook
 check-am: all-am
 check: check-am
+@ENABLE_GTK_DOC_FALSE@all-local:
 all-am: Makefile all-local
 installdirs:
 install: install-am
@@ -570,56 +642,58 @@ uninstall-am: uninstall-local
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-       clean-libtool clean-local dist-hook distclean \
-       distclean-generic distclean-libtool distclean-local distdir \
-       dvi dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-data-local install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am install-man \
-       install-pdf install-pdf-am install-ps install-ps-am \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic \
+       clean-libtool clean-local cscopelist-am ctags-am dist-hook \
+       distclean distclean-generic distclean-libtool distclean-local \
+       distdir dvi dvi-am html html-am info info-am install \
+       install-am install-data install-data-am install-data-local \
+       install-dvi install-dvi-am install-exec install-exec-am \
+       install-html install-html-am install-info install-info-am \
+       install-man install-pdf install-pdf-am install-ps \
+       install-ps-am install-strip installcheck installcheck-am \
+       installdirs maintainer-clean maintainer-clean-generic \
        maintainer-clean-local mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-       uninstall-local
+       mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+       uninstall-am uninstall-local
 
 
-@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-@ENABLE_GTK_DOC_FALSE@all-local:
+gtkdoc-check.test: Makefile
+       $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
+               echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
+               chmod +x $@
+
+all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+.PHONY: all-gtk-doc
+
+@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc
 
 docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 $(REPORT_FILES): sgml-build.stamp
 
-#### setup ####
-
 setup-build.stamp:
-       -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-           echo '  DOC   Preparing build'; \
+       -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
            files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
            if test "x$$files" != "x" ; then \
                for file in $$files ; do \
+                   destdir=`dirname $(abs_builddir)/$$file` ;\
+                   test -d "$$destdir" || mkdir -p "$$destdir"; \
                    test -f $(abs_srcdir)/$$file && \
-                       cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+                       cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
                done; \
            fi; \
            test -d $(abs_srcdir)/tmpl && \
-               { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+               { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
                chmod -R u+w $(abs_builddir)/tmpl; } \
        fi
-       @touch setup-build.stamp
+       $(AM_V_at)touch setup-build.stamp
 
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-       @echo '  DOC   Scanning header files'
-       @_source_dir='' ; \
+scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
+       $(GTK_DOC_V_SCAN)_source_dir='' ; \
        for i in $(DOC_SOURCE_DIR) ; do \
            _source_dir="$${_source_dir} --source-dir=$$i" ; \
        done ; \
        gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-       @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-           echo "  DOC   Introspecting gobjects"; \
+       $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
            scanobj_options=""; \
            gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
            if test "$(?)" = "0"; then \
@@ -634,22 +708,19 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
                test -f $$i || touch $$i ; \
            done \
        fi
-       @touch scan-build.stamp
+       $(AM_V_at)touch scan-build.stamp
 
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
        @true
 
-#### templates ####
-
 tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-       @echo '  DOC   Rebuilding template files'
-       @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-       @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+       $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+       $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
          if test -w $(abs_srcdir) ; then \
-           cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+           cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
          fi \
        fi
-       @touch tmpl-build.stamp
+       $(AM_V_at)touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
        @true
@@ -657,28 +728,20 @@ tmpl.stamp: tmpl-build.stamp
 $(srcdir)/tmpl/*.sgml:
        @true
 
-#### xml ####
-
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-       @echo '  DOC   Building XML'
-       @-chmod -R u+w $(srcdir)
-       @_source_dir='' ; \
+       -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \
        for i in $(DOC_SOURCE_DIR) ; do \
            _source_dir="$${_source_dir} --source-dir=$$i" ; \
        done ; \
        gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
-       @touch sgml-build.stamp
+       $(AM_V_at)touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
        @true
 
-#### html ####
-
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-       @echo '  DOC   Building HTML'
-       @rm -rf html
-       @mkdir html
-       @mkhtml_options=""; \
+       $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+       mkhtml_options=""; \
        gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
        if test "$(?)" = "0"; then \
          if test "x$(V)" = "x1"; then \
@@ -699,16 +762,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
            cp $(abs_builddir)/$$file $(abs_builddir)/html; \
          fi; \
        done;
-       @echo '  DOC   Fixing cross-references'
-       @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-       @touch html-build.stamp
-
-#### pdf ####
+       $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+       $(AM_V_at)touch html-build.stamp
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-       @echo '  DOC   Building PDF'
-       @rm -f $(DOC_MODULE).pdf
-       @mkpdf_options=""; \
+       $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+       mkpdf_options=""; \
        gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
        if test "$(?)" = "0"; then \
          if test "x$(V)" = "x1"; then \
@@ -725,13 +784,16 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
          done; \
        fi; \
        gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-       @touch pdf-build.stamp
+       $(AM_V_at)touch pdf-build.stamp
 
 ##############
 
 clean-local:
        @rm -f *~ *.bak
        @rm -rf .libs
+       @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
+         rm -f $(DOC_MODULE).types; \
+       fi
 
 distclean-local:
        @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
@@ -741,7 +803,7 @@ distclean-local:
            rm -rf tmpl; \
        fi
 
-maintainer-clean-local: clean
+maintainer-clean-local:
        @rm -rf xml html
 
 install-data-local:
@@ -777,12 +839,14 @@ uninstall-local:
 #
 # Require gtk-doc when making dist
 #
-@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc:
-@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc:
-@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist"
-@ENABLE_GTK_DOC_FALSE@ @false
-
-dist-hook: dist-check-gtkdoc dist-hook-local
+@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs
+@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc:
+@HAVE_GTK_DOC_FALSE@   @echo "*** gtk-doc is needed to run 'make dist'.         ***"
+@HAVE_GTK_DOC_FALSE@   @echo "*** gtk-doc was not found when 'configure' ran.   ***"
+@HAVE_GTK_DOC_FALSE@   @echo "*** please install gtk-doc and rerun 'configure'. ***"
+@HAVE_GTK_DOC_FALSE@   @false
+
+dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
        @mkdir $(distdir)/tmpl
        @mkdir $(distdir)/html
        @-cp ./tmpl/*.sgml $(distdir)/tmpl
index 01f5e920f18603996e54d4b582188ba8db5ca653..3d7f0c8136242dcd7f61b7f3d80edf322ba74071 100644 (file)
@@ -2,27 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Basic LibGlabels Usage</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlabels 3.0 Reference Manual: Basic LibGlabels Usage</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="up" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="prev" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="next" href="libglabels-3.0-db.html" title="Database">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="index.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td> </td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlabels 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglabels-3.0-db.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="index.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglabels-3.0-db.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="idp146224"></a>Basic LibGlabels Usage</h2></div></div></div>
-<div class="toc"><dl>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="id-1.2"></a>Basic LibGlabels Usage</h1></div></div></div>
+<div class="toc"><dl class="toc">
 <dt>
 <span class="refentrytitle"><a href="libglabels-3.0-db.html">Database</a></span><span class="refpurpose"> — Database of pre-defined templates</span>
 </dt>
@@ -42,6 +42,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 53c185f639538c9f3a1e56c731629928644c2aab..260da3939f10696f001c8865ab36b1b663f33f6c 100644 (file)
@@ -2,27 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Working Directly With LibGlabels XML</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlabels 3.0 Reference Manual: Working Directly With LibGlabels XML</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="up" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="prev" href="libglabels-3.0-vendor.html" title="The lglVendor Structure">
 <link rel="next" href="libglabels-3.0-xml-paper.html" title="XML Paper Functions">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="libglabels-3.0-vendor.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td> </td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlabels 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglabels-3.0-xml-paper.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="libglabels-3.0-vendor.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglabels-3.0-xml-paper.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="idp73920"></a>Working Directly With LibGlabels XML</h2></div></div></div>
-<div class="toc"><dl>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="id-1.3"></a>Working Directly With LibGlabels XML</h1></div></div></div>
+<div class="toc"><dl class="toc">
 <dt>
 <span class="refentrytitle"><a href="libglabels-3.0-xml-paper.html">XML Paper Functions</a></span><span class="refpurpose"> — Functions to parse glabels XML paper definition files</span>
 </dt>
@@ -42,6 +42,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 43c7e57f334a225714c1ddcc8aea85f9ce561d61..18c4693f5e2df3a05085209aadfa185fa2cb142d 100644 (file)
@@ -2,27 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Miscellaneous</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlabels 3.0 Reference Manual: Miscellaneous</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="up" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="prev" href="libglabels-3.0-xml.html" title="XML Helper Functions">
 <link rel="next" href="libglabels-3.0-units.html" title="Units">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="libglabels-3.0-xml.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td> </td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlabels 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglabels-3.0-units.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="libglabels-3.0-xml.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglabels-3.0-units.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="idp150208"></a>Miscellaneous</h2></div></div></div>
-<div class="toc"><dl>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="id-1.4"></a>Miscellaneous</h1></div></div></div>
+<div class="toc"><dl class="toc">
 <dt>
 <span class="refentrytitle"><a href="libglabels-3.0-units.html">Units</a></span><span class="refpurpose"> — Type to represent units of distance supported by libglabels</span>
 </dt>
@@ -33,6 +33,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index fb60b552ed4965b293039b2f814a71afca95e90c..28c2e27c6177f78365ca9fc04e5a1d0f0feaa51e 100644 (file)
Binary files a/docs/libglabels/html/home.png and b/docs/libglabels/html/home.png differ
index 23b36cc73c11678ffe0c7f89be9569c9f088af85..fa09cb1ed06ea8facb4a57ddcc2763a1cb1f6b82 100644 (file)
@@ -2,11 +2,11 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>LibGlabels 3.0 Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlabels 3.0 Reference Manual: LibGlabels 3.0 Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="next" href="ch01.html" title="Basic LibGlabels Usage">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -15,7 +15,7 @@
 <div><div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">LibGlabels 3.0 Reference Manual</p></th></tr></table></div></div>
 <hr>
 </div>
-<div class="toc"><dl>
+<div class="toc"><dl class="toc">
 <dt><span class="chapter"><a href="ch01.html">Basic LibGlabels Usage</a></span></dt>
 <dd><dl>
 <dt>
@@ -65,6 +65,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 31c3c0e5de56ebc59179477c3484fd89b44e7095..cd11487661d0e4aa3a9accce6bbf557ea4133d3d 100644 (file)
@@ -1,17 +1,10 @@
 <ANCHOR id="libglabels-3.0-db" href="libglabels-3.0/libglabels-3.0-db.html">
-<ANCHOR id="libglabels-3.0-db.synopsis" href="libglabels-3.0/libglabels-3.0-db.html#libglabels-3.0-db.synopsis">
+<ANCHOR id="libglabels-3.0-db.functions" href="libglabels-3.0/libglabels-3.0-db.html#libglabels-3.0-db.functions">
+<ANCHOR id="libglabels-3.0-db.other" href="libglabels-3.0/libglabels-3.0-db.html#libglabels-3.0-db.other">
+<ANCHOR id="libglabels-3.0-db.object-hierarchy" href="libglabels-3.0/libglabels-3.0-db.html#libglabels-3.0-db.object-hierarchy">
+<ANCHOR id="libglabels-3.0-db.includes" href="libglabels-3.0/libglabels-3.0-db.html#libglabels-3.0-db.includes">
 <ANCHOR id="libglabels-3.0-db.description" href="libglabels-3.0/libglabels-3.0-db.html#libglabels-3.0-db.description">
-<ANCHOR id="libglabels-3.0-db.details" href="libglabels-3.0/libglabels-3.0-db.html#libglabels-3.0-db.details">
-<ANCHOR id="lglDbRegStatus" href="libglabels-3.0/libglabels-3.0-db.html#lglDbRegStatus">
-<ANCHOR id="LGL-DB-REG-OK:CAPS" href="libglabels-3.0/libglabels-3.0-db.html#LGL-DB-REG-OK:CAPS">
-<ANCHOR id="LGL-DB-REG-BAD-PAPER-ID:CAPS" href="libglabels-3.0/libglabels-3.0-db.html#LGL-DB-REG-BAD-PAPER-ID:CAPS">
-<ANCHOR id="LGL-DB-REG-BRAND-PART-EXISTS:CAPS" href="libglabels-3.0/libglabels-3.0-db.html#LGL-DB-REG-BRAND-PART-EXISTS:CAPS">
-<ANCHOR id="LGL-DB-REG-FILE-WRITE-ERROR:CAPS" href="libglabels-3.0/libglabels-3.0-db.html#LGL-DB-REG-FILE-WRITE-ERROR:CAPS">
-<ANCHOR id="lglDbDeleteStatus" href="libglabels-3.0/libglabels-3.0-db.html#lglDbDeleteStatus">
-<ANCHOR id="LGL-DB-DELETE-OK:CAPS" href="libglabels-3.0/libglabels-3.0-db.html#LGL-DB-DELETE-OK:CAPS">
-<ANCHOR id="LGL-DB-DELETE-DOES-NOT-EXIST:CAPS" href="libglabels-3.0/libglabels-3.0-db.html#LGL-DB-DELETE-DOES-NOT-EXIST:CAPS">
-<ANCHOR id="LGL-DB-DELETE-NOT-USER-DEFINED:CAPS" href="libglabels-3.0/libglabels-3.0-db.html#LGL-DB-DELETE-NOT-USER-DEFINED:CAPS">
-<ANCHOR id="LGL-DB-DELETE-FILE-ERROR:CAPS" href="libglabels-3.0/libglabels-3.0-db.html#LGL-DB-DELETE-FILE-ERROR:CAPS">
+<ANCHOR id="libglabels-3.0-db.functions_details" href="libglabels-3.0/libglabels-3.0-db.html#libglabels-3.0-db.functions_details">
 <ANCHOR id="lgl-db-init" href="libglabels-3.0/libglabels-3.0-db.html#lgl-db-init">
 <ANCHOR id="lglDbNotifyFunc" href="libglabels-3.0/libglabels-3.0-db.html#lglDbNotifyFunc">
 <ANCHOR id="lgl-db-notify-add" href="libglabels-3.0/libglabels-3.0-db.html#lgl-db-notify-add">
 <ANCHOR id="lgl-db-print-known-categories" href="libglabels-3.0/libglabels-3.0-db.html#lgl-db-print-known-categories">
 <ANCHOR id="lgl-db-print-known-templates" href="libglabels-3.0/libglabels-3.0-db.html#lgl-db-print-known-templates">
 <ANCHOR id="lgl-db-print-known-vendors" href="libglabels-3.0/libglabels-3.0-db.html#lgl-db-print-known-vendors">
+<ANCHOR id="libglabels-3.0-db.other_details" href="libglabels-3.0/libglabels-3.0-db.html#libglabels-3.0-db.other_details">
+<ANCHOR id="lglDbRegStatus" href="libglabels-3.0/libglabels-3.0-db.html#lglDbRegStatus">
+<ANCHOR id="lglDbDeleteStatus" href="libglabels-3.0/libglabels-3.0-db.html#lglDbDeleteStatus">
 <ANCHOR id="libglabels-3.0-template" href="libglabels-3.0/libglabels-3.0-template.html">
-<ANCHOR id="libglabels-3.0-template.synopsis" href="libglabels-3.0/libglabels-3.0-template.html#libglabels-3.0-template.synopsis">
+<ANCHOR id="libglabels-3.0-template.functions" href="libglabels-3.0/libglabels-3.0-template.html#libglabels-3.0-template.functions">
+<ANCHOR id="libglabels-3.0-template.other" href="libglabels-3.0/libglabels-3.0-template.html#libglabels-3.0-template.other">
+<ANCHOR id="libglabels-3.0-template.object-hierarchy" href="libglabels-3.0/libglabels-3.0-template.html#libglabels-3.0-template.object-hierarchy">
+<ANCHOR id="libglabels-3.0-template.includes" href="libglabels-3.0/libglabels-3.0-template.html#libglabels-3.0-template.includes">
 <ANCHOR id="libglabels-3.0-template.description" href="libglabels-3.0/libglabels-3.0-template.html#libglabels-3.0-template.description">
-<ANCHOR id="libglabels-3.0-template.details" href="libglabels-3.0/libglabels-3.0-template.html#libglabels-3.0-template.details">
-<ANCHOR id="lglTemplate" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplate">
-<ANCHOR id="lglTemplateFrameShape" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateFrameShape">
-<ANCHOR id="LGL-TEMPLATE-FRAME-SHAPE-RECT:CAPS" href="libglabels-3.0/libglabels-3.0-template.html#LGL-TEMPLATE-FRAME-SHAPE-RECT:CAPS">
-<ANCHOR id="LGL-TEMPLATE-FRAME-SHAPE-ELLIPSE:CAPS" href="libglabels-3.0/libglabels-3.0-template.html#LGL-TEMPLATE-FRAME-SHAPE-ELLIPSE:CAPS">
-<ANCHOR id="LGL-TEMPLATE-FRAME-SHAPE-ROUND:CAPS" href="libglabels-3.0/libglabels-3.0-template.html#LGL-TEMPLATE-FRAME-SHAPE-ROUND:CAPS">
-<ANCHOR id="LGL-TEMPLATE-FRAME-SHAPE-CD:CAPS" href="libglabels-3.0/libglabels-3.0-template.html#LGL-TEMPLATE-FRAME-SHAPE-CD:CAPS">
-<ANCHOR id="lglTemplateFrame" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateFrame">
-<ANCHOR id="lglTemplateFrameAll" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateFrameAll">
-<ANCHOR id="lglTemplateFrameRect" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateFrameRect">
-<ANCHOR id="lglTemplateFrameEllipse" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateFrameEllipse">
-<ANCHOR id="lglTemplateFrameRound" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateFrameRound">
-<ANCHOR id="lglTemplateFrameCD" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateFrameCD">
-<ANCHOR id="lglTemplateLayout" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateLayout">
-<ANCHOR id="lglTemplateMarkupType" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateMarkupType">
-<ANCHOR id="LGL-TEMPLATE-MARKUP-MARGIN:CAPS" href="libglabels-3.0/libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-MARGIN:CAPS">
-<ANCHOR id="LGL-TEMPLATE-MARKUP-LINE:CAPS" href="libglabels-3.0/libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-LINE:CAPS">
-<ANCHOR id="LGL-TEMPLATE-MARKUP-CIRCLE:CAPS" href="libglabels-3.0/libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-CIRCLE:CAPS">
-<ANCHOR id="LGL-TEMPLATE-MARKUP-RECT:CAPS" href="libglabels-3.0/libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-RECT:CAPS">
-<ANCHOR id="LGL-TEMPLATE-MARKUP-ELLIPSE:CAPS" href="libglabels-3.0/libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-ELLIPSE:CAPS">
-<ANCHOR id="lglTemplateMarkup" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateMarkup">
-<ANCHOR id="lglTemplateMarkupMargin" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateMarkupMargin">
-<ANCHOR id="lglTemplateMarkupLine" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateMarkupLine">
-<ANCHOR id="lglTemplateMarkupCircle" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateMarkupCircle">
-<ANCHOR id="lglTemplateMarkupRect" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateMarkupRect">
-<ANCHOR id="lglTemplateMarkupEllipse" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateMarkupEllipse">
-<ANCHOR id="lglTemplateOrigin" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateOrigin">
+<ANCHOR id="libglabels-3.0-template.functions_details" href="libglabels-3.0/libglabels-3.0-template.html#libglabels-3.0-template.functions_details">
 <ANCHOR id="lgl-template-new" href="libglabels-3.0/libglabels-3.0-template.html#lgl-template-new">
 <ANCHOR id="lgl-template-new-from-equiv" href="libglabels-3.0/libglabels-3.0-template.html#lgl-template-new-from-equiv">
 <ANCHOR id="lgl-template-dup" href="libglabels-3.0/libglabels-3.0-template.html#lgl-template-dup">
 <ANCHOR id="lgl-template-markup-dup" href="libglabels-3.0/libglabels-3.0-template.html#lgl-template-markup-dup">
 <ANCHOR id="lgl-template-markup-free" href="libglabels-3.0/libglabels-3.0-template.html#lgl-template-markup-free">
 <ANCHOR id="lgl-template-print" href="libglabels-3.0/libglabels-3.0-template.html#lgl-template-print">
+<ANCHOR id="libglabels-3.0-template.other_details" href="libglabels-3.0/libglabels-3.0-template.html#libglabels-3.0-template.other_details">
+<ANCHOR id="lglTemplate" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplate">
+<ANCHOR id="lglTemplateFrameShape" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateFrameShape">
+<ANCHOR id="lglTemplateFrame" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateFrame">
+<ANCHOR id="lglTemplateFrameAll" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateFrameAll">
+<ANCHOR id="lglTemplateFrameRect" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateFrameRect">
+<ANCHOR id="lglTemplateFrameEllipse" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateFrameEllipse">
+<ANCHOR id="lglTemplateFrameRound" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateFrameRound">
+<ANCHOR id="lglTemplateFrameCD" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateFrameCD">
+<ANCHOR id="lglTemplateLayout" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateLayout">
+<ANCHOR id="lglTemplateMarkupType" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateMarkupType">
+<ANCHOR id="lglTemplateMarkup" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateMarkup">
+<ANCHOR id="lglTemplateMarkupMargin" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateMarkupMargin">
+<ANCHOR id="lglTemplateMarkupLine" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateMarkupLine">
+<ANCHOR id="lglTemplateMarkupCircle" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateMarkupCircle">
+<ANCHOR id="lglTemplateMarkupRect" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateMarkupRect">
+<ANCHOR id="lglTemplateMarkupEllipse" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateMarkupEllipse">
+<ANCHOR id="lglTemplateOrigin" href="libglabels-3.0/libglabels-3.0-template.html#lglTemplateOrigin">
 <ANCHOR id="libglabels-3.0-paper" href="libglabels-3.0/libglabels-3.0-paper.html">
-<ANCHOR id="libglabels-3.0-paper.synopsis" href="libglabels-3.0/libglabels-3.0-paper.html#libglabels-3.0-paper.synopsis">
+<ANCHOR id="libglabels-3.0-paper.functions" href="libglabels-3.0/libglabels-3.0-paper.html#libglabels-3.0-paper.functions">
+<ANCHOR id="libglabels-3.0-paper.other" href="libglabels-3.0/libglabels-3.0-paper.html#libglabels-3.0-paper.other">
+<ANCHOR id="libglabels-3.0-paper.object-hierarchy" href="libglabels-3.0/libglabels-3.0-paper.html#libglabels-3.0-paper.object-hierarchy">
+<ANCHOR id="libglabels-3.0-paper.includes" href="libglabels-3.0/libglabels-3.0-paper.html#libglabels-3.0-paper.includes">
 <ANCHOR id="libglabels-3.0-paper.description" href="libglabels-3.0/libglabels-3.0-paper.html#libglabels-3.0-paper.description">
-<ANCHOR id="libglabels-3.0-paper.details" href="libglabels-3.0/libglabels-3.0-paper.html#libglabels-3.0-paper.details">
-<ANCHOR id="lglPaper" href="libglabels-3.0/libglabels-3.0-paper.html#lglPaper">
+<ANCHOR id="libglabels-3.0-paper.functions_details" href="libglabels-3.0/libglabels-3.0-paper.html#libglabels-3.0-paper.functions_details">
 <ANCHOR id="lgl-paper-new" href="libglabels-3.0/libglabels-3.0-paper.html#lgl-paper-new">
 <ANCHOR id="lgl-paper-dup" href="libglabels-3.0/libglabels-3.0-paper.html#lgl-paper-dup">
 <ANCHOR id="lgl-paper-free" href="libglabels-3.0/libglabels-3.0-paper.html#lgl-paper-free">
+<ANCHOR id="libglabels-3.0-paper.other_details" href="libglabels-3.0/libglabels-3.0-paper.html#libglabels-3.0-paper.other_details">
+<ANCHOR id="lglPaper" href="libglabels-3.0/libglabels-3.0-paper.html#lglPaper">
 <ANCHOR id="libglabels-3.0-category" href="libglabels-3.0/libglabels-3.0-category.html">
-<ANCHOR id="libglabels-3.0-category.synopsis" href="libglabels-3.0/libglabels-3.0-category.html#libglabels-3.0-category.synopsis">
+<ANCHOR id="libglabels-3.0-category.functions" href="libglabels-3.0/libglabels-3.0-category.html#libglabels-3.0-category.functions">
+<ANCHOR id="libglabels-3.0-category.other" href="libglabels-3.0/libglabels-3.0-category.html#libglabels-3.0-category.other">
+<ANCHOR id="libglabels-3.0-category.object-hierarchy" href="libglabels-3.0/libglabels-3.0-category.html#libglabels-3.0-category.object-hierarchy">
+<ANCHOR id="libglabels-3.0-category.includes" href="libglabels-3.0/libglabels-3.0-category.html#libglabels-3.0-category.includes">
 <ANCHOR id="libglabels-3.0-category.description" href="libglabels-3.0/libglabels-3.0-category.html#libglabels-3.0-category.description">
-<ANCHOR id="libglabels-3.0-category.details" href="libglabels-3.0/libglabels-3.0-category.html#libglabels-3.0-category.details">
-<ANCHOR id="lglCategory" href="libglabels-3.0/libglabels-3.0-category.html#lglCategory">
+<ANCHOR id="libglabels-3.0-category.functions_details" href="libglabels-3.0/libglabels-3.0-category.html#libglabels-3.0-category.functions_details">
 <ANCHOR id="lgl-category-new" href="libglabels-3.0/libglabels-3.0-category.html#lgl-category-new">
 <ANCHOR id="lgl-category-dup" href="libglabels-3.0/libglabels-3.0-category.html#lgl-category-dup">
 <ANCHOR id="lgl-category-free" href="libglabels-3.0/libglabels-3.0-category.html#lgl-category-free">
+<ANCHOR id="libglabels-3.0-category.other_details" href="libglabels-3.0/libglabels-3.0-category.html#libglabels-3.0-category.other_details">
+<ANCHOR id="lglCategory" href="libglabels-3.0/libglabels-3.0-category.html#lglCategory">
 <ANCHOR id="libglabels-3.0-vendor" href="libglabels-3.0/libglabels-3.0-vendor.html">
-<ANCHOR id="libglabels-3.0-vendor.synopsis" href="libglabels-3.0/libglabels-3.0-vendor.html#libglabels-3.0-vendor.synopsis">
+<ANCHOR id="libglabels-3.0-vendor.functions" href="libglabels-3.0/libglabels-3.0-vendor.html#libglabels-3.0-vendor.functions">
+<ANCHOR id="libglabels-3.0-vendor.other" href="libglabels-3.0/libglabels-3.0-vendor.html#libglabels-3.0-vendor.other">
+<ANCHOR id="libglabels-3.0-vendor.object-hierarchy" href="libglabels-3.0/libglabels-3.0-vendor.html#libglabels-3.0-vendor.object-hierarchy">
+<ANCHOR id="libglabels-3.0-vendor.includes" href="libglabels-3.0/libglabels-3.0-vendor.html#libglabels-3.0-vendor.includes">
 <ANCHOR id="libglabels-3.0-vendor.description" href="libglabels-3.0/libglabels-3.0-vendor.html#libglabels-3.0-vendor.description">
-<ANCHOR id="libglabels-3.0-vendor.details" href="libglabels-3.0/libglabels-3.0-vendor.html#libglabels-3.0-vendor.details">
-<ANCHOR id="lglVendor" href="libglabels-3.0/libglabels-3.0-vendor.html#lglVendor">
+<ANCHOR id="libglabels-3.0-vendor.functions_details" href="libglabels-3.0/libglabels-3.0-vendor.html#libglabels-3.0-vendor.functions_details">
 <ANCHOR id="lgl-vendor-new" href="libglabels-3.0/libglabels-3.0-vendor.html#lgl-vendor-new">
 <ANCHOR id="lgl-vendor-dup" href="libglabels-3.0/libglabels-3.0-vendor.html#lgl-vendor-dup">
 <ANCHOR id="lgl-vendor-free" href="libglabels-3.0/libglabels-3.0-vendor.html#lgl-vendor-free">
+<ANCHOR id="libglabels-3.0-vendor.other_details" href="libglabels-3.0/libglabels-3.0-vendor.html#libglabels-3.0-vendor.other_details">
+<ANCHOR id="lglVendor" href="libglabels-3.0/libglabels-3.0-vendor.html#lglVendor">
 <ANCHOR id="libglabels-3.0-xml-paper" href="libglabels-3.0/libglabels-3.0-xml-paper.html">
-<ANCHOR id="libglabels-3.0-xml-paper.synopsis" href="libglabels-3.0/libglabels-3.0-xml-paper.html#libglabels-3.0-xml-paper.synopsis">
+<ANCHOR id="libglabels-3.0-xml-paper.functions" href="libglabels-3.0/libglabels-3.0-xml-paper.html#libglabels-3.0-xml-paper.functions">
+<ANCHOR id="libglabels-3.0-xml-paper.object-hierarchy" href="libglabels-3.0/libglabels-3.0-xml-paper.html#libglabels-3.0-xml-paper.object-hierarchy">
+<ANCHOR id="libglabels-3.0-xml-paper.includes" href="libglabels-3.0/libglabels-3.0-xml-paper.html#libglabels-3.0-xml-paper.includes">
 <ANCHOR id="libglabels-3.0-xml-paper.description" href="libglabels-3.0/libglabels-3.0-xml-paper.html#libglabels-3.0-xml-paper.description">
-<ANCHOR id="libglabels-3.0-xml-paper.details" href="libglabels-3.0/libglabels-3.0-xml-paper.html#libglabels-3.0-xml-paper.details">
+<ANCHOR id="libglabels-3.0-xml-paper.functions_details" href="libglabels-3.0/libglabels-3.0-xml-paper.html#libglabels-3.0-xml-paper.functions_details">
 <ANCHOR id="lgl-xml-paper-read-papers-from-file" href="libglabels-3.0/libglabels-3.0-xml-paper.html#lgl-xml-paper-read-papers-from-file">
 <ANCHOR id="lgl-xml-paper-parse-papers-doc" href="libglabels-3.0/libglabels-3.0-xml-paper.html#lgl-xml-paper-parse-papers-doc">
 <ANCHOR id="lgl-xml-paper-parse-paper-node" href="libglabels-3.0/libglabels-3.0-xml-paper.html#lgl-xml-paper-parse-paper-node">
+<ANCHOR id="libglabels-3.0-xml-paper.other_details" href="libglabels-3.0/libglabels-3.0-xml-paper.html#libglabels-3.0-xml-paper.other_details">
 <ANCHOR id="libglabels-3.0-xml-category" href="libglabels-3.0/libglabels-3.0-xml-category.html">
-<ANCHOR id="libglabels-3.0-xml-category.synopsis" href="libglabels-3.0/libglabels-3.0-xml-category.html#libglabels-3.0-xml-category.synopsis">
+<ANCHOR id="libglabels-3.0-xml-category.functions" href="libglabels-3.0/libglabels-3.0-xml-category.html#libglabels-3.0-xml-category.functions">
+<ANCHOR id="libglabels-3.0-xml-category.object-hierarchy" href="libglabels-3.0/libglabels-3.0-xml-category.html#libglabels-3.0-xml-category.object-hierarchy">
+<ANCHOR id="libglabels-3.0-xml-category.includes" href="libglabels-3.0/libglabels-3.0-xml-category.html#libglabels-3.0-xml-category.includes">
 <ANCHOR id="libglabels-3.0-xml-category.description" href="libglabels-3.0/libglabels-3.0-xml-category.html#libglabels-3.0-xml-category.description">
-<ANCHOR id="libglabels-3.0-xml-category.details" href="libglabels-3.0/libglabels-3.0-xml-category.html#libglabels-3.0-xml-category.details">
+<ANCHOR id="libglabels-3.0-xml-category.functions_details" href="libglabels-3.0/libglabels-3.0-xml-category.html#libglabels-3.0-xml-category.functions_details">
 <ANCHOR id="lgl-xml-category-read-categories-from-file" href="libglabels-3.0/libglabels-3.0-xml-category.html#lgl-xml-category-read-categories-from-file">
 <ANCHOR id="lgl-xml-category-parse-categories-doc" href="libglabels-3.0/libglabels-3.0-xml-category.html#lgl-xml-category-parse-categories-doc">
 <ANCHOR id="lgl-xml-category-parse-category-node" href="libglabels-3.0/libglabels-3.0-xml-category.html#lgl-xml-category-parse-category-node">
+<ANCHOR id="libglabels-3.0-xml-category.other_details" href="libglabels-3.0/libglabels-3.0-xml-category.html#libglabels-3.0-xml-category.other_details">
 <ANCHOR id="libglabels-3.0-xml-template" href="libglabels-3.0/libglabels-3.0-xml-template.html">
-<ANCHOR id="libglabels-3.0-xml-template.synopsis" href="libglabels-3.0/libglabels-3.0-xml-template.html#libglabels-3.0-xml-template.synopsis">
+<ANCHOR id="libglabels-3.0-xml-template.functions" href="libglabels-3.0/libglabels-3.0-xml-template.html#libglabels-3.0-xml-template.functions">
+<ANCHOR id="libglabels-3.0-xml-template.object-hierarchy" href="libglabels-3.0/libglabels-3.0-xml-template.html#libglabels-3.0-xml-template.object-hierarchy">
+<ANCHOR id="libglabels-3.0-xml-template.includes" href="libglabels-3.0/libglabels-3.0-xml-template.html#libglabels-3.0-xml-template.includes">
 <ANCHOR id="libglabels-3.0-xml-template.description" href="libglabels-3.0/libglabels-3.0-xml-template.html#libglabels-3.0-xml-template.description">
-<ANCHOR id="libglabels-3.0-xml-template.details" href="libglabels-3.0/libglabels-3.0-xml-template.html#libglabels-3.0-xml-template.details">
+<ANCHOR id="libglabels-3.0-xml-template.functions_details" href="libglabels-3.0/libglabels-3.0-xml-template.html#libglabels-3.0-xml-template.functions_details">
 <ANCHOR id="lgl-xml-template-read-templates-from-file" href="libglabels-3.0/libglabels-3.0-xml-template.html#lgl-xml-template-read-templates-from-file">
 <ANCHOR id="lgl-xml-template-parse-templates-doc" href="libglabels-3.0/libglabels-3.0-xml-template.html#lgl-xml-template-parse-templates-doc">
 <ANCHOR id="lgl-xml-template-parse-template-node" href="libglabels-3.0/libglabels-3.0-xml-template.html#lgl-xml-template-parse-template-node">
 <ANCHOR id="lgl-xml-template-write-templates-to-file" href="libglabels-3.0/libglabels-3.0-xml-template.html#lgl-xml-template-write-templates-to-file">
 <ANCHOR id="lgl-xml-template-write-template-to-file" href="libglabels-3.0/libglabels-3.0-xml-template.html#lgl-xml-template-write-template-to-file">
 <ANCHOR id="lgl-xml-template-create-template-node" href="libglabels-3.0/libglabels-3.0-xml-template.html#lgl-xml-template-create-template-node">
+<ANCHOR id="libglabels-3.0-xml-template.other_details" href="libglabels-3.0/libglabels-3.0-xml-template.html#libglabels-3.0-xml-template.other_details">
 <ANCHOR id="libglabels-3.0-xml-vendor" href="libglabels-3.0/libglabels-3.0-xml-vendor.html">
-<ANCHOR id="libglabels-3.0-xml-vendor.synopsis" href="libglabels-3.0/libglabels-3.0-xml-vendor.html#libglabels-3.0-xml-vendor.synopsis">
+<ANCHOR id="libglabels-3.0-xml-vendor.functions" href="libglabels-3.0/libglabels-3.0-xml-vendor.html#libglabels-3.0-xml-vendor.functions">
+<ANCHOR id="libglabels-3.0-xml-vendor.object-hierarchy" href="libglabels-3.0/libglabels-3.0-xml-vendor.html#libglabels-3.0-xml-vendor.object-hierarchy">
+<ANCHOR id="libglabels-3.0-xml-vendor.includes" href="libglabels-3.0/libglabels-3.0-xml-vendor.html#libglabels-3.0-xml-vendor.includes">
 <ANCHOR id="libglabels-3.0-xml-vendor.description" href="libglabels-3.0/libglabels-3.0-xml-vendor.html#libglabels-3.0-xml-vendor.description">
-<ANCHOR id="libglabels-3.0-xml-vendor.details" href="libglabels-3.0/libglabels-3.0-xml-vendor.html#libglabels-3.0-xml-vendor.details">
+<ANCHOR id="libglabels-3.0-xml-vendor.functions_details" href="libglabels-3.0/libglabels-3.0-xml-vendor.html#libglabels-3.0-xml-vendor.functions_details">
 <ANCHOR id="lgl-xml-vendor-read-vendors-from-file" href="libglabels-3.0/libglabels-3.0-xml-vendor.html#lgl-xml-vendor-read-vendors-from-file">
 <ANCHOR id="lgl-xml-vendor-parse-vendors-doc" href="libglabels-3.0/libglabels-3.0-xml-vendor.html#lgl-xml-vendor-parse-vendors-doc">
 <ANCHOR id="lgl-xml-vendor-parse-vendor-node" href="libglabels-3.0/libglabels-3.0-xml-vendor.html#lgl-xml-vendor-parse-vendor-node">
+<ANCHOR id="libglabels-3.0-xml-vendor.other_details" href="libglabels-3.0/libglabels-3.0-xml-vendor.html#libglabels-3.0-xml-vendor.other_details">
 <ANCHOR id="libglabels-3.0-xml" href="libglabels-3.0/libglabels-3.0-xml.html">
-<ANCHOR id="libglabels-3.0-xml.synopsis" href="libglabels-3.0/libglabels-3.0-xml.html#libglabels-3.0-xml.synopsis">
+<ANCHOR id="libglabels-3.0-xml.functions" href="libglabels-3.0/libglabels-3.0-xml.html#libglabels-3.0-xml.functions">
+<ANCHOR id="libglabels-3.0-xml.other" href="libglabels-3.0/libglabels-3.0-xml.html#libglabels-3.0-xml.other">
+<ANCHOR id="libglabels-3.0-xml.object-hierarchy" href="libglabels-3.0/libglabels-3.0-xml.html#libglabels-3.0-xml.object-hierarchy">
+<ANCHOR id="libglabels-3.0-xml.includes" href="libglabels-3.0/libglabels-3.0-xml.html#libglabels-3.0-xml.includes">
 <ANCHOR id="libglabels-3.0-xml.description" href="libglabels-3.0/libglabels-3.0-xml.html#libglabels-3.0-xml.description">
-<ANCHOR id="libglabels-3.0-xml.details" href="libglabels-3.0/libglabels-3.0-xml.html#libglabels-3.0-xml.details">
-<ANCHOR id="LGL-XML-NAME-SPACE:CAPS" href="libglabels-3.0/libglabels-3.0-xml.html#LGL-XML-NAME-SPACE:CAPS">
+<ANCHOR id="libglabels-3.0-xml.functions_details" href="libglabels-3.0/libglabels-3.0-xml.html#libglabels-3.0-xml.functions_details">
 <ANCHOR id="lgl-xml-get-prop-string" href="libglabels-3.0/libglabels-3.0-xml.html#lgl-xml-get-prop-string">
 <ANCHOR id="lgl-xml-get-prop-i18n-string" href="libglabels-3.0/libglabels-3.0-xml.html#lgl-xml-get-prop-i18n-string">
 <ANCHOR id="lgl-xml-get-prop-double" href="libglabels-3.0/libglabels-3.0-xml.html#lgl-xml-get-prop-double">
 <ANCHOR id="lgl-xml-is-node" href="libglabels-3.0/libglabels-3.0-xml.html#lgl-xml-is-node">
 <ANCHOR id="lgl-xml-get-node-content" href="libglabels-3.0/libglabels-3.0-xml.html#lgl-xml-get-node-content">
 <ANCHOR id="lgl-xml-set-default-units" href="libglabels-3.0/libglabels-3.0-xml.html#lgl-xml-set-default-units">
+<ANCHOR id="libglabels-3.0-xml.other_details" href="libglabels-3.0/libglabels-3.0-xml.html#libglabels-3.0-xml.other_details">
+<ANCHOR id="LGL-XML-NAME-SPACE:CAPS" href="libglabels-3.0/libglabels-3.0-xml.html#LGL-XML-NAME-SPACE:CAPS">
 <ANCHOR id="libglabels-3.0-units" href="libglabels-3.0/libglabels-3.0-units.html">
-<ANCHOR id="libglabels-3.0-units.synopsis" href="libglabels-3.0/libglabels-3.0-units.html#libglabels-3.0-units.synopsis">
+<ANCHOR id="libglabels-3.0-units.functions" href="libglabels-3.0/libglabels-3.0-units.html#libglabels-3.0-units.functions">
+<ANCHOR id="libglabels-3.0-units.other" href="libglabels-3.0/libglabels-3.0-units.html#libglabels-3.0-units.other">
+<ANCHOR id="libglabels-3.0-units.object-hierarchy" href="libglabels-3.0/libglabels-3.0-units.html#libglabels-3.0-units.object-hierarchy">
+<ANCHOR id="libglabels-3.0-units.includes" href="libglabels-3.0/libglabels-3.0-units.html#libglabels-3.0-units.includes">
 <ANCHOR id="libglabels-3.0-units.description" href="libglabels-3.0/libglabels-3.0-units.html#libglabels-3.0-units.description">
-<ANCHOR id="libglabels-3.0-units.details" href="libglabels-3.0/libglabels-3.0-units.html#libglabels-3.0-units.details">
-<ANCHOR id="lglUnits" href="libglabels-3.0/libglabels-3.0-units.html#lglUnits">
-<ANCHOR id="LGL-UNITS-POINT:CAPS" href="libglabels-3.0/libglabels-3.0-units.html#LGL-UNITS-POINT:CAPS">
-<ANCHOR id="LGL-UNITS-INCH:CAPS" href="libglabels-3.0/libglabels-3.0-units.html#LGL-UNITS-INCH:CAPS">
-<ANCHOR id="LGL-UNITS-MM:CAPS" href="libglabels-3.0/libglabels-3.0-units.html#LGL-UNITS-MM:CAPS">
-<ANCHOR id="LGL-UNITS-CM:CAPS" href="libglabels-3.0/libglabels-3.0-units.html#LGL-UNITS-CM:CAPS">
-<ANCHOR id="LGL-UNITS-PICA:CAPS" href="libglabels-3.0/libglabels-3.0-units.html#LGL-UNITS-PICA:CAPS">
-<ANCHOR id="LGL-UNITS-FIRST:CAPS" href="libglabels-3.0/libglabels-3.0-units.html#LGL-UNITS-FIRST:CAPS">
-<ANCHOR id="LGL-UNITS-LAST:CAPS" href="libglabels-3.0/libglabels-3.0-units.html#LGL-UNITS-LAST:CAPS">
-<ANCHOR id="LGL-UNITS-INVALID:CAPS" href="libglabels-3.0/libglabels-3.0-units.html#LGL-UNITS-INVALID:CAPS">
+<ANCHOR id="libglabels-3.0-units.functions_details" href="libglabels-3.0/libglabels-3.0-units.html#libglabels-3.0-units.functions_details">
 <ANCHOR id="lgl-units-get-id" href="libglabels-3.0/libglabels-3.0-units.html#lgl-units-get-id">
 <ANCHOR id="lgl-units-from-id" href="libglabels-3.0/libglabels-3.0-units.html#lgl-units-from-id">
 <ANCHOR id="lgl-units-get-name" href="libglabels-3.0/libglabels-3.0-units.html#lgl-units-get-name">
 <ANCHOR id="lgl-units-from-name" href="libglabels-3.0/libglabels-3.0-units.html#lgl-units-from-name">
 <ANCHOR id="lgl-units-get-points-per-unit" href="libglabels-3.0/libglabels-3.0-units.html#lgl-units-get-points-per-unit">
 <ANCHOR id="lgl-units-get-units-per-point" href="libglabels-3.0/libglabels-3.0-units.html#lgl-units-get-units-per-point">
+<ANCHOR id="libglabels-3.0-units.other_details" href="libglabels-3.0/libglabels-3.0-units.html#libglabels-3.0-units.other_details">
+<ANCHOR id="lglUnits" href="libglabels-3.0/libglabels-3.0-units.html#lglUnits">
 <ANCHOR id="libglabels-3.0-str" href="libglabels-3.0/libglabels-3.0-str.html">
-<ANCHOR id="libglabels-3.0-str.synopsis" href="libglabels-3.0/libglabels-3.0-str.html#libglabels-3.0-str.synopsis">
+<ANCHOR id="libglabels-3.0-str.functions" href="libglabels-3.0/libglabels-3.0-str.html#libglabels-3.0-str.functions">
+<ANCHOR id="libglabels-3.0-str.object-hierarchy" href="libglabels-3.0/libglabels-3.0-str.html#libglabels-3.0-str.object-hierarchy">
+<ANCHOR id="libglabels-3.0-str.includes" href="libglabels-3.0/libglabels-3.0-str.html#libglabels-3.0-str.includes">
 <ANCHOR id="libglabels-3.0-str.description" href="libglabels-3.0/libglabels-3.0-str.html#libglabels-3.0-str.description">
-<ANCHOR id="libglabels-3.0-str.details" href="libglabels-3.0/libglabels-3.0-str.html#libglabels-3.0-str.details">
+<ANCHOR id="libglabels-3.0-str.functions_details" href="libglabels-3.0/libglabels-3.0-str.html#libglabels-3.0-str.functions_details">
 <ANCHOR id="lgl-str-utf8-casecmp" href="libglabels-3.0/libglabels-3.0-str.html#lgl-str-utf8-casecmp">
 <ANCHOR id="lgl-str-part-name-cmp" href="libglabels-3.0/libglabels-3.0-str.html#lgl-str-part-name-cmp">
 <ANCHOR id="lgl-str-format-fraction" href="libglabels-3.0/libglabels-3.0-str.html#lgl-str-format-fraction">
+<ANCHOR id="libglabels-3.0-str.other_details" href="libglabels-3.0/libglabels-3.0-str.html#libglabels-3.0-str.other_details">
diff --git a/docs/libglabels/html/left-insensitive.png b/docs/libglabels/html/left-insensitive.png
new file mode 100644 (file)
index 0000000..9b8005b
Binary files /dev/null and b/docs/libglabels/html/left-insensitive.png differ
index 48cab276723733c79792bf270990592938a46e1f..c518641ea922e1490796318103566648d4878634 100644 (file)
Binary files a/docs/libglabels/html/left.png and b/docs/libglabels/html/left.png differ
index 62a6ced3f77352a8d0894c56989a9914dfb5152a..c157fdc3e897eee922f44e0261830646c6b1f8df 100644 (file)
@@ -2,30 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>The lglCategory Structure</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlabels 3.0 Reference Manual: The lglCategory Structure</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="up" href="ch01.html" title="Basic LibGlabels Usage">
 <link rel="prev" href="libglabels-3.0-paper.html" title="The lglPaper Structure">
 <link rel="next" href="libglabels-3.0-vendor.html" title="The lglVendor Structure">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libglabels-3.0-paper.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlabels 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglabels-3.0-vendor.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libglabels-3.0-category.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libglabels-3.0-category.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-category.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-category.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libglabels-3.0-paper.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglabels-3.0-vendor.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="libglabels-3.0-category"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <h2><span class="refentrytitle"><a name="libglabels-3.0-category.top_of_page"></a>The lglCategory Structure</span></h2>
 <p>The lglCategory Structure — Template category definitions</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="libglabels-3.0-category.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libglabels/lgl-category.h&gt;
-
-struct              <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory">lglCategory</a>;
-<a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *       <a class="link" href="libglabels-3.0-category.html#lgl-category-new" title="lgl_category_new ()">lgl_category_new</a>                    (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);
-<a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *       <a class="link" href="libglabels-3.0-category.html#lgl-category-dup" title="lgl_category_dup ()">lgl_category_dup</a>                    (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> *orig</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-category.html#lgl-category-free" title="lgl_category_free ()">lgl_category_free</a>                   (<em class="parameter"><code><a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> *category</code></em>);
+<div class="refsect1">
+<a name="libglabels-3.0-category.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-category.html#lgl-category-new" title="lgl_category_new ()">lgl_category_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-category.html#lgl-category-dup" title="lgl_category_dup ()">lgl_category_dup</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-category.html#lgl-category-free" title="lgl_category_free ()">lgl_category_free</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-category.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody><tr>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory">lglCategory</a></td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-category.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-category.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;libglabels/lgl-category.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -55,99 +98,131 @@ functions.
 </p>
 </div>
 <div class="refsect1">
-<a name="libglabels-3.0-category.details"></a><h2>Details</h2>
+<a name="libglabels-3.0-category.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="lglCategory"></a><h3>struct lglCategory</h3>
-<pre class="programlisting">struct lglCategory {
-        gchar               *id;     /* Unique ID of category */
-        gchar               *name;   /* Localized name of category */
-};
-</pre>
-<p>
-This structure defines a category.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-category-new"></a><h3>lgl_category_new ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *
+lgl_category_new (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
+                  <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+<p>Allocates and constructs a new <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure.</p>
+<div class="refsect3">
+<a name="id-1.2.5.8.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglCategory.id"></a>id</code></em>;</span></p></td>
-<td>Category ID.</td>
+<td class="parameter_name"><p>id</p></td>
+<td class="parameter_description"><p>Id of category definition. (E.g. label, card, etc.)  Should be
+unique.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglCategory.name"></a>name</code></em>;</span></p></td>
-<td>Localized category name.</td>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>Localized name of category.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.5.8.2.6"></a><h4>Returns</h4>
+<p> a pointer to a newly allocated <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-category-new"></a><h3>lgl_category_new ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *       lgl_category_new                    (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
-<p>
-Allocates and constructs a new <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>Id of category definition. (E.g. label, card, etc.)  Should be
-unique.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>Localized name of category.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a pointer to a newly allocated <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure.</td>
-</tr>
-</tbody>
+<a name="lgl-category-dup"></a><h3>lgl_category_dup ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *
+lgl_category_dup (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> *orig</code></em>);</pre>
+<p>Duplicates an existing <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure.</p>
+<div class="refsect3">
+<a name="id-1.2.5.8.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>orig</p></td>
+<td class="parameter_description"><p><a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure to be duplicated.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.5.8.3.6"></a><h4>Returns</h4>
+<p> a pointer to a newly allocated <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-category-dup"></a><h3>lgl_category_dup ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *       lgl_category_dup                    (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> *orig</code></em>);</pre>
+<a name="lgl-category-free"></a><h3>lgl_category_free ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_category_free (<em class="parameter"><code><a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> *category</code></em>);</pre>
+<p>Free all memory associated with an existing <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure.</p>
+<div class="refsect3">
+<a name="id-1.2.5.8.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>category</p></td>
+<td class="parameter_description"><p>pointer to <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure to be freed.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-category.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="lglCategory"></a><h3>struct lglCategory</h3>
+<pre class="programlisting">struct lglCategory {
+        gchar               *id;     /* Unique ID of category */
+        gchar               *name;   /* Localized name of category */
+};
+</pre>
 <p>
-Duplicates an existing <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure.
+This structure defines a category.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.5.9.2.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>orig</code></em> :</span></p></td>
-<td>
-<a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure to be duplicated.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglCategory.id"></a>id</code></em>;</p></td>
+<td class="struct_member_description"><p>Category ID.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a pointer to a newly allocated <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglCategory.name"></a>name</code></em>;</p></td>
+<td class="struct_member_description"><p>Localized category name.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="lgl-category-free"></a><h3>lgl_category_free ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_category_free                   (<em class="parameter"><code><a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> *category</code></em>);</pre>
-<p>
-Free all memory associated with an existing <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>category</code></em> :</span></p></td>
-<td>pointer to <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure to be freed.</td>
-</tr></tbody>
-</table></div>
 </div>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 82009194779365644506a99ffff3e9f2c131a673..d0d988ed6e675d06cce5acca27798c44b22bca1c 100644 (file)
@@ -2,30 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Database</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlabels 3.0 Reference Manual: Database</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="up" href="ch01.html" title="Basic LibGlabels Usage">
 <link rel="prev" href="ch01.html" title="Basic LibGlabels Usage">
 <link rel="next" href="libglabels-3.0-template.html" title="The lglTemplate Structure">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="ch01.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlabels 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglabels-3.0-template.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libglabels-3.0-db.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libglabels-3.0-db.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-db.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-db.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="ch01.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglabels-3.0-template.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="libglabels-3.0-db"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <h2><span class="refentrytitle"><a name="libglabels-3.0-db.top_of_page"></a>Database</span></h2>
 <p>Database — Database of pre-defined templates</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="libglabels-3.0-db.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libglabels/lgl-db.h&gt;
-
-enum                <a class="link" href="libglabels-3.0-db.html#lglDbRegStatus" title="enum lglDbRegStatus">lglDbRegStatus</a>;
-enum                <a class="link" href="libglabels-3.0-db.html#lglDbDeleteStatus" title="enum lglDbDeleteStatus">lglDbDeleteStatus</a>;
-
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-db.html#lgl-db-init" title="lgl_db_init ()">lgl_db_init</a>                         (<em class="parameter"><code><span class="type">void</span></code></em>);
-
-<span class="returnvalue">void</span>                (<a class="link" href="libglabels-3.0-db.html#lglDbNotifyFunc" title="lglDbNotifyFunc ()">*lglDbNotifyFunc</a>)                  (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gulong"><span class="returnvalue">gulong</span></a>              <a class="link" href="libglabels-3.0-db.html#lgl-db-notify-add" title="lgl_db_notify_add ()">lgl_db_notify_add</a>                   (<em class="parameter"><code><a class="link" href="libglabels-3.0-db.html#lglDbNotifyFunc" title="lglDbNotifyFunc ()"><span class="type">lglDbNotifyFunc</span></a> func</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-db.html#lgl-db-notify-remove" title="lgl_db_notify_remove ()">lgl_db_notify_remove</a>                (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gulong"><span class="type">gulong</span></a> id</code></em>);
-
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="libglabels-3.0-db.html#lgl-db-get-paper-id-list" title="lgl_db_get_paper_id_list ()">lgl_db_get_paper_id_list</a>            (<em class="parameter"><code><span class="type">void</span></code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-db.html#lgl-db-free-paper-id-list" title="lgl_db_free_paper_id_list ()">lgl_db_free_paper_id_list</a>           (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *ids</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="libglabels-3.0-db.html#lgl-db-get-paper-name-list" title="lgl_db_get_paper_name_list ()">lgl_db_get_paper_name_list</a>          (<em class="parameter"><code><span class="type">void</span></code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-db.html#lgl-db-free-paper-name-list" title="lgl_db_free_paper_name_list ()">lgl_db_free_paper_name_list</a>         (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *names</code></em>);
-<a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *          <a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-paper-from-id" title="lgl_db_lookup_paper_from_id ()">lgl_db_lookup_paper_from_id</a>         (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);
-<a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *          <a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-paper-from-name" title="lgl_db_lookup_paper_from_name ()">lgl_db_lookup_paper_from_name</a>       (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-paper-id-from-name" title="lgl_db_lookup_paper_id_from_name ()">lgl_db_lookup_paper_id_from_name</a>    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-paper-name-from-id" title="lgl_db_lookup_paper_name_from_id ()">lgl_db_lookup_paper_name_from_id</a>    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libglabels-3.0-db.html#lgl-db-is-paper-id-known" title="lgl_db_is_paper_id_known ()">lgl_db_is_paper_id_known</a>            (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libglabels-3.0-db.html#lgl-db-is-paper-id-other" title="lgl_db_is_paper_id_other ()">lgl_db_is_paper_id_other</a>            (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);
-
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="libglabels-3.0-db.html#lgl-db-get-category-id-list" title="lgl_db_get_category_id_list ()">lgl_db_get_category_id_list</a>         (<em class="parameter"><code><span class="type">void</span></code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-db.html#lgl-db-free-category-id-list" title="lgl_db_free_category_id_list ()">lgl_db_free_category_id_list</a>        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *ids</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="libglabels-3.0-db.html#lgl-db-get-category-name-list" title="lgl_db_get_category_name_list ()">lgl_db_get_category_name_list</a>       (<em class="parameter"><code><span class="type">void</span></code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-db.html#lgl-db-free-category-name-list" title="lgl_db_free_category_name_list ()">lgl_db_free_category_name_list</a>      (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *names</code></em>);
-<a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *       <a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-category-from-id" title="lgl_db_lookup_category_from_id ()">lgl_db_lookup_category_from_id</a>      (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);
-<a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *       <a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-category-from-name" title="lgl_db_lookup_category_from_name ()">lgl_db_lookup_category_from_name</a>    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-category-id-from-name" title="lgl_db_lookup_category_id_from_name ()">lgl_db_lookup_category_id_from_name</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-category-name-from-id" title="lgl_db_lookup_category_name_from_id ()">lgl_db_lookup_category_name_from_id</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libglabels-3.0-db.html#lgl-db-is-category-id-known" title="lgl_db_is_category_id_known ()">lgl_db_is_category_id_known</a>         (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);
-
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="libglabels-3.0-db.html#lgl-db-get-brand-list" title="lgl_db_get_brand_list ()">lgl_db_get_brand_list</a>               (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *paper_id</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *category_id</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-db.html#lgl-db-free-brand-list" title="lgl_db_free_brand_list ()">lgl_db_free_brand_list</a>              (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *brands</code></em>);
-
-<a class="link" href="libglabels-3.0-db.html#lglDbRegStatus" title="enum lglDbRegStatus"><span class="returnvalue">lglDbRegStatus</span></a>      <a class="link" href="libglabels-3.0-db.html#lgl-db-register-template" title="lgl_db_register_template ()">lgl_db_register_template</a>            (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>);
-<a class="link" href="libglabels-3.0-db.html#lglDbDeleteStatus" title="enum lglDbDeleteStatus"><span class="returnvalue">lglDbDeleteStatus</span></a>   <a class="link" href="libglabels-3.0-db.html#lgl-db-delete-template-by-brand-part" title="lgl_db_delete_template_by_brand_part ()">lgl_db_delete_template_by_brand_part</a>
-                                                        (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *part</code></em>);
-<a class="link" href="libglabels-3.0-db.html#lglDbDeleteStatus" title="enum lglDbDeleteStatus"><span class="returnvalue">lglDbDeleteStatus</span></a>   <a class="link" href="libglabels-3.0-db.html#lgl-db-delete-template-by-name" title="lgl_db_delete_template_by_name ()">lgl_db_delete_template_by_name</a>      (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libglabels-3.0-db.html#lgl-db-does-template-exist" title="lgl_db_does_template_exist ()">lgl_db_does_template_exist</a>          (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *part</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libglabels-3.0-db.html#lgl-db-does-template-name-exist" title="lgl_db_does_template_name_exist ()">lgl_db_does_template_name_exist</a>     (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="libglabels-3.0-db.html#lgl-db-get-template-name-list-all" title="lgl_db_get_template_name_list_all ()">lgl_db_get_template_name_list_all</a>   (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *paper_id</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *category_id</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="libglabels-3.0-db.html#lgl-db-get-similar-template-name-list" title="lgl_db_get_similar_template_name_list ()">lgl_db_get_similar_template_name_list</a>
-                                                        (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-db.html#lgl-db-free-template-name-list" title="lgl_db_free_template_name_list ()">lgl_db_free_template_name_list</a>      (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *names</code></em>);
-<a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *       <a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-template-from-name" title="lgl_db_lookup_template_from_name ()">lgl_db_lookup_template_from_name</a>    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);
-<a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *       <a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-template-from-brand-part" title="lgl_db_lookup_template_from_brand_part ()">lgl_db_lookup_template_from_brand_part</a>
-                                                        (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *part</code></em>);
-
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="libglabels-3.0-db.html#lgl-db-get-vendor-name-list" title="lgl_db_get_vendor_name_list ()">lgl_db_get_vendor_name_list</a>         (<em class="parameter"><code><span class="type">void</span></code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-db.html#lgl-db-free-vendor-name-list" title="lgl_db_free_vendor_name_list ()">lgl_db_free_vendor_name_list</a>        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *names</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libglabels-3.0-db.html#lgl-db-is-vendor-name-known" title="lgl_db_is_vendor_name_known ()">lgl_db_is_vendor_name_known</a>         (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);
-<a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="returnvalue">lglVendor</span></a> *         <a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-vendor-from-name" title="lgl_db_lookup_vendor_from_name ()">lgl_db_lookup_vendor_from_name</a>      (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);
-
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-db.html#lgl-db-print-known-papers" title="lgl_db_print_known_papers ()">lgl_db_print_known_papers</a>           (<em class="parameter"><code><span class="type">void</span></code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-db.html#lgl-db-print-known-categories" title="lgl_db_print_known_categories ()">lgl_db_print_known_categories</a>       (<em class="parameter"><code><span class="type">void</span></code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-db.html#lgl-db-print-known-templates" title="lgl_db_print_known_templates ()">lgl_db_print_known_templates</a>        (<em class="parameter"><code><span class="type">void</span></code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-db.html#lgl-db-print-known-vendors" title="lgl_db_print_known_vendors ()">lgl_db_print_known_vendors</a>          (<em class="parameter"><code><span class="type">void</span></code></em>);
-</pre>
-</div>
-<div class="refsect1">
-<a name="libglabels-3.0-db.description"></a><h2>Description</h2>
-<p>
-This section describes a set of functions to locate and add templates and related information in
-the LibGlabels template database.
-</p>
-</div>
 <div class="refsect1">
-<a name="libglabels-3.0-db.details"></a><h2>Details</h2>
-<div class="refsect2">
-<a name="lglDbRegStatus"></a><h3>enum lglDbRegStatus</h3>
-<pre class="programlisting">typedef enum {
-        LGL_DB_REG_OK                =  0,
-        LGL_DB_REG_BAD_PAPER_ID      = -1,
-        LGL_DB_REG_BRAND_PART_EXISTS = -2,
-        LGL_DB_REG_FILE_WRITE_ERROR  = -3
-} lglDbRegStatus;
-</pre>
-<p>
-This enumeration defines a set of possible return values for <a class="link" href="libglabels-3.0-db.html#lgl-db-register-template" title="lgl_db_register_template ()"><code class="function">lgl_db_register_template()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="libglabels-3.0-db.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
 <tbody>
 <tr>
-<td><p><a name="LGL-DB-REG-OK:CAPS"></a><span class="term"><code class="literal">LGL_DB_REG_OK</code></span></p></td>
-<td>Registration successful.
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-init" title="lgl_db_init ()">lgl_db_init</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td><p><a name="LGL-DB-REG-BAD-PAPER-ID:CAPS"></a><span class="term"><code class="literal">LGL_DB_REG_BAD_PAPER_ID</code></span></p></td>
-<td> Registration failed because paper id is unknown.
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<span class="c_punctuation">(</span><a class="link" href="libglabels-3.0-db.html#lglDbNotifyFunc" title="lglDbNotifyFunc ()">*lglDbNotifyFunc</a><span class="c_punctuation">)</span> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td><p><a name="LGL-DB-REG-BRAND-PART-EXISTS:CAPS"></a><span class="term"><code class="literal">LGL_DB_REG_BRAND_PART_EXISTS</code></span></p></td>
-<td>Registration failed because template with same brand and part name/number already exists.
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gulong"><span class="returnvalue">gulong</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-notify-add" title="lgl_db_notify_add ()">lgl_db_notify_add</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td><p><a name="LGL-DB-REG-FILE-WRITE-ERROR:CAPS"></a><span class="term"><code class="literal">LGL_DB_REG_FILE_WRITE_ERROR</code></span></p></td>
-<td>Registration failed because an error while writing to disk.
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-notify-remove" title="lgl_db_notify_remove ()">lgl_db_notify_remove</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-get-paper-id-list" title="lgl_db_get_paper_id_list ()">lgl_db_get_paper_id_list</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-free-paper-id-list" title="lgl_db_free_paper_id_list ()">lgl_db_free_paper_id_list</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-get-paper-name-list" title="lgl_db_get_paper_name_list ()">lgl_db_get_paper_name_list</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-free-paper-name-list" title="lgl_db_free_paper_name_list ()">lgl_db_free_paper_name_list</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-paper-from-id" title="lgl_db_lookup_paper_from_id ()">lgl_db_lookup_paper_from_id</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-paper-from-name" title="lgl_db_lookup_paper_from_name ()">lgl_db_lookup_paper_from_name</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-paper-id-from-name" title="lgl_db_lookup_paper_id_from_name ()">lgl_db_lookup_paper_id_from_name</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-paper-name-from-id" title="lgl_db_lookup_paper_name_from_id ()">lgl_db_lookup_paper_name_from_id</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-is-paper-id-known" title="lgl_db_is_paper_id_known ()">lgl_db_is_paper_id_known</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-is-paper-id-other" title="lgl_db_is_paper_id_other ()">lgl_db_is_paper_id_other</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-get-category-id-list" title="lgl_db_get_category_id_list ()">lgl_db_get_category_id_list</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lglDbDeleteStatus"></a><h3>enum lglDbDeleteStatus</h3>
-<pre class="programlisting">typedef enum {
-        LGL_DB_DELETE_OK                =  0,
-        LGL_DB_DELETE_DOES_NOT_EXIST    = -1,
-        LGL_DB_DELETE_NOT_USER_DEFINED  = -2,
-        LGL_DB_DELETE_FILE_ERROR        = -3
-} lglDbDeleteStatus;
-</pre>
-<p>
-This enumeration defines a set of possible return values for <a class="link" href="libglabels-3.0-db.html#lgl-db-delete-template-by-name" title="lgl_db_delete_template_by_name ()"><code class="function">lgl_db_delete_template_by_name()</code></a> or <a class="link" href="libglabels-3.0-db.html#lgl-db-delete-template-by-brand-part" title="lgl_db_delete_template_by_brand_part ()"><code class="function">lgl_db_delete_template_by_brand_part()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
 <tr>
-<td><p><a name="LGL-DB-DELETE-OK:CAPS"></a><span class="term"><code class="literal">LGL_DB_DELETE_OK</code></span></p></td>
-<td>Deletion successful.
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-free-category-id-list" title="lgl_db_free_category_id_list ()">lgl_db_free_category_id_list</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-get-category-name-list" title="lgl_db_get_category_name_list ()">lgl_db_get_category_name_list</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td><p><a name="LGL-DB-DELETE-DOES-NOT-EXIST:CAPS"></a><span class="term"><code class="literal">LGL_DB_DELETE_DOES_NOT_EXIST</code></span></p></td>
-<td>Deletion failed because template with given brand and part name/number does not exist.
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-free-category-name-list" title="lgl_db_free_category_name_list ()">lgl_db_free_category_name_list</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td><p><a name="LGL-DB-DELETE-NOT-USER-DEFINED:CAPS"></a><span class="term"><code class="literal">LGL_DB_DELETE_NOT_USER_DEFINED</code></span></p></td>
-<td>Deletion failed because given template is not a user defined template.
+<td class="function_type">
+<a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-category-from-id" title="lgl_db_lookup_category_from_id ()">lgl_db_lookup_category_from_id</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td><p><a name="LGL-DB-DELETE-FILE-ERROR:CAPS"></a><span class="term"><code class="literal">LGL_DB_DELETE_FILE_ERROR</code></span></p></td>
-<td>Deletion failed because of an error while attempting to remove template from disk.
+<td class="function_type">
+<a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-category-from-name" title="lgl_db_lookup_category_from_name ()">lgl_db_lookup_category_from_name</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-category-id-from-name" title="lgl_db_lookup_category_id_from_name ()">lgl_db_lookup_category_id_from_name</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-category-name-from-id" title="lgl_db_lookup_category_name_from_id ()">lgl_db_lookup_category_name_from_id</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-is-category-id-known" title="lgl_db_is_category_id_known ()">lgl_db_is_category_id_known</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-get-brand-list" title="lgl_db_get_brand_list ()">lgl_db_get_brand_list</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-free-brand-list" title="lgl_db_free_brand_list ()">lgl_db_free_brand_list</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-db.html#lglDbRegStatus" title="enum lglDbRegStatus"><span class="returnvalue">lglDbRegStatus</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-register-template" title="lgl_db_register_template ()">lgl_db_register_template</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-db.html#lglDbDeleteStatus" title="enum lglDbDeleteStatus"><span class="returnvalue">lglDbDeleteStatus</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-delete-template-by-brand-part" title="lgl_db_delete_template_by_brand_part ()">lgl_db_delete_template_by_brand_part</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-db.html#lglDbDeleteStatus" title="enum lglDbDeleteStatus"><span class="returnvalue">lglDbDeleteStatus</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-delete-template-by-name" title="lgl_db_delete_template_by_name ()">lgl_db_delete_template_by_name</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-does-template-exist" title="lgl_db_does_template_exist ()">lgl_db_does_template_exist</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-does-template-name-exist" title="lgl_db_does_template_name_exist ()">lgl_db_does_template_name_exist</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-get-template-name-list-all" title="lgl_db_get_template_name_list_all ()">lgl_db_get_template_name_list_all</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-get-similar-template-name-list" title="lgl_db_get_similar_template_name_list ()">lgl_db_get_similar_template_name_list</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-free-template-name-list" title="lgl_db_free_template_name_list ()">lgl_db_free_template_name_list</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-template-from-name" title="lgl_db_lookup_template_from_name ()">lgl_db_lookup_template_from_name</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-template-from-brand-part" title="lgl_db_lookup_template_from_brand_part ()">lgl_db_lookup_template_from_brand_part</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-get-vendor-name-list" title="lgl_db_get_vendor_name_list ()">lgl_db_get_vendor_name_list</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-free-vendor-name-list" title="lgl_db_free_vendor_name_list ()">lgl_db_free_vendor_name_list</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-is-vendor-name-known" title="lgl_db_is_vendor_name_known ()">lgl_db_is_vendor_name_known</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="returnvalue">lglVendor</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-lookup-vendor-from-name" title="lgl_db_lookup_vendor_from_name ()">lgl_db_lookup_vendor_from_name</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-print-known-papers" title="lgl_db_print_known_papers ()">lgl_db_print_known_papers</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-print-known-categories" title="lgl_db_print_known_categories ()">lgl_db_print_known_categories</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-print-known-templates" title="lgl_db_print_known_templates ()">lgl_db_print_known_templates</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-db.html#lgl-db-print-known-vendors" title="lgl_db_print_known_vendors ()">lgl_db_print_known_vendors</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="lgl-db-init"></a><h3>lgl_db_init ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_db_init                         (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<div class="refsect1">
+<a name="libglabels-3.0-db.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-db.html#lglDbRegStatus" title="enum lglDbRegStatus">lglDbRegStatus</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-db.html#lglDbDeleteStatus" title="enum lglDbDeleteStatus">lglDbDeleteStatus</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-db.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-db.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;libglabels/lgl-db.h&gt;
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-db.description"></a><h2>Description</h2>
 <p>
-Initialize all libglabels subsystems.  It is not necessary for an application to call
-<a class="link" href="libglabels-3.0-db.html#lgl-db-init" title="lgl_db_init ()"><code class="function">lgl_db_init()</code></a>, because libglabels will initialize on demand.  An application programmer may
-choose to call <a class="link" href="libglabels-3.0-db.html#lgl-db-init" title="lgl_db_init ()"><code class="function">lgl_db_init()</code></a> at startup to minimize the impact of the first libglabels call
-on GUI response time.
+This section describes a set of functions to locate and add templates and related information in
+the LibGlabels template database.
 </p>
-<p>
-This function initializes its paper definitions, category definitions, vendor definitions,
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-db.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="lgl-db-init"></a><h3>lgl_db_init ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_db_init (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Initialize all libglabels subsystems.  It is not necessary for an application to call
+<a class="link" href="libglabels-3.0-db.html#lgl-db-init" title="lgl_db_init ()"><code class="function">lgl_db_init()</code></a>, because libglabels will initialize on demand.  An application programmer may
+choose to call <a class="link" href="libglabels-3.0-db.html#lgl-db-init" title="lgl_db_init ()"><code class="function">lgl_db_init()</code></a> at startup to minimize the impact of the first libglabels call
+on GUI response time.</p>
+<p>This function initializes its paper definitions, category definitions, vendor definitions,
 and its template database. It will search both system and user template directories to locate
-this data.
-</p>
+this data.</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="lglDbNotifyFunc"></a><h3>lglDbNotifyFunc ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*lglDbNotifyFunc)                  (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<a name="lglDbNotifyFunc"></a><h3>lglDbNotifyFunc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+<span class="c_punctuation">(</span>*lglDbNotifyFunc<span class="c_punctuation">)</span> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>
 Defines the type of notify callback function to be called when database changes.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.2.8.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>Pointer to user data that is passed to the notify function.</td>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>Pointer to user data that is passed to the notify function.</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-notify-add"></a><h3>lgl_db_notify_add ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gulong"><span class="returnvalue">gulong</span></a>              lgl_db_notify_add                   (<em class="parameter"><code><a class="link" href="libglabels-3.0-db.html#lglDbNotifyFunc" title="lglDbNotifyFunc ()"><span class="type">lglDbNotifyFunc</span></a> func</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<p>
-Register a notification callback function to be called when the database changes.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-db-notify-add"></a><h3>lgl_db_notify_add ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gulong"><span class="returnvalue">gulong</span></a>
+lgl_db_notify_add (<em class="parameter"><code><a class="link" href="libglabels-3.0-db.html#lglDbNotifyFunc" title="lglDbNotifyFunc ()"><span class="type">lglDbNotifyFunc</span></a> func</code></em>,
+                   <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<p>Register a notification callback function to be called when the database changes.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>func</code></em> :</span></p></td>
-<td>Callback function to be called when database changes.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>Passback user data to supply to callback function.</td>
+<td class="parameter_name"><p>func</p></td>
+<td class="parameter_description"><p>Callback function to be called when database changes.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>an ID for this notification registration.</td>
+<td class="parameter_name"><p>user_data</p></td>
+<td class="parameter_description"><p>Passback user data to supply to callback function.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.4.6"></a><h4>Returns</h4>
+<p> an ID for this notification registration.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-notify-remove"></a><h3>lgl_db_notify_remove ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_db_notify_remove                (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gulong"><span class="type">gulong</span></a> id</code></em>);</pre>
-<p>
-Cancel a previous registration a notification callback function.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-db-notify-remove"></a><h3>lgl_db_notify_remove ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_db_notify_remove (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gulong"><span class="type">gulong</span></a> id</code></em>);</pre>
+<p>Cancel a previous registration a notification callback function.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.5.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>ID of notification registration to cancel (see <a class="link" href="libglabels-3.0-db.html#lgl-db-notify-add" title="lgl_db_notify_add ()"><code class="function">lgl_db_notify_add()</code></a>).</td>
+<td class="parameter_name"><p>id</p></td>
+<td class="parameter_description"><p>ID of notification registration to cancel (see <a class="link" href="libglabels-3.0-db.html#lgl-db-notify-add" title="lgl_db_notify_add ()"><code class="function">lgl_db_notify_add()</code></a>).</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-get-paper-id-list"></a><h3>lgl_db_get_paper_id_list ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             lgl_db_get_paper_id_list            (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-Get a list of all paper ids known to libglabels.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a list of paper ids.</td>
-</tr></tbody>
-</table></div>
+<a name="lgl-db-get-paper-id-list"></a><h3>lgl_db_get_paper_id_list ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+lgl_db_get_paper_id_list (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Get a list of all paper ids known to libglabels.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.6.5"></a><h4>Returns</h4>
+<p> a list of paper ids.</p>
+<p></p>
+</div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-free-paper-id-list"></a><h3>lgl_db_free_paper_id_list ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_db_free_paper_id_list           (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *ids</code></em>);</pre>
-<p>
-Free up all storage associated with an id list obtained with
-<a class="link" href="libglabels-3.0-db.html#lgl-db-get-paper-id-list" title="lgl_db_get_paper_id_list ()"><code class="function">lgl_db_get_paper_id_list()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-db-free-paper-id-list"></a><h3>lgl_db_free_paper_id_list ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_db_free_paper_id_list (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *ids</code></em>);</pre>
+<p>Free up all storage associated with an id list obtained with
+<a class="link" href="libglabels-3.0-db.html#lgl-db-get-paper-id-list" title="lgl_db_get_paper_id_list ()"><code class="function">lgl_db_get_paper_id_list()</code></a>.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.7.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>ids</code></em> :</span></p></td>
-<td>List of id strings to be freed.</td>
+<td class="parameter_name"><p>ids</p></td>
+<td class="parameter_description"><p>List of id strings to be freed.</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-get-paper-name-list"></a><h3>lgl_db_get_paper_name_list ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             lgl_db_get_paper_name_list          (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-Get a list of all localized paper names known to libglabels.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a list of localized paper names.</td>
-</tr></tbody>
-</table></div>
+<a name="lgl-db-get-paper-name-list"></a><h3>lgl_db_get_paper_name_list ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+lgl_db_get_paper_name_list (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Get a list of all localized paper names known to libglabels.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.8.5"></a><h4>Returns</h4>
+<p> a list of localized paper names.</p>
+<p></p>
+</div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-free-paper-name-list"></a><h3>lgl_db_free_paper_name_list ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_db_free_paper_name_list         (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *names</code></em>);</pre>
-<p>
-Free up all storage associated with a name list obtained with
-<a class="link" href="libglabels-3.0-db.html#lgl-db-get-paper-name-list" title="lgl_db_get_paper_name_list ()"><code class="function">lgl_db_get_paper_name_list()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-db-free-paper-name-list"></a><h3>lgl_db_free_paper_name_list ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_db_free_paper_name_list (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *names</code></em>);</pre>
+<p>Free up all storage associated with a name list obtained with
+<a class="link" href="libglabels-3.0-db.html#lgl-db-get-paper-name-list" title="lgl_db_get_paper_name_list ()"><code class="function">lgl_db_get_paper_name_list()</code></a>.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.9.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>names</code></em> :</span></p></td>
-<td>List of localized paper name strings to be freed.</td>
+<td class="parameter_name"><p>names</p></td>
+<td class="parameter_description"><p>List of localized paper name strings to be freed.</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="lgl-db-lookup-paper-from-id"></a><h3>lgl_db_lookup_paper_from_id ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *          lgl_db_lookup_paper_from_id         (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);</pre>
-<p>
-Lookup paper definition from id string.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>paper id string</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>pointer to a newly allocated <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure.</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-lookup-paper-from-name"></a><h3>lgl_db_lookup_paper_from_name ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *          lgl_db_lookup_paper_from_name       (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
-<p>
-Lookup paper definition from localized paper name string.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>localized paper name string</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>pointer to a newly allocated <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure.</td>
-</tr>
-</tbody>
+<a name="lgl-db-lookup-paper-from-id"></a><h3>lgl_db_lookup_paper_from_id ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *
+lgl_db_lookup_paper_from_id (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);</pre>
+<p>Lookup paper definition from id string.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.10.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>id</p></td>
+<td class="parameter_description"><p>paper id string</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="lgl-db-lookup-paper-id-from-name"></a><h3>lgl_db_lookup_paper_id_from_name ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             lgl_db_lookup_paper_id_from_name    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
-<p>
-Lookup paper name string from localized paper name string.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>localized paper name stringp</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>pointer to a newly allocated id string.</td>
-</tr>
-</tbody>
-</table></div>
+<div class="refsect3">
+<a name="id-1.2.2.8.10.6"></a><h4>Returns</h4>
+<p> pointer to a newly allocated <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure.</p>
+<p></p>
+</div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-lookup-paper-name-from-id"></a><h3>lgl_db_lookup_paper_name_from_id ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             lgl_db_lookup_paper_name_from_id    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);</pre>
-<p>
-Lookup localized paper name string from paper id string.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>paper id string</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>pointer to a newly allocated localized paper name string.</td>
-</tr>
-</tbody>
+<a name="lgl-db-lookup-paper-from-name"></a><h3>lgl_db_lookup_paper_from_name ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *
+lgl_db_lookup_paper_from_name (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+<p>Lookup paper definition from localized paper name string.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.11.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>localized paper name string</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.11.6"></a><h4>Returns</h4>
+<p> pointer to a newly allocated <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-is-paper-id-known"></a><h3>lgl_db_is_paper_id_known ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            lgl_db_is_paper_id_known            (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);</pre>
-<p>
-Determine if given paper id is known to libglabels.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>paper id to test</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if id is known, otherwise FALSE.</td>
-</tr>
-</tbody>
+<a name="lgl-db-lookup-paper-id-from-name"></a><h3>lgl_db_lookup_paper_id_from_name ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+lgl_db_lookup_paper_id_from_name (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+<p>Lookup paper name string from localized paper name string.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.12.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>localized paper name stringp</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="lgl-db-is-paper-id-other"></a><h3>lgl_db_is_paper_id_other ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            lgl_db_is_paper_id_other            (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);</pre>
-<p>
-Determine if given paper id is the special id "Other."
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>paper id to test</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if id is "Other", otherwise FALSE.</td>
-</tr>
-</tbody>
+<div class="refsect3">
+<a name="id-1.2.2.8.12.6"></a><h4>Returns</h4>
+<p> pointer to a newly allocated id string.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-db-lookup-paper-name-from-id"></a><h3>lgl_db_lookup_paper_name_from_id ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+lgl_db_lookup_paper_name_from_id (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);</pre>
+<p>Lookup localized paper name string from paper id string.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.13.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>id</p></td>
+<td class="parameter_description"><p>paper id string</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.13.6"></a><h4>Returns</h4>
+<p> pointer to a newly allocated localized paper name string.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-get-category-id-list"></a><h3>lgl_db_get_category_id_list ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             lgl_db_get_category_id_list         (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-Get a list of all category ids known to libglabels.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-db-is-paper-id-known"></a><h3>lgl_db_is_paper_id_known ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+lgl_db_is_paper_id_known (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);</pre>
+<p>Determine if given paper id is known to libglabels.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.14.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a list of category ids.</td>
+<td class="parameter_name"><p>id</p></td>
+<td class="parameter_description"><p>paper id to test</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.14.6"></a><h4>Returns</h4>
+<p> TRUE if id is known, otherwise FALSE.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-free-category-id-list"></a><h3>lgl_db_free_category_id_list ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_db_free_category_id_list        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *ids</code></em>);</pre>
-<p>
-Free up all storage associated with an id list obtained with
-<a class="link" href="libglabels-3.0-db.html#lgl-db-get-category-id-list" title="lgl_db_get_category_id_list ()"><code class="function">lgl_db_get_category_id_list()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-db-is-paper-id-other"></a><h3>lgl_db_is_paper_id_other ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+lgl_db_is_paper_id_other (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);</pre>
+<p>Determine if given paper id is the special id "Other."</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.15.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>ids</code></em> :</span></p></td>
-<td>List of id strings to be freed.</td>
+<td class="parameter_name"><p>id</p></td>
+<td class="parameter_description"><p>paper id to test</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.15.6"></a><h4>Returns</h4>
+<p> TRUE if id is "Other", otherwise FALSE.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-get-category-name-list"></a><h3>lgl_db_get_category_name_list ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             lgl_db_get_category_name_list       (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-Get a list of all localized category names known to libglabels.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-db-get-category-id-list"></a><h3>lgl_db_get_category_id_list ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+lgl_db_get_category_id_list (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Get a list of all category ids known to libglabels.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.16.5"></a><h4>Returns</h4>
+<p> a list of category ids.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-db-free-category-id-list"></a><h3>lgl_db_free_category_id_list ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_db_free_category_id_list (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *ids</code></em>);</pre>
+<p>Free up all storage associated with an id list obtained with
+<a class="link" href="libglabels-3.0-db.html#lgl-db-get-category-id-list" title="lgl_db_get_category_id_list ()"><code class="function">lgl_db_get_category_id_list()</code></a>.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.17.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a list of localized category names.</td>
+<td class="parameter_name"><p>ids</p></td>
+<td class="parameter_description"><p>List of id strings to be freed.</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-free-category-name-list"></a><h3>lgl_db_free_category_name_list ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_db_free_category_name_list      (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *names</code></em>);</pre>
-<p>
-Free up all storage associated with a name list obtained with
-<a class="link" href="libglabels-3.0-db.html#lgl-db-get-category-name-list" title="lgl_db_get_category_name_list ()"><code class="function">lgl_db_get_category_name_list()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-db-get-category-name-list"></a><h3>lgl_db_get_category_name_list ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+lgl_db_get_category_name_list (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Get a list of all localized category names known to libglabels.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.18.5"></a><h4>Returns</h4>
+<p> a list of localized category names.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-db-free-category-name-list"></a><h3>lgl_db_free_category_name_list ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_db_free_category_name_list (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *names</code></em>);</pre>
+<p>Free up all storage associated with a name list obtained with
+<a class="link" href="libglabels-3.0-db.html#lgl-db-get-category-name-list" title="lgl_db_get_category_name_list ()"><code class="function">lgl_db_get_category_name_list()</code></a>.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.19.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>names</code></em> :</span></p></td>
-<td>List of localized category name strings to be freed.</td>
+<td class="parameter_name"><p>names</p></td>
+<td class="parameter_description"><p>List of localized category name strings to be freed.</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-lookup-category-from-id"></a><h3>lgl_db_lookup_category_from_id ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *       lgl_db_lookup_category_from_id      (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);</pre>
-<p>
-Lookup category definition from id string.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>category id string</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>pointer to a newly allocated <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure.</td>
-</tr>
-</tbody>
+<a name="lgl-db-lookup-category-from-id"></a><h3>lgl_db_lookup_category_from_id ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *
+lgl_db_lookup_category_from_id (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);</pre>
+<p>Lookup category definition from id string.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.20.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>id</p></td>
+<td class="parameter_description"><p>category id string</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.20.6"></a><h4>Returns</h4>
+<p> pointer to a newly allocated <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-lookup-category-from-name"></a><h3>lgl_db_lookup_category_from_name ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *       lgl_db_lookup_category_from_name    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
-<p>
-Lookup category definition from localized category name string.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>localized category name string</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>pointer to a newly allocated <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure.</td>
-</tr>
-</tbody>
+<a name="lgl-db-lookup-category-from-name"></a><h3>lgl_db_lookup_category_from_name ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *
+lgl_db_lookup_category_from_name (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+<p>Lookup category definition from localized category name string.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.21.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>localized category name string</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.21.6"></a><h4>Returns</h4>
+<p> pointer to a newly allocated <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-lookup-category-id-from-name"></a><h3>lgl_db_lookup_category_id_from_name ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             lgl_db_lookup_category_id_from_name (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
-<p>
-Lookup category name string from localized category name string.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>localized category name stringp</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>pointer to a newly allocated id string.</td>
-</tr>
-</tbody>
+<a name="lgl-db-lookup-category-id-from-name"></a><h3>lgl_db_lookup_category_id_from_name ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+lgl_db_lookup_category_id_from_name (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+<p>Lookup category name string from localized category name string.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.22.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>localized category name stringp</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.22.6"></a><h4>Returns</h4>
+<p> pointer to a newly allocated id string.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-lookup-category-name-from-id"></a><h3>lgl_db_lookup_category_name_from_id ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             lgl_db_lookup_category_name_from_id (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);</pre>
-<p>
-Lookup localized category name string from category id string.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>category id string</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>pointer to a newly allocated localized category name string.</td>
-</tr>
-</tbody>
+<a name="lgl-db-lookup-category-name-from-id"></a><h3>lgl_db_lookup_category_name_from_id ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+lgl_db_lookup_category_name_from_id (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);</pre>
+<p>Lookup localized category name string from category id string.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.23.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>id</p></td>
+<td class="parameter_description"><p>category id string</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.23.6"></a><h4>Returns</h4>
+<p> pointer to a newly allocated localized category name string.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-is-category-id-known"></a><h3>lgl_db_is_category_id_known ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            lgl_db_is_category_id_known         (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);</pre>
-<p>
-Determine if given category id is known to libglabels.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>category id to test</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if id is known, otherwise FALSE.</td>
-</tr>
-</tbody>
+<a name="lgl-db-is-category-id-known"></a><h3>lgl_db_is_category_id_known ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+lgl_db_is_category_id_known (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);</pre>
+<p>Determine if given category id is known to libglabels.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.24.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>id</p></td>
+<td class="parameter_description"><p>category id to test</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.24.6"></a><h4>Returns</h4>
+<p> TRUE if id is known, otherwise FALSE.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-get-brand-list"></a><h3>lgl_db_get_brand_list ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             lgl_db_get_brand_list               (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *paper_id</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *category_id</code></em>);</pre>
-<p>
-Get a list of all valid brands of templates in the template database.
+<a name="lgl-db-get-brand-list"></a><h3>lgl_db_get_brand_list ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+lgl_db_get_brand_list (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *paper_id</code></em>,
+                       <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *category_id</code></em>);</pre>
+<p>Get a list of all valid brands of templates in the template database.
 Results can be filtered by page size and/or template category.  A list of valid page
-sizes can be obtained using <a class="link" href="libglabels-3.0-db.html#lgl-db-get-paper-id-list" title="lgl_db_get_paper_id_list ()"><code class="function">lgl_db_get_paper_id_list()</code></a>.  A list of valid template
-categories can be obtained using <a class="link" href="libglabels-3.0-db.html#lgl-db-get-category-id-list" title="lgl_db_get_category_id_list ()"><code class="function">lgl_db_get_category_id_list()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+sizes can be obtained using <a class="link" href="libglabels-3.0-db.html#lgl-db-get-paper-id-list" title="lgl_db_get_paper_id_list ()"><code class="function">lgl_db_get_paper_id_list()</code></a>.  A list of valid template
+categories can be obtained using <a class="link" href="libglabels-3.0-db.html#lgl-db-get-category-id-list" title="lgl_db_get_category_id_list ()"><code class="function">lgl_db_get_category_id_list()</code></a>.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.25.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>paper_id</code></em> :</span></p></td>
-<td>If non NULL, limit results to given page size.</td>
+<td class="parameter_name"><p>paper_id</p></td>
+<td class="parameter_description"><p>If non NULL, limit results to given page size.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>category_id</code></em> :</span></p></td>
-<td>If non NULL, limit results to given template category.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a list of brands</td>
+<td class="parameter_name"><p>category_id</p></td>
+<td class="parameter_description"><p>If non NULL, limit results to given template category.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.25.6"></a><h4>Returns</h4>
+<p> a list of brands</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-free-brand-list"></a><h3>lgl_db_free_brand_list ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_db_free_brand_list              (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *brands</code></em>);</pre>
-<p>
-Free up all storage associated with a list of template names obtained with
-<a class="link" href="libglabels-3.0-db.html#lgl-db-get-brand-list" title="lgl_db_get_brand_list ()"><code class="function">lgl_db_get_brand_list()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-db-free-brand-list"></a><h3>lgl_db_free_brand_list ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_db_free_brand_list (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *brands</code></em>);</pre>
+<p>Free up all storage associated with a list of template names obtained with
+<a class="link" href="libglabels-3.0-db.html#lgl-db-get-brand-list" title="lgl_db_get_brand_list ()"><code class="function">lgl_db_get_brand_list()</code></a>.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.26.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>brands</code></em> :</span></p></td>
-<td>List of template brand strings to be freed.</td>
+<td class="parameter_name"><p>brands</p></td>
+<td class="parameter_description"><p>List of template brand strings to be freed.</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-register-template"></a><h3>lgl_db_register_template ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-db.html#lglDbRegStatus" title="enum lglDbRegStatus"><span class="returnvalue">lglDbRegStatus</span></a>      lgl_db_register_template            (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>);</pre>
-<p>
-Register a template.  This function adds a template to the template database.
-The template will be stored in an individual XML file in the user template directory.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>template</code></em> :</span></p></td>
-<td>Pointer to a template structure to add to database.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>Status of registration attempt (<a class="link" href="libglabels-3.0-db.html#lglDbRegStatus" title="enum lglDbRegStatus"><span class="type">lglDbRegStatus</span></a>)</td>
-</tr>
-</tbody>
+<a name="lgl-db-register-template"></a><h3>lgl_db_register_template ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-db.html#lglDbRegStatus" title="enum lglDbRegStatus"><span class="returnvalue">lglDbRegStatus</span></a>
+lgl_db_register_template (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>);</pre>
+<p>Register a template.  This function adds a template to the template database.
+The template will be stored in an individual XML file in the user template directory.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.27.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>template</p></td>
+<td class="parameter_description"><p>Pointer to a template structure to add to database.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.27.6"></a><h4>Returns</h4>
+<p> Status of registration attempt (<a class="link" href="libglabels-3.0-db.html#lglDbRegStatus" title="enum lglDbRegStatus"><span class="type">lglDbRegStatus</span></a>)</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-delete-template-by-brand-part"></a><h3>lgl_db_delete_template_by_brand_part ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-db.html#lglDbDeleteStatus" title="enum lglDbDeleteStatus"><span class="returnvalue">lglDbDeleteStatus</span></a>   lgl_db_delete_template_by_brand_part
-                                                        (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *part</code></em>);</pre>
-<p>
-Delete a user defined template.  This function deletes a template from
+<a name="lgl-db-delete-template-by-brand-part"></a><h3>lgl_db_delete_template_by_brand_part ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-db.html#lglDbDeleteStatus" title="enum lglDbDeleteStatus"><span class="returnvalue">lglDbDeleteStatus</span></a>
+lgl_db_delete_template_by_brand_part (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
+                                      <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *part</code></em>);</pre>
+<p>Delete a user defined template.  This function deletes a template from
 the template database. The individual XML file in the user template
-directory will also be removed.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+directory will also be removed.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.28.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>brand</code></em> :</span></p></td>
-<td>Brand name or vendor of template to be deleted.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>part</code></em> :</span></p></td>
-<td>Part name or number of template to be deleted.</td>
+<td class="parameter_name"><p>brand</p></td>
+<td class="parameter_description"><p>Brand name or vendor of template to be deleted.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>Status of registration attempt (<a class="link" href="libglabels-3.0-db.html#lglDbDeleteStatus" title="enum lglDbDeleteStatus"><span class="type">lglDbDeleteStatus</span></a>)</td>
+<td class="parameter_name"><p>part</p></td>
+<td class="parameter_description"><p>Part name or number of template to be deleted.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.28.6"></a><h4>Returns</h4>
+<p> Status of registration attempt (<a class="link" href="libglabels-3.0-db.html#lglDbDeleteStatus" title="enum lglDbDeleteStatus"><span class="type">lglDbDeleteStatus</span></a>)</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-delete-template-by-name"></a><h3>lgl_db_delete_template_by_name ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-db.html#lglDbDeleteStatus" title="enum lglDbDeleteStatus"><span class="returnvalue">lglDbDeleteStatus</span></a>   lgl_db_delete_template_by_name      (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
-<p>
-Delete a user defined template.  This function deletes a template from
+<a name="lgl-db-delete-template-by-name"></a><h3>lgl_db_delete_template_by_name ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-db.html#lglDbDeleteStatus" title="enum lglDbDeleteStatus"><span class="returnvalue">lglDbDeleteStatus</span></a>
+lgl_db_delete_template_by_name (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+<p>Delete a user defined template.  This function deletes a template from
 the template database. The individual XML file in the user template
-directory will also be removed.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>Name of template to be deleted.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>Status of registration attempt (<a class="link" href="libglabels-3.0-db.html#lglDbDeleteStatus" title="enum lglDbDeleteStatus"><span class="type">lglDbDeleteStatus</span></a>)</td>
-</tr>
-</tbody>
+directory will also be removed.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.29.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>Name of template to be deleted.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.29.6"></a><h4>Returns</h4>
+<p> Status of registration attempt (<a class="link" href="libglabels-3.0-db.html#lglDbDeleteStatus" title="enum lglDbDeleteStatus"><span class="type">lglDbDeleteStatus</span></a>)</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-does-template-exist"></a><h3>lgl_db_does_template_exist ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            lgl_db_does_template_exist          (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *part</code></em>);</pre>
-<p>
-This function tests whether a template with the given brand and part name/number exists.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-db-does-template-exist"></a><h3>lgl_db_does_template_exist ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+lgl_db_does_template_exist (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
+                            <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *part</code></em>);</pre>
+<p>This function tests whether a template with the given brand and part name/number exists.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.30.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>brand</code></em> :</span></p></td>
-<td>Brand name.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>part</code></em> :</span></p></td>
-<td>Part name/number.</td>
+<td class="parameter_name"><p>brand</p></td>
+<td class="parameter_description"><p>Brand name.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if such a template exists in the database.</td>
+<td class="parameter_name"><p>part</p></td>
+<td class="parameter_description"><p>Part name/number.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.30.6"></a><h4>Returns</h4>
+<p>  TRUE if such a template exists in the database.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-does-template-name-exist"></a><h3>lgl_db_does_template_name_exist ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            lgl_db_does_template_name_exist     (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
-<p>
-This function test whether a template with the given name exists.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>name string</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if such a template exists in the database.</td>
-</tr>
-</tbody>
+<a name="lgl-db-does-template-name-exist"></a><h3>lgl_db_does_template_name_exist ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+lgl_db_does_template_name_exist (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+<p>This function test whether a template with the given name exists.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.31.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>name string</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.31.6"></a><h4>Returns</h4>
+<p> TRUE if such a template exists in the database.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-get-template-name-list-all"></a><h3>lgl_db_get_template_name_list_all ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             lgl_db_get_template_name_list_all   (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *paper_id</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *category_id</code></em>);</pre>
-<p>
-Get a list of all valid names of templates in the template database.
+<a name="lgl-db-get-template-name-list-all"></a><h3>lgl_db_get_template_name_list_all ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+lgl_db_get_template_name_list_all (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
+                                   <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *paper_id</code></em>,
+                                   <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *category_id</code></em>);</pre>
+<p>Get a list of all valid names of templates in the template database.
 Results can be filtered by page size and/or template category.  A list of valid page
-sizes can be obtained using <a class="link" href="libglabels-3.0-db.html#lgl-db-get-paper-id-list" title="lgl_db_get_paper_id_list ()"><code class="function">lgl_db_get_paper_id_list()</code></a>.  A list of valid template
-categories can be obtained using <a class="link" href="libglabels-3.0-db.html#lgl-db-get-category-id-list" title="lgl_db_get_category_id_list ()"><code class="function">lgl_db_get_category_id_list()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+sizes can be obtained using <a class="link" href="libglabels-3.0-db.html#lgl-db-get-paper-id-list" title="lgl_db_get_paper_id_list ()"><code class="function">lgl_db_get_paper_id_list()</code></a>.  A list of valid template
+categories can be obtained using <a class="link" href="libglabels-3.0-db.html#lgl-db-get-category-id-list" title="lgl_db_get_category_id_list ()"><code class="function">lgl_db_get_category_id_list()</code></a>.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.32.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>brand</code></em> :</span></p></td>
-<td>If non NULL, limit results to given brand</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>paper_id</code></em> :</span></p></td>
-<td>If non NULL, limit results to given page size.</td>
+<td class="parameter_name"><p>brand</p></td>
+<td class="parameter_description"><p>If non NULL, limit results to given brand</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>category_id</code></em> :</span></p></td>
-<td>If non NULL, limit results to given template category.</td>
+<td class="parameter_name"><p>paper_id</p></td>
+<td class="parameter_description"><p>If non NULL, limit results to given page size.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a list of template names.</td>
+<td class="parameter_name"><p>category_id</p></td>
+<td class="parameter_description"><p>If non NULL, limit results to given template category.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.32.6"></a><h4>Returns</h4>
+<p> a list of template names.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-get-similar-template-name-list"></a><h3>lgl_db_get_similar_template_name_list ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             lgl_db_get_similar_template_name_list
-                                                        (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
-<p>
-Get a list of all valid names of templates in the template database that
-have the same size and layout characteristics as the given template.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>Name of template under test.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a list of template names.</td>
-</tr>
-</tbody>
+<a name="lgl-db-get-similar-template-name-list"></a><h3>lgl_db_get_similar_template_name_list ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+lgl_db_get_similar_template_name_list (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+<p>Get a list of all valid names of templates in the template database that
+have the same size and layout characteristics as the given template.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.33.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>Name of template under test.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.33.6"></a><h4>Returns</h4>
+<p> a list of template names.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-free-template-name-list"></a><h3>lgl_db_free_template_name_list ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_db_free_template_name_list      (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *names</code></em>);</pre>
-<p>
-Free up all storage associated with a list of template names obtained with
-<a class="link" href="libglabels-3.0-db.html#lgl-db-get-template-name-list-all" title="lgl_db_get_template_name_list_all ()"><code class="function">lgl_db_get_template_name_list_all()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-db-free-template-name-list"></a><h3>lgl_db_free_template_name_list ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_db_free_template_name_list (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *names</code></em>);</pre>
+<p>Free up all storage associated with a list of template names obtained with
+<a class="link" href="libglabels-3.0-db.html#lgl-db-get-template-name-list-all" title="lgl_db_get_template_name_list_all ()"><code class="function">lgl_db_get_template_name_list_all()</code></a>.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.34.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>names</code></em> :</span></p></td>
-<td>List of template name strings to be freed.</td>
+<td class="parameter_name"><p>names</p></td>
+<td class="parameter_description"><p>List of template name strings to be freed.</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-lookup-template-from-name"></a><h3>lgl_db_lookup_template_from_name ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *       lgl_db_lookup_template_from_name    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
-<p>
-Lookup template in template database from name string.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>name string</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>pointer to a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structure.</td>
-</tr>
-</tbody>
+<a name="lgl-db-lookup-template-from-name"></a><h3>lgl_db_lookup_template_from_name ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *
+lgl_db_lookup_template_from_name (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+<p>Lookup template in template database from name string.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.35.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>name string</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.35.6"></a><h4>Returns</h4>
+<p> pointer to a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-lookup-template-from-brand-part"></a><h3>lgl_db_lookup_template_from_brand_part ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *       lgl_db_lookup_template_from_brand_part
-                                                        (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *part</code></em>);</pre>
-<p>
-Lookup template in template database from brand and part strings.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-db-lookup-template-from-brand-part"></a><h3>lgl_db_lookup_template_from_brand_part ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *
+lgl_db_lookup_template_from_brand_part
+                               (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
+                                <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *part</code></em>);</pre>
+<p>Lookup template in template database from brand and part strings.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.36.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>brand</code></em> :</span></p></td>
-<td>brand name string</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>part</code></em> :</span></p></td>
-<td>part name string</td>
+<td class="parameter_name"><p>brand</p></td>
+<td class="parameter_description"><p>brand name string</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>pointer to a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structure.</td>
+<td class="parameter_name"><p>part</p></td>
+<td class="parameter_description"><p>part name string</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.36.6"></a><h4>Returns</h4>
+<p> pointer to a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-get-vendor-name-list"></a><h3>lgl_db_get_vendor_name_list ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             lgl_db_get_vendor_name_list         (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-Get a list of all localized vendor names known to libglabels.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-db-get-vendor-name-list"></a><h3>lgl_db_get_vendor_name_list ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+lgl_db_get_vendor_name_list (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Get a list of all localized vendor names known to libglabels.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.37.5"></a><h4>Returns</h4>
+<p> a list of localized vendor names.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-db-free-vendor-name-list"></a><h3>lgl_db_free_vendor_name_list ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_db_free_vendor_name_list (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *names</code></em>);</pre>
+<p>Free up all storage associated with a name list obtained with
+<a class="link" href="libglabels-3.0-db.html#lgl-db-get-vendor-name-list" title="lgl_db_get_vendor_name_list ()"><code class="function">lgl_db_get_vendor_name_list()</code></a>.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.38.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a list of localized vendor names.</td>
+<td class="parameter_name"><p>names</p></td>
+<td class="parameter_description"><p>List of localized vendor name strings to be freed.</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-free-vendor-name-list"></a><h3>lgl_db_free_vendor_name_list ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_db_free_vendor_name_list        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *names</code></em>);</pre>
-<p>
-Free up all storage associated with a name list obtained with
-<a class="link" href="libglabels-3.0-db.html#lgl-db-get-vendor-name-list" title="lgl_db_get_vendor_name_list ()"><code class="function">lgl_db_get_vendor_name_list()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-db-is-vendor-name-known"></a><h3>lgl_db_is_vendor_name_known ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+lgl_db_is_vendor_name_known (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+<p>Determine if given vendor id is known to libglabels.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.39.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>vendor name to test</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.2.2.8.39.6"></a><h4>Returns</h4>
+<p> TRUE if id is known, otherwise FALSE.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-db-lookup-vendor-from-name"></a><h3>lgl_db_lookup_vendor_from_name ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="returnvalue">lglVendor</span></a> *
+lgl_db_lookup_vendor_from_name (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+<p>Lookup vendor definition from localized vendor name string.</p>
+<div class="refsect3">
+<a name="id-1.2.2.8.40.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>names</code></em> :</span></p></td>
-<td>List of localized vendor name strings to be freed.</td>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>localized vendor name string</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.2.8.40.6"></a><h4>Returns</h4>
+<p> pointer to a newly allocated <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-db-print-known-papers"></a><h3>lgl_db_print_known_papers ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_db_print_known_papers (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>For debugging purposes: print a list of all paper definitions known to
+libglabels.</p>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-is-vendor-name-known"></a><h3>lgl_db_is_vendor_name_known ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            lgl_db_is_vendor_name_known         (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+<a name="lgl-db-print-known-categories"></a><h3>lgl_db_print_known_categories ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_db_print_known_categories (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>For debugging purposes: print a list of all category definitions known to
+libglabels.</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-db-print-known-templates"></a><h3>lgl_db_print_known_templates ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_db_print_known_templates (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Print all known templates (for debugging purposes).</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-db-print-known-vendors"></a><h3>lgl_db_print_known_vendors ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_db_print_known_vendors (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>For debugging purposes: print a list of all vendor definitions known to
+libglabels.</p>
+</div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-db.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="lglDbRegStatus"></a><h3>enum lglDbRegStatus</h3>
 <p>
-Determine if given vendor id is known to libglabels.
+This enumeration defines a set of possible return values for <a class="link" href="libglabels-3.0-db.html#lgl-db-register-template" title="lgl_db_register_template ()"><code class="function">lgl_db_register_template()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.2.9.2.4"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>vendor name to test</td>
+<td class="enum_member_name"><p><a name="LGL-DB-REG-OK:CAPS"></a>LGL_DB_REG_OK</p></td>
+<td class="enum_member_description">
+<p>Registration successful.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-DB-REG-BAD-PAPER-ID:CAPS"></a>LGL_DB_REG_BAD_PAPER_ID</p></td>
+<td class="enum_member_description">
+<p> Registration failed because paper id is unknown.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-DB-REG-BRAND-PART-EXISTS:CAPS"></a>LGL_DB_REG_BRAND_PART_EXISTS</p></td>
+<td class="enum_member_description">
+<p>Registration failed because template with same brand and part name/number already exists.</p>
+</td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if id is known, otherwise FALSE.</td>
+<td class="enum_member_name"><p><a name="LGL-DB-REG-FILE-WRITE-ERROR:CAPS"></a>LGL_DB_REG_FILE_WRITE_ERROR</p></td>
+<td class="enum_member_description">
+<p>Registration failed because an error while writing to disk.</p>
+</td>
+<td class="enum_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-db-lookup-vendor-from-name"></a><h3>lgl_db_lookup_vendor_from_name ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="returnvalue">lglVendor</span></a> *         lgl_db_lookup_vendor_from_name      (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+<a name="lglDbDeleteStatus"></a><h3>enum lglDbDeleteStatus</h3>
 <p>
-Lookup vendor definition from localized vendor name string.
+This enumeration defines a set of possible return values for <a class="link" href="libglabels-3.0-db.html#lgl-db-delete-template-by-name" title="lgl_db_delete_template_by_name ()"><code class="function">lgl_db_delete_template_by_name()</code></a> or <a class="link" href="libglabels-3.0-db.html#lgl-db-delete-template-by-brand-part" title="lgl_db_delete_template_by_brand_part ()"><code class="function">lgl_db_delete_template_by_brand_part()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.2.9.3.4"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>localized vendor name string</td>
+<td class="enum_member_name"><p><a name="LGL-DB-DELETE-OK:CAPS"></a>LGL_DB_DELETE_OK</p></td>
+<td class="enum_member_description">
+<p>Deletion successful.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-DB-DELETE-DOES-NOT-EXIST:CAPS"></a>LGL_DB_DELETE_DOES_NOT_EXIST</p></td>
+<td class="enum_member_description">
+<p>Deletion failed because template with given brand and part name/number does not exist.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-DB-DELETE-NOT-USER-DEFINED:CAPS"></a>LGL_DB_DELETE_NOT_USER_DEFINED</p></td>
+<td class="enum_member_description">
+<p>Deletion failed because given template is not a user defined template.</p>
+</td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>pointer to a newly allocated <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure.</td>
+<td class="enum_member_name"><p><a name="LGL-DB-DELETE-FILE-ERROR:CAPS"></a>LGL_DB_DELETE_FILE_ERROR</p></td>
+<td class="enum_member_description">
+<p>Deletion failed because of an error while attempting to remove template from disk.</p>
+</td>
+<td class="enum_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="lgl-db-print-known-papers"></a><h3>lgl_db_print_known_papers ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_db_print_known_papers           (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-For debugging purposes: print a list of all paper definitions known to
-libglabels.
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-db-print-known-categories"></a><h3>lgl_db_print_known_categories ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_db_print_known_categories       (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-For debugging purposes: print a list of all category definitions known to
-libglabels.
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-db-print-known-templates"></a><h3>lgl_db_print_known_templates ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_db_print_known_templates        (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-Print all known templates (for debugging purposes).
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-db-print-known-vendors"></a><h3>lgl_db_print_known_vendors ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_db_print_known_vendors          (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-For debugging purposes: print a list of all vendor definitions known to
-libglabels.
-</p>
 </div>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index b7f03da2a47ce6ab5ebdb77c0ccf5394c089fc1f..bda48d815d5c22125a85c6e8d314f7ea7cc3c7c4 100644 (file)
@@ -2,30 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>The lglPaper Structure</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlabels 3.0 Reference Manual: The lglPaper Structure</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="up" href="ch01.html" title="Basic LibGlabels Usage">
 <link rel="prev" href="libglabels-3.0-template.html" title="The lglTemplate Structure">
 <link rel="next" href="libglabels-3.0-category.html" title="The lglCategory Structure">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libglabels-3.0-template.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlabels 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglabels-3.0-category.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libglabels-3.0-paper.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libglabels-3.0-paper.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-paper.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-paper.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libglabels-3.0-template.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglabels-3.0-category.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="libglabels-3.0-paper"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <h2><span class="refentrytitle"><a name="libglabels-3.0-paper.top_of_page"></a>The lglPaper Structure</span></h2>
 <p>The lglPaper Structure — Paper size definitions</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="libglabels-3.0-paper.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libglabels/lgl-paper.h&gt;
-
-struct              <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper">lglPaper</a>;
-<a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *          <a class="link" href="libglabels-3.0-paper.html#lgl-paper-new" title="lgl_paper_new ()">lgl_paper_new</a>                       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> width</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> height</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *pwg_size</code></em>);
-<a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *          <a class="link" href="libglabels-3.0-paper.html#lgl-paper-dup" title="lgl_paper_dup ()">lgl_paper_dup</a>                       (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> *orig</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-paper.html#lgl-paper-free" title="lgl_paper_free ()">lgl_paper_free</a>                      (<em class="parameter"><code><a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> *paper</code></em>);
+<div class="refsect1">
+<a name="libglabels-3.0-paper.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-paper.html#lgl-paper-new" title="lgl_paper_new ()">lgl_paper_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-paper.html#lgl-paper-dup" title="lgl_paper_dup ()">lgl_paper_dup</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-paper.html#lgl-paper-free" title="lgl_paper_free ()">lgl_paper_free</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-paper.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody><tr>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper">lglPaper</a></td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-paper.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-paper.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;libglabels/lgl-paper.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -58,129 +98,167 @@ and related functions.
 </p>
 </div>
 <div class="refsect1">
-<a name="libglabels-3.0-paper.details"></a><h2>Details</h2>
+<a name="libglabels-3.0-paper.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="lglPaper"></a><h3>struct lglPaper</h3>
-<pre class="programlisting">struct lglPaper {
-        gchar               *id;       /* Unique ID of paper definition */
-        gchar               *name;     /* Localized name of paper */
-        gdouble              width;    /* Width (in points) */
-        gdouble              height;   /* Height (in points) */
-        gchar               *pwg_size; /* PWG 5101.1-2002 size name */
-};
-</pre>
-<p>
-This structure defines a paper (page) size.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-paper-new"></a><h3>lgl_paper_new ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *
+lgl_paper_new (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
+               <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>,
+               <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> width</code></em>,
+               <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> height</code></em>,
+               <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *pwg_size</code></em>);</pre>
+<p>Allocates and constructs a new <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure.</p>
+<div class="refsect3">
+<a name="id-1.2.4.8.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglPaper.id"></a>id</code></em>;</span></p></td>
-<td>Paper size ID.</td>
+<td class="parameter_name"><p>id</p></td>
+<td class="parameter_description"><p>Id of paper definition. (E.g. US-Letter, A4, etc.)  Should be
+unique.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglPaper.name"></a>name</code></em>;</span></p></td>
-<td>Localized paper size name.</td>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>Localized name of paper.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglPaper.width"></a>width</code></em>;</span></p></td>
-<td>Width of paper in points.</td>
+<td class="parameter_name"><p>width</p></td>
+<td class="parameter_description"><p>Width of paper in points.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglPaper.height"></a>height</code></em>;</span></p></td>
-<td>Height of paper in points.</td>
+<td class="parameter_name"><p>height</p></td>
+<td class="parameter_description"><p>Height of paper in points.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglPaper.pwg-size"></a>pwg_size</code></em>;</span></p></td>
-<td>Paper size string as defined in PWG 5101.1-2002.</td>
+<td class="parameter_name"><p>pwg_size</p></td>
+<td class="parameter_description"><p>PWG 5101.1-2002 size name.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.4.8.2.6"></a><h4>Returns</h4>
+<p> a pointer to a newly allocated <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-paper-new"></a><h3>lgl_paper_new ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *          lgl_paper_new                       (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> width</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> height</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *pwg_size</code></em>);</pre>
+<a name="lgl-paper-dup"></a><h3>lgl_paper_dup ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *
+lgl_paper_dup (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> *orig</code></em>);</pre>
+<p>Duplicates an existing <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure.</p>
+<div class="refsect3">
+<a name="id-1.2.4.8.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>orig</p></td>
+<td class="parameter_description"><p><a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure to be duplicated.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.2.4.8.3.6"></a><h4>Returns</h4>
+<p> a pointer to a newly allocated <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-paper-free"></a><h3>lgl_paper_free ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_paper_free (<em class="parameter"><code><a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> *paper</code></em>);</pre>
+<p>Free all memory associated with an existing <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure.</p>
+<div class="refsect3">
+<a name="id-1.2.4.8.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>paper</p></td>
+<td class="parameter_description"><p>pointer to <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure to be freed.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-paper.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="lglPaper"></a><h3>struct lglPaper</h3>
+<pre class="programlisting">struct lglPaper {
+        gchar               *id;       /* Unique ID of paper definition */
+        gchar               *name;     /* Localized name of paper */
+        gdouble              width;    /* Width (in points) */
+        gdouble              height;   /* Height (in points) */
+        gchar               *pwg_size; /* PWG 5101.1-2002 size name */
+};
+</pre>
 <p>
-Allocates and constructs a new <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure.
+This structure defines a paper (page) size.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.4.9.2.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>Id of paper definition. (E.g. US-Letter, A4, etc.)  Should be
-unique.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>Localized name of paper.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglPaper.id"></a>id</code></em>;</p></td>
+<td class="struct_member_description"><p>Paper size ID.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td>
-<td>Width of paper in points.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglPaper.name"></a>name</code></em>;</p></td>
+<td class="struct_member_description"><p>Localized paper size name.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>height</code></em> :</span></p></td>
-<td>Height of paper in points.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglPaper.width"></a>width</code></em>;</p></td>
+<td class="struct_member_description"><p>Width of paper in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>pwg_size</code></em> :</span></p></td>
-<td>PWG 5101.1-2002 size name.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a pointer to a newly allocated <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure.</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-paper-dup"></a><h3>lgl_paper_dup ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *          lgl_paper_dup                       (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> *orig</code></em>);</pre>
-<p>
-Duplicates an existing <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>orig</code></em> :</span></p></td>
-<td>
-<a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure to be duplicated.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglPaper.height"></a>height</code></em>;</p></td>
+<td class="struct_member_description"><p>Height of paper in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a pointer to a newly allocated <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglPaper.pwg-size"></a>pwg_size</code></em>;</p></td>
+<td class="struct_member_description"><p>Paper size string as defined in PWG 5101.1-2002.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="lgl-paper-free"></a><h3>lgl_paper_free ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_paper_free                      (<em class="parameter"><code><a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> *paper</code></em>);</pre>
-<p>
-Free all memory associated with an existing <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>paper</code></em> :</span></p></td>
-<td>pointer to <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure to be freed.</td>
-</tr></tbody>
-</table></div>
 </div>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 72c75367f800b51175734f992e8ebc110f13c784..182f4f5be4ad025e73972b2714a193abe122c658 100644 (file)
@@ -2,29 +2,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>String Utility Functions</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlabels 3.0 Reference Manual: String Utility Functions</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="up" href="ch03.html" title="Miscellaneous">
 <link rel="prev" href="libglabels-3.0-units.html" title="Units">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libglabels-3.0-units.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch03.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlabels 3.0 Reference Manual</th>
-<td> </td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libglabels-3.0-str.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libglabels-3.0-str.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-str.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-str.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libglabels-3.0-units.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><img src="right-insensitive.png" width="16" height="16" border="0"></td>
+</tr></table>
 <div class="refentry">
 <a name="libglabels-3.0-str"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <h2><span class="refentrytitle"><a name="libglabels-3.0-str.top_of_page"></a>String Utility Functions</span></h2>
 <p>String Utility Functions — String utility functions provided by libglabels</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="libglabels-3.0-str.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libglabels/lgl-str.h&gt;
-
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                <a class="link" href="libglabels-3.0-str.html#lgl-str-utf8-casecmp" title="lgl_str_utf8_casecmp ()">lgl_str_utf8_casecmp</a>                (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *s1</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *s2</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                <a class="link" href="libglabels-3.0-str.html#lgl-str-part-name-cmp" title="lgl_str_part_name_cmp ()">lgl_str_part_name_cmp</a>               (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *s1</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *s2</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="libglabels-3.0-str.html#lgl-str-format-fraction" title="lgl_str_format_fraction ()">lgl_str_format_fraction</a>             (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>);
+<div class="refsect1">
+<a name="libglabels-3.0-str.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-str.html#lgl-str-utf8-casecmp" title="lgl_str_utf8_casecmp ()">lgl_str_utf8_casecmp</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-str.html#lgl-str-part-name-cmp" title="lgl_str_part_name_cmp ()">lgl_str_part_name_cmp</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-str.html#lgl-str-format-fraction" title="lgl_str_format_fraction ()">lgl_str_format_fraction</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-str.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-str.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;libglabels/lgl-str.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -54,116 +84,129 @@ possible use to a user of libglabels.
 </p>
 </div>
 <div class="refsect1">
-<a name="libglabels-3.0-str.details"></a><h2>Details</h2>
+<a name="libglabels-3.0-str.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="lgl-str-utf8-casecmp"></a><h3>lgl_str_utf8_casecmp ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                lgl_str_utf8_casecmp                (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *s1</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *s2</code></em>);</pre>
-<p>
-Compare two UTF-8 strings, ignoring the case of characters.
-</p>
-<p>
-This function should be used only on strings that are known to be encoded
-in UTF-8 or a compatible UTF-8 subset.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-str-utf8-casecmp"></a><h3>lgl_str_utf8_casecmp ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+lgl_str_utf8_casecmp (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *s1</code></em>,
+                      <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *s2</code></em>);</pre>
+<p>Compare two UTF-8 strings, ignoring the case of characters.</p>
+<p>This function should be used only on strings that are known to be encoded
+in UTF-8 or a compatible UTF-8 subset.</p>
+<div class="refsect3">
+<a name="id-1.4.3.7.2.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>s1</code></em> :</span></p></td>
-<td>string to compare with s2.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>s2</code></em> :</span></p></td>
-<td>string to compare with s1.</td>
+<td class="parameter_name"><p>s1</p></td>
+<td class="parameter_description"><p>string to compare with s2.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>0 if the strings match, a negative value if s1 &lt; s2,
-or a positive value if s1 &gt; s2.</td>
+<td class="parameter_name"><p>s2</p></td>
+<td class="parameter_description"><p>string to compare with s1.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.4.3.7.2.7"></a><h4>Returns</h4>
+<p> 0 if the strings match, a negative value if s1 &lt; s2,
+or a positive value if s1 &gt; s2.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-str-part-name-cmp"></a><h3>lgl_str_part_name_cmp ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                lgl_str_part_name_cmp               (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *s1</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *s2</code></em>);</pre>
-<p>
-Compare two UTF-8 strings representing part names or numbers.  This function
-uses a natural sort order:
-</p>
-<p>
- - Ignores case.
-</p>
-<p>
- - Strings are divided into chunks (numeric and non-numeric)
-</p>
-<p>
- - Non-numeric chunks are compared character by character
-</p>
-<p>
- - Numerical chunks are compared numerically, so that "20" precedes "100".
-</p>
-<p>
- - Comparison of chunks is performed left to right until the first difference
-   is encountered or all chunks evaluate as equal.
-</p>
-<p>
-This function should be used only on strings that are known to be encoded
-in UTF-8 or a compatible UTF-8 subset.
-</p>
-<p>
-Numeric chunks are converted to 64 bit unsigned integers for comparison,
+<a name="lgl-str-part-name-cmp"></a><h3>lgl_str_part_name_cmp ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+lgl_str_part_name_cmp (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *s1</code></em>,
+                       <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *s2</code></em>);</pre>
+<p>Compare two UTF-8 strings representing part names or numbers.  This function
+uses a natural sort order:</p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p>Ignores case.</p></li>
+<li class="listitem"><p>Strings are divided into chunks (numeric and non-numeric)</p></li>
+<li class="listitem"><p>Non-numeric chunks are compared character by character</p></li>
+<li class="listitem"><p>Numerical chunks are compared numerically, so that "20" precedes "100".</p></li>
+<li class="listitem"><p>Comparison of chunks is performed left to right until the first difference
+is encountered or all chunks evaluate as equal.</p></li>
+</ul></div>
+<p>This function should be used only on strings that are known to be encoded
+in UTF-8 or a compatible UTF-8 subset.</p>
+<p>Numeric chunks are converted to 64 bit unsigned integers for comparison,
 so the behaviour may be unpredictable for numeric chunks that exceed
-18446744073709551615.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+18446744073709551615.</p>
+<div class="refsect3">
+<a name="id-1.4.3.7.3.8"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>s1</code></em> :</span></p></td>
-<td>string to compare with s2.</td>
+<td class="parameter_name"><p>s1</p></td>
+<td class="parameter_description"><p>string to compare with s2.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>s2</code></em> :</span></p></td>
-<td>string to compare with s1.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>0 if the strings match, a negative value if s1 &lt; s2,
-or a positive value if s1 &gt; s2.</td>
+<td class="parameter_name"><p>s2</p></td>
+<td class="parameter_description"><p>string to compare with s1.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.4.3.7.3.9"></a><h4>Returns</h4>
+<p> 0 if the strings match, a negative value if s1 &lt; s2,
+or a positive value if s1 &gt; s2.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-str-format-fraction"></a><h3>lgl_str_format_fraction ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             lgl_str_format_fraction             (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>);</pre>
-<p>
-Create fractional representation of number, if possible.  Uses UTF-8 superscripts and
-subscripts for numerator and denominator values respecively.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td>
-<td>Floating point number to convert to fractional notation</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>UTF-8 string containing fractional representation of x.</td>
-</tr>
-</tbody>
+<a name="lgl-str-format-fraction"></a><h3>lgl_str_format_fraction ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+lgl_str_format_fraction (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>);</pre>
+<p>Create fractional representation of number, if possible.  Uses UTF-8 superscripts and
+subscripts for numerator and denominator values respecively.</p>
+<div class="refsect3">
+<a name="id-1.4.3.7.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>x</p></td>
+<td class="parameter_description"><p>Floating point number to convert to fractional notation</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.4.3.7.4.6"></a><h4>Returns</h4>
+<p> UTF-8 string containing fractional representation of x.</p>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-str.other_details"></a><h2>Types and Values</h2>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 48976dff08ab1748af1ff1230bd727a35cd05cfe..a264673ef2594823fa5ad0f25d038f0837ff82e8 100644 (file)
@@ -2,30 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>The lglTemplate Structure</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlabels 3.0 Reference Manual: The lglTemplate Structure</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="up" href="ch01.html" title="Basic LibGlabels Usage">
 <link rel="prev" href="libglabels-3.0-db.html" title="Database">
 <link rel="next" href="libglabels-3.0-paper.html" title="The lglPaper Structure">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libglabels-3.0-db.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlabels 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglabels-3.0-paper.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libglabels-3.0-template.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libglabels-3.0-template.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-template.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-template.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libglabels-3.0-db.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglabels-3.0-paper.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="libglabels-3.0-template"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <h2><span class="refentrytitle"><a name="libglabels-3.0-template.top_of_page"></a>The lglTemplate Structure</span></h2>
 <p>The lglTemplate Structure — How templates are represented in memory</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="libglabels-3.0-template.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libglabels/lgl-template.h&gt;
-
-struct              <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate">lglTemplate</a>;
-
-enum                <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameShape" title="enum lglTemplateFrameShape">lglTemplateFrameShape</a>;
-union               <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame">lglTemplateFrame</a>;
-struct              <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll">lglTemplateFrameAll</a>;
-struct              <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameRect" title="struct lglTemplateFrameRect">lglTemplateFrameRect</a>;
-struct              <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameEllipse" title="struct lglTemplateFrameEllipse">lglTemplateFrameEllipse</a>;
-struct              <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameRound" title="struct lglTemplateFrameRound">lglTemplateFrameRound</a>;
-struct              <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameCD" title="struct lglTemplateFrameCD">lglTemplateFrameCD</a>;
-
-struct              <a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout">lglTemplateLayout</a>;
-
-enum                <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupType" title="enum lglTemplateMarkupType">lglTemplateMarkupType</a>;
-union               <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup">lglTemplateMarkup</a>;
-struct              <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupMargin" title="struct lglTemplateMarkupMargin">lglTemplateMarkupMargin</a>;
-struct              <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupLine" title="struct lglTemplateMarkupLine">lglTemplateMarkupLine</a>;
-struct              <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupCircle" title="struct lglTemplateMarkupCircle">lglTemplateMarkupCircle</a>;
-struct              <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupRect" title="struct lglTemplateMarkupRect">lglTemplateMarkupRect</a>;
-struct              <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupEllipse" title="struct lglTemplateMarkupEllipse">lglTemplateMarkupEllipse</a>;
-
-struct              <a class="link" href="libglabels-3.0-template.html#lglTemplateOrigin" title="struct lglTemplateOrigin">lglTemplateOrigin</a>;
-
-<a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *       <a class="link" href="libglabels-3.0-template.html#lgl-template-new" title="lgl_template_new ()">lgl_template_new</a>                    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *part</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *description</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *paper_id</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> page_width</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> page_height</code></em>);
-<a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *       <a class="link" href="libglabels-3.0-template.html#lgl-template-new-from-equiv" title="lgl_template_new_from_equiv ()">lgl_template_new_from_equiv</a>         (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *part</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *equiv_part</code></em>);
-<a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *       <a class="link" href="libglabels-3.0-template.html#lgl-template-dup" title="lgl_template_dup ()">lgl_template_dup</a>                    (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *orig_template</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-template.html#lgl-template-free" title="lgl_template_free ()">lgl_template_free</a>                   (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-template.html#lgl-template-add-category" title="lgl_template_add_category ()">lgl_template_add_category</a>           (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *category_id</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-template.html#lgl-template-add-frame" title="lgl_template_add_frame ()">lgl_template_add_frame</a>              (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>);
-
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="libglabels-3.0-template.html#lgl-template-get-name" title="lgl_template_get_name ()">lgl_template_get_name</a>               (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libglabels-3.0-template.html#lgl-template-do-templates-match" title="lgl_template_do_templates_match ()">lgl_template_do_templates_match</a>     (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template1</code></em>,
-                                                         <em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template2</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libglabels-3.0-template.html#lgl-template-does-brand-match" title="lgl_template_does_brand_match ()">lgl_template_does_brand_match</a>       (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libglabels-3.0-template.html#lgl-template-does-page-size-match" title="lgl_template_does_page_size_match ()">lgl_template_does_page_size_match</a>   (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *paper_id</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libglabels-3.0-template.html#lgl-template-does-category-match" title="lgl_template_does_category_match ()">lgl_template_does_category_match</a>    (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *category_id</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libglabels-3.0-template.html#lgl-template-are-templates-identical" title="lgl_template_are_templates_identical ()">lgl_template_are_templates_identical</a>
-                                                        (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template1</code></em>,
-                                                         <em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template2</code></em>);
-
-<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *  <a class="link" href="libglabels-3.0-template.html#lgl-template-frame-rect-new" title="lgl_template_frame_rect_new ()">lgl_template_frame_rect_new</a>         (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x_waste</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y_waste</code></em>);
-<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *  <a class="link" href="libglabels-3.0-template.html#lgl-template-frame-ellipse-new" title="lgl_template_frame_ellipse_new ()">lgl_template_frame_ellipse_new</a>      (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> waste</code></em>);
-<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *  <a class="link" href="libglabels-3.0-template.html#lgl-template-frame-round-new" title="lgl_template_frame_round_new ()">lgl_template_frame_round_new</a>        (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> waste</code></em>);
-<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *  <a class="link" href="libglabels-3.0-template.html#lgl-template-frame-cd-new" title="lgl_template_frame_cd_new ()">lgl_template_frame_cd_new</a>           (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r1</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r2</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> waste</code></em>);
-<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *  <a class="link" href="libglabels-3.0-template.html#lgl-template-frame-dup" title="lgl_template_frame_dup ()">lgl_template_frame_dup</a>              (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *orig_frame</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-template.html#lgl-template-frame-free" title="lgl_template_frame_free ()">lgl_template_frame_free</a>             (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-template.html#lgl-template-frame-add-layout" title="lgl_template_frame_add_layout ()">lgl_template_frame_add_layout</a>       (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> *layout</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-template.html#lgl-template-frame-add-markup" title="lgl_template_frame_add_markup ()">lgl_template_frame_add_markup</a>       (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> *markup</code></em>);
-
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-template.html#lgl-template-frame-get-size" title="lgl_template_frame_get_size ()">lgl_template_frame_get_size</a>         (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> *w</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> *h</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                <a class="link" href="libglabels-3.0-template.html#lgl-template-frame-get-n-labels" title="lgl_template_frame_get_n_labels ()">lgl_template_frame_get_n_labels</a>     (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>);
-<a class="link" href="libglabels-3.0-template.html#lglTemplateOrigin" title="struct lglTemplateOrigin"><span class="returnvalue">lglTemplateOrigin</span></a> * <a class="link" href="libglabels-3.0-template.html#lgl-template-frame-get-origins" title="lgl_template_frame_get_origins ()">lgl_template_frame_get_origins</a>      (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="libglabels-3.0-template.html#lgl-template-frame-get-layout-description" title="lgl_template_frame_get_layout_description ()">lgl_template_frame_get_layout_description</a>
-                                                        (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="libglabels-3.0-template.html#lgl-template-frame-get-size-description" title="lgl_template_frame_get_size_description ()">lgl_template_frame_get_size_description</a>
-                                                        (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);
-
-<a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="returnvalue">lglTemplateLayout</span></a> * <a class="link" href="libglabels-3.0-template.html#lgl-template-layout-new" title="lgl_template_layout_new ()">lgl_template_layout_new</a>             (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> nx</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> ny</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x0</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y0</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> dx</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> dy</code></em>);
-<a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="returnvalue">lglTemplateLayout</span></a> * <a class="link" href="libglabels-3.0-template.html#lgl-template-layout-dup" title="lgl_template_layout_dup ()">lgl_template_layout_dup</a>             (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> *orig_layout</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-template.html#lgl-template-layout-free" title="lgl_template_layout_free ()">lgl_template_layout_free</a>            (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> *layout</code></em>);
-
-<a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> * <a class="link" href="libglabels-3.0-template.html#lgl-template-markup-margin-new" title="lgl_template_markup_margin_new ()">lgl_template_markup_margin_new</a>      (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> size</code></em>);
-<a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> * <a class="link" href="libglabels-3.0-template.html#lgl-template-markup-line-new" title="lgl_template_markup_line_new ()">lgl_template_markup_line_new</a>        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x1</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y1</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x2</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y2</code></em>);
-<a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> * <a class="link" href="libglabels-3.0-template.html#lgl-template-markup-circle-new" title="lgl_template_markup_circle_new ()">lgl_template_markup_circle_new</a>      (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x0</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y0</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r</code></em>);
-<a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> * <a class="link" href="libglabels-3.0-template.html#lgl-template-markup-rect-new" title="lgl_template_markup_rect_new ()">lgl_template_markup_rect_new</a>        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x1</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y1</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r</code></em>);
-<a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> * <a class="link" href="libglabels-3.0-template.html#lgl-template-markup-ellipse-new" title="lgl_template_markup_ellipse_new ()">lgl_template_markup_ellipse_new</a>     (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x1</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y1</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>);
-<a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> * <a class="link" href="libglabels-3.0-template.html#lgl-template-markup-dup" title="lgl_template_markup_dup ()">lgl_template_markup_dup</a>             (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> *orig_markup</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-template.html#lgl-template-markup-free" title="lgl_template_markup_free ()">lgl_template_markup_free</a>            (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> *markup</code></em>);
-
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-template.html#lgl-template-print" title="lgl_template_print ()">lgl_template_print</a>                  (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>);
-</pre>
-</div>
-<div class="refsect1">
-<a name="libglabels-3.0-template.description"></a><h2>Description</h2>
-<p>
-This section describes a set of structures that represent a template in memory.  It also
-describes functions to help create and interpret these structures.
-</p>
-</div>
 <div class="refsect1">
-<a name="libglabels-3.0-template.details"></a><h2>Details</h2>
-<div class="refsect2">
-<a name="lglTemplate"></a><h3>struct lglTemplate</h3>
-<pre class="programlisting">struct lglTemplate {
-        gchar               *brand;
-        gchar               *part;
-        gchar               *equiv_part;
-
-        gchar               *description;
-        gchar               *paper_id;
-        gdouble              page_width;
-        gdouble              page_height;
-
-        /* Meta information. */
-        gchar               *product_url;   /* URL to manufacturer's product website. */
-        GList               *category_ids;  /* List of (gchar *) category ids. */
-
-        /* List of (lglTemplateFrame *) label frame structures.
-         * Currently glabels only supports a single label frame per
-         * template. */
-        GList               *frames;
-};
-</pre>
-<p>
-This is the main structure of a libglabels template.  A template represents a single sheet
-of peel-off labels or cards.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="libglabels-3.0-template.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplate.brand"></a>brand</code></em>;</span></p></td>
-<td>Vendor or brand name of label or card.  E.g. "Avery."</td>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-new" title="lgl_template_new ()">lgl_template_new</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplate.part"></a>part</code></em>;</span></p></td>
-<td>Part name or number of label or card.  E.g. "8160."</td>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-new-from-equiv" title="lgl_template_new_from_equiv ()">lgl_template_new_from_equiv</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplate.equiv-part"></a>equiv_part</code></em>;</span></p></td>
-<td>Part name or number of a part with identical layout.  Must be from same vendor.</td>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-dup" title="lgl_template_dup ()">lgl_template_dup</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplate.description"></a>description</code></em>;</span></p></td>
-<td>A description of the template.  E.g. "Mailing labels."</td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-free" title="lgl_template_free ()">lgl_template_free</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplate.paper-id"></a>paper_id</code></em>;</span></p></td>
-<td>A paper ID.  E.g. "A4" or "US-Letter."</td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-add-category" title="lgl_template_add_category ()">lgl_template_add_category</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplate.page-width"></a>page_width</code></em>;</span></p></td>
-<td>Page width in points.  Used only if paper_id is "Other."</td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-add-frame" title="lgl_template_add_frame ()">lgl_template_add_frame</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplate.page-height"></a>page_height</code></em>;</span></p></td>
-<td>Page height in points.  Used only if paper_id is "Other."</td>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-get-name" title="lgl_template_get_name ()">lgl_template_get_name</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplate.product-url"></a>product_url</code></em>;</span></p></td>
-<td>URL to a webpage describing product.</td>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-do-templates-match" title="lgl_template_do_templates_match ()">lgl_template_do_templates_match</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplate.category-ids"></a>category_ids</code></em>;</span></p></td>
-<td>A list of category IDs that this template belongs to.</td>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-does-brand-match" title="lgl_template_does_brand_match ()">lgl_template_does_brand_match</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplate.frames"></a>frames</code></em>;</span></p></td>
-<td>A list of (<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *) structures.  GLabels currently only supports one frame
-per template -- future versions may support multiple frames per template.</td>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-does-page-size-match" title="lgl_template_does_page_size_match ()">lgl_template_does_page_size_match</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lglTemplateFrameShape"></a><h3>enum lglTemplateFrameShape</h3>
-<pre class="programlisting">typedef enum {
-        LGL_TEMPLATE_FRAME_SHAPE_RECT,
-        LGL_TEMPLATE_FRAME_SHAPE_ELLIPSE,
-        LGL_TEMPLATE_FRAME_SHAPE_ROUND,
-        LGL_TEMPLATE_FRAME_SHAPE_CD
-} lglTemplateFrameShape;
-</pre>
-<p>
-This enumeration defines frame types that are supported by libglabels
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
 <tr>
-<td><p><a name="LGL-TEMPLATE-FRAME-SHAPE-RECT:CAPS"></a><span class="term"><code class="literal">LGL_TEMPLATE_FRAME_SHAPE_RECT</code></span></p></td>
-<td>A rectangular frame.  (May have rounded corners.)
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-does-category-match" title="lgl_template_does_category_match ()">lgl_template_does_category_match</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td><p><a name="LGL-TEMPLATE-FRAME-SHAPE-ELLIPSE:CAPS"></a><span class="term"><code class="literal">LGL_TEMPLATE_FRAME_SHAPE_ELLIPSE</code></span></p></td>
-<td>An elliptical frame.
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-are-templates-identical" title="lgl_template_are_templates_identical ()">lgl_template_are_templates_identical</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td><p><a name="LGL-TEMPLATE-FRAME-SHAPE-ROUND:CAPS"></a><span class="term"><code class="literal">LGL_TEMPLATE_FRAME_SHAPE_ROUND</code></span></p></td>
-<td>A round frame.
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-frame-rect-new" title="lgl_template_frame_rect_new ()">lgl_template_frame_rect_new</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td><p><a name="LGL-TEMPLATE-FRAME-SHAPE-CD:CAPS"></a><span class="term"><code class="literal">LGL_TEMPLATE_FRAME_SHAPE_CD</code></span></p></td>
-<td>A CD or DVD frame.  (Includes credit-card style CDs.)
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-frame-ellipse-new" title="lgl_template_frame_ellipse_new ()">lgl_template_frame_ellipse_new</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lglTemplateFrame"></a><h3>union lglTemplateFrame</h3>
-<pre class="programlisting">union _lglTemplateFrame{
-
-        lglTemplateFrameShape   shape;
-
-        lglTemplateFrameAll     all;
-        lglTemplateFrameRect    rect;
-        lglTemplateFrameEllipse ellipse;
-        lglTemplateFrameRound   round;
-        lglTemplateFrameCD      cd;
-};
-</pre>
-<p>
-A union of all possible frame structures.  The type of structure is indicated by the shape
-member, which overlays the first field of all other member structures.
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lglTemplateFrameAll"></a><h3>struct lglTemplateFrameAll</h3>
-<pre class="programlisting">struct lglTemplateFrameAll {
-        /* Begin Common Fields */
-        lglTemplateFrameShape shape;
-
-        gchar                *id;       /* Id, currently always "0" */
-        GList                *layouts;  /* List of lglTemplateLayouts */
-        GList                *markups;  /* List of lglTemplateMarkups */
-        /* End Common Fields */
-};
-</pre>
-<p>
-This structure is composed of a set of fields common to all frame structures.  All frame types
-can be cast to this structure.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
 <tr>
-<td><p><span class="term"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrameShape" title="enum lglTemplateFrameShape"><span class="type">lglTemplateFrameShape</span></a> <em class="structfield"><code><a name="lglTemplateFrameAll.shape"></a>shape</code></em>;</span></p></td>
-<td>The shape of the frame.</td>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-frame-round-new" title="lgl_template_frame_round_new ()">lgl_template_frame_round_new</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplateFrameAll.id"></a>id</code></em>;</span></p></td>
-<td>Reserved for future use.  Should always be zero.</td>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-frame-cd-new" title="lgl_template_frame_cd_new ()">lgl_template_frame_cd_new</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameAll.layouts"></a>layouts</code></em>;</span></p></td>
-<td>A list of (<a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> *) structures.  Typically a frame will have a single
-layout, representing a simple grid of labels or cards.  If the layout of labels or cards is
-more complex, multiple (<a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> *) structures may be needed.</td>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-frame-dup" title="lgl_template_frame_dup ()">lgl_template_frame_dup</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameAll.markups"></a>markups</code></em>;</span></p></td>
-<td>A list of (<a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> *) structures, which represent non-printing markup lines.</td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-frame-free" title="lgl_template_frame_free ()">lgl_template_frame_free</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lglTemplateFrameRect"></a><h3>struct lglTemplateFrameRect</h3>
-<pre class="programlisting">struct lglTemplateFrameRect {
-        /* Begin Common Fields */
-        lglTemplateFrameShape shape;    /* Always LGL_TEMPLATE_FRAME_SHAPE_RECT. */
-
-        gchar                *id;       /* Id, currently always "0" */
-        GList                *layouts;  /* List of lglTemplateLayouts */
-        GList                *markups;  /* List of lglTemplateMarkups */
-        /* End Common Fields */
-
-        gdouble               w;        /* Width */
-        gdouble               h;        /* Height */
-        gdouble               r;        /* Corner radius */
-        gdouble               x_waste;  /* Amount of horiz overprint allowed. */
-        gdouble               y_waste;  /* Amount of vert overprint allowed. */
-};
-</pre>
-<p>
-This structure defines the frame for a rectangular label or card.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
 <tr>
-<td><p><span class="term"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrameShape" title="enum lglTemplateFrameShape"><span class="type">lglTemplateFrameShape</span></a> <em class="structfield"><code><a name="lglTemplateFrameRect.shape"></a>shape</code></em>;</span></p></td>
-<td>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-FRAME-SHAPE-RECT:CAPS"><span class="type">LGL_TEMPLATE_FRAME_SHAPE_RECT</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameRect" title="struct lglTemplateFrameRect"><span class="type">lglTemplateFrameRect</span></a>.</td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-frame-add-layout" title="lgl_template_frame_add_layout ()">lgl_template_frame_add_layout</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-frame-add-markup" title="lgl_template_frame_add_markup ()">lgl_template_frame_add_markup</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplateFrameRect.id"></a>id</code></em>;</span></p></td>
-<td>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-frame-get-size" title="lgl_template_frame_get_size ()">lgl_template_frame_get_size</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-frame-get-n-labels" title="lgl_template_frame_get_n_labels ()">lgl_template_frame_get_n_labels</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameRect.layouts"></a>layouts</code></em>;</span></p></td>
-<td>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</td>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplateOrigin" title="struct lglTemplateOrigin"><span class="returnvalue">lglTemplateOrigin</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-frame-get-origins" title="lgl_template_frame_get_origins ()">lgl_template_frame_get_origins</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameRect.markups"></a>markups</code></em>;</span></p></td>
-<td>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</td>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-frame-get-layout-description" title="lgl_template_frame_get_layout_description ()">lgl_template_frame_get_layout_description</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameRect.w"></a>w</code></em>;</span></p></td>
-<td>Width of label or card in points.</td>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-frame-get-size-description" title="lgl_template_frame_get_size_description ()">lgl_template_frame_get_size_description</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameRect.h"></a>h</code></em>;</span></p></td>
-<td>Height of label or card in points.</td>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="returnvalue">lglTemplateLayout</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-layout-new" title="lgl_template_layout_new ()">lgl_template_layout_new</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameRect.r"></a>r</code></em>;</span></p></td>
-<td>Radius of corners in points.</td>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="returnvalue">lglTemplateLayout</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-layout-dup" title="lgl_template_layout_dup ()">lgl_template_layout_dup</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameRect.x-waste"></a>x_waste</code></em>;</span></p></td>
-<td>Amount of horizontal over-print to allow in points.</td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-layout-free" title="lgl_template_layout_free ()">lgl_template_layout_free</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameRect.y-waste"></a>y_waste</code></em>;</span></p></td>
-<td>Amount of vertical over-print to allow in points.</td>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-markup-margin-new" title="lgl_template_markup_margin_new ()">lgl_template_markup_margin_new</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lglTemplateFrameEllipse"></a><h3>struct lglTemplateFrameEllipse</h3>
-<pre class="programlisting">struct lglTemplateFrameEllipse {
-        /* Begin Common Fields */
-        lglTemplateFrameShape shape;    /* Always LGL_TEMPLATE_FRAME_SHAPE_ELLIPSE. */
-
-        gchar                *id;       /* Id, currently always "0" */
-        GList                *layouts;  /* List of lglTemplateLayouts */
-        GList                *markups;  /* List of lglTemplateMarkups */
-        /* End Common Fields */
-
-        gdouble               w;        /* Width */
-        gdouble               h;        /* Height */
-        gdouble               waste;    /* Amount of overprint allowed. */
-};
-</pre>
-<p>
-This structure defines the frame for an elliptical label or card.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
 <tr>
-<td><p><span class="term"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrameShape" title="enum lglTemplateFrameShape"><span class="type">lglTemplateFrameShape</span></a> <em class="structfield"><code><a name="lglTemplateFrameEllipse.shape"></a>shape</code></em>;</span></p></td>
-<td>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-FRAME-SHAPE-ELLIPSE:CAPS"><span class="type">LGL_TEMPLATE_FRAME_SHAPE_ELLIPSE</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameEllipse" title="struct lglTemplateFrameEllipse"><span class="type">lglTemplateFrameEllipse</span></a>.</td>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-markup-line-new" title="lgl_template_markup_line_new ()">lgl_template_markup_line_new</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplateFrameEllipse.id"></a>id</code></em>;</span></p></td>
-<td>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</td>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-markup-circle-new" title="lgl_template_markup_circle_new ()">lgl_template_markup_circle_new</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameEllipse.layouts"></a>layouts</code></em>;</span></p></td>
-<td>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</td>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-markup-rect-new" title="lgl_template_markup_rect_new ()">lgl_template_markup_rect_new</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameEllipse.markups"></a>markups</code></em>;</span></p></td>
-<td>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</td>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-markup-ellipse-new" title="lgl_template_markup_ellipse_new ()">lgl_template_markup_ellipse_new</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameEllipse.w"></a>w</code></em>;</span></p></td>
-<td>Width of label or card in points.</td>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-markup-dup" title="lgl_template_markup_dup ()">lgl_template_markup_dup</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameEllipse.h"></a>h</code></em>;</span></p></td>
-<td>Height of label or card in points.</td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-markup-free" title="lgl_template_markup_free ()">lgl_template_markup_free</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameEllipse.waste"></a>waste</code></em>;</span></p></td>
-<td>Amount of over-print to allow in points.</td>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-template.html#lgl-template-print" title="lgl_template_print ()">lgl_template_print</a> <span class="c_punctuation">()</span>
+</td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="lglTemplateFrameRound"></a><h3>struct lglTemplateFrameRound</h3>
-<pre class="programlisting">struct lglTemplateFrameRound {
-        /* Begin Common Fields */
-        lglTemplateFrameShape shape;    /* Always LGL_TEMPLATE_FRAME_SHAPE_ROUND. */
-
-        gchar                *id;       /* Id, currently always "0" */
-        GList                *layouts;  /* List of lglTemplateLayouts */
-        GList                *markups;  /* List of lglTemplateMarkups */
-        /* End Common Fields */
-
-        gdouble               r;      /* Radius */
-        gdouble               waste;  /* Amount of overprint allowed. */
-};
-</pre>
-<p>
-This structure defines the frame for a round label or card.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect1">
+<a name="libglabels-3.0-template.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrameShape" title="enum lglTemplateFrameShape"><span class="type">lglTemplateFrameShape</span></a> <em class="structfield"><code><a name="lglTemplateFrameRound.shape"></a>shape</code></em>;</span></p></td>
-<td>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-FRAME-SHAPE-ROUND:CAPS"><span class="type">LGL_TEMPLATE_FRAME_SHAPE_ROUND</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameRound" title="struct lglTemplateFrameRound"><span class="type">lglTemplateFrameRound</span></a>.</td>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate">lglTemplate</a></td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplateFrameRound.id"></a>id</code></em>;</span></p></td>
-<td>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</td>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrameShape" title="enum lglTemplateFrameShape">lglTemplateFrameShape</a></td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameRound.layouts"></a>layouts</code></em>;</span></p></td>
-<td>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</td>
+<td class="datatype_keyword">union</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame">lglTemplateFrame</a></td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameRound.markups"></a>markups</code></em>;</span></p></td>
-<td>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</td>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll">lglTemplateFrameAll</a></td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameRound.r"></a>r</code></em>;</span></p></td>
-<td>Radius of label or card in points.</td>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrameRect" title="struct lglTemplateFrameRect">lglTemplateFrameRect</a></td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameRound.waste"></a>waste</code></em>;</span></p></td>
-<td>Amount of over-print to allow in points.</td>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrameEllipse" title="struct lglTemplateFrameEllipse">lglTemplateFrameEllipse</a></td>
 </tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lglTemplateFrameCD"></a><h3>struct lglTemplateFrameCD</h3>
-<pre class="programlisting">struct lglTemplateFrameCD {
-        /* Begin Common Fields */
-        lglTemplateFrameShape shape;    /* Always LGL_TEMPLATE_FRAME_SHAPE_CD. */
-
-        gchar                *id;       /* Id, currently always "0" */
-        GList                *layouts;  /* List of lglTemplateLayouts */
-        GList                *markups;  /* List of lglTemplateMarkups */
-        /* End Common Fields */
-
-        gdouble               r1;     /* Outer radius */
-        gdouble               r2;     /* Inner radius (hole) */
-        gdouble               w;      /* Clip width, business card CDs */
-        gdouble               h;      /* Clip height, business card CDs */
-        gdouble               waste;  /* Amount of overprint allowed. */
-};
-</pre>
-<p>
-This structure defines the frame for a CD or DVD label.  This structure also supports
-credit-card CD labels.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
 <tr>
-<td><p><span class="term"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrameShape" title="enum lglTemplateFrameShape"><span class="type">lglTemplateFrameShape</span></a> <em class="structfield"><code><a name="lglTemplateFrameCD.shape"></a>shape</code></em>;</span></p></td>
-<td>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-FRAME-SHAPE-CD:CAPS"><span class="type">LGL_TEMPLATE_FRAME_SHAPE_CD</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameCD" title="struct lglTemplateFrameCD"><span class="type">lglTemplateFrameCD</span></a>.</td>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrameRound" title="struct lglTemplateFrameRound">lglTemplateFrameRound</a></td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplateFrameCD.id"></a>id</code></em>;</span></p></td>
-<td>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</td>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrameCD" title="struct lglTemplateFrameCD">lglTemplateFrameCD</a></td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameCD.layouts"></a>layouts</code></em>;</span></p></td>
-<td>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</td>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout">lglTemplateLayout</a></td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameCD.markups"></a>markups</code></em>;</span></p></td>
-<td>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</td>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupType" title="enum lglTemplateMarkupType">lglTemplateMarkupType</a></td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameCD.r1"></a>r1</code></em>;</span></p></td>
-<td>Outer radius of label in points.</td>
+<td class="datatype_keyword">union</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup">lglTemplateMarkup</a></td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameCD.r2"></a>r2</code></em>;</span></p></td>
-<td>Radius of center hole in points.</td>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupMargin" title="struct lglTemplateMarkupMargin">lglTemplateMarkupMargin</a></td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameCD.w"></a>w</code></em>;</span></p></td>
-<td>Clip width in points.  Used for credit-card CD labels.  This field is ignored if zero.</td>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupLine" title="struct lglTemplateMarkupLine">lglTemplateMarkupLine</a></td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameCD.h"></a>h</code></em>;</span></p></td>
-<td>Clip height in points.  Used for credit-card CD labels.  This field is ignored if zero.</td>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupCircle" title="struct lglTemplateMarkupCircle">lglTemplateMarkupCircle</a></td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameCD.waste"></a>waste</code></em>;</span></p></td>
-<td>Amount of over-print to allow in points.</td>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupRect" title="struct lglTemplateMarkupRect">lglTemplateMarkupRect</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupEllipse" title="struct lglTemplateMarkupEllipse">lglTemplateMarkupEllipse</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-template.html#lglTemplateOrigin" title="struct lglTemplateOrigin">lglTemplateOrigin</a></td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="lglTemplateLayout"></a><h3>struct lglTemplateLayout</h3>
-<pre class="programlisting">struct lglTemplateLayout {
-        gint                  nx;  /* Number of labels across */
-        gint                  ny;  /* Number of labels up and down */
-
-        gdouble               x0;  /* Left of grid from left edge of paper */
-        gdouble               y0;  /* Top of grid from top edge of paper */
-
-        gdouble               dx;  /* Horizontal pitch of grid */
-        gdouble               dy;  /* Vertical pitch of grid */
-};
+<div class="refsect1">
+<a name="libglabels-3.0-template.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">
 </pre>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-template.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;libglabels/lgl-template.h&gt;
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-template.description"></a><h2>Description</h2>
 <p>
-This structure defines a simple grid layout of labels or cards.
+This section describes a set of structures that represent a template in memory.  It also
+describes functions to help create and interpret these structures.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-template.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="lgl-template-new"></a><h3>lgl_template_new ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *
+lgl_template_new (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
+                  <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *part</code></em>,
+                  <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *description</code></em>,
+                  <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *paper_id</code></em>,
+                  <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> page_width</code></em>,
+                  <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> page_height</code></em>);</pre>
+<p>Create a new template structure, with the given top-level attributes.  The
+created template will have no initial categories, or frames associated with
+it.  See <a class="link" href="libglabels-3.0-template.html#lgl-template-add-category" title="lgl_template_add_category ()"><code class="function">lgl_template_add_category()</code></a> and <a class="link" href="libglabels-3.0-template.html#lgl-template-add-frame" title="lgl_template_add_frame ()"><code class="function">lgl_template_add_frame()</code></a> to add
+these.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> <em class="structfield"><code><a name="lglTemplateLayout.nx"></a>nx</code></em>;</span></p></td>
-<td>Number of labels or cards across in the grid (horizontal).</td>
+<td class="parameter_name"><p>brand</p></td>
+<td class="parameter_description"><p>Template brand</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> <em class="structfield"><code><a name="lglTemplateLayout.ny"></a>ny</code></em>;</span></p></td>
-<td>Number of labels or cards down in the grid (vertical).</td>
+<td class="parameter_name"><p>part</p></td>
+<td class="parameter_description"><p>Template part name/number</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateLayout.x0"></a>x0</code></em>;</span></p></td>
-<td>Distance (in points) from the left edge of page to the left edge of the left column of
-cards or labels in the layout.</td>
+<td class="parameter_name"><p>description</p></td>
+<td class="parameter_description"><p>Template descriptions</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateLayout.y0"></a>y0</code></em>;</span></p></td>
-<td>Distance (in points) from the top edge of page to the top edge of the top row of
-cards or labels in the layout.</td>
+<td class="parameter_name"><p>paper_id</p></td>
+<td class="parameter_description"><p>Page size id</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateLayout.dx"></a>dx</code></em>;</span></p></td>
-<td>Horizontal pitch of grid in points.  This is the distance from left edge to left edge
-(not the gap between labels or cards).</td>
+<td class="parameter_name"><p>page_width</p></td>
+<td class="parameter_description"><p>Page width in points, set to zero unless paper_id="Other"</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateLayout.dy"></a>dy</code></em>;</span></p></td>
-<td>Vertical pitch of grid in points.  This is the distance from top edge to top edge
-(not the gap between labels or cards).</td>
+<td class="parameter_name"><p>page_height</p></td>
+<td class="parameter_description"><p>Page height in points, set to zero unless paper_id="Other"</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.3.8.2.6"></a><h4>Returns</h4>
+<p> pointer to a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lglTemplateMarkupType"></a><h3>enum lglTemplateMarkupType</h3>
-<pre class="programlisting">typedef enum {
-        LGL_TEMPLATE_MARKUP_MARGIN,
-        LGL_TEMPLATE_MARKUP_LINE,
-        LGL_TEMPLATE_MARKUP_CIRCLE,
-        LGL_TEMPLATE_MARKUP_RECT,
-        LGL_TEMPLATE_MARKUP_ELLIPSE
-} lglTemplateMarkupType;
-</pre>
-<p>
-This enumeration defines markup types that are supported by libglabels
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-new-from-equiv"></a><h3>lgl_template_new_from_equiv ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *
+lgl_template_new_from_equiv (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
+                             <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *part</code></em>,
+                             <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *equiv_part</code></em>);</pre>
+<p>Create a new template structure based on an existing template.  The
+created template will be a duplicate of the original template, except with
+the new part name/number.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><a name="LGL-TEMPLATE-MARKUP-MARGIN:CAPS"></a><span class="term"><code class="literal">LGL_TEMPLATE_MARKUP_MARGIN</code></span></p></td>
-<td>A margin line around perimeter of label or card.
-</td>
-</tr>
-<tr>
-<td><p><a name="LGL-TEMPLATE-MARKUP-LINE:CAPS"></a><span class="term"><code class="literal">LGL_TEMPLATE_MARKUP_LINE</code></span></p></td>
-<td>A simple line segment.
-</td>
-</tr>
-<tr>
-<td><p><a name="LGL-TEMPLATE-MARKUP-CIRCLE:CAPS"></a><span class="term"><code class="literal">LGL_TEMPLATE_MARKUP_CIRCLE</code></span></p></td>
-<td>A circle.
-</td>
+<td class="parameter_name"><p>brand</p></td>
+<td class="parameter_description"><p>Template brand</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><a name="LGL-TEMPLATE-MARKUP-RECT:CAPS"></a><span class="term"><code class="literal">LGL_TEMPLATE_MARKUP_RECT</code></span></p></td>
-<td>A rectangle.  Possibly with rounded corners.
-</td>
+<td class="parameter_name"><p>part</p></td>
+<td class="parameter_description"><p>Template part name/number</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><a name="LGL-TEMPLATE-MARKUP-ELLIPSE:CAPS"></a><span class="term"><code class="literal">LGL_TEMPLATE_MARKUP_ELLIPSE</code></span></p></td>
-<td>An ellipse.
-</td>
+<td class="parameter_name"><p>equiv_part</p></td>
+<td class="parameter_description"><p>Name of equivalent part to base template on</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.3.8.3.6"></a><h4>Returns</h4>
+<p> pointer to a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lglTemplateMarkup"></a><h3>union lglTemplateMarkup</h3>
-<pre class="programlisting">union _lglTemplateMarkup {
-
-        lglTemplateMarkupType    type;
-
-        lglTemplateMarkupMargin  margin;
-        lglTemplateMarkupLine    line;
-        lglTemplateMarkupCircle  circle;
-        lglTemplateMarkupRect    rect;
-        lglTemplateMarkupEllipse ellipse;
-};
-</pre>
-<p>
-A union of all possible markup structures.  The type of structure is indicated by the type
-member, which overlays the first field of all other member structures.
-</p>
+<a name="lgl-template-dup"></a><h3>lgl_template_dup ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *
+lgl_template_dup (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *orig_template</code></em>);</pre>
+<p>This function duplicates a template structure.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>orig_template</p></td>
+<td class="parameter_description"><p>Template to duplicate.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.2.3.8.4.6"></a><h4>Returns</h4>
+<p>  a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structure.</p>
+<p></p>
+</div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="lglTemplateMarkupMargin"></a><h3>struct lglTemplateMarkupMargin</h3>
-<pre class="programlisting">struct lglTemplateMarkupMargin {
-        lglTemplateMarkupType  type;  /* Always LGL_TEMPLATE_MARKUP_MARGIN */
-
-        gdouble                size;  /* Margin size */
-};
-</pre>
-<p>
-This structure defines a simple margin markup around the perimeter of a label or card.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-free"></a><h3>lgl_template_free ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_template_free (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>);</pre>
+<p>This function frees all memory associated with given template structure.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.5.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>template</p></td>
+<td class="parameter_description"><p>Template to free.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-template-add-category"></a><h3>lgl_template_add_category ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_template_add_category (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
+                           <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *category_id</code></em>);</pre>
+<p>This function adds the given category ID to a templates category list.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.6.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupType" title="enum lglTemplateMarkupType"><span class="type">lglTemplateMarkupType</span></a> <em class="structfield"><code><a name="lglTemplateMarkupMargin.type"></a>type</code></em>;</span></p></td>
-<td>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-MARGIN:CAPS"><span class="type">LGL_TEMPLATE_MARKUP_MARGIN</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupMargin" title="struct lglTemplateMarkupMargin"><span class="type">lglTemplateMarkupMargin</span></a>.</td>
+<td class="parameter_name"><p>template</p></td>
+<td class="parameter_description"><p>Pointer to template structure</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupMargin.size"></a>size</code></em>;</span></p></td>
-<td>Distance of margin from edge of label or card.</td>
+<td class="parameter_name"><p>category_id</p></td>
+<td class="parameter_description"><p>Category ID string</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lglTemplateMarkupLine"></a><h3>struct lglTemplateMarkupLine</h3>
-<pre class="programlisting">struct lglTemplateMarkupLine {
-        lglTemplateMarkupType  type;   /* Always LGL_TEMPLATE_MARKUP_LINE */
-
-        gdouble                x1, y1; /* 1st endpoint */
-        gdouble                x2, y2; /* 2nd endpoint */
-};
-</pre>
-<p>
-This structure defines a simple line segment markup.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-add-frame"></a><h3>lgl_template_add_frame ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_template_add_frame (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
+                        <em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>);</pre>
+<p>This function adds the given frame structure to the template.  Once added,
+the frame structure belongs to the given template; do not attempt to free
+it.</p>
+<p>Note: Currently glabels only supports a single frame per template.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.7.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupType" title="enum lglTemplateMarkupType"><span class="type">lglTemplateMarkupType</span></a> <em class="structfield"><code><a name="lglTemplateMarkupLine.type"></a>type</code></em>;</span></p></td>
-<td>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-LINE:CAPS"><span class="type">LGL_TEMPLATE_MARKUP_LINE</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupLine" title="struct lglTemplateMarkupLine"><span class="type">lglTemplateMarkupLine</span></a>.</td>
-</tr>
-<tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupLine.x1"></a>x1</code></em>;</span></p></td>
-<td>Distance (in points) of first endpoint from left edge of label or card.</td>
-</tr>
-<tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupLine.y1"></a>y1</code></em>;</span></p></td>
-<td>Distance (in points) of first endpoint from top edge of label or card.</td>
-</tr>
-<tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupLine.x2"></a>x2</code></em>;</span></p></td>
-<td>Distance (in points) of second endpoint from left edge of label or card.</td>
+<td class="parameter_name"><p>template</p></td>
+<td class="parameter_description"><p>Pointer to template structure</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupLine.y2"></a>y2</code></em>;</span></p></td>
-<td>Distance (in points) of second endpoint from top edge of label or card.</td>
+<td class="parameter_name"><p>frame</p></td>
+<td class="parameter_description"><p>Pointer to frame structure</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lglTemplateMarkupCircle"></a><h3>struct lglTemplateMarkupCircle</h3>
-<pre class="programlisting">struct lglTemplateMarkupCircle {
-        lglTemplateMarkupType  type;   /* Always LGL_TEMPLATE_MARKUP_CIRCLE */
-
-        gdouble                x0, y0; /* Center of circle */
-        gdouble                r;      /* Radius of circle */
-};
-</pre>
-<p>
-This structure defines a simple circle markup.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-get-name"></a><h3>lgl_template_get_name ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+lgl_template_get_name (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>);</pre>
+<p>This function returns the name of the given template.  The name is the concetenation
+of the brand and part name/number.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.8.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>template</p></td>
+<td class="parameter_description"><p>Pointer to template structure to test</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.2.3.8.8.6"></a><h4>Returns</h4>
+<p>  A pointer to a newly allocated name string.  Should be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-template-do-templates-match"></a><h3>lgl_template_do_templates_match ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+lgl_template_do_templates_match (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template1</code></em>,
+                                 <em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template2</code></em>);</pre>
+<p>This function tests if the given templates match.  This is a simple test that only tests
+the brand and part name/number. It does not test if they are actually identical.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.9.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupType" title="enum lglTemplateMarkupType"><span class="type">lglTemplateMarkupType</span></a> <em class="structfield"><code><a name="lglTemplateMarkupCircle.type"></a>type</code></em>;</span></p></td>
-<td>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-CIRCLE:CAPS"><span class="type">LGL_TEMPLATE_MARKUP_CIRCLE</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupCircle" title="struct lglTemplateMarkupCircle"><span class="type">lglTemplateMarkupCircle</span></a>.</td>
+<td class="parameter_name"><p>template1</p></td>
+<td class="parameter_description"><p>Pointer to 1st template structure to test</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupCircle.x0"></a>x0</code></em>;</span></p></td>
-<td>Distance (in points) of vertex from left edge of label or card.</td>
+<td class="parameter_name"><p>template2</p></td>
+<td class="parameter_description"><p>Pointer to 2nd template structure to test</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.2.3.8.9.6"></a><h4>Returns</h4>
+<p>  TRUE if the two templates match.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-template-does-brand-match"></a><h3>lgl_template_does_brand_match ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+lgl_template_does_brand_match (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
+                               <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>);</pre>
+<p>This function tests if the brand of the template matches the given brand.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.10.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupCircle.y0"></a>y0</code></em>;</span></p></td>
-<td>Distance (in points) of vertex from top edge of label or card.</td>
+<td class="parameter_name"><p>template</p></td>
+<td class="parameter_description"><p>Pointer to template structure to test</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupCircle.r"></a>r</code></em>;</span></p></td>
-<td>Radius of circle in points.</td>
+<td class="parameter_name"><p>brand</p></td>
+<td class="parameter_description"><p>Brand string</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.3.8.10.6"></a><h4>Returns</h4>
+<p>  TRUE if the template matches the given brand.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lglTemplateMarkupRect"></a><h3>struct lglTemplateMarkupRect</h3>
-<pre class="programlisting">struct lglTemplateMarkupRect {
-        lglTemplateMarkupType  type;   /* Always LGL_TEMPLATE_MARKUP_RECT */
-
-        gdouble                x1, y1; /* Upper left corner */
-        gdouble                w, h;   /* Width and height. */
-        gdouble                r;      /* Radius of corners. */
-};
-</pre>
-<p>
-This structure defines a simple rectangle markup.  The rectangle can have rounded corners.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-does-page-size-match"></a><h3>lgl_template_does_page_size_match ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+lgl_template_does_page_size_match (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
+                                   <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *paper_id</code></em>);</pre>
+<p>This function tests if the page size of the template matches the given ID.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.11.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupType" title="enum lglTemplateMarkupType"><span class="type">lglTemplateMarkupType</span></a> <em class="structfield"><code><a name="lglTemplateMarkupRect.type"></a>type</code></em>;</span></p></td>
-<td>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-RECT:CAPS"><span class="type">LGL_TEMPLATE_MARKUP_RECT</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupRect" title="struct lglTemplateMarkupRect"><span class="type">lglTemplateMarkupRect</span></a>.</td>
+<td class="parameter_name"><p>template</p></td>
+<td class="parameter_description"><p>Pointer to template structure to test</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupRect.x1"></a>x1</code></em>;</span></p></td>
-<td>Distance (in points) of left edge of markup from left edge of label or card.</td>
+<td class="parameter_name"><p>paper_id</p></td>
+<td class="parameter_description"><p>Page size ID string</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.2.3.8.11.6"></a><h4>Returns</h4>
+<p>  TRUE if the template matches the given page size ID.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-template-does-category-match"></a><h3>lgl_template_does_category_match ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+lgl_template_does_category_match (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
+                                  <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *category_id</code></em>);</pre>
+<p>This function tests if the given template belongs to the given category ID.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.12.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupRect.y1"></a>y1</code></em>;</span></p></td>
-<td>Distance (in points) of top edge of markup from top edge of label or card.</td>
+<td class="parameter_name"><p>template</p></td>
+<td class="parameter_description"><p>Pointer to template structure to test</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupRect.w"></a>w</code></em>;</span></p></td>
-<td>Width of rectangle in points.</td>
+<td class="parameter_name"><p>category_id</p></td>
+<td class="parameter_description"><p>Category ID string</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.2.3.8.12.6"></a><h4>Returns</h4>
+<p>  TRUE if the template matches the given category ID.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-template-are-templates-identical"></a><h3>lgl_template_are_templates_identical ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+lgl_template_are_templates_identical (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template1</code></em>,
+                                      <em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template2</code></em>);</pre>
+<p>This function tests if the given templates have identical size and layout properties.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.13.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupRect.h"></a>h</code></em>;</span></p></td>
-<td>Height of rectangle in points.</td>
+<td class="parameter_name"><p>template1</p></td>
+<td class="parameter_description"><p>Pointer to 1st template structure to test</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupRect.r"></a>r</code></em>;</span></p></td>
-<td>Radius of corners in points.  Should be zero for sharp corners.</td>
+<td class="parameter_name"><p>template2</p></td>
+<td class="parameter_description"><p>Pointer to 2nd template structure to test</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.3.8.13.6"></a><h4>Returns</h4>
+<p>  TRUE if the two templates are identical.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lglTemplateMarkupEllipse"></a><h3>struct lglTemplateMarkupEllipse</h3>
-<pre class="programlisting">struct lglTemplateMarkupEllipse {
-        lglTemplateMarkupType  type;   /* Always LGL_TEMPLATE_MARKUP_ELLIPSE */
-
-        gdouble                x1, y1; /* Upper left corner */
-        gdouble                w, h;   /* Width and height. */
-};
-</pre>
-<p>
-This structure defines a simple elliptical markup.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-frame-rect-new"></a><h3>lgl_template_frame_rect_new ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *
+lgl_template_frame_rect_new (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
+                             <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
+                             <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>,
+                             <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r</code></em>,
+                             <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x_waste</code></em>,
+                             <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y_waste</code></em>);</pre>
+<p>This function creates a new template frame for a rectangular label or card.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.14.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupType" title="enum lglTemplateMarkupType"><span class="type">lglTemplateMarkupType</span></a> <em class="structfield"><code><a name="lglTemplateMarkupEllipse.type"></a>type</code></em>;</span></p></td>
-<td>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-ELLIPSE:CAPS"><span class="type">LGL_TEMPLATE_MARKUP_ELLIPSE</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupEllipse" title="struct lglTemplateMarkupEllipse"><span class="type">lglTemplateMarkupEllipse</span></a>.</td>
+<td class="parameter_name"><p>id</p></td>
+<td class="parameter_description"><p>ID of frame.  (This should currently always be "0").</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupEllipse.x1"></a>x1</code></em>;</span></p></td>
-<td>Distance (in points) of left edge of markup from left edge of label or card.</td>
+<td class="parameter_name"><p>w</p></td>
+<td class="parameter_description"><p>width of frame in points.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupEllipse.y1"></a>y1</code></em>;</span></p></td>
-<td>Distance (in points) of top edge of markup from top edge of label or card.</td>
+<td class="parameter_name"><p>h</p></td>
+<td class="parameter_description"><p>height of frame in points.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupEllipse.w"></a>w</code></em>;</span></p></td>
-<td>Width of rectangle in points.</td>
+<td class="parameter_name"><p>r</p></td>
+<td class="parameter_description"><p>radius of rounded corners in points.  (Should be 0 for square corners.)</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupEllipse.h"></a>h</code></em>;</span></p></td>
-<td>Height of rectangle in points.</td>
+<td class="parameter_name"><p>x_waste</p></td>
+<td class="parameter_description"><p>Amount of overprint to allow in the horizontal direction.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>y_waste</p></td>
+<td class="parameter_description"><p>Amount of overprint to allow in the vertical direction.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.3.8.14.6"></a><h4>Returns</h4>
+<p> Pointer to newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lglTemplateOrigin"></a><h3>struct lglTemplateOrigin</h3>
-<pre class="programlisting">struct lglTemplateOrigin {
-        gdouble               x, y; /* Label origin relative to upper 
-                                     * upper left hand corner of paper */
-};
-</pre>
-<p>
-This structure represents the cartesian coordinates of the origin of a label or card on the page.
-The orign is the upper left corner of the extent of the label or card.  These coordinates are
-relative to the upper left corner of the page.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-frame-ellipse-new"></a><h3>lgl_template_frame_ellipse_new ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *
+lgl_template_frame_ellipse_new (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
+                                <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
+                                <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>,
+                                <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> waste</code></em>);</pre>
+<p>This function creates a new template frame for an elliptical label or card.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.15.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateOrigin.x"></a>x</code></em>;</span></p></td>
-<td>Distance in points from top edge of page.</td>
+<td class="parameter_name"><p>id</p></td>
+<td class="parameter_description"><p>ID of frame.  (This should currently always be "0").</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>w</p></td>
+<td class="parameter_description"><p>width of frame in points.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>h</p></td>
+<td class="parameter_description"><p>height of frame in points.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateOrigin.y"></a>y</code></em>;</span></p></td>
-<td>Distance in points from left edge of page.</td>
+<td class="parameter_name"><p>waste</p></td>
+<td class="parameter_description"><p>Amount of overprint to allow in points.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.3.8.15.6"></a><h4>Returns</h4>
+<p> Pointer to newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-new"></a><h3>lgl_template_new ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *       lgl_template_new                    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *part</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *description</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *paper_id</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> page_width</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> page_height</code></em>);</pre>
-<p>
-Create a new template structure, with the given top-level attributes.  The
-created template will have no initial categories, or frames associated with
-it.  See <a class="link" href="libglabels-3.0-template.html#lgl-template-add-category" title="lgl_template_add_category ()"><code class="function">lgl_template_add_category()</code></a> and <a class="link" href="libglabels-3.0-template.html#lgl-template-add-frame" title="lgl_template_add_frame ()"><code class="function">lgl_template_add_frame()</code></a> to add
-these.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-frame-round-new"></a><h3>lgl_template_frame_round_new ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *
+lgl_template_frame_round_new (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
+                              <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r</code></em>,
+                              <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> waste</code></em>);</pre>
+<p>This function creates a new template frame for a round label.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.16.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>brand</code></em> :</span></p></td>
-<td>Template brand</td>
+<td class="parameter_name"><p>id</p></td>
+<td class="parameter_description"><p>ID of frame.  (This should currently always be "0").</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>part</code></em> :</span></p></td>
-<td>Template part name/number</td>
+<td class="parameter_name"><p>r</p></td>
+<td class="parameter_description"><p>radius of label in points.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>waste</p></td>
+<td class="parameter_description"><p>Amount of overprint to allow.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.2.3.8.16.6"></a><h4>Returns</h4>
+<p> Pointer to newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-template-frame-cd-new"></a><h3>lgl_template_frame_cd_new ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *
+lgl_template_frame_cd_new (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
+                           <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r1</code></em>,
+                           <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r2</code></em>,
+                           <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
+                           <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>,
+                           <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> waste</code></em>);</pre>
+<p>This function creates a new template frame for a CD/DVD label.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.17.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>id</p></td>
+<td class="parameter_description"><p>ID of frame.  (This should currently always be "0").</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>description</code></em> :</span></p></td>
-<td>Template descriptions</td>
+<td class="parameter_name"><p>r1</p></td>
+<td class="parameter_description"><p>outer radius of label in points.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>paper_id</code></em> :</span></p></td>
-<td>Page size id</td>
+<td class="parameter_name"><p>r2</p></td>
+<td class="parameter_description"><p>radius of center hole in points.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>page_width</code></em> :</span></p></td>
-<td>Page width in points, set to zero unless paper_id="Other"</td>
+<td class="parameter_name"><p>w</p></td>
+<td class="parameter_description"><p>clip width of frame in points for business card CDs.  Should be 0 for no clipping.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>page_height</code></em> :</span></p></td>
-<td>Page height in points, set to zero unless paper_id="Other"</td>
+<td class="parameter_name"><p>h</p></td>
+<td class="parameter_description"><p>clip height of frame in points for business card CDs.  Should be 0 for no clipping.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>pointer to a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structure.</td>
+<td class="parameter_name"><p>waste</p></td>
+<td class="parameter_description"><p>Amount of overprint to allow.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.3.8.17.6"></a><h4>Returns</h4>
+<p> Pointer to newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-new-from-equiv"></a><h3>lgl_template_new_from_equiv ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *       lgl_template_new_from_equiv         (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *part</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *equiv_part</code></em>);</pre>
-<p>
-Create a new template structure based on an existing template.  The
-created template will be a duplicate of the original template, except with
-the new part name/number.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-frame-dup"></a><h3>lgl_template_frame_dup ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *
+lgl_template_frame_dup (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *orig_frame</code></em>);</pre>
+<p>This function duplicates a template frame structure.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.18.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>orig_frame</p></td>
+<td class="parameter_description"><p>Frame to duplicate.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.2.3.8.18.6"></a><h4>Returns</h4>
+<p>  a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-template-frame-free"></a><h3>lgl_template_frame_free ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_template_frame_free (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>);</pre>
+<p>This function frees all memory associated with given template frame structure.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.19.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>frame</p></td>
+<td class="parameter_description"><p>Frame to free.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-template-frame-add-layout"></a><h3>lgl_template_frame_add_layout ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_template_frame_add_layout (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>,
+                               <em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> *layout</code></em>);</pre>
+<p>This function adds a layout structure to the given template frame.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.20.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>brand</code></em> :</span></p></td>
-<td>Template brand</td>
+<td class="parameter_name"><p>frame</p></td>
+<td class="parameter_description"><p>Pointer to template frame to add layout to.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>part</code></em> :</span></p></td>
-<td>Template part name/number</td>
+<td class="parameter_name"><p>layout</p></td>
+<td class="parameter_description"><p>Pointer to layout structure to add to frame.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-template-frame-add-markup"></a><h3>lgl_template_frame_add_markup ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_template_frame_add_markup (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>,
+                               <em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> *markup</code></em>);</pre>
+<p>This function adds a markup structure to the given template frame.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.21.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>equiv_part</code></em> :</span></p></td>
-<td>Name of equivalent part to base template on</td>
+<td class="parameter_name"><p>frame</p></td>
+<td class="parameter_description"><p>Pointer to template frame to add markup to.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>pointer to a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structure.</td>
+<td class="parameter_name"><p>markup</p></td>
+<td class="parameter_description"><p>Pointer to markup structure to add to frame.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-dup"></a><h3>lgl_template_dup ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *       lgl_template_dup                    (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *orig_template</code></em>);</pre>
-<p>
-This function duplicates a template structure.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-frame-get-size"></a><h3>lgl_template_frame_get_size ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_template_frame_get_size (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>,
+                             <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> *w</code></em>,
+                             <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> *h</code></em>);</pre>
+<p>Get size (width and height) of given <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> in points.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.22.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>orig_template</code></em> :</span></p></td>
-<td>Template to duplicate.</td>
+<td class="parameter_name"><p>frame</p></td>
+<td class="parameter_description"><p><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure to query</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>w</p></td>
+<td class="parameter_description"><p>pointer to location to receive width of frame</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structure.</td>
+<td class="parameter_name"><p>h</p></td>
+<td class="parameter_description"><p>pointer to location to receive height of frame</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-free"></a><h3>lgl_template_free ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_template_free                   (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>);</pre>
-<p>
-This function frees all memory associated with given template structure.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-frame-get-n-labels"></a><h3>lgl_template_frame_get_n_labels ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+lgl_template_frame_get_n_labels (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>);</pre>
+<p>Get total number of labels per sheet corresponding to the given frame.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.23.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>template</code></em> :</span></p></td>
-<td>Template to free.</td>
+<td class="parameter_name"><p>frame</p></td>
+<td class="parameter_description"><p><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure to query</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.3.8.23.6"></a><h4>Returns</h4>
+<p> number of labels per sheet.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-add-category"></a><h3>lgl_template_add_category ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_template_add_category           (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *category_id</code></em>);</pre>
-<p>
-This function adds the given category ID to a templates category list.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-frame-get-origins"></a><h3>lgl_template_frame_get_origins ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateOrigin" title="struct lglTemplateOrigin"><span class="returnvalue">lglTemplateOrigin</span></a> *
+lgl_template_frame_get_origins (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>);</pre>
+<p>Get an array of label origins for the given frame.  These origins represent the
+upper left hand corner of each label on a page corresponding to the given frame.
+The origins will be ordered geometrically left to right and then top to bottom.
+The array should be freed using <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.24.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>frame</p></td>
+<td class="parameter_description"><p><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure to query</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.2.3.8.24.6"></a><h4>Returns</h4>
+<p> A newly allocated array of <a class="link" href="libglabels-3.0-template.html#lglTemplateOrigin" title="struct lglTemplateOrigin"><span class="type">lglTemplateOrigin</span></a> structures.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-template-frame-get-layout-description"></a><h3>lgl_template_frame_get_layout_description ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+lgl_template_frame_get_layout_description
+                               (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>);</pre>
+<p>Get a description of the label layout including number of labels per sheet.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.25.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>frame</p></td>
+<td class="parameter_description"><p><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure to query</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.2.3.8.25.6"></a><h4>Returns</h4>
+<p> a newly allocation description string.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-template-frame-get-size-description"></a><h3>lgl_template_frame_get_size_description ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+lgl_template_frame_get_size_description
+                               (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>,
+                                <em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);</pre>
+<p>Get a description of the label size.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.26.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>template</code></em> :</span></p></td>
-<td>Pointer to template structure</td>
+<td class="parameter_name"><p>frame</p></td>
+<td class="parameter_description"><p><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure to query</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>category_id</code></em> :</span></p></td>
-<td>Category ID string</td>
+<td class="parameter_name"><p>units</p></td>
+<td class="parameter_description"><p><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.3.8.26.6"></a><h4>Returns</h4>
+<p> a newly allocation description string.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-add-frame"></a><h3>lgl_template_add_frame ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_template_add_frame              (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>);</pre>
-<p>
-This function adds the given frame structure to the template.  Once added,
-the frame structure belongs to the given template; do not attempt to free
-it.
-</p>
-<p>
-Note: Currently glabels only supports a single frame per template.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-layout-new"></a><h3>lgl_template_layout_new ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="returnvalue">lglTemplateLayout</span></a> *
+lgl_template_layout_new (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> nx</code></em>,
+                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> ny</code></em>,
+                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x0</code></em>,
+                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y0</code></em>,
+                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> dx</code></em>,
+                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> dy</code></em>);</pre>
+<p>This function creates a new layout structure with the given parameters.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.27.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>template</code></em> :</span></p></td>
-<td>Pointer to template structure</td>
+<td class="parameter_name"><p>nx</p></td>
+<td class="parameter_description"><p>Number of labels across.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>ny</p></td>
+<td class="parameter_description"><p>Number of labels down.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>x0</p></td>
+<td class="parameter_description"><p>X coordinate of the top-left corner of the top-left label in the layout in points.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>frame</code></em> :</span></p></td>
-<td>Pointer to frame structure</td>
+<td class="parameter_name"><p>y0</p></td>
+<td class="parameter_description"><p>Y coordinate of the top-left corner of the top-left label in the layout in points.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>dx</p></td>
+<td class="parameter_description"><p>Horizontal pitch in points.  This is the distance from left-edge to left-edge.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>dy</p></td>
+<td class="parameter_description"><p>Vertical pitch in points.  This is the distance from top-edge to top-edge.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.3.8.27.6"></a><h4>Returns</h4>
+<p> a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-get-name"></a><h3>lgl_template_get_name ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             lgl_template_get_name               (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>);</pre>
-<p>
-This function returns the name of the given template.  The name is the concetenation
-of the brand and part name/number.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-layout-dup"></a><h3>lgl_template_layout_dup ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="returnvalue">lglTemplateLayout</span></a> *
+lgl_template_layout_dup (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> *orig_layout</code></em>);</pre>
+<p>This function duplicates a template layout structure.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.28.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>orig_layout</p></td>
+<td class="parameter_description"><p>Layout to duplicate.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.2.3.8.28.6"></a><h4>Returns</h4>
+<p>  a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> structure.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-template-layout-free"></a><h3>lgl_template_layout_free ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_template_layout_free (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> *layout</code></em>);</pre>
+<p>This function frees all memory associated with given template layout structure.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.29.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>layout</p></td>
+<td class="parameter_description"><p>Layout to free.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-template-markup-margin-new"></a><h3>lgl_template_markup_margin_new ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> *
+lgl_template_markup_margin_new (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> size</code></em>);</pre>
+<p>This function creates a new margin markup structure.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.30.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>size</p></td>
+<td class="parameter_description"><p>margin size in points.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.2.3.8.30.6"></a><h4>Returns</h4>
+<p> a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> structure.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-template-markup-line-new"></a><h3>lgl_template_markup_line_new ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> *
+lgl_template_markup_line_new (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x1</code></em>,
+                              <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y1</code></em>,
+                              <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x2</code></em>,
+                              <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y2</code></em>);</pre>
+<p>This function creates a new line markup structure.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.31.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>template</code></em> :</span></p></td>
-<td>Pointer to template structure to test</td>
+<td class="parameter_name"><p>x1</p></td>
+<td class="parameter_description"><p>x coordinate of first endpoint.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>y1</p></td>
+<td class="parameter_description"><p>y coordinate of first endpoint.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>x2</p></td>
+<td class="parameter_description"><p>x coordinate of second endpoint.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A pointer to a newly allocated name string.  Should be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>.</td>
+<td class="parameter_name"><p>y2</p></td>
+<td class="parameter_description"><p>y coordinate of second endpoint.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.3.8.31.6"></a><h4>Returns</h4>
+<p> a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-do-templates-match"></a><h3>lgl_template_do_templates_match ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            lgl_template_do_templates_match     (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template1</code></em>,
-                                                         <em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template2</code></em>);</pre>
-<p>
-This function tests if the given templates match.  This is a simple test that only tests
-the brand and part name/number. It does not test if they are actually identical.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-markup-circle-new"></a><h3>lgl_template_markup_circle_new ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> *
+lgl_template_markup_circle_new (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x0</code></em>,
+                                <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y0</code></em>,
+                                <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r</code></em>);</pre>
+<p>This function creates a new circle markup structure.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.32.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>template1</code></em> :</span></p></td>
-<td>Pointer to 1st template structure to test</td>
+<td class="parameter_name"><p>x0</p></td>
+<td class="parameter_description"><p>x coordinate of center of circle.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>template2</code></em> :</span></p></td>
-<td>Pointer to 2nd template structure to test</td>
+<td class="parameter_name"><p>y0</p></td>
+<td class="parameter_description"><p>y coordinate of center of circle.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if the two templates match.</td>
+<td class="parameter_name"><p>r</p></td>
+<td class="parameter_description"><p>radius of circle.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.3.8.32.6"></a><h4>Returns</h4>
+<p> a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-does-brand-match"></a><h3>lgl_template_does_brand_match ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            lgl_template_does_brand_match       (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *brand</code></em>);</pre>
-<p>
-This function tests if the brand of the template matches the given brand.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-markup-rect-new"></a><h3>lgl_template_markup_rect_new ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> *
+lgl_template_markup_rect_new (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x1</code></em>,
+                              <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y1</code></em>,
+                              <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
+                              <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>,
+                              <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r</code></em>);</pre>
+<p>This function creates a new rectangle markup structure.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.33.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>template</code></em> :</span></p></td>
-<td>Pointer to template structure to test</td>
+<td class="parameter_name"><p>x1</p></td>
+<td class="parameter_description"><p>x coordinate of top-left corner of rectangle.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>y1</p></td>
+<td class="parameter_description"><p>y coordinate of top-left corner of rectangle.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>w</p></td>
+<td class="parameter_description"><p>width of rectangle.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>brand</code></em> :</span></p></td>
-<td>Brand string</td>
+<td class="parameter_name"><p>h</p></td>
+<td class="parameter_description"><p>height of rectangle.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if the template matches the given brand.</td>
+<td class="parameter_name"><p>r</p></td>
+<td class="parameter_description"><p>radius of rounded corner.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.3.8.33.6"></a><h4>Returns</h4>
+<p> a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-does-page-size-match"></a><h3>lgl_template_does_page_size_match ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            lgl_template_does_page_size_match   (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *paper_id</code></em>);</pre>
-<p>
-This function tests if the page size of the template matches the given ID.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-template-markup-ellipse-new"></a><h3>lgl_template_markup_ellipse_new ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> *
+lgl_template_markup_ellipse_new (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x1</code></em>,
+                                 <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y1</code></em>,
+                                 <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
+                                 <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>);</pre>
+<p>This function creates a new ellipse markup structure.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.34.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>template</code></em> :</span></p></td>
-<td>Pointer to template structure to test</td>
+<td class="parameter_name"><p>x1</p></td>
+<td class="parameter_description"><p>x coordinate of top-left corner of ellipse.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>y1</p></td>
+<td class="parameter_description"><p>y coordinate of top-left corner of ellipse.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>paper_id</code></em> :</span></p></td>
-<td>Page size ID string</td>
+<td class="parameter_name"><p>w</p></td>
+<td class="parameter_description"><p>width of ellipse.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if the template matches the given page size ID.</td>
+<td class="parameter_name"><p>h</p></td>
+<td class="parameter_description"><p>height of ellipse.</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.3.8.34.6"></a><h4>Returns</h4>
+<p> a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> structure.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-template-markup-dup"></a><h3>lgl_template_markup_dup ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> *
+lgl_template_markup_dup (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> *orig_markup</code></em>);</pre>
+<p>This function duplicates a template markup structure.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.35.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>orig_markup</p></td>
+<td class="parameter_description"><p>Markup to duplicate.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.2.3.8.35.6"></a><h4>Returns</h4>
+<p>  a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> structure.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-template-markup-free"></a><h3>lgl_template_markup_free ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_template_markup_free (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> *markup</code></em>);</pre>
+<p>This function frees all memory associated with given template markup structure.</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.36.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>markup</p></td>
+<td class="parameter_description"><p>Markup to free.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-does-category-match"></a><h3>lgl_template_does_category_match ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            lgl_template_does_category_match    (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *category_id</code></em>);</pre>
+<a name="lgl-template-print"></a><h3>lgl_template_print ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_template_print (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>);</pre>
+<p>Print template details (for debugging purposes).</p>
+<div class="refsect3">
+<a name="id-1.2.3.8.37.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>template</p></td>
+<td class="parameter_description"><p>template</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-template.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="lglTemplate"></a><h3>struct lglTemplate</h3>
+<pre class="programlisting">struct lglTemplate {
+        gchar               *brand;
+        gchar               *part;
+        gchar               *equiv_part;
+
+        gchar               *description;
+        gchar               *paper_id;
+        gdouble              page_width;
+        gdouble              page_height;
+
+        /* Meta information. */
+        gchar               *product_url;   /* URL to manufacturer's product website. */
+        GList               *category_ids;  /* List of (gchar *) category ids. */
+
+        /* List of (lglTemplateFrame *) label frame structures.
+         * Currently glabels only supports a single label frame per
+         * template. */
+        GList               *frames;
+};
+</pre>
 <p>
-This function tests if the given template belongs to the given category ID.
+This is the main structure of a libglabels template.  A template represents a single sheet
+of peel-off labels or cards.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.3.9.2.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>template</code></em> :</span></p></td>
-<td>Pointer to template structure to test</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplate.brand"></a>brand</code></em>;</p></td>
+<td class="struct_member_description"><p>Vendor or brand name of label or card.  E.g. "Avery."</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplate.part"></a>part</code></em>;</p></td>
+<td class="struct_member_description"><p>Part name or number of label or card.  E.g. "8160."</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplate.equiv-part"></a>equiv_part</code></em>;</p></td>
+<td class="struct_member_description"><p>Part name or number of a part with identical layout.  Must be from same vendor.</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplate.description"></a>description</code></em>;</p></td>
+<td class="struct_member_description"><p>A description of the template.  E.g. "Mailing labels."</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplate.paper-id"></a>paper_id</code></em>;</p></td>
+<td class="struct_member_description"><p>A paper ID.  E.g. "A4" or "US-Letter."</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplate.page-width"></a>page_width</code></em>;</p></td>
+<td class="struct_member_description"><p>Page width in points.  Used only if paper_id is "Other."</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplate.page-height"></a>page_height</code></em>;</p></td>
+<td class="struct_member_description"><p>Page height in points.  Used only if paper_id is "Other."</p></td>
+<td class="struct_member_annotations"> </td>
+</tr>
+<tr>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplate.product-url"></a>product_url</code></em>;</p></td>
+<td class="struct_member_description"><p>URL to a webpage describing product.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>category_id</code></em> :</span></p></td>
-<td>Category ID string</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplate.category-ids"></a>category_ids</code></em>;</p></td>
+<td class="struct_member_description"><p>A list of category IDs that this template belongs to.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if the template matches the given category ID.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplate.frames"></a>frames</code></em>;</p></td>
+<td class="struct_member_description"><p>A list of (<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *) structures.  GLabels currently only supports one frame
+per template -- future versions may support multiple frames per template.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-are-templates-identical"></a><h3>lgl_template_are_templates_identical ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            lgl_template_are_templates_identical
-                                                        (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template1</code></em>,
-                                                         <em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template2</code></em>);</pre>
+<a name="lglTemplateFrameShape"></a><h3>enum lglTemplateFrameShape</h3>
 <p>
-This function tests if the given templates have identical size and layout properties.
+This enumeration defines frame types that are supported by libglabels
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.3.9.3.4"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>template1</code></em> :</span></p></td>
-<td>Pointer to 1st template structure to test</td>
+<td class="enum_member_name"><p><a name="LGL-TEMPLATE-FRAME-SHAPE-RECT:CAPS"></a>LGL_TEMPLATE_FRAME_SHAPE_RECT</p></td>
+<td class="enum_member_description">
+<p>A rectangular frame.  (May have rounded corners.)</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-TEMPLATE-FRAME-SHAPE-ELLIPSE:CAPS"></a>LGL_TEMPLATE_FRAME_SHAPE_ELLIPSE</p></td>
+<td class="enum_member_description">
+<p>An elliptical frame.</p>
+</td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>template2</code></em> :</span></p></td>
-<td>Pointer to 2nd template structure to test</td>
+<td class="enum_member_name"><p><a name="LGL-TEMPLATE-FRAME-SHAPE-ROUND:CAPS"></a>LGL_TEMPLATE_FRAME_SHAPE_ROUND</p></td>
+<td class="enum_member_description">
+<p>A round frame.</p>
+</td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if the two templates are identical.</td>
+<td class="enum_member_name"><p><a name="LGL-TEMPLATE-FRAME-SHAPE-CD:CAPS"></a>LGL_TEMPLATE_FRAME_SHAPE_CD</p></td>
+<td class="enum_member_description">
+<p>A CD or DVD frame.  (Includes credit-card style CDs.)</p>
+</td>
+<td class="enum_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-frame-rect-new"></a><h3>lgl_template_frame_rect_new ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *  lgl_template_frame_rect_new         (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x_waste</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y_waste</code></em>);</pre>
+<a name="lglTemplateFrame"></a><h3>union lglTemplateFrame</h3>
 <p>
-This function creates a new template frame for a rectangular label or card.
+A union of all possible frame structures.  The type of structure is indicated by the shape
+member, which overlays the first field of all other member structures.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>ID of frame.  (This should currently always be "0").</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>w</code></em> :</span></p></td>
-<td>width of frame in points.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>h</code></em> :</span></p></td>
-<td>height of frame in points.</td>
-</tr>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lglTemplateFrameAll"></a><h3>struct lglTemplateFrameAll</h3>
+<pre class="programlisting">struct lglTemplateFrameAll {
+        /* Begin Common Fields */
+        lglTemplateFrameShape shape;
+
+        gchar                *id;       /* Id, currently always "0" */
+        GList                *layouts;  /* List of lglTemplateLayouts */
+        GList                *markups;  /* List of lglTemplateMarkups */
+        /* End Common Fields */
+};
+</pre>
+<p>
+This structure is composed of a set of fields common to all frame structures.  All frame types
+can be cast to this structure.
+</p>
+<div class="refsect3">
+<a name="id-1.2.3.9.5.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
+<tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>r</code></em> :</span></p></td>
-<td>radius of rounded corners in points.  (Should be 0 for square corners.)</td>
+<td class="struct_member_name"><p><a class="link" href="libglabels-3.0-template.html#lglTemplateFrameShape" title="enum lglTemplateFrameShape"><span class="type">lglTemplateFrameShape</span></a> <em class="structfield"><code><a name="lglTemplateFrameAll.shape"></a>shape</code></em>;</p></td>
+<td class="struct_member_description"><p>The shape of the frame.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>x_waste</code></em> :</span></p></td>
-<td>Amount of overprint to allow in the horizontal direction.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplateFrameAll.id"></a>id</code></em>;</p></td>
+<td class="struct_member_description"><p>Reserved for future use.  Should always be zero.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>y_waste</code></em> :</span></p></td>
-<td>Amount of overprint to allow in the vertical direction.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameAll.layouts"></a>layouts</code></em>;</p></td>
+<td class="struct_member_description"><p>A list of (<a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> *) structures.  Typically a frame will have a single
+layout, representing a simple grid of labels or cards.  If the layout of labels or cards is
+more complex, multiple (<a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> *) structures may be needed.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>Pointer to newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameAll.markups"></a>markups</code></em>;</p></td>
+<td class="struct_member_description"><p>A list of (<a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> *) structures, which represent non-printing markup lines.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-frame-ellipse-new"></a><h3>lgl_template_frame_ellipse_new ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *  lgl_template_frame_ellipse_new      (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> waste</code></em>);</pre>
+<a name="lglTemplateFrameRect"></a><h3>struct lglTemplateFrameRect</h3>
+<pre class="programlisting">struct lglTemplateFrameRect {
+        /* Begin Common Fields */
+        lglTemplateFrameShape shape;    /* Always LGL_TEMPLATE_FRAME_SHAPE_RECT. */
+
+        gchar                *id;       /* Id, currently always "0" */
+        GList                *layouts;  /* List of lglTemplateLayouts */
+        GList                *markups;  /* List of lglTemplateMarkups */
+        /* End Common Fields */
+
+        gdouble               w;        /* Width */
+        gdouble               h;        /* Height */
+        gdouble               r;        /* Corner radius */
+        gdouble               x_waste;  /* Amount of horiz overprint allowed. */
+        gdouble               y_waste;  /* Amount of vert overprint allowed. */
+};
+</pre>
 <p>
-This function creates a new template frame for an elliptical label or card.
+This structure defines the frame for a rectangular label or card.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.3.9.6.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>ID of frame.  (This should currently always be "0").</td>
+<td class="struct_member_name"><p><a class="link" href="libglabels-3.0-template.html#lglTemplateFrameShape" title="enum lglTemplateFrameShape"><span class="type">lglTemplateFrameShape</span></a> <em class="structfield"><code><a name="lglTemplateFrameRect.shape"></a>shape</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-FRAME-SHAPE-RECT:CAPS"><span class="type">LGL_TEMPLATE_FRAME_SHAPE_RECT</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameRect" title="struct lglTemplateFrameRect"><span class="type">lglTemplateFrameRect</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>w</code></em> :</span></p></td>
-<td>width of frame in points.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplateFrameRect.id"></a>id</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>h</code></em> :</span></p></td>
-<td>height of frame in points.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameRect.layouts"></a>layouts</code></em>;</p></td>
+<td class="struct_member_description"><p> Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>waste</code></em> :</span></p></td>
-<td>Amount of overprint to allow in points.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameRect.markups"></a>markups</code></em>;</p></td>
+<td class="struct_member_description"><p> Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>Pointer to newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameRect.w"></a>w</code></em>;</p></td>
+<td class="struct_member_description"><p>Width of label or card in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-template-frame-round-new"></a><h3>lgl_template_frame_round_new ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *  lgl_template_frame_round_new        (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> waste</code></em>);</pre>
-<p>
-This function creates a new template frame for a round label.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>ID of frame.  (This should currently always be "0").</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameRect.h"></a>h</code></em>;</p></td>
+<td class="struct_member_description"><p>Height of label or card in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>r</code></em> :</span></p></td>
-<td>radius of label in points.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameRect.r"></a>r</code></em>;</p></td>
+<td class="struct_member_description"><p>Radius of corners in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>waste</code></em> :</span></p></td>
-<td>Amount of overprint to allow.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameRect.x-waste"></a>x_waste</code></em>;</p></td>
+<td class="struct_member_description"><p>Amount of horizontal over-print to allow in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>Pointer to newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameRect.y-waste"></a>y_waste</code></em>;</p></td>
+<td class="struct_member_description"><p>Amount of vertical over-print to allow in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-frame-cd-new"></a><h3>lgl_template_frame_cd_new ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *  lgl_template_frame_cd_new           (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r1</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r2</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> waste</code></em>);</pre>
+<a name="lglTemplateFrameEllipse"></a><h3>struct lglTemplateFrameEllipse</h3>
+<pre class="programlisting">struct lglTemplateFrameEllipse {
+        /* Begin Common Fields */
+        lglTemplateFrameShape shape;    /* Always LGL_TEMPLATE_FRAME_SHAPE_ELLIPSE. */
+
+        gchar                *id;       /* Id, currently always "0" */
+        GList                *layouts;  /* List of lglTemplateLayouts */
+        GList                *markups;  /* List of lglTemplateMarkups */
+        /* End Common Fields */
+
+        gdouble               w;        /* Width */
+        gdouble               h;        /* Height */
+        gdouble               waste;    /* Amount of overprint allowed. */
+};
+</pre>
 <p>
-This function creates a new template frame for a CD/DVD label.
+This structure defines the frame for an elliptical label or card.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.3.9.7.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>ID of frame.  (This should currently always be "0").</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>r1</code></em> :</span></p></td>
-<td>outer radius of label in points.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>r2</code></em> :</span></p></td>
-<td>radius of center hole in points.</td>
+<td class="struct_member_name"><p><a class="link" href="libglabels-3.0-template.html#lglTemplateFrameShape" title="enum lglTemplateFrameShape"><span class="type">lglTemplateFrameShape</span></a> <em class="structfield"><code><a name="lglTemplateFrameEllipse.shape"></a>shape</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-FRAME-SHAPE-ELLIPSE:CAPS"><span class="type">LGL_TEMPLATE_FRAME_SHAPE_ELLIPSE</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameEllipse" title="struct lglTemplateFrameEllipse"><span class="type">lglTemplateFrameEllipse</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>w</code></em> :</span></p></td>
-<td>clip width of frame in points for business card CDs.  Should be 0 for no clipping.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplateFrameEllipse.id"></a>id</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>h</code></em> :</span></p></td>
-<td>clip height of frame in points for business card CDs.  Should be 0 for no clipping.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameEllipse.layouts"></a>layouts</code></em>;</p></td>
+<td class="struct_member_description"><p> Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>waste</code></em> :</span></p></td>
-<td>Amount of overprint to allow.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameEllipse.markups"></a>markups</code></em>;</p></td>
+<td class="struct_member_description"><p> Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>Pointer to newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameEllipse.w"></a>w</code></em>;</p></td>
+<td class="struct_member_description"><p>Width of label or card in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-template-frame-dup"></a><h3>lgl_template_frame_dup ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="returnvalue">lglTemplateFrame</span></a> *  lgl_template_frame_dup              (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *orig_frame</code></em>);</pre>
-<p>
-This function duplicates a template frame structure.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>orig_frame</code></em> :</span></p></td>
-<td>Frame to duplicate.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameEllipse.h"></a>h</code></em>;</p></td>
+<td class="struct_member_description"><p>Height of label or card in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameEllipse.waste"></a>waste</code></em>;</p></td>
+<td class="struct_member_description"><p>Amount of over-print to allow in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="lgl-template-frame-free"></a><h3>lgl_template_frame_free ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_template_frame_free             (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>);</pre>
-<p>
-This function frees all memory associated with given template frame structure.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>frame</code></em> :</span></p></td>
-<td>Frame to free.</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-frame-add-layout"></a><h3>lgl_template_frame_add_layout ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_template_frame_add_layout       (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> *layout</code></em>);</pre>
+<a name="lglTemplateFrameRound"></a><h3>struct lglTemplateFrameRound</h3>
+<pre class="programlisting">struct lglTemplateFrameRound {
+        /* Begin Common Fields */
+        lglTemplateFrameShape shape;    /* Always LGL_TEMPLATE_FRAME_SHAPE_ROUND. */
+
+        gchar                *id;       /* Id, currently always "0" */
+        GList                *layouts;  /* List of lglTemplateLayouts */
+        GList                *markups;  /* List of lglTemplateMarkups */
+        /* End Common Fields */
+
+        gdouble               r;      /* Radius */
+        gdouble               waste;  /* Amount of overprint allowed. */
+};
+</pre>
 <p>
-This function adds a layout structure to the given template frame.
+This structure defines the frame for a round label or card.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.3.9.8.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>frame</code></em> :</span></p></td>
-<td>Pointer to template frame to add layout to.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>layout</code></em> :</span></p></td>
-<td>Pointer to layout structure to add to frame.</td>
+<td class="struct_member_name"><p><a class="link" href="libglabels-3.0-template.html#lglTemplateFrameShape" title="enum lglTemplateFrameShape"><span class="type">lglTemplateFrameShape</span></a> <em class="structfield"><code><a name="lglTemplateFrameRound.shape"></a>shape</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-FRAME-SHAPE-ROUND:CAPS"><span class="type">LGL_TEMPLATE_FRAME_SHAPE_ROUND</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameRound" title="struct lglTemplateFrameRound"><span class="type">lglTemplateFrameRound</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-template-frame-add-markup"></a><h3>lgl_template_frame_add_markup ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_template_frame_add_markup       (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> *markup</code></em>);</pre>
-<p>
-This function adds a markup structure to the given template frame.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>frame</code></em> :</span></p></td>
-<td>Pointer to template frame to add markup to.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplateFrameRound.id"></a>id</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>markup</code></em> :</span></p></td>
-<td>Pointer to markup structure to add to frame.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameRound.layouts"></a>layouts</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-template-frame-get-size"></a><h3>lgl_template_frame_get_size ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_template_frame_get_size         (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> *w</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> *h</code></em>);</pre>
-<p>
-Get size (width and height) of given <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> in points.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>frame</code></em> :</span></p></td>
-<td>
-<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure to query</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameRound.markups"></a>markups</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>w</code></em> :</span></p></td>
-<td>pointer to location to receive width of frame</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameRound.r"></a>r</code></em>;</p></td>
+<td class="struct_member_description"><p>Radius of label or card in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>h</code></em> :</span></p></td>
-<td>pointer to location to receive height of frame</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameRound.waste"></a>waste</code></em>;</p></td>
+<td class="struct_member_description"><p>Amount of over-print to allow in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-frame-get-n-labels"></a><h3>lgl_template_frame_get_n_labels ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                lgl_template_frame_get_n_labels     (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>);</pre>
+<a name="lglTemplateFrameCD"></a><h3>struct lglTemplateFrameCD</h3>
+<pre class="programlisting">struct lglTemplateFrameCD {
+        /* Begin Common Fields */
+        lglTemplateFrameShape shape;    /* Always LGL_TEMPLATE_FRAME_SHAPE_CD. */
+
+        gchar                *id;       /* Id, currently always "0" */
+        GList                *layouts;  /* List of lglTemplateLayouts */
+        GList                *markups;  /* List of lglTemplateMarkups */
+        /* End Common Fields */
+
+        gdouble               r1;     /* Outer radius */
+        gdouble               r2;     /* Inner radius (hole) */
+        gdouble               w;      /* Clip width, business card CDs */
+        gdouble               h;      /* Clip height, business card CDs */
+        gdouble               waste;  /* Amount of overprint allowed. */
+};
+</pre>
 <p>
-Get total number of labels per sheet corresponding to the given frame.
+This structure defines the frame for a CD or DVD label.  This structure also supports
+credit-card CD labels.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.3.9.9.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>frame</code></em> :</span></p></td>
-<td>
-<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure to query</td>
+<td class="struct_member_name"><p><a class="link" href="libglabels-3.0-template.html#lglTemplateFrameShape" title="enum lglTemplateFrameShape"><span class="type">lglTemplateFrameShape</span></a> <em class="structfield"><code><a name="lglTemplateFrameCD.shape"></a>shape</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-FRAME-SHAPE-CD:CAPS"><span class="type">LGL_TEMPLATE_FRAME_SHAPE_CD</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameCD" title="struct lglTemplateFrameCD"><span class="type">lglTemplateFrameCD</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>number of labels per sheet.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglTemplateFrameCD.id"></a>id</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-template-frame-get-origins"></a><h3>lgl_template_frame_get_origins ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateOrigin" title="struct lglTemplateOrigin"><span class="returnvalue">lglTemplateOrigin</span></a> * lgl_template_frame_get_origins      (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>);</pre>
-<p>
-Get an array of label origins for the given frame.  These origins represent the
-upper left hand corner of each label on a page corresponding to the given frame.
-The origins will be ordered geometrically left to right and then top to bottom.
-The array should be freed using <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>frame</code></em> :</span></p></td>
-<td>
-<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure to query</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameCD.layouts"></a>layouts</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A newly allocated array of <a class="link" href="libglabels-3.0-template.html#lglTemplateOrigin" title="struct lglTemplateOrigin"><span class="type">lglTemplateOrigin</span></a> structures.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglTemplateFrameCD.markups"></a>markups</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  See <a class="link" href="libglabels-3.0-template.html#lglTemplateFrameAll" title="struct lglTemplateFrameAll"><span class="type">lglTemplateFrameAll</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-template-frame-get-layout-description"></a><h3>lgl_template_frame_get_layout_description ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             lgl_template_frame_get_layout_description
-                                                        (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>);</pre>
-<p>
-Get a description of the label layout including number of labels per sheet.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>frame</code></em> :</span></p></td>
-<td>
-<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure to query</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameCD.r1"></a>r1</code></em>;</p></td>
+<td class="struct_member_description"><p>Outer radius of label in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a newly allocation description string.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameCD.r2"></a>r2</code></em>;</p></td>
+<td class="struct_member_description"><p>Radius of center hole in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-template-frame-get-size-description"></a><h3>lgl_template_frame_get_size_description ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             lgl_template_frame_get_size_description
-                                                        (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> *frame</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);</pre>
-<p>
-Get a description of the label size.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>frame</code></em> :</span></p></td>
-<td>
-<a class="link" href="libglabels-3.0-template.html#lglTemplateFrame" title="union lglTemplateFrame"><span class="type">lglTemplateFrame</span></a> structure to query</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameCD.w"></a>w</code></em>;</p></td>
+<td class="struct_member_description"><p>Clip width in points.  Used for credit-card CD labels.  This field is ignored if zero.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>units</code></em> :</span></p></td>
-<td><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a></td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameCD.h"></a>h</code></em>;</p></td>
+<td class="struct_member_description"><p>Clip height in points.  Used for credit-card CD labels.  This field is ignored if zero.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a newly allocation description string.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateFrameCD.waste"></a>waste</code></em>;</p></td>
+<td class="struct_member_description"><p>Amount of over-print to allow in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-layout-new"></a><h3>lgl_template_layout_new ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="returnvalue">lglTemplateLayout</span></a> * lgl_template_layout_new             (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> nx</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> ny</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x0</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y0</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> dx</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> dy</code></em>);</pre>
+<a name="lglTemplateLayout"></a><h3>struct lglTemplateLayout</h3>
+<pre class="programlisting">struct lglTemplateLayout {
+        gint                  nx;  /* Number of labels across */
+        gint                  ny;  /* Number of labels up and down */
+
+        gdouble               x0;  /* Left of grid from left edge of paper */
+        gdouble               y0;  /* Top of grid from top edge of paper */
+
+        gdouble               dx;  /* Horizontal pitch of grid */
+        gdouble               dy;  /* Vertical pitch of grid */
+};
+</pre>
 <p>
-This function creates a new layout structure with the given parameters.
+This structure defines a simple grid layout of labels or cards.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.3.9.10.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>nx</code></em> :</span></p></td>
-<td>Number of labels across.</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>ny</code></em> :</span></p></td>
-<td>Number of labels down.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> <em class="structfield"><code><a name="lglTemplateLayout.nx"></a>nx</code></em>;</p></td>
+<td class="struct_member_description"><p>Number of labels or cards across in the grid (horizontal).</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>x0</code></em> :</span></p></td>
-<td>X coordinate of the top-left corner of the top-left label in the layout in points.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> <em class="structfield"><code><a name="lglTemplateLayout.ny"></a>ny</code></em>;</p></td>
+<td class="struct_member_description"><p>Number of labels or cards down in the grid (vertical).</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>y0</code></em> :</span></p></td>
-<td>Y coordinate of the top-left corner of the top-left label in the layout in points.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateLayout.x0"></a>x0</code></em>;</p></td>
+<td class="struct_member_description"><p>Distance (in points) from the left edge of page to the left edge of the left column of
+cards or labels in the layout.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>dx</code></em> :</span></p></td>
-<td>Horizontal pitch in points.  This is the distance from left-edge to left-edge.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateLayout.y0"></a>y0</code></em>;</p></td>
+<td class="struct_member_description"><p>Distance (in points) from the top edge of page to the top edge of the top row of
+cards or labels in the layout.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>dy</code></em> :</span></p></td>
-<td>Vertical pitch in points.  This is the distance from top-edge to top-edge.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateLayout.dx"></a>dx</code></em>;</p></td>
+<td class="struct_member_description"><p>Horizontal pitch of grid in points.  This is the distance from left edge to left edge
+(not the gap between labels or cards).</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> structure.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateLayout.dy"></a>dy</code></em>;</p></td>
+<td class="struct_member_description"><p>Vertical pitch of grid in points.  This is the distance from top edge to top edge
+(not the gap between labels or cards).</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-layout-dup"></a><h3>lgl_template_layout_dup ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="returnvalue">lglTemplateLayout</span></a> * lgl_template_layout_dup             (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> *orig_layout</code></em>);</pre>
+<a name="lglTemplateMarkupType"></a><h3>enum lglTemplateMarkupType</h3>
 <p>
-This function duplicates a template layout structure.
+This enumeration defines markup types that are supported by libglabels
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.3.9.11.4"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>orig_layout</code></em> :</span></p></td>
-<td>Layout to duplicate.</td>
+<td class="enum_member_name"><p><a name="LGL-TEMPLATE-MARKUP-MARGIN:CAPS"></a>LGL_TEMPLATE_MARKUP_MARGIN</p></td>
+<td class="enum_member_description">
+<p>A margin line around perimeter of label or card.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-TEMPLATE-MARKUP-LINE:CAPS"></a>LGL_TEMPLATE_MARKUP_LINE</p></td>
+<td class="enum_member_description">
+<p>A simple line segment.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-TEMPLATE-MARKUP-CIRCLE:CAPS"></a>LGL_TEMPLATE_MARKUP_CIRCLE</p></td>
+<td class="enum_member_description">
+<p>A circle.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-TEMPLATE-MARKUP-RECT:CAPS"></a>LGL_TEMPLATE_MARKUP_RECT</p></td>
+<td class="enum_member_description">
+<p>A rectangle.  Possibly with rounded corners.</p>
+</td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> structure.</td>
+<td class="enum_member_name"><p><a name="LGL-TEMPLATE-MARKUP-ELLIPSE:CAPS"></a>LGL_TEMPLATE_MARKUP_ELLIPSE</p></td>
+<td class="enum_member_description">
+<p>An ellipse.</p>
+</td>
+<td class="enum_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-layout-free"></a><h3>lgl_template_layout_free ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_template_layout_free            (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateLayout" title="struct lglTemplateLayout"><span class="type">lglTemplateLayout</span></a> *layout</code></em>);</pre>
+<a name="lglTemplateMarkup"></a><h3>union lglTemplateMarkup</h3>
 <p>
-This function frees all memory associated with given template layout structure.
+A union of all possible markup structures.  The type of structure is indicated by the type
+member, which overlays the first field of all other member structures.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>layout</code></em> :</span></p></td>
-<td>Layout to free.</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-markup-margin-new"></a><h3>lgl_template_markup_margin_new ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> * lgl_template_markup_margin_new      (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> size</code></em>);</pre>
+<a name="lglTemplateMarkupMargin"></a><h3>struct lglTemplateMarkupMargin</h3>
+<pre class="programlisting">struct lglTemplateMarkupMargin {
+        lglTemplateMarkupType  type;  /* Always LGL_TEMPLATE_MARKUP_MARGIN */
+
+        gdouble                size;  /* Margin size */
+};
+</pre>
 <p>
-This function creates a new margin markup structure.
+This structure defines a simple margin markup around the perimeter of a label or card.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.3.9.13.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>size</code></em> :</span></p></td>
-<td>margin size in points.</td>
+<td class="struct_member_name"><p><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupType" title="enum lglTemplateMarkupType"><span class="type">lglTemplateMarkupType</span></a> <em class="structfield"><code><a name="lglTemplateMarkupMargin.type"></a>type</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-MARGIN:CAPS"><span class="type">LGL_TEMPLATE_MARKUP_MARGIN</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupMargin" title="struct lglTemplateMarkupMargin"><span class="type">lglTemplateMarkupMargin</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> structure.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupMargin.size"></a>size</code></em>;</p></td>
+<td class="struct_member_description"><p>Distance of margin from edge of label or card.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-markup-line-new"></a><h3>lgl_template_markup_line_new ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> * lgl_template_markup_line_new        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x1</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y1</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x2</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y2</code></em>);</pre>
+<a name="lglTemplateMarkupLine"></a><h3>struct lglTemplateMarkupLine</h3>
+<pre class="programlisting">struct lglTemplateMarkupLine {
+        lglTemplateMarkupType  type;   /* Always LGL_TEMPLATE_MARKUP_LINE */
+
+        gdouble                x1, y1; /* 1st endpoint */
+        gdouble                x2, y2; /* 2nd endpoint */
+};
+</pre>
 <p>
-This function creates a new line markup structure.
+This structure defines a simple line segment markup.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.3.9.14.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>x1</code></em> :</span></p></td>
-<td>x coordinate of first endpoint.</td>
+<td class="struct_member_name"><p><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupType" title="enum lglTemplateMarkupType"><span class="type">lglTemplateMarkupType</span></a> <em class="structfield"><code><a name="lglTemplateMarkupLine.type"></a>type</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-LINE:CAPS"><span class="type">LGL_TEMPLATE_MARKUP_LINE</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupLine" title="struct lglTemplateMarkupLine"><span class="type">lglTemplateMarkupLine</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>y1</code></em> :</span></p></td>
-<td>y coordinate of first endpoint.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupLine.x1"></a>x1</code></em>;</p></td>
+<td class="struct_member_description"><p>Distance (in points) of first endpoint from left edge of label or card.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>x2</code></em> :</span></p></td>
-<td>x coordinate of second endpoint.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupLine.y1"></a>y1</code></em>;</p></td>
+<td class="struct_member_description"><p>Distance (in points) of first endpoint from top edge of label or card.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>y2</code></em> :</span></p></td>
-<td>y coordinate of second endpoint.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupLine.x2"></a>x2</code></em>;</p></td>
+<td class="struct_member_description"><p>Distance (in points) of second endpoint from left edge of label or card.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> structure.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupLine.y2"></a>y2</code></em>;</p></td>
+<td class="struct_member_description"><p>Distance (in points) of second endpoint from top edge of label or card.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-markup-circle-new"></a><h3>lgl_template_markup_circle_new ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> * lgl_template_markup_circle_new      (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x0</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y0</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r</code></em>);</pre>
+<a name="lglTemplateMarkupCircle"></a><h3>struct lglTemplateMarkupCircle</h3>
+<pre class="programlisting">struct lglTemplateMarkupCircle {
+        lglTemplateMarkupType  type;   /* Always LGL_TEMPLATE_MARKUP_CIRCLE */
+
+        gdouble                x0, y0; /* Center of circle */
+        gdouble                r;      /* Radius of circle */
+};
+</pre>
 <p>
-This function creates a new circle markup structure.
+This structure defines a simple circle markup.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.3.9.15.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>x0</code></em> :</span></p></td>
-<td>x coordinate of center of circle.</td>
+<td class="struct_member_name"><p><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupType" title="enum lglTemplateMarkupType"><span class="type">lglTemplateMarkupType</span></a> <em class="structfield"><code><a name="lglTemplateMarkupCircle.type"></a>type</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-CIRCLE:CAPS"><span class="type">LGL_TEMPLATE_MARKUP_CIRCLE</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupCircle" title="struct lglTemplateMarkupCircle"><span class="type">lglTemplateMarkupCircle</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>y0</code></em> :</span></p></td>
-<td>y coordinate of center of circle.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupCircle.x0"></a>x0</code></em>;</p></td>
+<td class="struct_member_description"><p>Distance (in points) of vertex from left edge of label or card.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>r</code></em> :</span></p></td>
-<td>radius of circle.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupCircle.y0"></a>y0</code></em>;</p></td>
+<td class="struct_member_description"><p>Distance (in points) of vertex from top edge of label or card.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> structure.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupCircle.r"></a>r</code></em>;</p></td>
+<td class="struct_member_description"><p>Radius of circle in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-markup-rect-new"></a><h3>lgl_template_markup_rect_new ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> * lgl_template_markup_rect_new        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x1</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y1</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> r</code></em>);</pre>
+<a name="lglTemplateMarkupRect"></a><h3>struct lglTemplateMarkupRect</h3>
+<pre class="programlisting">struct lglTemplateMarkupRect {
+        lglTemplateMarkupType  type;   /* Always LGL_TEMPLATE_MARKUP_RECT */
+
+        gdouble                x1, y1; /* Upper left corner */
+        gdouble                w, h;   /* Width and height. */
+        gdouble                r;      /* Radius of corners. */
+};
+</pre>
 <p>
-This function creates a new rectangle markup structure.
+This structure defines a simple rectangle markup.  The rectangle can have rounded corners.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.3.9.16.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>x1</code></em> :</span></p></td>
-<td>x coordinate of top-left corner of rectangle.</td>
+<td class="struct_member_name"><p><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupType" title="enum lglTemplateMarkupType"><span class="type">lglTemplateMarkupType</span></a> <em class="structfield"><code><a name="lglTemplateMarkupRect.type"></a>type</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-RECT:CAPS"><span class="type">LGL_TEMPLATE_MARKUP_RECT</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupRect" title="struct lglTemplateMarkupRect"><span class="type">lglTemplateMarkupRect</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>y1</code></em> :</span></p></td>
-<td>y coordinate of top-left corner of rectangle.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupRect.x1"></a>x1</code></em>;</p></td>
+<td class="struct_member_description"><p>Distance (in points) of left edge of markup from left edge of label or card.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>w</code></em> :</span></p></td>
-<td>width of rectangle.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupRect.y1"></a>y1</code></em>;</p></td>
+<td class="struct_member_description"><p>Distance (in points) of top edge of markup from top edge of label or card.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>h</code></em> :</span></p></td>
-<td>height of rectangle.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupRect.w"></a>w</code></em>;</p></td>
+<td class="struct_member_description"><p>Width of rectangle in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>r</code></em> :</span></p></td>
-<td>radius of rounded corner.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupRect.h"></a>h</code></em>;</p></td>
+<td class="struct_member_description"><p>Height of rectangle in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> structure.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupRect.r"></a>r</code></em>;</p></td>
+<td class="struct_member_description"><p>Radius of corners in points.  Should be zero for sharp corners.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-markup-ellipse-new"></a><h3>lgl_template_markup_ellipse_new ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> * lgl_template_markup_ellipse_new     (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x1</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y1</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>);</pre>
+<a name="lglTemplateMarkupEllipse"></a><h3>struct lglTemplateMarkupEllipse</h3>
+<pre class="programlisting">struct lglTemplateMarkupEllipse {
+        lglTemplateMarkupType  type;   /* Always LGL_TEMPLATE_MARKUP_ELLIPSE */
+
+        gdouble                x1, y1; /* Upper left corner */
+        gdouble                w, h;   /* Width and height. */
+};
+</pre>
 <p>
-This function creates a new ellipse markup structure.
+This structure defines a simple elliptical markup.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.3.9.17.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>x1</code></em> :</span></p></td>
-<td>x coordinate of top-left corner of ellipse.</td>
+<td class="struct_member_name"><p><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupType" title="enum lglTemplateMarkupType"><span class="type">lglTemplateMarkupType</span></a> <em class="structfield"><code><a name="lglTemplateMarkupEllipse.type"></a>type</code></em>;</p></td>
+<td class="struct_member_description"><p>Common field.  Always <a class="link" href="libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-ELLIPSE:CAPS"><span class="type">LGL_TEMPLATE_MARKUP_ELLIPSE</span></a> for <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkupEllipse" title="struct lglTemplateMarkupEllipse"><span class="type">lglTemplateMarkupEllipse</span></a>.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>y1</code></em> :</span></p></td>
-<td>y coordinate of top-left corner of ellipse.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupEllipse.x1"></a>x1</code></em>;</p></td>
+<td class="struct_member_description"><p>Distance (in points) of left edge of markup from left edge of label or card.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>w</code></em> :</span></p></td>
-<td>width of ellipse.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupEllipse.y1"></a>y1</code></em>;</p></td>
+<td class="struct_member_description"><p>Distance (in points) of top edge of markup from top edge of label or card.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>h</code></em> :</span></p></td>
-<td>height of ellipse.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupEllipse.w"></a>w</code></em>;</p></td>
+<td class="struct_member_description"><p>Width of rectangle in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> structure.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateMarkupEllipse.h"></a>h</code></em>;</p></td>
+<td class="struct_member_description"><p>Height of rectangle in points.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-template-markup-dup"></a><h3>lgl_template_markup_dup ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="returnvalue">lglTemplateMarkup</span></a> * lgl_template_markup_dup             (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> *orig_markup</code></em>);</pre>
+<a name="lglTemplateOrigin"></a><h3>struct lglTemplateOrigin</h3>
+<pre class="programlisting">struct lglTemplateOrigin {
+        gdouble               x, y; /* Label origin relative to upper 
+                                     * upper left hand corner of paper */
+};
+</pre>
 <p>
-This function duplicates a template markup structure.
+This structure represents the cartesian coordinates of the origin of a label or card on the page.
+The orign is the upper left corner of the extent of the label or card.  These coordinates are
+relative to the upper left corner of the page.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.3.9.18.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>orig_markup</code></em> :</span></p></td>
-<td>Markup to duplicate.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateOrigin.x"></a>x</code></em>;</p></td>
+<td class="struct_member_description"><p>Distance in points from top edge of page.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a newly allocated <a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> structure.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglTemplateOrigin.y"></a>y</code></em>;</p></td>
+<td class="struct_member_description"><p>Distance in points from left edge of page.</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="lgl-template-markup-free"></a><h3>lgl_template_markup_free ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_template_markup_free            (<em class="parameter"><code><a class="link" href="libglabels-3.0-template.html#lglTemplateMarkup" title="union lglTemplateMarkup"><span class="type">lglTemplateMarkup</span></a> *markup</code></em>);</pre>
-<p>
-This function frees all memory associated with given template markup structure.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>markup</code></em> :</span></p></td>
-<td>Markup to free.</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-template-print"></a><h3>lgl_template_print ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_template_print                  (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>);</pre>
-<p>
-Print template details (for debugging purposes).
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>template</code></em> :</span></p></td>
-<td>template</td>
-</tr></tbody>
-</table></div>
 </div>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 31ba20eaa8c17e619c135cab5b121235cc78b709..a9ff255684e74090a20c08e7040774d1627d1978 100644 (file)
@@ -2,30 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Units</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlabels 3.0 Reference Manual: Units</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="up" href="ch03.html" title="Miscellaneous">
 <link rel="prev" href="ch03.html" title="Miscellaneous">
 <link rel="next" href="libglabels-3.0-str.html" title="String Utility Functions">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="ch03.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch03.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlabels 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglabels-3.0-str.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libglabels-3.0-units.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libglabels-3.0-units.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-units.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-units.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch03.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="ch03.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglabels-3.0-str.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="libglabels-3.0-units"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <h2><span class="refentrytitle"><a name="libglabels-3.0-units.top_of_page"></a>Units</span></h2>
 <p>Units — Type to represent units of distance supported by libglabels</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="libglabels-3.0-units.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libglabels/lgl-units.h&gt;
-
-enum                <a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits">lglUnits</a>;
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       <a class="link" href="libglabels-3.0-units.html#lgl-units-get-id" title="lgl_units_get_id ()">lgl_units_get_id</a>                    (<em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);
-<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="returnvalue">lglUnits</span></a>            <a class="link" href="libglabels-3.0-units.html#lgl-units-from-id" title="lgl_units_from_id ()">lgl_units_from_id</a>                   (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);
-const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       <a class="link" href="libglabels-3.0-units.html#lgl-units-get-name" title="lgl_units_get_name ()">lgl_units_get_name</a>                  (<em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);
-<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="returnvalue">lglUnits</span></a>            <a class="link" href="libglabels-3.0-units.html#lgl-units-from-name" title="lgl_units_from_name ()">lgl_units_from_name</a>                 (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>             <a class="link" href="libglabels-3.0-units.html#lgl-units-get-points-per-unit" title="lgl_units_get_points_per_unit ()">lgl_units_get_points_per_unit</a>       (<em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>             <a class="link" href="libglabels-3.0-units.html#lgl-units-get-units-per-point" title="lgl_units_get_units_per_point ()">lgl_units_get_units_per_point</a>       (<em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);
-</pre>
-</div>
-<div class="refsect1">
-<a name="libglabels-3.0-units.description"></a><h2>Description</h2>
-<p>
-This section defines a type to represent the various units of distance
-supported by libglabels.  It also defines a set of related functions.
-</p>
-</div>
 <div class="refsect1">
-<a name="libglabels-3.0-units.details"></a><h2>Details</h2>
-<div class="refsect2">
-<a name="lglUnits"></a><h3>enum lglUnits</h3>
-<pre class="programlisting">typedef enum {
-        LGL_UNITS_POINT, /* encoded as "pt" */
-        LGL_UNITS_INCH,  /* encoded as "in" */
-        LGL_UNITS_MM,    /* encoded as "mm" */
-        LGL_UNITS_CM,    /* encoded as "cm" */
-        LGL_UNITS_PICA,  /* encoded as "pc" */
-
-        LGL_UNITS_FIRST = LGL_UNITS_POINT,
-        LGL_UNITS_LAST  = LGL_UNITS_PICA,
-
-        LGL_UNITS_INVALID = -1
-} lglUnits;
-</pre>
-<p>
-This enumeration defines supported units of distance.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="libglabels-3.0-units.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
 <tbody>
 <tr>
-<td><p><a name="LGL-UNITS-POINT:CAPS"></a><span class="term"><code class="literal">LGL_UNITS_POINT</code></span></p></td>
-<td>Points.
+<td class="function_type">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
 </td>
-</tr>
-<tr>
-<td><p><a name="LGL-UNITS-INCH:CAPS"></a><span class="term"><code class="literal">LGL_UNITS_INCH</code></span></p></td>
-<td>Inches.
+<td class="function_name">
+<a class="link" href="libglabels-3.0-units.html#lgl-units-get-id" title="lgl_units_get_id ()">lgl_units_get_id</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td><p><a name="LGL-UNITS-MM:CAPS"></a><span class="term"><code class="literal">LGL_UNITS_MM</code></span></p></td>
-<td>Millimeters
+<td class="function_type">
+<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="returnvalue">lglUnits</span></a>
 </td>
-</tr>
-<tr>
-<td><p><a name="LGL-UNITS-CM:CAPS"></a><span class="term"><code class="literal">LGL_UNITS_CM</code></span></p></td>
-<td>Centimeters
+<td class="function_name">
+<a class="link" href="libglabels-3.0-units.html#lgl-units-from-id" title="lgl_units_from_id ()">lgl_units_from_id</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td><p><a name="LGL-UNITS-PICA:CAPS"></a><span class="term"><code class="literal">LGL_UNITS_PICA</code></span></p></td>
-<td>Picas
+<td class="function_type">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-units.html#lgl-units-get-name" title="lgl_units_get_name ()">lgl_units_get_name</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td><p><a name="LGL-UNITS-FIRST:CAPS"></a><span class="term"><code class="literal">LGL_UNITS_FIRST</code></span></p></td>
-<td>First supported unit.  (Used for bounds checking and iteration through supported units.)
+<td class="function_type">
+<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="returnvalue">lglUnits</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-units.html#lgl-units-from-name" title="lgl_units_from_name ()">lgl_units_from_name</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td><p><a name="LGL-UNITS-LAST:CAPS"></a><span class="term"><code class="literal">LGL_UNITS_LAST</code></span></p></td>
-<td>Last supported unit.  (Used for bounds checking and iteration through supported units.)
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-units.html#lgl-units-get-points-per-unit" title="lgl_units_get_points_per_unit ()">lgl_units_get_points_per_unit</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td><p><a name="LGL-UNITS-INVALID:CAPS"></a><span class="term"><code class="literal">LGL_UNITS_INVALID</code></span></p></td>
-<td>Invalid unit.  (Returned by libglabels units functions when a supported unit cannot be determined.)
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-units.html#lgl-units-get-units-per-point" title="lgl_units_get_units_per_point ()">lgl_units_get_units_per_point</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="lgl-units-get-id"></a><h3>lgl_units_get_id ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       lgl_units_get_id                    (<em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);</pre>
+<div class="refsect1">
+<a name="libglabels-3.0-units.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody><tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits">lglUnits</a></td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-units.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-units.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;libglabels/lgl-units.h&gt;
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-units.description"></a><h2>Description</h2>
 <p>
-Return a unique ID string for the given units.  This ID is how units
+This section defines a type to represent the various units of distance
+supported by libglabels.  It also defines a set of related functions.
+</p>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-units.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="lgl-units-get-id"></a><h3>lgl_units_get_id ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+lgl_units_get_id (<em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);</pre>
+<p>Return a unique ID string for the given units.  This ID is how units
 are encoded in libglabels XML files and will remain constant across
 all locales.  IDs are identical to the absolute length units supported
-in the CSS2 Specification (Section 4.3.2).
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>units</code></em> :</span></p></td>
-<td>Units (<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a>)</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>ID string.</td>
-</tr>
-</tbody>
+in the CSS2 Specification (Section 4.3.2).</p>
+<div class="refsect3">
+<a name="id-1.4.2.8.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>units</p></td>
+<td class="parameter_description"><p>Units (<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a>)</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.4.2.8.2.6"></a><h4>Returns</h4>
+<p> ID string.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-units-from-id"></a><h3>lgl_units_from_id ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="returnvalue">lglUnits</span></a>            lgl_units_from_id                   (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);</pre>
-<p>
-Return the unique <a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> for the given ID string.
+<a name="lgl-units-from-id"></a><h3>lgl_units_from_id ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="returnvalue">lglUnits</span></a>
+lgl_units_from_id (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>);</pre>
+<p>Return the unique <a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> for the given ID string.
 This ID is how units are encoded in libglabels XML files and will remain
 constant across all locales.  IDs are identical to the absolute length
-units supported in the CSS2 Specification (Section 4.3.2).
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>ID string</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>units (<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a>).</td>
-</tr>
-</tbody>
+units supported in the CSS2 Specification (Section 4.3.2).</p>
+<div class="refsect3">
+<a name="id-1.4.2.8.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>id</p></td>
+<td class="parameter_description"><p>ID string</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.4.2.8.3.6"></a><h4>Returns</h4>
+<p> units (<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a>).</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-units-get-name"></a><h3>lgl_units_get_name ()</h3>
-<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       lgl_units_get_name                  (<em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);</pre>
-<p>
-Return a unique name string for the given units.  This name is human
-readable and will be translated to the current locale.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>units</code></em> :</span></p></td>
-<td>Units (<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a>)</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>name string.</td>
-</tr>
-</tbody>
+<a name="lgl-units-get-name"></a><h3>lgl_units_get_name ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+lgl_units_get_name (<em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);</pre>
+<p>Return a unique name string for the given units.  This name is human
+readable and will be translated to the current locale.</p>
+<div class="refsect3">
+<a name="id-1.4.2.8.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>units</p></td>
+<td class="parameter_description"><p>Units (<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a>)</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.4.2.8.4.6"></a><h4>Returns</h4>
+<p> name string.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-units-from-name"></a><h3>lgl_units_from_name ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="returnvalue">lglUnits</span></a>            lgl_units_from_name                 (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
-<p>
-Return the unique <a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> for the given name string.  This name is
-human readable and is expected to be translated to the current locale.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>NAME string</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>units (<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a>).</td>
-</tr>
-</tbody>
+<a name="lgl-units-from-name"></a><h3>lgl_units_from_name ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="returnvalue">lglUnits</span></a>
+lgl_units_from_name (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+<p>Return the unique <a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> for the given name string.  This name is
+human readable and is expected to be translated to the current locale.</p>
+<div class="refsect3">
+<a name="id-1.4.2.8.5.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>NAME string</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.4.2.8.5.6"></a><h4>Returns</h4>
+<p> units (<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a>).</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-units-get-points-per-unit"></a><h3>lgl_units_get_points_per_unit ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>             lgl_units_get_points_per_unit       (<em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);</pre>
-<p>
-Return a scale factor for the given units in points/unit.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>units</code></em> :</span></p></td>
-<td>Units (<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a>)</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>scale factor.</td>
-</tr>
-</tbody>
+<a name="lgl-units-get-points-per-unit"></a><h3>lgl_units_get_points_per_unit ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>
+lgl_units_get_points_per_unit (<em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);</pre>
+<p>Return a scale factor for the given units in points/unit.</p>
+<div class="refsect3">
+<a name="id-1.4.2.8.6.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>units</p></td>
+<td class="parameter_description"><p>Units (<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a>)</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.4.2.8.6.6"></a><h4>Returns</h4>
+<p> scale factor.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-units-get-units-per-point"></a><h3>lgl_units_get_units_per_point ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>             lgl_units_get_units_per_point       (<em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);</pre>
+<a name="lgl-units-get-units-per-point"></a><h3>lgl_units_get_units_per_point ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>
+lgl_units_get_units_per_point (<em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);</pre>
+<p>Return a scale factor for the given units in units/point.</p>
+<div class="refsect3">
+<a name="id-1.4.2.8.7.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>units</p></td>
+<td class="parameter_description"><p>Units (<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a>)</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="id-1.4.2.8.7.6"></a><h4>Returns</h4>
+<p> scale factor.</p>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-units.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="lglUnits"></a><h3>enum lglUnits</h3>
 <p>
-Return a scale factor for the given units in units/point.
+This enumeration defines supported units of distance.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.4.2.9.2.4"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>units</code></em> :</span></p></td>
-<td>Units (<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a>)</td>
+<td class="enum_member_name"><p><a name="LGL-UNITS-POINT:CAPS"></a>LGL_UNITS_POINT</p></td>
+<td class="enum_member_description">
+<p>Points.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-UNITS-INCH:CAPS"></a>LGL_UNITS_INCH</p></td>
+<td class="enum_member_description">
+<p>Inches.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-UNITS-MM:CAPS"></a>LGL_UNITS_MM</p></td>
+<td class="enum_member_description">
+<p>Millimeters</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-UNITS-CM:CAPS"></a>LGL_UNITS_CM</p></td>
+<td class="enum_member_description">
+<p>Centimeters</p>
+</td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>scale factor.</td>
+<td class="enum_member_name"><p><a name="LGL-UNITS-PICA:CAPS"></a>LGL_UNITS_PICA</p></td>
+<td class="enum_member_description">
+<p>Picas</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-UNITS-FIRST:CAPS"></a>LGL_UNITS_FIRST</p></td>
+<td class="enum_member_description">
+<p>First supported unit.  (Used for bounds checking and iteration through supported units.)</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-UNITS-LAST:CAPS"></a>LGL_UNITS_LAST</p></td>
+<td class="enum_member_description">
+<p>Last supported unit.  (Used for bounds checking and iteration through supported units.)</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-UNITS-INVALID:CAPS"></a>LGL_UNITS_INVALID</p></td>
+<td class="enum_member_description">
+<p>Invalid unit.  (Returned by libglabels units functions when a supported unit cannot be determined.)</p>
+</td>
+<td class="enum_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
 </div>
+</div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 8de55a68f8bdb5796a72cbd80ee731a8becbe51b..9eeabc71f5903f99280d416b9cf1155c9984c70b 100644 (file)
@@ -2,30 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>The lglVendor Structure</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlabels 3.0 Reference Manual: The lglVendor Structure</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="up" href="ch01.html" title="Basic LibGlabels Usage">
 <link rel="prev" href="libglabels-3.0-category.html" title="The lglCategory Structure">
 <link rel="next" href="ch02.html" title="Working Directly With LibGlabels XML">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libglabels-3.0-category.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlabels 3.0 Reference Manual</th>
-<td><a accesskey="n" href="ch02.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libglabels-3.0-vendor.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libglabels-3.0-vendor.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-vendor.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-vendor.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libglabels-3.0-category.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="ch02.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="libglabels-3.0-vendor"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <h2><span class="refentrytitle"><a name="libglabels-3.0-vendor.top_of_page"></a>The lglVendor Structure</span></h2>
 <p>The lglVendor Structure — Vendor definitions</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="libglabels-3.0-vendor.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libglabels/lgl-vendor.h&gt;
-
-struct              <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor">lglVendor</a>;
-<a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="returnvalue">lglVendor</span></a> *         <a class="link" href="libglabels-3.0-vendor.html#lgl-vendor-new" title="lgl_vendor_new ()">lgl_vendor_new</a>                      (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);
-<a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="returnvalue">lglVendor</span></a> *         <a class="link" href="libglabels-3.0-vendor.html#lgl-vendor-dup" title="lgl_vendor_dup ()">lgl_vendor_dup</a>                      (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> *orig</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-vendor.html#lgl-vendor-free" title="lgl_vendor_free ()">lgl_vendor_free</a>                     (<em class="parameter"><code><a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> *vendor</code></em>);
+<div class="refsect1">
+<a name="libglabels-3.0-vendor.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="returnvalue">lglVendor</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-vendor.html#lgl-vendor-new" title="lgl_vendor_new ()">lgl_vendor_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="returnvalue">lglVendor</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-vendor.html#lgl-vendor-dup" title="lgl_vendor_dup ()">lgl_vendor_dup</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-vendor.html#lgl-vendor-free" title="lgl_vendor_free ()">lgl_vendor_free</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-vendor.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody><tr>
+<td class="datatype_keyword">struct</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor">lglVendor</a></td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-vendor.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-vendor.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;libglabels/lgl-vendor.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -53,93 +97,122 @@ This section describes a structure for representing vendor data.
 </p>
 </div>
 <div class="refsect1">
-<a name="libglabels-3.0-vendor.details"></a><h2>Details</h2>
+<a name="libglabels-3.0-vendor.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="lglVendor"></a><h3>struct lglVendor</h3>
-<pre class="programlisting">struct lglVendor {
-        gchar               *name;           /* Vendor name */
-        gchar               *url;            /* Vendor URL */
-};
-</pre>
-<p>
-This structure defines a vendor.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglVendor.name"></a>name</code></em>;</span></p></td>
-<td>Vendor name.  (e.g. "Avery")</td>
-</tr>
-<tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglVendor.url"></a>url</code></em>;</span></p></td>
-<td>URL to vendor website</td>
-</tr>
-</tbody>
+<a name="lgl-vendor-new"></a><h3>lgl_vendor_new ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="returnvalue">lglVendor</span></a> *
+lgl_vendor_new (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+<p>Allocates and constructs a new <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure.</p>
+<div class="refsect3">
+<a name="id-1.2.6.8.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>Localized name of vendor.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.6.8.2.6"></a><h4>Returns</h4>
+<p> a pointer to a newly allocated <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-vendor-new"></a><h3>lgl_vendor_new ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="returnvalue">lglVendor</span></a> *         lgl_vendor_new                      (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
-<p>
-Allocates and constructs a new <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>Localized name of vendor.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a pointer to a newly allocated <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure.</td>
-</tr>
-</tbody>
+<a name="lgl-vendor-dup"></a><h3>lgl_vendor_dup ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="returnvalue">lglVendor</span></a> *
+lgl_vendor_dup (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> *orig</code></em>);</pre>
+<p>Duplicates an existing <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure.</p>
+<div class="refsect3">
+<a name="id-1.2.6.8.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>orig</p></td>
+<td class="parameter_description"><p><a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure to be duplicated.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.2.6.8.3.6"></a><h4>Returns</h4>
+<p> a pointer to a newly allocated <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-vendor-dup"></a><h3>lgl_vendor_dup ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="returnvalue">lglVendor</span></a> *         lgl_vendor_dup                      (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> *orig</code></em>);</pre>
+<a name="lgl-vendor-free"></a><h3>lgl_vendor_free ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_vendor_free (<em class="parameter"><code><a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> *vendor</code></em>);</pre>
+<p>Free all memory associated with an existing <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure.</p>
+<div class="refsect3">
+<a name="id-1.2.6.8.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>vendor</p></td>
+<td class="parameter_description"><p>pointer to <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure to be freed.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-vendor.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="lglVendor"></a><h3>struct lglVendor</h3>
+<pre class="programlisting">struct lglVendor {
+        gchar               *name;           /* Vendor name */
+        gchar               *url;            /* Vendor URL */
+};
+</pre>
 <p>
-Duplicates an existing <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure.
+This structure defines a vendor.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.2.6.9.2.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>orig</code></em> :</span></p></td>
-<td>
-<a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure to be duplicated.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglVendor.name"></a>name</code></em>;</p></td>
+<td class="struct_member_description"><p>Vendor name.  (e.g. "Avery")</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a pointer to a newly allocated <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure.</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglVendor.url"></a>url</code></em>;</p></td>
+<td class="struct_member_description"><p>URL to vendor website</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="lgl-vendor-free"></a><h3>lgl_vendor_free ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_vendor_free                     (<em class="parameter"><code><a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> *vendor</code></em>);</pre>
-<p>
-Free all memory associated with an existing <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>vendor</code></em> :</span></p></td>
-<td>pointer to <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure to be freed.</td>
-</tr></tbody>
-</table></div>
 </div>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 0476fb871080b0f87f359ee8ed6c2e533c3246d5..6b668cf605d503295aad56fbaee10f79111c8ef6 100644 (file)
@@ -2,30 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>XML Category Functions</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlabels 3.0 Reference Manual: XML Category Functions</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="up" href="ch02.html" title="Working Directly With LibGlabels XML">
 <link rel="prev" href="libglabels-3.0-xml-paper.html" title="XML Paper Functions">
 <link rel="next" href="libglabels-3.0-xml-template.html" title="XML Template Functions">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libglabels-3.0-xml-paper.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlabels 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglabels-3.0-xml-template.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libglabels-3.0-xml-category.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libglabels-3.0-xml-category.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-xml-category.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-xml-category.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libglabels-3.0-xml-paper.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglabels-3.0-xml-template.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="libglabels-3.0-xml-category"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <h2><span class="refentrytitle"><a name="libglabels-3.0-xml-category.top_of_page"></a>XML Category Functions</span></h2>
 <p>XML Category Functions — Functions to parse glabels XML category definition files</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="libglabels-3.0-xml-category.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libglabels/lgl-xml-category.h&gt;
-
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="libglabels-3.0-xml-category.html#lgl-xml-category-read-categories-from-file" title="lgl_xml_category_read_categories_from_file ()">lgl_xml_category_read_categories_from_file</a>
-                                                        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="libglabels-3.0-xml-category.html#lgl-xml-category-parse-categories-doc" title="lgl_xml_category_parse_categories_doc ()">lgl_xml_category_parse_categories_doc</a>
-                                                        (<em class="parameter"><code><span class="type">xmlDocPtr</span> categories_doc</code></em>);
-<a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *       <a class="link" href="libglabels-3.0-xml-category.html#lgl-xml-category-parse-category-node" title="lgl_xml_category_parse_category_node ()">lgl_xml_category_parse_category_node</a>
-                                                        (<em class="parameter"><code><span class="type">xmlNodePtr</span> category_node</code></em>);
+<div class="refsect1">
+<a name="libglabels-3.0-xml-category.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml-category.html#lgl-xml-category-read-categories-from-file" title="lgl_xml_category_read_categories_from_file ()">lgl_xml_category_read_categories_from_file</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml-category.html#lgl-xml-category-parse-categories-doc" title="lgl_xml_category_parse_categories_doc ()">lgl_xml_category_parse_categories_doc</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml-category.html#lgl-xml-category-parse-category-node" title="lgl_xml_category_parse_category_node ()">lgl_xml_category_parse_category_node</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-xml-category.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-xml-category.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;libglabels/lgl-xml-category.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -56,77 +85,96 @@ XML category definition files.
 </p>
 </div>
 <div class="refsect1">
-<a name="libglabels-3.0-xml-category.details"></a><h2>Details</h2>
+<a name="libglabels-3.0-xml-category.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="lgl-xml-category-read-categories-from-file"></a><h3>lgl_xml_category_read_categories_from_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             lgl_xml_category_read_categories_from_file
-                                                        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);</pre>
-<p>
-Read category definitions from a file.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>utf8_filename</code></em> :</span></p></td>
-<td>Filename of categories file (name encoded as UTF-8)</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a list of <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structures.</td>
-</tr>
-</tbody>
+<a name="lgl-xml-category-read-categories-from-file"></a><h3>lgl_xml_category_read_categories_from_file ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+lgl_xml_category_read_categories_from_file
+                               (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);</pre>
+<p>Read category definitions from a file.</p>
+<div class="refsect3">
+<a name="id-1.3.3.7.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>utf8_filename</p></td>
+<td class="parameter_description"><p>Filename of categories file (name encoded as UTF-8)</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.3.7.2.6"></a><h4>Returns</h4>
+<p> a list of <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structures.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-category-parse-categories-doc"></a><h3>lgl_xml_category_parse_categories_doc ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             lgl_xml_category_parse_categories_doc
-                                                        (<em class="parameter"><code><span class="type">xmlDocPtr</span> categories_doc</code></em>);</pre>
-<p>
-Read category definitions from a libxml <span class="type">xmlDocPtr</span> tree.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>categories_doc</code></em> :</span></p></td>
-<td>libxml <span class="type">xmlDocPtr</span> tree, representing a categories
-definition file.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a list of <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structures.</td>
-</tr>
-</tbody>
+<a name="lgl-xml-category-parse-categories-doc"></a><h3>lgl_xml_category_parse_categories_doc ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+lgl_xml_category_parse_categories_doc (<em class="parameter"><code><span class="type">xmlDocPtr</span> categories_doc</code></em>);</pre>
+<p>Read category definitions from a libxml <span class="type">xmlDocPtr</span> tree.</p>
+<div class="refsect3">
+<a name="id-1.3.3.7.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>categories_doc</p></td>
+<td class="parameter_description"><p>libxml <span class="type">xmlDocPtr</span> tree, representing a categories
+definition file.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.3.7.3.6"></a><h4>Returns</h4>
+<p> a list of <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structures.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-category-parse-category-node"></a><h3>lgl_xml_category_parse_category_node ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *       lgl_xml_category_parse_category_node
-                                                        (<em class="parameter"><code><span class="type">xmlNodePtr</span> category_node</code></em>);</pre>
-<p>
-Read a single category definition from a libxml <span class="type">xmlNodePtr</span> node.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>category_node</code></em> :</span></p></td>
-<td>libxml <span class="type">xmlNodePtr</span> category node from a <span class="type">xmlDocPtr</span> tree.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a pointer to a newly created <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure.</td>
-</tr>
-</tbody>
+<a name="lgl-xml-category-parse-category-node"></a><h3>lgl_xml_category_parse_category_node ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="returnvalue">lglCategory</span></a> *
+lgl_xml_category_parse_category_node (<em class="parameter"><code><span class="type">xmlNodePtr</span> category_node</code></em>);</pre>
+<p>Read a single category definition from a libxml <span class="type">xmlNodePtr</span> node.</p>
+<div class="refsect3">
+<a name="id-1.3.3.7.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>category_node</p></td>
+<td class="parameter_description"><p>libxml <span class="type">xmlNodePtr</span> category node from a <span class="type">xmlDocPtr</span> tree.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.3.7.4.6"></a><h4>Returns</h4>
+<p> a pointer to a newly created <a class="link" href="libglabels-3.0-category.html#lglCategory" title="struct lglCategory"><span class="type">lglCategory</span></a> structure.</p>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-xml-category.other_details"></a><h2>Types and Values</h2>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 523987506b5e2f1bf4693af5b746a12e0ae61734..c28c7e0481a965c49a8592e7a840da4e546f980c 100644 (file)
@@ -2,30 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>XML Paper Functions</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlabels 3.0 Reference Manual: XML Paper Functions</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="up" href="ch02.html" title="Working Directly With LibGlabels XML">
 <link rel="prev" href="ch02.html" title="Working Directly With LibGlabels XML">
 <link rel="next" href="libglabels-3.0-xml-category.html" title="XML Category Functions">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="ch02.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlabels 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglabels-3.0-xml-category.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libglabels-3.0-xml-paper.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libglabels-3.0-xml-paper.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-xml-paper.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-xml-paper.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="ch02.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglabels-3.0-xml-category.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="libglabels-3.0-xml-paper"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <h2><span class="refentrytitle"><a name="libglabels-3.0-xml-paper.top_of_page"></a>XML Paper Functions</span></h2>
 <p>XML Paper Functions — Functions to parse glabels XML paper definition files</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="libglabels-3.0-xml-paper.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libglabels/lgl-xml-paper.h&gt;
-
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="libglabels-3.0-xml-paper.html#lgl-xml-paper-read-papers-from-file" title="lgl_xml_paper_read_papers_from_file ()">lgl_xml_paper_read_papers_from_file</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="libglabels-3.0-xml-paper.html#lgl-xml-paper-parse-papers-doc" title="lgl_xml_paper_parse_papers_doc ()">lgl_xml_paper_parse_papers_doc</a>      (<em class="parameter"><code><span class="type">xmlDocPtr</span> papers_doc</code></em>);
-<a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *          <a class="link" href="libglabels-3.0-xml-paper.html#lgl-xml-paper-parse-paper-node" title="lgl_xml_paper_parse_paper_node ()">lgl_xml_paper_parse_paper_node</a>      (<em class="parameter"><code><span class="type">xmlNodePtr</span> paper_node</code></em>);
+<div class="refsect1">
+<a name="libglabels-3.0-xml-paper.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml-paper.html#lgl-xml-paper-read-papers-from-file" title="lgl_xml_paper_read_papers_from_file ()">lgl_xml_paper_read_papers_from_file</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml-paper.html#lgl-xml-paper-parse-papers-doc" title="lgl_xml_paper_parse_papers_doc ()">lgl_xml_paper_parse_papers_doc</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml-paper.html#lgl-xml-paper-parse-paper-node" title="lgl_xml_paper_parse_paper_node ()">lgl_xml_paper_parse_paper_node</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-xml-paper.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-xml-paper.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;libglabels/lgl-xml-paper.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -53,73 +85,94 @@ XML paper definition files.
 </p>
 </div>
 <div class="refsect1">
-<a name="libglabels-3.0-xml-paper.details"></a><h2>Details</h2>
+<a name="libglabels-3.0-xml-paper.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="lgl-xml-paper-read-papers-from-file"></a><h3>lgl_xml_paper_read_papers_from_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             lgl_xml_paper_read_papers_from_file (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);</pre>
-<p>
-Read paper definitions from a file.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>utf8_filename</code></em> :</span></p></td>
-<td>Filename of papers file (name encoded as UTF-8)</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a list of <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structures.</td>
-</tr>
-</tbody>
+<a name="lgl-xml-paper-read-papers-from-file"></a><h3>lgl_xml_paper_read_papers_from_file ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+lgl_xml_paper_read_papers_from_file (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);</pre>
+<p>Read paper definitions from a file.</p>
+<div class="refsect3">
+<a name="id-1.3.2.7.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>utf8_filename</p></td>
+<td class="parameter_description"><p>Filename of papers file (name encoded as UTF-8)</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.2.7.2.6"></a><h4>Returns</h4>
+<p> a list of <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structures.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-paper-parse-papers-doc"></a><h3>lgl_xml_paper_parse_papers_doc ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             lgl_xml_paper_parse_papers_doc      (<em class="parameter"><code><span class="type">xmlDocPtr</span> papers_doc</code></em>);</pre>
-<p>
-Read paper definitions from a libxml <span class="type">xmlDocPtr</span> tree.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>papers_doc</code></em> :</span></p></td>
-<td>libxml <span class="type">xmlDocPtr</span> tree, representing a papers definition file.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a list of <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structures.</td>
-</tr>
-</tbody>
+<a name="lgl-xml-paper-parse-papers-doc"></a><h3>lgl_xml_paper_parse_papers_doc ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+lgl_xml_paper_parse_papers_doc (<em class="parameter"><code><span class="type">xmlDocPtr</span> papers_doc</code></em>);</pre>
+<p>Read paper definitions from a libxml <span class="type">xmlDocPtr</span> tree.</p>
+<div class="refsect3">
+<a name="id-1.3.2.7.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>papers_doc</p></td>
+<td class="parameter_description"><p>libxml <span class="type">xmlDocPtr</span> tree, representing a papers definition file.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.2.7.3.6"></a><h4>Returns</h4>
+<p> a list of <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structures.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-paper-parse-paper-node"></a><h3>lgl_xml_paper_parse_paper_node ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *          lgl_xml_paper_parse_paper_node      (<em class="parameter"><code><span class="type">xmlNodePtr</span> paper_node</code></em>);</pre>
-<p>
-Read a single paper definition from a libxml <span class="type">xmlNodePtr</span> node.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>paper_node</code></em> :</span></p></td>
-<td>libxml <span class="type">xmlNodePtr</span> paper node from a <span class="type">xmlDocPtr</span> tree.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a pointer to a newly created <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure.</td>
-</tr>
-</tbody>
+<a name="lgl-xml-paper-parse-paper-node"></a><h3>lgl_xml_paper_parse_paper_node ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="returnvalue">lglPaper</span></a> *
+lgl_xml_paper_parse_paper_node (<em class="parameter"><code><span class="type">xmlNodePtr</span> paper_node</code></em>);</pre>
+<p>Read a single paper definition from a libxml <span class="type">xmlNodePtr</span> node.</p>
+<div class="refsect3">
+<a name="id-1.3.2.7.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>paper_node</p></td>
+<td class="parameter_description"><p>libxml <span class="type">xmlNodePtr</span> paper node from a <span class="type">xmlDocPtr</span> tree.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.2.7.4.6"></a><h4>Returns</h4>
+<p> a pointer to a newly created <a class="link" href="libglabels-3.0-paper.html#lglPaper" title="struct lglPaper"><span class="type">lglPaper</span></a> structure.</p>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-xml-paper.other_details"></a><h2>Types and Values</h2>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 84a09dfde72889ed6fae05f1fc6d8712b4722ecd..4a3e2698cd39f60f0cf7c8a435ed4b8136aad1af 100644 (file)
@@ -2,30 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>XML Template Functions</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlabels 3.0 Reference Manual: XML Template Functions</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="up" href="ch02.html" title="Working Directly With LibGlabels XML">
 <link rel="prev" href="libglabels-3.0-xml-category.html" title="XML Category Functions">
 <link rel="next" href="libglabels-3.0-xml-vendor.html" title="XML Vendor Functions">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libglabels-3.0-xml-category.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlabels 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglabels-3.0-xml-vendor.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libglabels-3.0-xml-template.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libglabels-3.0-xml-template.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-xml-template.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-xml-template.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libglabels-3.0-xml-category.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglabels-3.0-xml-vendor.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="libglabels-3.0-xml-template"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <h2><span class="refentrytitle"><a name="libglabels-3.0-xml-template.top_of_page"></a>XML Template Functions</span></h2>
 <p>XML Template Functions — Functions to create and parse glabels XML template nodes and files</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="libglabels-3.0-xml-template.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libglabels/lgl-xml-templates.h&gt;
-
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-xml-template.html#lgl-xml-template-read-templates-from-file" title="lgl_xml_template_read_templates_from_file ()">lgl_xml_template_read_templates_from_file</a>
-                                                        (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-xml-template.html#lgl-xml-template-parse-templates-doc" title="lgl_xml_template_parse_templates_doc ()">lgl_xml_template_parse_templates_doc</a>
-                                                        (<em class="parameter"><code>const <span class="type">xmlDocPtr</span> templates_doc</code></em>);
-<a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *       <a class="link" href="libglabels-3.0-xml-template.html#lgl-xml-template-parse-template-node" title="lgl_xml_template_parse_template_node ()">lgl_xml_template_parse_template_node</a>
-                                                        (<em class="parameter"><code>const <span class="type">xmlNodePtr</span> template_node</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                <a class="link" href="libglabels-3.0-xml-template.html#lgl-xml-template-write-templates-to-file" title="lgl_xml_template_write_templates_to_file ()">lgl_xml_template_write_templates_to_file</a>
-                                                        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *templates</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                <a class="link" href="libglabels-3.0-xml-template.html#lgl-xml-template-write-template-to-file" title="lgl_xml_template_write_template_to_file ()">lgl_xml_template_write_template_to_file</a>
-                                                        (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-xml-template.html#lgl-xml-template-create-template-node" title="lgl_xml_template_create_template_node ()">lgl_xml_template_create_template_node</a>
-                                                        (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
-                                                         <em class="parameter"><code><span class="type">xmlNodePtr</span> root</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">xmlNsPtr</span> ns</code></em>);
+<div class="refsect1">
+<a name="libglabels-3.0-xml-template.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml-template.html#lgl-xml-template-read-templates-from-file" title="lgl_xml_template_read_templates_from_file ()">lgl_xml_template_read_templates_from_file</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml-template.html#lgl-xml-template-parse-templates-doc" title="lgl_xml_template_parse_templates_doc ()">lgl_xml_template_parse_templates_doc</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml-template.html#lgl-xml-template-parse-template-node" title="lgl_xml_template_parse_template_node ()">lgl_xml_template_parse_template_node</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml-template.html#lgl-xml-template-write-templates-to-file" title="lgl_xml_template_write_templates_to_file ()">lgl_xml_template_write_templates_to_file</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml-template.html#lgl-xml-template-write-template-to-file" title="lgl_xml_template_write_template_to_file ()">lgl_xml_template_write_template_to_file</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml-template.html#lgl-xml-template-create-template-node" title="lgl_xml_template_create_template_node ()">lgl_xml_template_create_template_node</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-xml-template.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-xml-template.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;libglabels/lgl-xml-templates.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -67,149 +110,193 @@ template files and document files.
 </p>
 </div>
 <div class="refsect1">
-<a name="libglabels-3.0-xml-template.details"></a><h2>Details</h2>
+<a name="libglabels-3.0-xml-template.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="lgl-xml-template-read-templates-from-file"></a><h3>lgl_xml_template_read_templates_from_file ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_xml_template_read_templates_from_file
-                                                        (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);</pre>
-<p>
-Read glabels templates from template file.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-template-read-templates-from-file"></a><h3>lgl_xml_template_read_templates_from_file ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_xml_template_read_templates_from_file
+                               (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);</pre>
+<p>Read glabels templates from template file.</p>
+<div class="refsect3">
+<a name="id-1.3.4.7.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>utf8_filename</code></em> :</span></p></td>
-<td>Filename of papers file (name encoded as UTF-8)</td>
+<td class="parameter_name"><p>utf8_filename</p></td>
+<td class="parameter_description"><p>Filename of papers file (name encoded as UTF-8)</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-template-parse-templates-doc"></a><h3>lgl_xml_template_parse_templates_doc ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_xml_template_parse_templates_doc
-                                                        (<em class="parameter"><code>const <span class="type">xmlDocPtr</span> templates_doc</code></em>);</pre>
-<p>
-Read glabels templates from a libxml <span class="type">xmlDocPtr</span> tree.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-template-parse-templates-doc"></a><h3>lgl_xml_template_parse_templates_doc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_xml_template_parse_templates_doc (<em class="parameter"><code>const <span class="type">xmlDocPtr</span> templates_doc</code></em>);</pre>
+<p>Read glabels templates from a libxml <span class="type">xmlDocPtr</span> tree.</p>
+<div class="refsect3">
+<a name="id-1.3.4.7.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>templates_doc</code></em> :</span></p></td>
-<td>libxml <span class="type">xmlDocPtr</span> tree, representing template file.</td>
+<td class="parameter_name"><p>templates_doc</p></td>
+<td class="parameter_description"><p>libxml <span class="type">xmlDocPtr</span> tree, representing template file.</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-template-parse-template-node"></a><h3>lgl_xml_template_parse_template_node ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *       lgl_xml_template_parse_template_node
-                                                        (<em class="parameter"><code>const <span class="type">xmlNodePtr</span> template_node</code></em>);</pre>
-<p>
-Read a single glabels template from a libxml <span class="type">xmlNodePtr</span> node.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>template_node</code></em> :</span></p></td>
-<td>libxml <span class="type">xmlNodePtr</span> template node from a <span class="type">xmlDocPtr</span> tree.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a pointer to a newly created <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structure.</td>
-</tr>
-</tbody>
+<a name="lgl-xml-template-parse-template-node"></a><h3>lgl_xml_template_parse_template_node ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="returnvalue">lglTemplate</span></a> *
+lgl_xml_template_parse_template_node (<em class="parameter"><code>const <span class="type">xmlNodePtr</span> template_node</code></em>);</pre>
+<p>Read a single glabels template from a libxml <span class="type">xmlNodePtr</span> node.</p>
+<div class="refsect3">
+<a name="id-1.3.4.7.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>template_node</p></td>
+<td class="parameter_description"><p>libxml <span class="type">xmlNodePtr</span> template node from a <span class="type">xmlDocPtr</span> tree.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.4.7.4.6"></a><h4>Returns</h4>
+<p> a pointer to a newly created <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structure.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-template-write-templates-to-file"></a><h3>lgl_xml_template_write_templates_to_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                lgl_xml_template_write_templates_to_file
-                                                        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *templates</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);</pre>
-<p>
-Write a list of <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structures to a glabels XML template file.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-template-write-templates-to-file"></a><h3>lgl_xml_template_write_templates_to_file ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+lgl_xml_template_write_templates_to_file
+                               (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *templates</code></em>,
+                                <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);</pre>
+<p>Write a list of <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structures to a glabels XML template file.</p>
+<div class="refsect3">
+<a name="id-1.3.4.7.5.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>templates</code></em> :</span></p></td>
-<td>List of <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structures</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>utf8_filename</code></em> :</span></p></td>
-<td>Filename of templates file (name encoded as UTF-8)</td>
+<td class="parameter_name"><p>templates</p></td>
+<td class="parameter_description"><p>List of <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structures</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the number of bytes written or -1 in case of failure</td>
+<td class="parameter_name"><p>utf8_filename</p></td>
+<td class="parameter_description"><p>Filename of templates file (name encoded as UTF-8)</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.4.7.5.6"></a><h4>Returns</h4>
+<p> the number of bytes written or -1 in case of failure</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-template-write-template-to-file"></a><h3>lgl_xml_template_write_template_to_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                lgl_xml_template_write_template_to_file
-                                                        (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);</pre>
-<p>
-Write a single <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structures to a glabels XML template file.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-template-write-template-to-file"></a><h3>lgl_xml_template_write_template_to_file ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+lgl_xml_template_write_template_to_file
+                               (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
+                                <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);</pre>
+<p>Write a single <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structures to a glabels XML template file.</p>
+<div class="refsect3">
+<a name="id-1.3.4.7.6.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>template</code></em> :</span></p></td>
-<td>
-<a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structure to be written</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>utf8_filename</code></em> :</span></p></td>
-<td>Filename of templates file (name encoded as UTF-8)</td>
+<td class="parameter_name"><p>template</p></td>
+<td class="parameter_description"><p><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structure to be written</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the number of bytes written or -1 in case of failure</td>
+<td class="parameter_name"><p>utf8_filename</p></td>
+<td class="parameter_description"><p>Filename of templates file (name encoded as UTF-8)</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.4.7.6.6"></a><h4>Returns</h4>
+<p> the number of bytes written or -1 in case of failure</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-template-create-template-node"></a><h3>lgl_xml_template_create_template_node ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_xml_template_create_template_node
-                                                        (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
-                                                         <em class="parameter"><code><span class="type">xmlNodePtr</span> root</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">xmlNsPtr</span> ns</code></em>);</pre>
-<p>
-Add a single <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> child node to given <span class="type">xmlNodePtr</span>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-template-create-template-node"></a><h3>lgl_xml_template_create_template_node ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_xml_template_create_template_node (<em class="parameter"><code>const <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> *template</code></em>,
+                                       <em class="parameter"><code><span class="type">xmlNodePtr</span> root</code></em>,
+                                       <em class="parameter"><code>const <span class="type">xmlNsPtr</span> ns</code></em>);</pre>
+<p>Add a single <a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> child node to given <span class="type">xmlNodePtr</span>.</p>
+<div class="refsect3">
+<a name="id-1.3.4.7.7.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>template</code></em> :</span></p></td>
-<td>
-<a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structure to be written</td>
+<td class="parameter_name"><p>template</p></td>
+<td class="parameter_description"><p><a class="link" href="libglabels-3.0-template.html#lglTemplate" title="struct lglTemplate"><span class="type">lglTemplate</span></a> structure to be written</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>root</code></em> :</span></p></td>
-<td>parent node to receive new child node</td>
+<td class="parameter_name"><p>root</p></td>
+<td class="parameter_description"><p>parent node to receive new child node</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>ns</code></em> :</span></p></td>
-<td>a libxml <span class="type">xmlNsPtr</span>
-</td>
+<td class="parameter_name"><p>ns</p></td>
+<td class="parameter_description"><p>a libxml <span class="type">xmlNsPtr</span></p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
 </div>
+<div class="refsect1">
+<a name="libglabels-3.0-xml-template.other_details"></a><h2>Types and Values</h2>
+</div>
+</div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 3572b17a98604f79d0b4129741be9eb314f32872..535e92748ff6ad182b32778e5c8ab7c8c06e15c5 100644 (file)
@@ -2,30 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>XML Vendor Functions</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlabels 3.0 Reference Manual: XML Vendor Functions</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="up" href="ch02.html" title="Working Directly With LibGlabels XML">
 <link rel="prev" href="libglabels-3.0-xml-template.html" title="XML Template Functions">
 <link rel="next" href="libglabels-3.0-xml.html" title="XML Helper Functions">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libglabels-3.0-xml-template.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlabels 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglabels-3.0-xml.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libglabels-3.0-xml-vendor.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libglabels-3.0-xml-vendor.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-xml-vendor.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-xml-vendor.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libglabels-3.0-xml-template.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglabels-3.0-xml.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="libglabels-3.0-xml-vendor"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <h2><span class="refentrytitle"><a name="libglabels-3.0-xml-vendor.top_of_page"></a>XML Vendor Functions</span></h2>
 <p>XML Vendor Functions — Functions to parse glabels XML vendor descriptions</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="libglabels-3.0-xml-vendor.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libglabels/lgl-xml-vendor.h&gt;
-
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="libglabels-3.0-xml-vendor.html#lgl-xml-vendor-read-vendors-from-file" title="lgl_xml_vendor_read_vendors_from_file ()">lgl_xml_vendor_read_vendors_from_file</a>
-                                                        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             <a class="link" href="libglabels-3.0-xml-vendor.html#lgl-xml-vendor-parse-vendors-doc" title="lgl_xml_vendor_parse_vendors_doc ()">lgl_xml_vendor_parse_vendors_doc</a>    (<em class="parameter"><code><span class="type">xmlDocPtr</span> vendors_doc</code></em>);
-<a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="returnvalue">lglVendor</span></a> *         <a class="link" href="libglabels-3.0-xml-vendor.html#lgl-xml-vendor-parse-vendor-node" title="lgl_xml_vendor_parse_vendor_node ()">lgl_xml_vendor_parse_vendor_node</a>    (<em class="parameter"><code><span class="type">xmlNodePtr</span> vendor_node</code></em>);
+<div class="refsect1">
+<a name="libglabels-3.0-xml-vendor.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml-vendor.html#lgl-xml-vendor-read-vendors-from-file" title="lgl_xml_vendor_read_vendors_from_file ()">lgl_xml_vendor_read_vendors_from_file</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml-vendor.html#lgl-xml-vendor-parse-vendors-doc" title="lgl_xml_vendor_parse_vendors_doc ()">lgl_xml_vendor_parse_vendors_doc</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="returnvalue">lglVendor</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml-vendor.html#lgl-xml-vendor-parse-vendor-node" title="lgl_xml_vendor_parse_vendor_node ()">lgl_xml_vendor_parse_vendor_node</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-xml-vendor.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-xml-vendor.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;libglabels/lgl-xml-vendor.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -53,74 +84,94 @@ This section describes several functions for parsing vendor XML description file
 </p>
 </div>
 <div class="refsect1">
-<a name="libglabels-3.0-xml-vendor.details"></a><h2>Details</h2>
+<a name="libglabels-3.0-xml-vendor.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="lgl-xml-vendor-read-vendors-from-file"></a><h3>lgl_xml_vendor_read_vendors_from_file ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             lgl_xml_vendor_read_vendors_from_file
-                                                        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);</pre>
-<p>
-Read vendor definitions from a file.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>utf8_filename</code></em> :</span></p></td>
-<td>Filename of vendors file (name encoded as UTF-8)</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a list of <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structures.</td>
-</tr>
-</tbody>
+<a name="lgl-xml-vendor-read-vendors-from-file"></a><h3>lgl_xml_vendor_read_vendors_from_file ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+lgl_xml_vendor_read_vendors_from_file (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *utf8_filename</code></em>);</pre>
+<p>Read vendor definitions from a file.</p>
+<div class="refsect3">
+<a name="id-1.3.5.7.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>utf8_filename</p></td>
+<td class="parameter_description"><p>Filename of vendors file (name encoded as UTF-8)</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.5.7.2.6"></a><h4>Returns</h4>
+<p> a list of <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structures.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-vendor-parse-vendors-doc"></a><h3>lgl_xml_vendor_parse_vendors_doc ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *             lgl_xml_vendor_parse_vendors_doc    (<em class="parameter"><code><span class="type">xmlDocPtr</span> vendors_doc</code></em>);</pre>
-<p>
-Read vendor definitions from a libxml <span class="type">xmlDocPtr</span> tree.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>vendors_doc</code></em> :</span></p></td>
-<td>libxml <span class="type">xmlDocPtr</span> tree, representing a vendors definition file.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a list of <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structures.</td>
-</tr>
-</tbody>
+<a name="lgl-xml-vendor-parse-vendors-doc"></a><h3>lgl_xml_vendor_parse_vendors_doc ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+lgl_xml_vendor_parse_vendors_doc (<em class="parameter"><code><span class="type">xmlDocPtr</span> vendors_doc</code></em>);</pre>
+<p>Read vendor definitions from a libxml <span class="type">xmlDocPtr</span> tree.</p>
+<div class="refsect3">
+<a name="id-1.3.5.7.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>vendors_doc</p></td>
+<td class="parameter_description"><p>libxml <span class="type">xmlDocPtr</span> tree, representing a vendors definition file.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.5.7.3.6"></a><h4>Returns</h4>
+<p> a list of <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structures.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-vendor-parse-vendor-node"></a><h3>lgl_xml_vendor_parse_vendor_node ()</h3>
-<pre class="programlisting"><a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="returnvalue">lglVendor</span></a> *         lgl_xml_vendor_parse_vendor_node    (<em class="parameter"><code><span class="type">xmlNodePtr</span> vendor_node</code></em>);</pre>
-<p>
-Read a single vendor definition from a libxml <span class="type">xmlNodePtr</span> node.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>vendor_node</code></em> :</span></p></td>
-<td>libxml <span class="type">xmlNodePtr</span> vendor node from a <span class="type">xmlDocPtr</span> tree.</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a pointer to a newly created <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure.</td>
-</tr>
-</tbody>
+<a name="lgl-xml-vendor-parse-vendor-node"></a><h3>lgl_xml_vendor_parse_vendor_node ()</h3>
+<pre class="programlisting"><a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="returnvalue">lglVendor</span></a> *
+lgl_xml_vendor_parse_vendor_node (<em class="parameter"><code><span class="type">xmlNodePtr</span> vendor_node</code></em>);</pre>
+<p>Read a single vendor definition from a libxml <span class="type">xmlNodePtr</span> node.</p>
+<div class="refsect3">
+<a name="id-1.3.5.7.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>vendor_node</p></td>
+<td class="parameter_description"><p>libxml <span class="type">xmlNodePtr</span> vendor node from a <span class="type">xmlDocPtr</span> tree.</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.5.7.4.6"></a><h4>Returns</h4>
+<p> a pointer to a newly created <a class="link" href="libglabels-3.0-vendor.html#lglVendor" title="struct lglVendor"><span class="type">lglVendor</span></a> structure.</p>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-xml-vendor.other_details"></a><h2>Types and Values</h2>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index e9f46890befad2a78fa9cd09830d8f2edc40bfb0..f4b04aece48aca05cf21bec1d26611e62a67947a 100644 (file)
@@ -2,30 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>XML Helper Functions</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlabels 3.0 Reference Manual: XML Helper Functions</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlabels 3.0 Reference Manual">
 <link rel="up" href="ch02.html" title="Working Directly With LibGlabels XML">
 <link rel="prev" href="libglabels-3.0-xml-vendor.html" title="XML Vendor Functions">
 <link rel="next" href="ch03.html" title="Miscellaneous">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libglabels-3.0-xml-vendor.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlabels 3.0 Reference Manual</th>
-<td><a accesskey="n" href="ch03.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libglabels-3.0-xml.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libglabels-3.0-xml.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-xml.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+                  <a href="#libglabels-3.0-xml.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libglabels-3.0-xml-vendor.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="ch03.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="libglabels-3.0-xml"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <h2><span class="refentrytitle"><a name="libglabels-3.0-xml.top_of_page"></a>XML Helper Functions</span></h2>
 <p>XML Helper Functions — Functions to help format and parse glabels XML properties</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="libglabels-3.0-xml.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libglabels/lgl-xml.h&gt;
-
-#define             <a class="link" href="libglabels-3.0-xml.html#LGL-XML-NAME-SPACE:CAPS" title="LGL_XML_NAME_SPACE">LGL_XML_NAME_SPACE</a>
-
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="libglabels-3.0-xml.html#lgl-xml-get-prop-string" title="lgl_xml_get_prop_string ()">lgl_xml_get_prop_string</a>             (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *default_val</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="libglabels-3.0-xml.html#lgl-xml-get-prop-i18n-string" title="lgl_xml_get_prop_i18n_string ()">lgl_xml_get_prop_i18n_string</a>        (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *default_val</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>             <a class="link" href="libglabels-3.0-xml.html#lgl-xml-get-prop-double" title="lgl_xml_get_prop_double ()">lgl_xml_get_prop_double</a>             (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> default_val</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libglabels-3.0-xml.html#lgl-xml-get-prop-boolean" title="lgl_xml_get_prop_boolean ()">lgl_xml_get_prop_boolean</a>            (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> default_val</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                <a class="link" href="libglabels-3.0-xml.html#lgl-xml-get-prop-int" title="lgl_xml_get_prop_int ()">lgl_xml_get_prop_int</a>                (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> default_val</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               <a class="link" href="libglabels-3.0-xml.html#lgl-xml-get-prop-uint" title="lgl_xml_get_prop_uint ()">lgl_xml_get_prop_uint</a>               (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> default_val</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>             <a class="link" href="libglabels-3.0-xml.html#lgl-xml-get-prop-length" title="lgl_xml_get_prop_length ()">lgl_xml_get_prop_length</a>             (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> default_val</code></em>);
-
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-prop-string" title="lgl_xml_set_prop_string ()">lgl_xml_set_prop_string</a>             (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *val</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-prop-double" title="lgl_xml_set_prop_double ()">lgl_xml_set_prop_double</a>             (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> val</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-prop-boolean" title="lgl_xml_set_prop_boolean ()">lgl_xml_set_prop_boolean</a>            (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> val</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-prop-int" title="lgl_xml_set_prop_int ()">lgl_xml_set_prop_int</a>                (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> val</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-prop-uint-hex" title="lgl_xml_set_prop_uint_hex ()">lgl_xml_set_prop_uint_hex</a>           (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> val</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-prop-length" title="lgl_xml_set_prop_length ()">lgl_xml_set_prop_length</a>             (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> val</code></em>);
-
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libglabels-3.0-xml.html#lgl-xml-is-node" title="lgl_xml_is_node ()">lgl_xml_is_node</a>                     (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="libglabels-3.0-xml.html#lgl-xml-get-node-content" title="lgl_xml_get_node_content ()">lgl_xml_get_node_content</a>            (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>);
-
-<span class="returnvalue">void</span>                <a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-default-units" title="lgl_xml_set_default_units ()">lgl_xml_set_default_units</a>           (<em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);
+<div class="refsect1">
+<a name="libglabels-3.0-xml.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-get-prop-string" title="lgl_xml_get_prop_string ()">lgl_xml_get_prop_string</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-get-prop-i18n-string" title="lgl_xml_get_prop_i18n_string ()">lgl_xml_get_prop_i18n_string</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-get-prop-double" title="lgl_xml_get_prop_double ()">lgl_xml_get_prop_double</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-get-prop-boolean" title="lgl_xml_get_prop_boolean ()">lgl_xml_get_prop_boolean</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-get-prop-int" title="lgl_xml_get_prop_int ()">lgl_xml_get_prop_int</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-get-prop-uint" title="lgl_xml_get_prop_uint ()">lgl_xml_get_prop_uint</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-get-prop-length" title="lgl_xml_get_prop_length ()">lgl_xml_get_prop_length</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-prop-string" title="lgl_xml_set_prop_string ()">lgl_xml_set_prop_string</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-prop-double" title="lgl_xml_set_prop_double ()">lgl_xml_set_prop_double</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-prop-boolean" title="lgl_xml_set_prop_boolean ()">lgl_xml_set_prop_boolean</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-prop-int" title="lgl_xml_set_prop_int ()">lgl_xml_set_prop_int</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-prop-uint-hex" title="lgl_xml_set_prop_uint_hex ()">lgl_xml_set_prop_uint_hex</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-prop-length" title="lgl_xml_set_prop_length ()">lgl_xml_set_prop_length</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-is-node" title="lgl_xml_is_node ()">lgl_xml_is_node</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-get-node-content" title="lgl_xml_get_node_content ()">lgl_xml_get_node_content</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-default-units" title="lgl_xml_set_default_units ()">lgl_xml_set_default_units</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-xml.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody><tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libglabels-3.0-xml.html#LGL-XML-NAME-SPACE:CAPS" title="LGL_XML_NAME_SPACE">LGL_XML_NAME_SPACE</a></td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-xml.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglabels-3.0-xml.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;libglabels/lgl-xml.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -101,471 +205,619 @@ These functions are basically wrappers to functions from libxml2.
 </p>
 </div>
 <div class="refsect1">
-<a name="libglabels-3.0-xml.details"></a><h2>Details</h2>
+<a name="libglabels-3.0-xml.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="LGL-XML-NAME-SPACE:CAPS"></a><h3>LGL_XML_NAME_SPACE</h3>
-<pre class="programlisting">#define LGL_XML_NAME_SPACE "http://glabels.org/xmlns/3.0/"
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-xml-get-prop-string"></a><h3>lgl_xml_get_prop_string ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             lgl_xml_get_prop_string             (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *default_val</code></em>);</pre>
-<p>
-Return value of property as a string.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-get-prop-string"></a><h3>lgl_xml_get_prop_string ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+lgl_xml_get_prop_string (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
+                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *default_val</code></em>);</pre>
+<p>Return value of property as a string.</p>
+<div class="refsect3">
+<a name="id-1.3.6.8.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>the libxml2 <span class="type">xmlNodePtr</span> of the node</td>
+<td class="parameter_name"><p>node</p></td>
+<td class="parameter_description"><p>the libxml2 <span class="type">xmlNodePtr</span> of the node</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>the property name</td>
+<td class="parameter_name"><p>property</p></td>
+<td class="parameter_description"><p>the property name</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>default_val</code></em> :</span></p></td>
-<td>a default value to return if property not found</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the property as a pointer to a gchar string.  This string should
-be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>.</td>
+<td class="parameter_name"><p>default_val</p></td>
+<td class="parameter_description"><p>a default value to return if property not found</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.6.8.2.6"></a><h4>Returns</h4>
+<p> the property as a pointer to a gchar string.  This string should
+be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-get-prop-i18n-string"></a><h3>lgl_xml_get_prop_i18n_string ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             lgl_xml_get_prop_i18n_string        (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *default_val</code></em>);</pre>
-<p>
-Return value of a translatable property as a string.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-get-prop-i18n-string"></a><h3>lgl_xml_get_prop_i18n_string ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+lgl_xml_get_prop_i18n_string (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
+                              <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                              <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *default_val</code></em>);</pre>
+<p>Return value of a translatable property as a string.</p>
+<div class="refsect3">
+<a name="id-1.3.6.8.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>the libxml2 <span class="type">xmlNodePtr</span> of the node</td>
+<td class="parameter_name"><p>node</p></td>
+<td class="parameter_description"><p>the libxml2 <span class="type">xmlNodePtr</span> of the node</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>the property name</td>
+<td class="parameter_name"><p>property</p></td>
+<td class="parameter_description"><p>the property name</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>default_val</code></em> :</span></p></td>
-<td>a default value to return if property not found</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the property as a pointer to a gchar string.  This string should
-be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>.</td>
+<td class="parameter_name"><p>default_val</p></td>
+<td class="parameter_description"><p>a default value to return if property not found</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.6.8.3.6"></a><h4>Returns</h4>
+<p> the property as a pointer to a gchar string.  This string should
+be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-get-prop-double"></a><h3>lgl_xml_get_prop_double ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>             lgl_xml_get_prop_double             (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> default_val</code></em>);</pre>
-<p>
-Return value of property as a double.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-get-prop-double"></a><h3>lgl_xml_get_prop_double ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>
+lgl_xml_get_prop_double (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
+                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> default_val</code></em>);</pre>
+<p>Return value of property as a double.</p>
+<div class="refsect3">
+<a name="id-1.3.6.8.4.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>the libxml2 <span class="type">xmlNodePtr</span> of the node</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>the property name</td>
+<td class="parameter_name"><p>node</p></td>
+<td class="parameter_description"><p>the libxml2 <span class="type">xmlNodePtr</span> of the node</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>default_val</code></em> :</span></p></td>
-<td>a default value to return if property not found</td>
+<td class="parameter_name"><p>property</p></td>
+<td class="parameter_description"><p>the property name</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the property as a double.</td>
+<td class="parameter_name"><p>default_val</p></td>
+<td class="parameter_description"><p>a default value to return if property not found</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.6.8.4.6"></a><h4>Returns</h4>
+<p> the property as a double.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-get-prop-boolean"></a><h3>lgl_xml_get_prop_boolean ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            lgl_xml_get_prop_boolean            (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> default_val</code></em>);</pre>
-<p>
-Return value of property as a boolean.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-get-prop-boolean"></a><h3>lgl_xml_get_prop_boolean ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+lgl_xml_get_prop_boolean (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
+                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> default_val</code></em>);</pre>
+<p>Return value of property as a boolean.</p>
+<div class="refsect3">
+<a name="id-1.3.6.8.5.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>the libxml2 <span class="type">xmlNodePtr</span> of the node</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>the property name</td>
+<td class="parameter_name"><p>node</p></td>
+<td class="parameter_description"><p>the libxml2 <span class="type">xmlNodePtr</span> of the node</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>default_val</code></em> :</span></p></td>
-<td>a default value to return if property not found</td>
+<td class="parameter_name"><p>property</p></td>
+<td class="parameter_description"><p>the property name</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the property as a boolean.</td>
+<td class="parameter_name"><p>default_val</p></td>
+<td class="parameter_description"><p>a default value to return if property not found</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.6.8.5.6"></a><h4>Returns</h4>
+<p> the property as a boolean.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-get-prop-int"></a><h3>lgl_xml_get_prop_int ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>                lgl_xml_get_prop_int                (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> default_val</code></em>);</pre>
-<p>
-Return value of property as an integer.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-get-prop-int"></a><h3>lgl_xml_get_prop_int ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+lgl_xml_get_prop_int (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
+                      <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                      <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> default_val</code></em>);</pre>
+<p>Return value of property as an integer.</p>
+<div class="refsect3">
+<a name="id-1.3.6.8.6.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>the libxml2 <span class="type">xmlNodePtr</span> of the node</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>the property name</td>
+<td class="parameter_name"><p>node</p></td>
+<td class="parameter_description"><p>the libxml2 <span class="type">xmlNodePtr</span> of the node</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>default_val</code></em> :</span></p></td>
-<td>a default value to return if property not found</td>
+<td class="parameter_name"><p>property</p></td>
+<td class="parameter_description"><p>the property name</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the property as an integer.</td>
+<td class="parameter_name"><p>default_val</p></td>
+<td class="parameter_description"><p>a default value to return if property not found</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.6.8.6.6"></a><h4>Returns</h4>
+<p> the property as an integer.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-get-prop-uint"></a><h3>lgl_xml_get_prop_uint ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>               lgl_xml_get_prop_uint               (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> default_val</code></em>);</pre>
-<p>
-Return value of property (usually formatted in hex) as an unsigned integer.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-get-prop-uint"></a><h3>lgl_xml_get_prop_uint ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
+lgl_xml_get_prop_uint (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
+                       <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                       <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> default_val</code></em>);</pre>
+<p>Return value of property (usually formatted in hex) as an unsigned integer.</p>
+<div class="refsect3">
+<a name="id-1.3.6.8.7.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>the libxml2 <span class="type">xmlNodePtr</span> of the node</td>
+<td class="parameter_name"><p>node</p></td>
+<td class="parameter_description"><p>the libxml2 <span class="type">xmlNodePtr</span> of the node</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>the property name</td>
+<td class="parameter_name"><p>property</p></td>
+<td class="parameter_description"><p>the property name</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>default_val</code></em> :</span></p></td>
-<td>a default value to return if property not found</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the property as an unsigned integer.</td>
+<td class="parameter_name"><p>default_val</p></td>
+<td class="parameter_description"><p>a default value to return if property not found</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.6.8.7.6"></a><h4>Returns</h4>
+<p> the property as an unsigned integer.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-get-prop-length"></a><h3>lgl_xml_get_prop_length ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>             lgl_xml_get_prop_length             (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> default_val</code></em>);</pre>
-<p>
-Return value of a length property as a double, converting to internal
+<a name="lgl-xml-get-prop-length"></a><h3>lgl_xml_get_prop_length ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="returnvalue">gdouble</span></a>
+lgl_xml_get_prop_length (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
+                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> default_val</code></em>);</pre>
+<p>Return value of a length property as a double, converting to internal
 units (points).  The property is expected to be formatted as a number
 followed by a units string.  If there is no units string, the length
 is assumed to be in points.  Valid units strings are "pt" for points,
 "in" for inches, "mm" for millimeters, "cm" for centimeters, and
-"pc" for picas.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+"pc" for picas.</p>
+<div class="refsect3">
+<a name="id-1.3.6.8.8.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>the libxml2 <span class="type">xmlNodePtr</span> of the node</td>
+<td class="parameter_name"><p>node</p></td>
+<td class="parameter_description"><p>the libxml2 <span class="type">xmlNodePtr</span> of the node</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>the property name</td>
+<td class="parameter_name"><p>property</p></td>
+<td class="parameter_description"><p>the property name</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>default_val</code></em> :</span></p></td>
-<td>a default value to return if property not found</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the length in points.</td>
+<td class="parameter_name"><p>default_val</p></td>
+<td class="parameter_description"><p>a default value to return if property not found</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.6.8.8.6"></a><h4>Returns</h4>
+<p> the length in points.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-set-prop-string"></a><h3>lgl_xml_set_prop_string ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_xml_set_prop_string             (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *val</code></em>);</pre>
-<p>
-Set a property from a string.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-set-prop-string"></a><h3>lgl_xml_set_prop_string ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_xml_set_prop_string (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
+                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *val</code></em>);</pre>
+<p>Set a property from a string.</p>
+<div class="refsect3">
+<a name="id-1.3.6.8.9.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>the libxml2 <span class="type">xmlNodePtr</span> of the node</td>
+<td class="parameter_name"><p>node</p></td>
+<td class="parameter_description"><p>the libxml2 <span class="type">xmlNodePtr</span> of the node</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>the property name</td>
+<td class="parameter_name"><p>property</p></td>
+<td class="parameter_description"><p>the property name</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>the value to set</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>the value to set</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-set-prop-double"></a><h3>lgl_xml_set_prop_double ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_xml_set_prop_double             (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> val</code></em>);</pre>
-<p>
-Set a property from a double.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-set-prop-double"></a><h3>lgl_xml_set_prop_double ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_xml_set_prop_double (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
+                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> val</code></em>);</pre>
+<p>Set a property from a double.</p>
+<div class="refsect3">
+<a name="id-1.3.6.8.10.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>the libxml2 <span class="type">xmlNodePtr</span> of the node</td>
+<td class="parameter_name"><p>node</p></td>
+<td class="parameter_description"><p>the libxml2 <span class="type">xmlNodePtr</span> of the node</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>the property name</td>
+<td class="parameter_name"><p>property</p></td>
+<td class="parameter_description"><p>the property name</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>the value to set</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>the value to set</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-set-prop-boolean"></a><h3>lgl_xml_set_prop_boolean ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_xml_set_prop_boolean            (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> val</code></em>);</pre>
-<p>
-Set a property from a boolean.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-set-prop-boolean"></a><h3>lgl_xml_set_prop_boolean ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_xml_set_prop_boolean (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
+                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> val</code></em>);</pre>
+<p>Set a property from a boolean.</p>
+<div class="refsect3">
+<a name="id-1.3.6.8.11.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>the libxml2 <span class="type">xmlNodePtr</span> of the node</td>
+<td class="parameter_name"><p>node</p></td>
+<td class="parameter_description"><p>the libxml2 <span class="type">xmlNodePtr</span> of the node</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>the property name</td>
+<td class="parameter_name"><p>property</p></td>
+<td class="parameter_description"><p>the property name</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>the value to set</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>the value to set</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-set-prop-int"></a><h3>lgl_xml_set_prop_int ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_xml_set_prop_int                (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> val</code></em>);</pre>
-<p>
-Set a property from an integer.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-set-prop-int"></a><h3>lgl_xml_set_prop_int ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_xml_set_prop_int (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
+                      <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                      <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> val</code></em>);</pre>
+<p>Set a property from an integer.</p>
+<div class="refsect3">
+<a name="id-1.3.6.8.12.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>the libxml2 <span class="type">xmlNodePtr</span> of the node</td>
+<td class="parameter_name"><p>node</p></td>
+<td class="parameter_description"><p>the libxml2 <span class="type">xmlNodePtr</span> of the node</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>the property name</td>
+<td class="parameter_name"><p>property</p></td>
+<td class="parameter_description"><p>the property name</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>the value to set</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>the value to set</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-set-prop-uint-hex"></a><h3>lgl_xml_set_prop_uint_hex ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_xml_set_prop_uint_hex           (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> val</code></em>);</pre>
-<p>
-Set a property from an unsigned integer and format in hex.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-set-prop-uint-hex"></a><h3>lgl_xml_set_prop_uint_hex ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_xml_set_prop_uint_hex (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
+                           <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                           <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> val</code></em>);</pre>
+<p>Set a property from an unsigned integer and format in hex.</p>
+<div class="refsect3">
+<a name="id-1.3.6.8.13.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>the libxml2 <span class="type">xmlNodePtr</span> of the node</td>
+<td class="parameter_name"><p>node</p></td>
+<td class="parameter_description"><p>the libxml2 <span class="type">xmlNodePtr</span> of the node</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>the property name</td>
+<td class="parameter_name"><p>property</p></td>
+<td class="parameter_description"><p>the property name</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>the value to set</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>the value to set</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-set-prop-length"></a><h3>lgl_xml_set_prop_length ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_xml_set_prop_length             (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> val</code></em>);</pre>
-<p>
-Set a property from a length, performing any necessary conversion.
+<a name="lgl-xml-set-prop-length"></a><h3>lgl_xml_set_prop_length ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_xml_set_prop_length (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
+                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property</code></em>,
+                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> val</code></em>);</pre>
+<p>Set a property from a length, performing any necessary conversion.
 Length properties are formatted as a number followed by a units string.
 The units of the formatted property is determined by the most recent call to
-<a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-default-units" title="lgl_xml_set_default_units ()"><code class="function">lgl_xml_set_default_units()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-default-units" title="lgl_xml_set_default_units ()"><code class="function">lgl_xml_set_default_units()</code></a>.</p>
+<div class="refsect3">
+<a name="id-1.3.6.8.14.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>the libxml2 <span class="type">xmlNodePtr</span> of the node</td>
+<td class="parameter_name"><p>node</p></td>
+<td class="parameter_description"><p>the libxml2 <span class="type">xmlNodePtr</span> of the node</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>the property name</td>
+<td class="parameter_name"><p>property</p></td>
+<td class="parameter_description"><p>the property name</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>the length to set in internal units (points)</td>
+<td class="parameter_name"><p>val</p></td>
+<td class="parameter_description"><p>the length to set in internal units (points)</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-is-node"></a><h3>lgl_xml_is_node ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            lgl_xml_is_node                     (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
-<p>
-Test if a node name matches given name.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-is-node"></a><h3>lgl_xml_is_node ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+lgl_xml_is_node (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>,
+                 <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+<p>Test if a node name matches given name.</p>
+<div class="refsect3">
+<a name="id-1.3.6.8.15.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>the libxml2 <span class="type">xmlNodePtr</span> of the node</td>
+<td class="parameter_name"><p>node</p></td>
+<td class="parameter_description"><p>the libxml2 <span class="type">xmlNodePtr</span> of the node</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>the node name</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>TRUE if the name of the node matches.  Otherwise FALSE.</td>
+<td class="parameter_name"><p>name</p></td>
+<td class="parameter_description"><p>the node name</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.6.8.15.6"></a><h4>Returns</h4>
+<p> TRUE if the name of the node matches.  Otherwise FALSE.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-get-node-content"></a><h3>lgl_xml_get_node_content ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             lgl_xml_get_node_content            (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>);</pre>
-<p>
-Get the content of a node.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>node</code></em> :</span></p></td>
-<td>the libxml2 <span class="type">xmlNodePtr</span> of the node</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the property as a pointer to a gchar string.  This string should
-be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>.</td>
-</tr>
-</tbody>
+<a name="lgl-xml-get-node-content"></a><h3>lgl_xml_get_node_content ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+lgl_xml_get_node_content (<em class="parameter"><code><span class="type">xmlNodePtr</span> node</code></em>);</pre>
+<p>Get the content of a node.</p>
+<div class="refsect3">
+<a name="id-1.3.6.8.16.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>node</p></td>
+<td class="parameter_description"><p>the libxml2 <span class="type">xmlNodePtr</span> of the node</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.6.8.16.6"></a><h4>Returns</h4>
+<p> the property as a pointer to a gchar string.  This string should
+be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>.</p>
+<p></p>
+</div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-xml-set-default-units"></a><h3>lgl_xml_set_default_units ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_xml_set_default_units           (<em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);</pre>
-<p>
-Set the default units when formatting lengths.  See
-<a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-prop-length" title="lgl_xml_set_prop_length ()"><code class="function">lgl_xml_set_prop_length()</code></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<a name="lgl-xml-set-default-units"></a><h3>lgl_xml_set_default_units ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_xml_set_default_units (<em class="parameter"><code><a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a> units</code></em>);</pre>
+<p>Set the default units when formatting lengths.  See
+<a class="link" href="libglabels-3.0-xml.html#lgl-xml-set-prop-length" title="lgl_xml_set_prop_length ()"><code class="function">lgl_xml_set_prop_length()</code></a>.</p>
+<div class="refsect3">
+<a name="id-1.3.6.8.17.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>units</code></em> :</span></p></td>
-<td>default units selection (<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a>)</td>
+<td class="parameter_name"><p>units</p></td>
+<td class="parameter_description"><p>default units selection (<a class="link" href="libglabels-3.0-units.html#lglUnits" title="enum lglUnits"><span class="type">lglUnits</span></a>)</p></td>
+<td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
 </div>
 </div>
 </div>
+<div class="refsect1">
+<a name="libglabels-3.0-xml.other_details"></a><h2>Types and Values</h2>
+<div class="refsect2">
+<a name="LGL-XML-NAME-SPACE:CAPS"></a><h3>LGL_XML_NAME_SPACE</h3>
+<pre class="programlisting">#define LGL_XML_NAME_SPACE "http://glabels.org/xmlns/3.0/"
+</pre>
+<p>
+</p>
+</div>
+</div>
+</div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 33abfc7116f183304518c5b2cf1e16e13ac715f5..d050a83f0458120a383ef74934731f67f64ebab3 100644 (file)
     </sub>
   </chapters>
   <functions>
+    <keyword type="function" name="lgl_db_init ()" link="libglabels-3.0-db.html#lgl-db-init"/>
+    <keyword type="function" name="lglDbNotifyFunc ()" link="libglabels-3.0-db.html#lglDbNotifyFunc"/>
+    <keyword type="function" name="lgl_db_notify_add ()" link="libglabels-3.0-db.html#lgl-db-notify-add"/>
+    <keyword type="function" name="lgl_db_notify_remove ()" link="libglabels-3.0-db.html#lgl-db-notify-remove"/>
+    <keyword type="function" name="lgl_db_get_paper_id_list ()" link="libglabels-3.0-db.html#lgl-db-get-paper-id-list"/>
+    <keyword type="function" name="lgl_db_free_paper_id_list ()" link="libglabels-3.0-db.html#lgl-db-free-paper-id-list"/>
+    <keyword type="function" name="lgl_db_get_paper_name_list ()" link="libglabels-3.0-db.html#lgl-db-get-paper-name-list"/>
+    <keyword type="function" name="lgl_db_free_paper_name_list ()" link="libglabels-3.0-db.html#lgl-db-free-paper-name-list"/>
+    <keyword type="function" name="lgl_db_lookup_paper_from_id ()" link="libglabels-3.0-db.html#lgl-db-lookup-paper-from-id"/>
+    <keyword type="function" name="lgl_db_lookup_paper_from_name ()" link="libglabels-3.0-db.html#lgl-db-lookup-paper-from-name"/>
+    <keyword type="function" name="lgl_db_lookup_paper_id_from_name ()" link="libglabels-3.0-db.html#lgl-db-lookup-paper-id-from-name"/>
+    <keyword type="function" name="lgl_db_lookup_paper_name_from_id ()" link="libglabels-3.0-db.html#lgl-db-lookup-paper-name-from-id"/>
+    <keyword type="function" name="lgl_db_is_paper_id_known ()" link="libglabels-3.0-db.html#lgl-db-is-paper-id-known"/>
+    <keyword type="function" name="lgl_db_is_paper_id_other ()" link="libglabels-3.0-db.html#lgl-db-is-paper-id-other"/>
+    <keyword type="function" name="lgl_db_get_category_id_list ()" link="libglabels-3.0-db.html#lgl-db-get-category-id-list"/>
+    <keyword type="function" name="lgl_db_free_category_id_list ()" link="libglabels-3.0-db.html#lgl-db-free-category-id-list"/>
+    <keyword type="function" name="lgl_db_get_category_name_list ()" link="libglabels-3.0-db.html#lgl-db-get-category-name-list"/>
+    <keyword type="function" name="lgl_db_free_category_name_list ()" link="libglabels-3.0-db.html#lgl-db-free-category-name-list"/>
+    <keyword type="function" name="lgl_db_lookup_category_from_id ()" link="libglabels-3.0-db.html#lgl-db-lookup-category-from-id"/>
+    <keyword type="function" name="lgl_db_lookup_category_from_name ()" link="libglabels-3.0-db.html#lgl-db-lookup-category-from-name"/>
+    <keyword type="function" name="lgl_db_lookup_category_id_from_name ()" link="libglabels-3.0-db.html#lgl-db-lookup-category-id-from-name"/>
+    <keyword type="function" name="lgl_db_lookup_category_name_from_id ()" link="libglabels-3.0-db.html#lgl-db-lookup-category-name-from-id"/>
+    <keyword type="function" name="lgl_db_is_category_id_known ()" link="libglabels-3.0-db.html#lgl-db-is-category-id-known"/>
+    <keyword type="function" name="lgl_db_get_brand_list ()" link="libglabels-3.0-db.html#lgl-db-get-brand-list"/>
+    <keyword type="function" name="lgl_db_free_brand_list ()" link="libglabels-3.0-db.html#lgl-db-free-brand-list"/>
+    <keyword type="function" name="lgl_db_register_template ()" link="libglabels-3.0-db.html#lgl-db-register-template"/>
+    <keyword type="function" name="lgl_db_delete_template_by_brand_part ()" link="libglabels-3.0-db.html#lgl-db-delete-template-by-brand-part"/>
+    <keyword type="function" name="lgl_db_delete_template_by_name ()" link="libglabels-3.0-db.html#lgl-db-delete-template-by-name"/>
+    <keyword type="function" name="lgl_db_does_template_exist ()" link="libglabels-3.0-db.html#lgl-db-does-template-exist"/>
+    <keyword type="function" name="lgl_db_does_template_name_exist ()" link="libglabels-3.0-db.html#lgl-db-does-template-name-exist"/>
+    <keyword type="function" name="lgl_db_get_template_name_list_all ()" link="libglabels-3.0-db.html#lgl-db-get-template-name-list-all"/>
+    <keyword type="function" name="lgl_db_get_similar_template_name_list ()" link="libglabels-3.0-db.html#lgl-db-get-similar-template-name-list"/>
+    <keyword type="function" name="lgl_db_free_template_name_list ()" link="libglabels-3.0-db.html#lgl-db-free-template-name-list"/>
+    <keyword type="function" name="lgl_db_lookup_template_from_name ()" link="libglabels-3.0-db.html#lgl-db-lookup-template-from-name"/>
+    <keyword type="function" name="lgl_db_lookup_template_from_brand_part ()" link="libglabels-3.0-db.html#lgl-db-lookup-template-from-brand-part"/>
+    <keyword type="function" name="lgl_db_get_vendor_name_list ()" link="libglabels-3.0-db.html#lgl-db-get-vendor-name-list"/>
+    <keyword type="function" name="lgl_db_free_vendor_name_list ()" link="libglabels-3.0-db.html#lgl-db-free-vendor-name-list"/>
+    <keyword type="function" name="lgl_db_is_vendor_name_known ()" link="libglabels-3.0-db.html#lgl-db-is-vendor-name-known"/>
+    <keyword type="function" name="lgl_db_lookup_vendor_from_name ()" link="libglabels-3.0-db.html#lgl-db-lookup-vendor-from-name"/>
+    <keyword type="function" name="lgl_db_print_known_papers ()" link="libglabels-3.0-db.html#lgl-db-print-known-papers"/>
+    <keyword type="function" name="lgl_db_print_known_categories ()" link="libglabels-3.0-db.html#lgl-db-print-known-categories"/>
+    <keyword type="function" name="lgl_db_print_known_templates ()" link="libglabels-3.0-db.html#lgl-db-print-known-templates"/>
+    <keyword type="function" name="lgl_db_print_known_vendors ()" link="libglabels-3.0-db.html#lgl-db-print-known-vendors"/>
     <keyword type="enum" name="enum lglDbRegStatus" link="libglabels-3.0-db.html#lglDbRegStatus"/>
     <keyword type="enum" name="enum lglDbDeleteStatus" link="libglabels-3.0-db.html#lglDbDeleteStatus"/>
-    <keyword type="function" name="lgl_db_init ()" link="libglabels-3.0-db.html#lgl-db-init"/>
-    <keyword type="function" name="lglDbNotifyFunc ()" link="libglabels-3.0-db.html#lglDbNotifyFunc"/>
-    <keyword type="function" name="lgl_db_notify_add ()" link="libglabels-3.0-db.html#lgl-db-notify-add"/>
-    <keyword type="function" name="lgl_db_notify_remove ()" link="libglabels-3.0-db.html#lgl-db-notify-remove"/>
-    <keyword type="function" name="lgl_db_get_paper_id_list ()" link="libglabels-3.0-db.html#lgl-db-get-paper-id-list"/>
-    <keyword type="function" name="lgl_db_free_paper_id_list ()" link="libglabels-3.0-db.html#lgl-db-free-paper-id-list"/>
-    <keyword type="function" name="lgl_db_get_paper_name_list ()" link="libglabels-3.0-db.html#lgl-db-get-paper-name-list"/>
-    <keyword type="function" name="lgl_db_free_paper_name_list ()" link="libglabels-3.0-db.html#lgl-db-free-paper-name-list"/>
-    <keyword type="function" name="lgl_db_lookup_paper_from_id ()" link="libglabels-3.0-db.html#lgl-db-lookup-paper-from-id"/>
-    <keyword type="function" name="lgl_db_lookup_paper_from_name ()" link="libglabels-3.0-db.html#lgl-db-lookup-paper-from-name"/>
-    <keyword type="function" name="lgl_db_lookup_paper_id_from_name ()" link="libglabels-3.0-db.html#lgl-db-lookup-paper-id-from-name"/>
-    <keyword type="function" name="lgl_db_lookup_paper_name_from_id ()" link="libglabels-3.0-db.html#lgl-db-lookup-paper-name-from-id"/>
-    <keyword type="function" name="lgl_db_is_paper_id_known ()" link="libglabels-3.0-db.html#lgl-db-is-paper-id-known"/>
-    <keyword type="function" name="lgl_db_is_paper_id_other ()" link="libglabels-3.0-db.html#lgl-db-is-paper-id-other"/>
-    <keyword type="function" name="lgl_db_get_category_id_list ()" link="libglabels-3.0-db.html#lgl-db-get-category-id-list"/>
-    <keyword type="function" name="lgl_db_free_category_id_list ()" link="libglabels-3.0-db.html#lgl-db-free-category-id-list"/>
-    <keyword type="function" name="lgl_db_get_category_name_list ()" link="libglabels-3.0-db.html#lgl-db-get-category-name-list"/>
-    <keyword type="function" name="lgl_db_free_category_name_list ()" link="libglabels-3.0-db.html#lgl-db-free-category-name-list"/>
-    <keyword type="function" name="lgl_db_lookup_category_from_id ()" link="libglabels-3.0-db.html#lgl-db-lookup-category-from-id"/>
-    <keyword type="function" name="lgl_db_lookup_category_from_name ()" link="libglabels-3.0-db.html#lgl-db-lookup-category-from-name"/>
-    <keyword type="function" name="lgl_db_lookup_category_id_from_name ()" link="libglabels-3.0-db.html#lgl-db-lookup-category-id-from-name"/>
-    <keyword type="function" name="lgl_db_lookup_category_name_from_id ()" link="libglabels-3.0-db.html#lgl-db-lookup-category-name-from-id"/>
-    <keyword type="function" name="lgl_db_is_category_id_known ()" link="libglabels-3.0-db.html#lgl-db-is-category-id-known"/>
-    <keyword type="function" name="lgl_db_get_brand_list ()" link="libglabels-3.0-db.html#lgl-db-get-brand-list"/>
-    <keyword type="function" name="lgl_db_free_brand_list ()" link="libglabels-3.0-db.html#lgl-db-free-brand-list"/>
-    <keyword type="function" name="lgl_db_register_template ()" link="libglabels-3.0-db.html#lgl-db-register-template"/>
-    <keyword type="function" name="lgl_db_delete_template_by_brand_part ()" link="libglabels-3.0-db.html#lgl-db-delete-template-by-brand-part"/>
-    <keyword type="function" name="lgl_db_delete_template_by_name ()" link="libglabels-3.0-db.html#lgl-db-delete-template-by-name"/>
-    <keyword type="function" name="lgl_db_does_template_exist ()" link="libglabels-3.0-db.html#lgl-db-does-template-exist"/>
-    <keyword type="function" name="lgl_db_does_template_name_exist ()" link="libglabels-3.0-db.html#lgl-db-does-template-name-exist"/>
-    <keyword type="function" name="lgl_db_get_template_name_list_all ()" link="libglabels-3.0-db.html#lgl-db-get-template-name-list-all"/>
-    <keyword type="function" name="lgl_db_get_similar_template_name_list ()" link="libglabels-3.0-db.html#lgl-db-get-similar-template-name-list"/>
-    <keyword type="function" name="lgl_db_free_template_name_list ()" link="libglabels-3.0-db.html#lgl-db-free-template-name-list"/>
-    <keyword type="function" name="lgl_db_lookup_template_from_name ()" link="libglabels-3.0-db.html#lgl-db-lookup-template-from-name"/>
-    <keyword type="function" name="lgl_db_lookup_template_from_brand_part ()" link="libglabels-3.0-db.html#lgl-db-lookup-template-from-brand-part"/>
-    <keyword type="function" name="lgl_db_get_vendor_name_list ()" link="libglabels-3.0-db.html#lgl-db-get-vendor-name-list"/>
-    <keyword type="function" name="lgl_db_free_vendor_name_list ()" link="libglabels-3.0-db.html#lgl-db-free-vendor-name-list"/>
-    <keyword type="function" name="lgl_db_is_vendor_name_known ()" link="libglabels-3.0-db.html#lgl-db-is-vendor-name-known"/>
-    <keyword type="function" name="lgl_db_lookup_vendor_from_name ()" link="libglabels-3.0-db.html#lgl-db-lookup-vendor-from-name"/>
-    <keyword type="function" name="lgl_db_print_known_papers ()" link="libglabels-3.0-db.html#lgl-db-print-known-papers"/>
-    <keyword type="function" name="lgl_db_print_known_categories ()" link="libglabels-3.0-db.html#lgl-db-print-known-categories"/>
-    <keyword type="function" name="lgl_db_print_known_templates ()" link="libglabels-3.0-db.html#lgl-db-print-known-templates"/>
-    <keyword type="function" name="lgl_db_print_known_vendors ()" link="libglabels-3.0-db.html#lgl-db-print-known-vendors"/>
+    <keyword type="function" name="lgl_template_new ()" link="libglabels-3.0-template.html#lgl-template-new"/>
+    <keyword type="function" name="lgl_template_new_from_equiv ()" link="libglabels-3.0-template.html#lgl-template-new-from-equiv"/>
+    <keyword type="function" name="lgl_template_dup ()" link="libglabels-3.0-template.html#lgl-template-dup"/>
+    <keyword type="function" name="lgl_template_free ()" link="libglabels-3.0-template.html#lgl-template-free"/>
+    <keyword type="function" name="lgl_template_add_category ()" link="libglabels-3.0-template.html#lgl-template-add-category"/>
+    <keyword type="function" name="lgl_template_add_frame ()" link="libglabels-3.0-template.html#lgl-template-add-frame"/>
+    <keyword type="function" name="lgl_template_get_name ()" link="libglabels-3.0-template.html#lgl-template-get-name"/>
+    <keyword type="function" name="lgl_template_do_templates_match ()" link="libglabels-3.0-template.html#lgl-template-do-templates-match"/>
+    <keyword type="function" name="lgl_template_does_brand_match ()" link="libglabels-3.0-template.html#lgl-template-does-brand-match"/>
+    <keyword type="function" name="lgl_template_does_page_size_match ()" link="libglabels-3.0-template.html#lgl-template-does-page-size-match"/>
+    <keyword type="function" name="lgl_template_does_category_match ()" link="libglabels-3.0-template.html#lgl-template-does-category-match"/>
+    <keyword type="function" name="lgl_template_are_templates_identical ()" link="libglabels-3.0-template.html#lgl-template-are-templates-identical"/>
+    <keyword type="function" name="lgl_template_frame_rect_new ()" link="libglabels-3.0-template.html#lgl-template-frame-rect-new"/>
+    <keyword type="function" name="lgl_template_frame_ellipse_new ()" link="libglabels-3.0-template.html#lgl-template-frame-ellipse-new"/>
+    <keyword type="function" name="lgl_template_frame_round_new ()" link="libglabels-3.0-template.html#lgl-template-frame-round-new"/>
+    <keyword type="function" name="lgl_template_frame_cd_new ()" link="libglabels-3.0-template.html#lgl-template-frame-cd-new"/>
+    <keyword type="function" name="lgl_template_frame_dup ()" link="libglabels-3.0-template.html#lgl-template-frame-dup"/>
+    <keyword type="function" name="lgl_template_frame_free ()" link="libglabels-3.0-template.html#lgl-template-frame-free"/>
+    <keyword type="function" name="lgl_template_frame_add_layout ()" link="libglabels-3.0-template.html#lgl-template-frame-add-layout"/>
+    <keyword type="function" name="lgl_template_frame_add_markup ()" link="libglabels-3.0-template.html#lgl-template-frame-add-markup"/>
+    <keyword type="function" name="lgl_template_frame_get_size ()" link="libglabels-3.0-template.html#lgl-template-frame-get-size"/>
+    <keyword type="function" name="lgl_template_frame_get_n_labels ()" link="libglabels-3.0-template.html#lgl-template-frame-get-n-labels"/>
+    <keyword type="function" name="lgl_template_frame_get_origins ()" link="libglabels-3.0-template.html#lgl-template-frame-get-origins"/>
+    <keyword type="function" name="lgl_template_frame_get_layout_description ()" link="libglabels-3.0-template.html#lgl-template-frame-get-layout-description"/>
+    <keyword type="function" name="lgl_template_frame_get_size_description ()" link="libglabels-3.0-template.html#lgl-template-frame-get-size-description"/>
+    <keyword type="function" name="lgl_template_layout_new ()" link="libglabels-3.0-template.html#lgl-template-layout-new"/>
+    <keyword type="function" name="lgl_template_layout_dup ()" link="libglabels-3.0-template.html#lgl-template-layout-dup"/>
+    <keyword type="function" name="lgl_template_layout_free ()" link="libglabels-3.0-template.html#lgl-template-layout-free"/>
+    <keyword type="function" name="lgl_template_markup_margin_new ()" link="libglabels-3.0-template.html#lgl-template-markup-margin-new"/>
+    <keyword type="function" name="lgl_template_markup_line_new ()" link="libglabels-3.0-template.html#lgl-template-markup-line-new"/>
+    <keyword type="function" name="lgl_template_markup_circle_new ()" link="libglabels-3.0-template.html#lgl-template-markup-circle-new"/>
+    <keyword type="function" name="lgl_template_markup_rect_new ()" link="libglabels-3.0-template.html#lgl-template-markup-rect-new"/>
+    <keyword type="function" name="lgl_template_markup_ellipse_new ()" link="libglabels-3.0-template.html#lgl-template-markup-ellipse-new"/>
+    <keyword type="function" name="lgl_template_markup_dup ()" link="libglabels-3.0-template.html#lgl-template-markup-dup"/>
+    <keyword type="function" name="lgl_template_markup_free ()" link="libglabels-3.0-template.html#lgl-template-markup-free"/>
+    <keyword type="function" name="lgl_template_print ()" link="libglabels-3.0-template.html#lgl-template-print"/>
     <keyword type="struct" name="struct lglTemplate" link="libglabels-3.0-template.html#lglTemplate"/>
     <keyword type="enum" name="enum lglTemplateFrameShape" link="libglabels-3.0-template.html#lglTemplateFrameShape"/>
     <keyword type="union" name="union lglTemplateFrame" link="libglabels-3.0-template.html#lglTemplateFrame"/>
     <keyword type="struct" name="struct lglTemplateMarkupRect" link="libglabels-3.0-template.html#lglTemplateMarkupRect"/>
     <keyword type="struct" name="struct lglTemplateMarkupEllipse" link="libglabels-3.0-template.html#lglTemplateMarkupEllipse"/>
     <keyword type="struct" name="struct lglTemplateOrigin" link="libglabels-3.0-template.html#lglTemplateOrigin"/>
-    <keyword type="function" name="lgl_template_new ()" link="libglabels-3.0-template.html#lgl-template-new"/>
-    <keyword type="function" name="lgl_template_new_from_equiv ()" link="libglabels-3.0-template.html#lgl-template-new-from-equiv"/>
-    <keyword type="function" name="lgl_template_dup ()" link="libglabels-3.0-template.html#lgl-template-dup"/>
-    <keyword type="function" name="lgl_template_free ()" link="libglabels-3.0-template.html#lgl-template-free"/>
-    <keyword type="function" name="lgl_template_add_category ()" link="libglabels-3.0-template.html#lgl-template-add-category"/>
-    <keyword type="function" name="lgl_template_add_frame ()" link="libglabels-3.0-template.html#lgl-template-add-frame"/>
-    <keyword type="function" name="lgl_template_get_name ()" link="libglabels-3.0-template.html#lgl-template-get-name"/>
-    <keyword type="function" name="lgl_template_do_templates_match ()" link="libglabels-3.0-template.html#lgl-template-do-templates-match"/>
-    <keyword type="function" name="lgl_template_does_brand_match ()" link="libglabels-3.0-template.html#lgl-template-does-brand-match"/>
-    <keyword type="function" name="lgl_template_does_page_size_match ()" link="libglabels-3.0-template.html#lgl-template-does-page-size-match"/>
-    <keyword type="function" name="lgl_template_does_category_match ()" link="libglabels-3.0-template.html#lgl-template-does-category-match"/>
-    <keyword type="function" name="lgl_template_are_templates_identical ()" link="libglabels-3.0-template.html#lgl-template-are-templates-identical"/>
-    <keyword type="function" name="lgl_template_frame_rect_new ()" link="libglabels-3.0-template.html#lgl-template-frame-rect-new"/>
-    <keyword type="function" name="lgl_template_frame_ellipse_new ()" link="libglabels-3.0-template.html#lgl-template-frame-ellipse-new"/>
-    <keyword type="function" name="lgl_template_frame_round_new ()" link="libglabels-3.0-template.html#lgl-template-frame-round-new"/>
-    <keyword type="function" name="lgl_template_frame_cd_new ()" link="libglabels-3.0-template.html#lgl-template-frame-cd-new"/>
-    <keyword type="function" name="lgl_template_frame_dup ()" link="libglabels-3.0-template.html#lgl-template-frame-dup"/>
-    <keyword type="function" name="lgl_template_frame_free ()" link="libglabels-3.0-template.html#lgl-template-frame-free"/>
-    <keyword type="function" name="lgl_template_frame_add_layout ()" link="libglabels-3.0-template.html#lgl-template-frame-add-layout"/>
-    <keyword type="function" name="lgl_template_frame_add_markup ()" link="libglabels-3.0-template.html#lgl-template-frame-add-markup"/>
-    <keyword type="function" name="lgl_template_frame_get_size ()" link="libglabels-3.0-template.html#lgl-template-frame-get-size"/>
-    <keyword type="function" name="lgl_template_frame_get_n_labels ()" link="libglabels-3.0-template.html#lgl-template-frame-get-n-labels"/>
-    <keyword type="function" name="lgl_template_frame_get_origins ()" link="libglabels-3.0-template.html#lgl-template-frame-get-origins"/>
-    <keyword type="function" name="lgl_template_frame_get_layout_description ()" link="libglabels-3.0-template.html#lgl-template-frame-get-layout-description"/>
-    <keyword type="function" name="lgl_template_frame_get_size_description ()" link="libglabels-3.0-template.html#lgl-template-frame-get-size-description"/>
-    <keyword type="function" name="lgl_template_layout_new ()" link="libglabels-3.0-template.html#lgl-template-layout-new"/>
-    <keyword type="function" name="lgl_template_layout_dup ()" link="libglabels-3.0-template.html#lgl-template-layout-dup"/>
-    <keyword type="function" name="lgl_template_layout_free ()" link="libglabels-3.0-template.html#lgl-template-layout-free"/>
-    <keyword type="function" name="lgl_template_markup_margin_new ()" link="libglabels-3.0-template.html#lgl-template-markup-margin-new"/>
-    <keyword type="function" name="lgl_template_markup_line_new ()" link="libglabels-3.0-template.html#lgl-template-markup-line-new"/>
-    <keyword type="function" name="lgl_template_markup_circle_new ()" link="libglabels-3.0-template.html#lgl-template-markup-circle-new"/>
-    <keyword type="function" name="lgl_template_markup_rect_new ()" link="libglabels-3.0-template.html#lgl-template-markup-rect-new"/>
-    <keyword type="function" name="lgl_template_markup_ellipse_new ()" link="libglabels-3.0-template.html#lgl-template-markup-ellipse-new"/>
-    <keyword type="function" name="lgl_template_markup_dup ()" link="libglabels-3.0-template.html#lgl-template-markup-dup"/>
-    <keyword type="function" name="lgl_template_markup_free ()" link="libglabels-3.0-template.html#lgl-template-markup-free"/>
-    <keyword type="function" name="lgl_template_print ()" link="libglabels-3.0-template.html#lgl-template-print"/>
+    <keyword type="function" name="lgl_paper_new ()" link="libglabels-3.0-paper.html#lgl-paper-new"/>
+    <keyword type="function" name="lgl_paper_dup ()" link="libglabels-3.0-paper.html#lgl-paper-dup"/>
+    <keyword type="function" name="lgl_paper_free ()" link="libglabels-3.0-paper.html#lgl-paper-free"/>
     <keyword type="struct" name="struct lglPaper" link="libglabels-3.0-paper.html#lglPaper"/>
-    <keyword type="function" name="lgl_paper_new ()" link="libglabels-3.0-paper.html#lgl-paper-new"/>
-    <keyword type="function" name="lgl_paper_dup ()" link="libglabels-3.0-paper.html#lgl-paper-dup"/>
-    <keyword type="function" name="lgl_paper_free ()" link="libglabels-3.0-paper.html#lgl-paper-free"/>
+    <keyword type="function" name="lgl_category_new ()" link="libglabels-3.0-category.html#lgl-category-new"/>
+    <keyword type="function" name="lgl_category_dup ()" link="libglabels-3.0-category.html#lgl-category-dup"/>
+    <keyword type="function" name="lgl_category_free ()" link="libglabels-3.0-category.html#lgl-category-free"/>
     <keyword type="struct" name="struct lglCategory" link="libglabels-3.0-category.html#lglCategory"/>
-    <keyword type="function" name="lgl_category_new ()" link="libglabels-3.0-category.html#lgl-category-new"/>
-    <keyword type="function" name="lgl_category_dup ()" link="libglabels-3.0-category.html#lgl-category-dup"/>
-    <keyword type="function" name="lgl_category_free ()" link="libglabels-3.0-category.html#lgl-category-free"/>
+    <keyword type="function" name="lgl_vendor_new ()" link="libglabels-3.0-vendor.html#lgl-vendor-new"/>
+    <keyword type="function" name="lgl_vendor_dup ()" link="libglabels-3.0-vendor.html#lgl-vendor-dup"/>
+    <keyword type="function" name="lgl_vendor_free ()" link="libglabels-3.0-vendor.html#lgl-vendor-free"/>
     <keyword type="struct" name="struct lglVendor" link="libglabels-3.0-vendor.html#lglVendor"/>
-    <keyword type="function" name="lgl_vendor_new ()" link="libglabels-3.0-vendor.html#lgl-vendor-new"/>
-    <keyword type="function" name="lgl_vendor_dup ()" link="libglabels-3.0-vendor.html#lgl-vendor-dup"/>
-    <keyword type="function" name="lgl_vendor_free ()" link="libglabels-3.0-vendor.html#lgl-vendor-free"/>
-    <keyword type="function" name="lgl_xml_paper_read_papers_from_file ()" link="libglabels-3.0-xml-paper.html#lgl-xml-paper-read-papers-from-file"/>
-    <keyword type="function" name="lgl_xml_paper_parse_papers_doc ()" link="libglabels-3.0-xml-paper.html#lgl-xml-paper-parse-papers-doc"/>
-    <keyword type="function" name="lgl_xml_paper_parse_paper_node ()" link="libglabels-3.0-xml-paper.html#lgl-xml-paper-parse-paper-node"/>
-    <keyword type="function" name="lgl_xml_category_read_categories_from_file ()" link="libglabels-3.0-xml-category.html#lgl-xml-category-read-categories-from-file"/>
-    <keyword type="function" name="lgl_xml_category_parse_categories_doc ()" link="libglabels-3.0-xml-category.html#lgl-xml-category-parse-categories-doc"/>
-    <keyword type="function" name="lgl_xml_category_parse_category_node ()" link="libglabels-3.0-xml-category.html#lgl-xml-category-parse-category-node"/>
-    <keyword type="function" name="lgl_xml_template_read_templates_from_file ()" link="libglabels-3.0-xml-template.html#lgl-xml-template-read-templates-from-file"/>
-    <keyword type="function" name="lgl_xml_template_parse_templates_doc ()" link="libglabels-3.0-xml-template.html#lgl-xml-template-parse-templates-doc"/>
-    <keyword type="function" name="lgl_xml_template_parse_template_node ()" link="libglabels-3.0-xml-template.html#lgl-xml-template-parse-template-node"/>
-    <keyword type="function" name="lgl_xml_template_write_templates_to_file ()" link="libglabels-3.0-xml-template.html#lgl-xml-template-write-templates-to-file"/>
-    <keyword type="function" name="lgl_xml_template_write_template_to_file ()" link="libglabels-3.0-xml-template.html#lgl-xml-template-write-template-to-file"/>
-    <keyword type="function" name="lgl_xml_template_create_template_node ()" link="libglabels-3.0-xml-template.html#lgl-xml-template-create-template-node"/>
-    <keyword type="function" name="lgl_xml_vendor_read_vendors_from_file ()" link="libglabels-3.0-xml-vendor.html#lgl-xml-vendor-read-vendors-from-file"/>
-    <keyword type="function" name="lgl_xml_vendor_parse_vendors_doc ()" link="libglabels-3.0-xml-vendor.html#lgl-xml-vendor-parse-vendors-doc"/>
-    <keyword type="function" name="lgl_xml_vendor_parse_vendor_node ()" link="libglabels-3.0-xml-vendor.html#lgl-xml-vendor-parse-vendor-node"/>
+    <keyword type="function" name="lgl_xml_paper_read_papers_from_file ()" link="libglabels-3.0-xml-paper.html#lgl-xml-paper-read-papers-from-file"/>
+    <keyword type="function" name="lgl_xml_paper_parse_papers_doc ()" link="libglabels-3.0-xml-paper.html#lgl-xml-paper-parse-papers-doc"/>
+    <keyword type="function" name="lgl_xml_paper_parse_paper_node ()" link="libglabels-3.0-xml-paper.html#lgl-xml-paper-parse-paper-node"/>
+    <keyword type="function" name="lgl_xml_category_read_categories_from_file ()" link="libglabels-3.0-xml-category.html#lgl-xml-category-read-categories-from-file"/>
+    <keyword type="function" name="lgl_xml_category_parse_categories_doc ()" link="libglabels-3.0-xml-category.html#lgl-xml-category-parse-categories-doc"/>
+    <keyword type="function" name="lgl_xml_category_parse_category_node ()" link="libglabels-3.0-xml-category.html#lgl-xml-category-parse-category-node"/>
+    <keyword type="function" name="lgl_xml_template_read_templates_from_file ()" link="libglabels-3.0-xml-template.html#lgl-xml-template-read-templates-from-file"/>
+    <keyword type="function" name="lgl_xml_template_parse_templates_doc ()" link="libglabels-3.0-xml-template.html#lgl-xml-template-parse-templates-doc"/>
+    <keyword type="function" name="lgl_xml_template_parse_template_node ()" link="libglabels-3.0-xml-template.html#lgl-xml-template-parse-template-node"/>
+    <keyword type="function" name="lgl_xml_template_write_templates_to_file ()" link="libglabels-3.0-xml-template.html#lgl-xml-template-write-templates-to-file"/>
+    <keyword type="function" name="lgl_xml_template_write_template_to_file ()" link="libglabels-3.0-xml-template.html#lgl-xml-template-write-template-to-file"/>
+    <keyword type="function" name="lgl_xml_template_create_template_node ()" link="libglabels-3.0-xml-template.html#lgl-xml-template-create-template-node"/>
+    <keyword type="function" name="lgl_xml_vendor_read_vendors_from_file ()" link="libglabels-3.0-xml-vendor.html#lgl-xml-vendor-read-vendors-from-file"/>
+    <keyword type="function" name="lgl_xml_vendor_parse_vendors_doc ()" link="libglabels-3.0-xml-vendor.html#lgl-xml-vendor-parse-vendors-doc"/>
+    <keyword type="function" name="lgl_xml_vendor_parse_vendor_node ()" link="libglabels-3.0-xml-vendor.html#lgl-xml-vendor-parse-vendor-node"/>
+    <keyword type="function" name="lgl_xml_get_prop_string ()" link="libglabels-3.0-xml.html#lgl-xml-get-prop-string"/>
+    <keyword type="function" name="lgl_xml_get_prop_i18n_string ()" link="libglabels-3.0-xml.html#lgl-xml-get-prop-i18n-string"/>
+    <keyword type="function" name="lgl_xml_get_prop_double ()" link="libglabels-3.0-xml.html#lgl-xml-get-prop-double"/>
+    <keyword type="function" name="lgl_xml_get_prop_boolean ()" link="libglabels-3.0-xml.html#lgl-xml-get-prop-boolean"/>
+    <keyword type="function" name="lgl_xml_get_prop_int ()" link="libglabels-3.0-xml.html#lgl-xml-get-prop-int"/>
+    <keyword type="function" name="lgl_xml_get_prop_uint ()" link="libglabels-3.0-xml.html#lgl-xml-get-prop-uint"/>
+    <keyword type="function" name="lgl_xml_get_prop_length ()" link="libglabels-3.0-xml.html#lgl-xml-get-prop-length"/>
+    <keyword type="function" name="lgl_xml_set_prop_string ()" link="libglabels-3.0-xml.html#lgl-xml-set-prop-string"/>
+    <keyword type="function" name="lgl_xml_set_prop_double ()" link="libglabels-3.0-xml.html#lgl-xml-set-prop-double"/>
+    <keyword type="function" name="lgl_xml_set_prop_boolean ()" link="libglabels-3.0-xml.html#lgl-xml-set-prop-boolean"/>
+    <keyword type="function" name="lgl_xml_set_prop_int ()" link="libglabels-3.0-xml.html#lgl-xml-set-prop-int"/>
+    <keyword type="function" name="lgl_xml_set_prop_uint_hex ()" link="libglabels-3.0-xml.html#lgl-xml-set-prop-uint-hex"/>
+    <keyword type="function" name="lgl_xml_set_prop_length ()" link="libglabels-3.0-xml.html#lgl-xml-set-prop-length"/>
+    <keyword type="function" name="lgl_xml_is_node ()" link="libglabels-3.0-xml.html#lgl-xml-is-node"/>
+    <keyword type="function" name="lgl_xml_get_node_content ()" link="libglabels-3.0-xml.html#lgl-xml-get-node-content"/>
+    <keyword type="function" name="lgl_xml_set_default_units ()" link="libglabels-3.0-xml.html#lgl-xml-set-default-units"/>
     <keyword type="macro" name="LGL_XML_NAME_SPACE" link="libglabels-3.0-xml.html#LGL-XML-NAME-SPACE:CAPS"/>
-    <keyword type="function" name="lgl_xml_get_prop_string ()" link="libglabels-3.0-xml.html#lgl-xml-get-prop-string"/>
-    <keyword type="function" name="lgl_xml_get_prop_i18n_string ()" link="libglabels-3.0-xml.html#lgl-xml-get-prop-i18n-string"/>
-    <keyword type="function" name="lgl_xml_get_prop_double ()" link="libglabels-3.0-xml.html#lgl-xml-get-prop-double"/>
-    <keyword type="function" name="lgl_xml_get_prop_boolean ()" link="libglabels-3.0-xml.html#lgl-xml-get-prop-boolean"/>
-    <keyword type="function" name="lgl_xml_get_prop_int ()" link="libglabels-3.0-xml.html#lgl-xml-get-prop-int"/>
-    <keyword type="function" name="lgl_xml_get_prop_uint ()" link="libglabels-3.0-xml.html#lgl-xml-get-prop-uint"/>
-    <keyword type="function" name="lgl_xml_get_prop_length ()" link="libglabels-3.0-xml.html#lgl-xml-get-prop-length"/>
-    <keyword type="function" name="lgl_xml_set_prop_string ()" link="libglabels-3.0-xml.html#lgl-xml-set-prop-string"/>
-    <keyword type="function" name="lgl_xml_set_prop_double ()" link="libglabels-3.0-xml.html#lgl-xml-set-prop-double"/>
-    <keyword type="function" name="lgl_xml_set_prop_boolean ()" link="libglabels-3.0-xml.html#lgl-xml-set-prop-boolean"/>
-    <keyword type="function" name="lgl_xml_set_prop_int ()" link="libglabels-3.0-xml.html#lgl-xml-set-prop-int"/>
-    <keyword type="function" name="lgl_xml_set_prop_uint_hex ()" link="libglabels-3.0-xml.html#lgl-xml-set-prop-uint-hex"/>
-    <keyword type="function" name="lgl_xml_set_prop_length ()" link="libglabels-3.0-xml.html#lgl-xml-set-prop-length"/>
-    <keyword type="function" name="lgl_xml_is_node ()" link="libglabels-3.0-xml.html#lgl-xml-is-node"/>
-    <keyword type="function" name="lgl_xml_get_node_content ()" link="libglabels-3.0-xml.html#lgl-xml-get-node-content"/>
-    <keyword type="function" name="lgl_xml_set_default_units ()" link="libglabels-3.0-xml.html#lgl-xml-set-default-units"/>
+    <keyword type="function" name="lgl_units_get_id ()" link="libglabels-3.0-units.html#lgl-units-get-id"/>
+    <keyword type="function" name="lgl_units_from_id ()" link="libglabels-3.0-units.html#lgl-units-from-id"/>
+    <keyword type="function" name="lgl_units_get_name ()" link="libglabels-3.0-units.html#lgl-units-get-name"/>
+    <keyword type="function" name="lgl_units_from_name ()" link="libglabels-3.0-units.html#lgl-units-from-name"/>
+    <keyword type="function" name="lgl_units_get_points_per_unit ()" link="libglabels-3.0-units.html#lgl-units-get-points-per-unit"/>
+    <keyword type="function" name="lgl_units_get_units_per_point ()" link="libglabels-3.0-units.html#lgl-units-get-units-per-point"/>
     <keyword type="enum" name="enum lglUnits" link="libglabels-3.0-units.html#lglUnits"/>
-    <keyword type="function" name="lgl_units_get_id ()" link="libglabels-3.0-units.html#lgl-units-get-id"/>
-    <keyword type="function" name="lgl_units_from_id ()" link="libglabels-3.0-units.html#lgl-units-from-id"/>
-    <keyword type="function" name="lgl_units_get_name ()" link="libglabels-3.0-units.html#lgl-units-get-name"/>
-    <keyword type="function" name="lgl_units_from_name ()" link="libglabels-3.0-units.html#lgl-units-from-name"/>
-    <keyword type="function" name="lgl_units_get_points_per_unit ()" link="libglabels-3.0-units.html#lgl-units-get-points-per-unit"/>
-    <keyword type="function" name="lgl_units_get_units_per_point ()" link="libglabels-3.0-units.html#lgl-units-get-units-per-point"/>
-    <keyword type="function" name="lgl_str_utf8_casecmp ()" link="libglabels-3.0-str.html#lgl-str-utf8-casecmp"/>
-    <keyword type="function" name="lgl_str_part_name_cmp ()" link="libglabels-3.0-str.html#lgl-str-part-name-cmp"/>
-    <keyword type="function" name="lgl_str_format_fraction ()" link="libglabels-3.0-str.html#lgl-str-format-fraction"/>
-    <keyword type="constant" name="LGL_DB_REG_OK" link="libglabels-3.0-db.html#LGL-DB-REG-OK:CAPS"/>
-    <keyword type="constant" name="LGL_DB_REG_BAD_PAPER_ID" link="libglabels-3.0-db.html#LGL-DB-REG-BAD-PAPER-ID:CAPS"/>
-    <keyword type="constant" name="LGL_DB_REG_BRAND_PART_EXISTS" link="libglabels-3.0-db.html#LGL-DB-REG-BRAND-PART-EXISTS:CAPS"/>
-    <keyword type="constant" name="LGL_DB_REG_FILE_WRITE_ERROR" link="libglabels-3.0-db.html#LGL-DB-REG-FILE-WRITE-ERROR:CAPS"/>
-    <keyword type="constant" name="LGL_DB_DELETE_OK" link="libglabels-3.0-db.html#LGL-DB-DELETE-OK:CAPS"/>
-    <keyword type="constant" name="LGL_DB_DELETE_DOES_NOT_EXIST" link="libglabels-3.0-db.html#LGL-DB-DELETE-DOES-NOT-EXIST:CAPS"/>
-    <keyword type="constant" name="LGL_DB_DELETE_NOT_USER_DEFINED" link="libglabels-3.0-db.html#LGL-DB-DELETE-NOT-USER-DEFINED:CAPS"/>
-    <keyword type="constant" name="LGL_DB_DELETE_FILE_ERROR" link="libglabels-3.0-db.html#LGL-DB-DELETE-FILE-ERROR:CAPS"/>
-    <keyword type="constant" name="LGL_TEMPLATE_FRAME_SHAPE_RECT" link="libglabels-3.0-template.html#LGL-TEMPLATE-FRAME-SHAPE-RECT:CAPS"/>
-    <keyword type="constant" name="LGL_TEMPLATE_FRAME_SHAPE_ELLIPSE" link="libglabels-3.0-template.html#LGL-TEMPLATE-FRAME-SHAPE-ELLIPSE:CAPS"/>
-    <keyword type="constant" name="LGL_TEMPLATE_FRAME_SHAPE_ROUND" link="libglabels-3.0-template.html#LGL-TEMPLATE-FRAME-SHAPE-ROUND:CAPS"/>
-    <keyword type="constant" name="LGL_TEMPLATE_FRAME_SHAPE_CD" link="libglabels-3.0-template.html#LGL-TEMPLATE-FRAME-SHAPE-CD:CAPS"/>
-    <keyword type="constant" name="LGL_TEMPLATE_MARKUP_MARGIN" link="libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-MARGIN:CAPS"/>
-    <keyword type="constant" name="LGL_TEMPLATE_MARKUP_LINE" link="libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-LINE:CAPS"/>
-    <keyword type="constant" name="LGL_TEMPLATE_MARKUP_CIRCLE" link="libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-CIRCLE:CAPS"/>
-    <keyword type="constant" name="LGL_TEMPLATE_MARKUP_RECT" link="libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-RECT:CAPS"/>
-    <keyword type="constant" name="LGL_TEMPLATE_MARKUP_ELLIPSE" link="libglabels-3.0-template.html#LGL-TEMPLATE-MARKUP-ELLIPSE:CAPS"/>
-    <keyword type="constant" name="LGL_UNITS_POINT" link="libglabels-3.0-units.html#LGL-UNITS-POINT:CAPS"/>
-    <keyword type="constant" name="LGL_UNITS_INCH" link="libglabels-3.0-units.html#LGL-UNITS-INCH:CAPS"/>
-    <keyword type="constant" name="LGL_UNITS_MM" link="libglabels-3.0-units.html#LGL-UNITS-MM:CAPS"/>
-    <keyword type="constant" name="LGL_UNITS_CM" link="libglabels-3.0-units.html#LGL-UNITS-CM:CAPS"/>
-    <keyword type="constant" name="LGL_UNITS_PICA" link="libglabels-3.0-units.html#LGL-UNITS-PICA:CAPS"/>
-    <keyword type="constant" name="LGL_UNITS_FIRST" link="libglabels-3.0-units.html#LGL-UNITS-FIRST:CAPS"/>
-    <keyword type="constant" name="LGL_UNITS_LAST" link="libglabels-3.0-units.html#LGL-UNITS-LAST:CAPS"/>
-    <keyword type="constant" name="LGL_UNITS_INVALID" link="libglabels-3.0-units.html#LGL-UNITS-INVALID:CAPS"/>
+    <keyword type="function" name="lgl_str_utf8_casecmp ()" link="libglabels-3.0-str.html#lgl-str-utf8-casecmp"/>
+    <keyword type="function" name="lgl_str_part_name_cmp ()" link="libglabels-3.0-str.html#lgl-str-part-name-cmp"/>
+    <keyword type="function" name="lgl_str_format_fraction ()" link="libglabels-3.0-str.html#lgl-str-format-fraction"/>
   </functions>
 </book>
diff --git a/docs/libglabels/html/right-insensitive.png b/docs/libglabels/html/right-insensitive.png
new file mode 100644 (file)
index 0000000..f999f00
Binary files /dev/null and b/docs/libglabels/html/right-insensitive.png differ
index ed55207f1724d878d7f34739df09bc691de6ba5d..78f5875ae2a0f5ba25f5328d43ba33f10c933a39 100644 (file)
Binary files a/docs/libglabels/html/right.png and b/docs/libglabels/html/right.png differ
index d6f6c26ece096fcfb7fee1d4d8ea7896ca3aa765..705a5c9adc7c1717bad3c5aae7f2eb15371710ee 100644 (file)
@@ -1,15 +1,23 @@
+body
+{
+  font-family: cantarell, sans-serif;
+}
 .synopsis, .classsynopsis
 {
   /* tango:aluminium 1/2 */
   background: #eeeeec;
-  border: solid 1px #d3d7cf;
+  background: rgba(238, 238, 236, 0.5);
+  border: solid 1px rgb(238, 238, 236);
   padding: 0.5em;
 }
 .programlisting
 {
   /* tango:sky blue 0/1 */
+  /* fallback for no rgba support */
   background: #e6f3ff;
   border: solid 1px #729fcf;
+  background: rgba(114, 159, 207, 0.1);
+  border: solid 1px rgba(114, 159, 207, 0.2);
   padding: 0.5em;
 }
 .variablelist
@@ -27,7 +35,6 @@
   {
     position: relative;
     top: 0em ! important;
-    
   }
   /* this is needed so that the local anchors are displayed below the naviagtion */
   div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
    */
   body
   {
-    padding-top: 3.2em;
-    padding-bottom: 20em;
+    padding-top: 5em;
+    padding-bottom: 500px;
+    max-width: 60em;
+  }
+  p
+  {
+    max-width: 60em;
   }
   /* style and size the navigation bar */
   table.navigation#top
   {
     position: fixed;
-    /* tango:scarlet red 0/1 */
-    background: #ffe6e6;
-    border: solid 1px #ef2929;
+    background: #e2e2e2;
+    border-bottom: solid 1px #babdb6;
     margin-top: 0;
     margin-bottom: 0;
     top: 0;
   }
   .navigation a, .navigation a:visited
   {
-    /* tango:scarlet red 3 */
-    color: #a40000;
+    /* tango:sky blue 3 */
+    color: #204a87;
   }
   .navigation a:hover
   {
-    /* tango:scarlet red 1 */
-    color: #ef2929;
+    /* tango:sky blue 2 */
+    color: #3465a4;
   }
   td.shortcuts
   {
-    /* tango:scarlet red 1 */
-    color: #ef2929;
+    /* tango:sky blue 2 */
+    color: #3465a4;
     font-size: 80%;
     white-space: nowrap;
   }
+  td.shortcuts .dim
+  {
+    color: #babdb6;
+  }
+}
+@media screen and (min-width: 60em) {
+  /* screen larger than 60em */
+  body { margin: auto; }
+}
+@media screen and (max-width: 60em) {
+  /* screen less than 60em */
+  #nav_hierarchy { display: none; }
+  #nav_interfaces { display: none; }
+  #nav_prerequisites { display: none; }
+  #nav_derived_interfaces { display: none; }
+  #nav_implementations { display: none; }
+  #nav_child_properties { display: none; }
+  #nav_style_properties { display: none; }
+  #nav_index { display: none; }
+  #nav_glossary { display: none; }
+  .gallery_image { display: none; }
+  .property_flags { display: none; }
+  .signal_flags { display: none; }
+  .parameter_annotations { display: none; }
+  .enum_member_annotations { display: none; }
+  .struct_member_annotations { display: none; }
+  .union_member_annotations { display: none; }
+  /* now that a column is hidden, optimize space */
+  col.parameters_name { width: auto; }
+  col.parameters_description { width: auto; }
+  col.struct_members_name { width: auto; }
+  col.struct_members_description { width: auto; }
+  col.enum_members_name { width: auto; }
+  col.enum_members_description { width: auto; }
+  col.union_members_name { width: auto; }
+  col.union_members_description { width: auto; }
 }
 @media print {
   table.navigation {
   div.titlepage table.navigation {
     visibility: visible;
     display: table;
-    /* tango:scarlet red 0/1 */
-    background: #ffe6e6;
-    border: solid 1px #ef2929;
+    background: #e2e2e2;
+    border: solid 1px #babdb6;
     margin-top: 0;
     margin-bottom: 0;
     top: 0;
 
 .navigation .title
 {
-  font-size: 200%;
+  font-size: 120%;
 }
 
 div.gallery-float
@@ -132,6 +178,67 @@ a:hover
   color: #729fcf;
 }
 
+div.informaltable table
+{
+  border-collapse: separate;
+  border-spacing: 20px 3px;
+  border: none;
+}
+
+div.informaltable table td, div.informaltable table th
+{
+  vertical-align: top;
+}
+
+.function_type,
+.variable_type,
+.property_type,
+.signal_type,
+.parameter_name,
+.struct_member_name,
+.union_member_name,
+.define_keyword,
+.datatype_keyword,
+.typedef_keyword
+{
+  text-align: right;
+}
+
+/* dim non-primary columns */
+.c_punctuation,
+.function_type,
+.variable_type,
+.property_type,
+.signal_type,
+.define_keyword,
+.datatype_keyword,
+.typedef_keyword,
+.property_flags,
+.signal_flags,
+.parameter_annotations,
+.enum_member_annotations,
+.struct_member_annotations,
+.union_member_annotations
+{
+  color: #888a85;
+}
+
+.function_type a,
+.function_type a:visited,
+.function_type a:hover,
+.property_type a,
+.property_type a:visited,
+.property_type a:hover,
+.signal_type a,
+.signal_type a:visited,
+.signal_type a:hover,
+.signal_flags a,
+.signal_flags a:visited,
+.signal_flags a:hover
+{
+ color: #729fcf;
+}
+
 div.table table
 {
   border-collapse: collapse;
@@ -154,14 +261,43 @@ div.table table th
   background-color: #d3d7cf;
 }
 
+h4
+{
+  color: #555753;
+}
+
 hr
 {
-  /* tango:aluminium 3 */
-  color: #babdb6;
-  background: #babdb6;
+  /* tango:aluminium 1 */
+  color: #d3d7cf;
+  background: #d3d7cf;
   border: none 0px;
   height: 1px;
   clear: both;
+  margin: 2.0em 0em 2.0em 0em;
+}
+
+dl.toc dt
+{
+  padding-bottom: 0.25em;
+}
+
+dl.toc > dd > dl > dt
+{
+  padding-top: 0.25em;
+  padding-bottom: 0.25em;
+}
+
+dl.toc > dt
+{
+  padding-top: 1em;
+  padding-bottom: 0.5em;
+  font-weight: bold;
+}
+
+.parameter
+{
+  font-style: normal;
 }
 
 .footer
@@ -173,31 +309,70 @@ hr
   font-size: 80%;
 }
 
+.informalfigure,
+.figure
+{
+  margin: 1em;
+}
+
+.informalexample,
+.example
+{
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
 .warning
 {
   /* tango:orange 0/1 */
   background: #ffeed9;
+  background: rgba(252, 175, 62, 0.1);
   border-color: #ffb04f;
+  border-color: rgba(252, 175, 62, 0.2);
 }
 .note
 {
   /* tango:chameleon 0/0.5 */
   background: #d8ffb2;
+  background: rgba(138, 226, 52, 0.1);
   border-color: #abf562;
+  border-color: rgba(138, 226, 52, 0.2);
 }
-.note, .warning
+div.blockquote
+{
+  border-color: #eeeeec;
+}
+.note, .warning, div.blockquote
 {
   padding: 0.5em;
   border-width: 1px;
   border-style: solid;
+  margin: 2em;
 }
-.note h3, .warning h3
+.note p, .warning p
 {
-  margin-top: 0.0em
+  margin: 0;
 }
-.note p, .warning p
+
+div.warning h3.title,
+div.note h3.title
 {
-  margin-bottom: 0.0em
+  display: none;
+}
+
+p + div.section
+{
+  margin-top: 1em;
+}
+
+div.refnamediv,
+div.refsynopsisdiv,
+div.refsect1,
+div.refsect2,
+div.toc,
+div.section
+{
+  margin-bottom: 1em;
 }
 
 /* blob links */
@@ -210,11 +385,22 @@ h2 .extralinks, h3 .extralinks
   font-weight: normal;
 }
 
+.lineart
+{
+  color: #d3d7cf;
+  font-weight: normal;
+}
+
 .annotation
 {
   /* tango:aluminium 5 */
   color: #555753;
-  font-size: 80%;
+  font-weight: normal;
+}
+
+.structfield
+{
+  font-style: normal;
   font-weight: normal;
 }
 
@@ -237,6 +423,7 @@ h2 .extralinks, h3 .extralinks
 .listing_frame {
   /* tango:sky blue 1 */
   border: solid 1px #729fcf;
+  border: solid 1px rgba(114, 159, 207, 0.2);
   padding: 0px;
 }
 
@@ -245,20 +432,28 @@ h2 .extralinks, h3 .extralinks
   margin-bottom: 0px;
   padding: 0.5em;
 }
+.listing_lines {
+  /* this just adds visual clutter and
+     takes precious room from small screens */
+  display: none;
+}
 .listing_lines {
   /* tango:sky blue 0.5 */
   background: #a6c5e3;
+  background: rgba(114, 159, 207, 0.2);
   /* tango:aluminium 6 */
   color: #2e3436;
 }
 .listing_code {
   /* tango:sky blue 0 */
   background: #e6f3ff;
+  background: rgba(114, 159, 207, 0.1);
 }
 .listing_code .programlisting {
   /* override from previous */
   border: none 0px;
   padding: 0px;
+  background: none;
 }
 .listing_lines pre, .listing_code pre {
   margin: 0px;
diff --git a/docs/libglabels/html/up-insensitive.png b/docs/libglabels/html/up-insensitive.png
new file mode 100644 (file)
index 0000000..bda3ce2
Binary files /dev/null and b/docs/libglabels/html/up-insensitive.png differ
index 8eb591f3b8d09f472b1d32c003da9647394a3823..af46b2ada6174d22fd8cafaa79ea0125c5a891a7 100644 (file)
Binary files a/docs/libglabels/html/up.png and b/docs/libglabels/html/up.png differ
index b66ea528df901718a9fe5b29c1a8a7166ddc9e9e..11960c6f1ee2055b9c8ed3c603a4cf2a26236e70 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # Everything below here is generic #
 ####################################
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -56,8 +83,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-       $(top_srcdir)/gtk-doc.make
+DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \
+       $(srcdir)/Makefile.am
 subdir = docs/libglbarcode
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -67,12 +94,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -80,6 +113,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -125,6 +159,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -386,11 +421,47 @@ REPORT_FILES = \
        $(DOC_MODULE)-undeclared.txt \
        $(DOC_MODULE)-unused.txt
 
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
+@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
+@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
+@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
+@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
+
+#### setup ####
+GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0 = @echo "  DOC   Preparing build";
+
+#### scan ####
+GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0 = @echo "  DOC   Scanning header files";
+GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
+
+#### templates ####
+GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V))
+GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_TMPL_0 = @echo "  DOC   Rebuilding template files";
+
+#### xml ####
+GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0 = @echo "  DOC   Building XML";
+
+#### html ####
+GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0 = @echo "  DOC   Building HTML";
+GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0 = @echo "  DOC   Fixing cross-references";
+
+#### pdf ####
+GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0 = @echo "  DOC   Building PDF";
 all: all-am
 
 .SUFFIXES:
@@ -431,11 +502,11 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -473,6 +544,7 @@ distdir: $(DISTFILES)
          dist-hook
 check-am: all-am
 check: check-am
+@ENABLE_GTK_DOC_FALSE@all-local:
 all-am: Makefile all-local
 installdirs:
 install: install-am
@@ -576,56 +648,58 @@ uninstall-am: uninstall-local
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-       clean-libtool clean-local dist-hook distclean \
-       distclean-generic distclean-libtool distclean-local distdir \
-       dvi dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-data-local install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am install-man \
-       install-pdf install-pdf-am install-ps install-ps-am \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic \
+       clean-libtool clean-local cscopelist-am ctags-am dist-hook \
+       distclean distclean-generic distclean-libtool distclean-local \
+       distdir dvi dvi-am html html-am info info-am install \
+       install-am install-data install-data-am install-data-local \
+       install-dvi install-dvi-am install-exec install-exec-am \
+       install-html install-html-am install-info install-info-am \
+       install-man install-pdf install-pdf-am install-ps \
+       install-ps-am install-strip installcheck installcheck-am \
+       installdirs maintainer-clean maintainer-clean-generic \
        maintainer-clean-local mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-       uninstall-local
+       mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+       uninstall-am uninstall-local
 
 
-@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-@ENABLE_GTK_DOC_FALSE@all-local:
+gtkdoc-check.test: Makefile
+       $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
+               echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
+               chmod +x $@
+
+all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+.PHONY: all-gtk-doc
+
+@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc
 
 docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 $(REPORT_FILES): sgml-build.stamp
 
-#### setup ####
-
 setup-build.stamp:
-       -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-           echo '  DOC   Preparing build'; \
+       -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
            files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
            if test "x$$files" != "x" ; then \
                for file in $$files ; do \
+                   destdir=`dirname $(abs_builddir)/$$file` ;\
+                   test -d "$$destdir" || mkdir -p "$$destdir"; \
                    test -f $(abs_srcdir)/$$file && \
-                       cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+                       cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
                done; \
            fi; \
            test -d $(abs_srcdir)/tmpl && \
-               { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+               { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
                chmod -R u+w $(abs_builddir)/tmpl; } \
        fi
-       @touch setup-build.stamp
+       $(AM_V_at)touch setup-build.stamp
 
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-       @echo '  DOC   Scanning header files'
-       @_source_dir='' ; \
+scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
+       $(GTK_DOC_V_SCAN)_source_dir='' ; \
        for i in $(DOC_SOURCE_DIR) ; do \
            _source_dir="$${_source_dir} --source-dir=$$i" ; \
        done ; \
        gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-       @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-           echo "  DOC   Introspecting gobjects"; \
+       $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
            scanobj_options=""; \
            gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
            if test "$(?)" = "0"; then \
@@ -640,22 +714,19 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
                test -f $$i || touch $$i ; \
            done \
        fi
-       @touch scan-build.stamp
+       $(AM_V_at)touch scan-build.stamp
 
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
        @true
 
-#### templates ####
-
 tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-       @echo '  DOC   Rebuilding template files'
-       @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-       @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+       $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+       $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
          if test -w $(abs_srcdir) ; then \
-           cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+           cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
          fi \
        fi
-       @touch tmpl-build.stamp
+       $(AM_V_at)touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
        @true
@@ -663,28 +734,20 @@ tmpl.stamp: tmpl-build.stamp
 $(srcdir)/tmpl/*.sgml:
        @true
 
-#### xml ####
-
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-       @echo '  DOC   Building XML'
-       @-chmod -R u+w $(srcdir)
-       @_source_dir='' ; \
+       -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \
        for i in $(DOC_SOURCE_DIR) ; do \
            _source_dir="$${_source_dir} --source-dir=$$i" ; \
        done ; \
        gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
-       @touch sgml-build.stamp
+       $(AM_V_at)touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
        @true
 
-#### html ####
-
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-       @echo '  DOC   Building HTML'
-       @rm -rf html
-       @mkdir html
-       @mkhtml_options=""; \
+       $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+       mkhtml_options=""; \
        gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
        if test "$(?)" = "0"; then \
          if test "x$(V)" = "x1"; then \
@@ -705,16 +768,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
            cp $(abs_builddir)/$$file $(abs_builddir)/html; \
          fi; \
        done;
-       @echo '  DOC   Fixing cross-references'
-       @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-       @touch html-build.stamp
-
-#### pdf ####
+       $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+       $(AM_V_at)touch html-build.stamp
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-       @echo '  DOC   Building PDF'
-       @rm -f $(DOC_MODULE).pdf
-       @mkpdf_options=""; \
+       $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+       mkpdf_options=""; \
        gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
        if test "$(?)" = "0"; then \
          if test "x$(V)" = "x1"; then \
@@ -731,13 +790,16 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
          done; \
        fi; \
        gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-       @touch pdf-build.stamp
+       $(AM_V_at)touch pdf-build.stamp
 
 ##############
 
 clean-local:
        @rm -f *~ *.bak
        @rm -rf .libs
+       @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
+         rm -f $(DOC_MODULE).types; \
+       fi
 
 distclean-local:
        @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
@@ -747,7 +809,7 @@ distclean-local:
            rm -rf tmpl; \
        fi
 
-maintainer-clean-local: clean
+maintainer-clean-local:
        @rm -rf xml html
 
 install-data-local:
@@ -783,12 +845,14 @@ uninstall-local:
 #
 # Require gtk-doc when making dist
 #
-@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc:
-@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc:
-@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist"
-@ENABLE_GTK_DOC_FALSE@ @false
-
-dist-hook: dist-check-gtkdoc dist-hook-local
+@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs
+@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc:
+@HAVE_GTK_DOC_FALSE@   @echo "*** gtk-doc is needed to run 'make dist'.         ***"
+@HAVE_GTK_DOC_FALSE@   @echo "*** gtk-doc was not found when 'configure' ran.   ***"
+@HAVE_GTK_DOC_FALSE@   @echo "*** please install gtk-doc and rerun 'configure'. ***"
+@HAVE_GTK_DOC_FALSE@   @false
+
+dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
        @mkdir $(distdir)/tmpl
        @mkdir $(distdir)/html
        @-cp ./tmpl/*.sgml $(distdir)/tmpl
index 17c059cbd155fa3b391a3a32fae88e8156ff3f71..ee0027bca8e789392cfd07e56184f68c08ded71c 100644 (file)
@@ -2,27 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>API Reference</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlbarcode 3.0 Reference Manual: API Reference</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlbarcode 3.0 Reference Manual">
 <link rel="up" href="index.html" title="LibGlbarcode 3.0 Reference Manual">
 <link rel="prev" href="libglbarcode-intro.html" title="Introduction">
 <link rel="next" href="libglbarcode-3.0-lgl-barcode.html" title="lglBarcode">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="libglbarcode-intro.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td> </td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlbarcode 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglbarcode-3.0-lgl-barcode.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="libglbarcode-intro.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglbarcode-3.0-lgl-barcode.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="api"></a>API Reference</h2></div></div></div>
-<div class="toc"><dl>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="api"></a>API Reference</h1></div></div></div>
+<div class="toc"><dl class="toc">
 <dt>
 <span class="refentrytitle"><a href="libglbarcode-3.0-lgl-barcode.html">lglBarcode</a></span><span class="refpurpose"> — Barcode structure</span>
 </dt>
@@ -39,6 +39,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index fb60b552ed4965b293039b2f814a71afca95e90c..28c2e27c6177f78365ca9fc04e5a1d0f0feaa51e 100644 (file)
Binary files a/docs/libglbarcode/html/home.png and b/docs/libglbarcode/html/home.png differ
index 41f265cfb756c4d34d4988644a7196a26fdeb5ce..26f760eb366f9cc77703a901e8f59267907dff33 100644 (file)
@@ -2,11 +2,11 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>LibGlbarcode 3.0 Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlbarcode 3.0 Reference Manual: LibGlbarcode 3.0 Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlbarcode 3.0 Reference Manual">
 <link rel="next" href="overview.html" title="LibGlbarcode Overview">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -15,7 +15,7 @@
 <div><div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">LibGlbarcode 3.0 Reference Manual</p></th></tr></table></div></div>
 <hr>
 </div>
-<div class="toc"><dl>
+<div class="toc"><dl class="toc">
 <dt><span class="chapter"><a href="overview.html">LibGlbarcode Overview</a></span></dt>
 <dd><dl><dt>
 <span class="refentrytitle"><a href="libglbarcode-intro.html">Introduction</a></span><span class="refpurpose"> — 
@@ -41,6 +41,6 @@ Introduction to libglbarcode library
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index d7129617bfae9c29ee93e3450a92581398803c54..f25dbcd666919f36725c1657abdd25c88adbec39 100644 (file)
@@ -1,11 +1,21 @@
 <ANCHOR id="libglbarcode-intro" href="libglbarcode-3.0/libglbarcode-intro.html">
 <ANCHOR id="libglbarcode-3.0-lgl-barcode" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html">
-<ANCHOR id="libglbarcode-3.0-lgl-barcode.synopsis" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#libglbarcode-3.0-lgl-barcode.synopsis">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode.functions" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#libglbarcode-3.0-lgl-barcode.functions">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode.other" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#libglbarcode-3.0-lgl-barcode.other">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode.object-hierarchy" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#libglbarcode-3.0-lgl-barcode.object-hierarchy">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode.includes" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#libglbarcode-3.0-lgl-barcode.includes">
 <ANCHOR id="libglbarcode-3.0-lgl-barcode.description" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#libglbarcode-3.0-lgl-barcode.description">
-<ANCHOR id="libglbarcode-3.0-lgl-barcode.details" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#libglbarcode-3.0-lgl-barcode.details">
-<ANCHOR id="lglBarcode" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lglBarcode">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode.functions_details" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#libglbarcode-3.0-lgl-barcode.functions_details">
 <ANCHOR id="lgl-barcode-new" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lgl-barcode-new">
 <ANCHOR id="lgl-barcode-free" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lgl-barcode-free">
+<ANCHOR id="lgl-barcode-add-line" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-line">
+<ANCHOR id="lgl-barcode-add-box" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-box">
+<ANCHOR id="lgl-barcode-add-char" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-char">
+<ANCHOR id="lgl-barcode-add-string" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-string">
+<ANCHOR id="lgl-barcode-add-ring" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-ring">
+<ANCHOR id="lgl-barcode-add-hexagon" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-hexagon">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode.other_details" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#libglbarcode-3.0-lgl-barcode.other_details">
+<ANCHOR id="lglBarcode" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lglBarcode">
 <ANCHOR id="lglBarcodeShapeType" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeType">
 <ANCHOR id="lglBarcodeShape" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lglBarcodeShape">
 <ANCHOR id="lglBarcodeShapeAny" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeAny">
 <ANCHOR id="lglBarcodeShapeString" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeString">
 <ANCHOR id="lglBarcodeShapeRing" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeRing">
 <ANCHOR id="lglBarcodeShapeHexagon" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeHexagon">
-<ANCHOR id="lgl-barcode-add-line" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-line">
-<ANCHOR id="lgl-barcode-add-box" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-box">
-<ANCHOR id="lgl-barcode-add-char" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-char">
-<ANCHOR id="lgl-barcode-add-string" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-string">
-<ANCHOR id="lgl-barcode-add-ring" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-ring">
-<ANCHOR id="lgl-barcode-add-hexagon" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-hexagon">
 <ANCHOR id="libglbarcode-3.0-lgl-barcode-create" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-create.html">
-<ANCHOR id="libglbarcode-3.0-lgl-barcode-create.synopsis" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-create.html#libglbarcode-3.0-lgl-barcode-create.synopsis">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode-create.functions" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-create.html#libglbarcode-3.0-lgl-barcode-create.functions">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode-create.object-hierarchy" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-create.html#libglbarcode-3.0-lgl-barcode-create.object-hierarchy">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode-create.includes" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-create.html#libglbarcode-3.0-lgl-barcode-create.includes">
 <ANCHOR id="libglbarcode-3.0-lgl-barcode-create.description" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-create.html#libglbarcode-3.0-lgl-barcode-create.description">
-<ANCHOR id="libglbarcode-3.0-lgl-barcode-create.details" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-create.html#libglbarcode-3.0-lgl-barcode-create.details">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode-create.functions_details" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-create.html#libglbarcode-3.0-lgl-barcode-create.functions_details">
 <ANCHOR id="lgl-barcode-create" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-create.html#lgl-barcode-create">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode-create.other_details" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-create.html#libglbarcode-3.0-lgl-barcode-create.other_details">
 <ANCHOR id="libglbarcode-3.0-lgl-barcode-render-to-cairo" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-render-to-cairo.html">
-<ANCHOR id="libglbarcode-3.0-lgl-barcode-render-to-cairo.synopsis" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-render-to-cairo.html#libglbarcode-3.0-lgl-barcode-render-to-cairo.synopsis">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode-render-to-cairo.functions" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-render-to-cairo.html#libglbarcode-3.0-lgl-barcode-render-to-cairo.functions">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode-render-to-cairo.object-hierarchy" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-render-to-cairo.html#libglbarcode-3.0-lgl-barcode-render-to-cairo.object-hierarchy">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode-render-to-cairo.includes" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-render-to-cairo.html#libglbarcode-3.0-lgl-barcode-render-to-cairo.includes">
 <ANCHOR id="libglbarcode-3.0-lgl-barcode-render-to-cairo.description" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-render-to-cairo.html#libglbarcode-3.0-lgl-barcode-render-to-cairo.description">
-<ANCHOR id="libglbarcode-3.0-lgl-barcode-render-to-cairo.details" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-render-to-cairo.html#libglbarcode-3.0-lgl-barcode-render-to-cairo.details">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode-render-to-cairo.functions_details" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-render-to-cairo.html#libglbarcode-3.0-lgl-barcode-render-to-cairo.functions_details">
 <ANCHOR id="lgl-barcode-render-to-cairo" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-render-to-cairo.html#lgl-barcode-render-to-cairo">
 <ANCHOR id="lgl-barcode-render-to-cairo-path" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-render-to-cairo.html#lgl-barcode-render-to-cairo-path">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode-render-to-cairo.other_details" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-render-to-cairo.html#libglbarcode-3.0-lgl-barcode-render-to-cairo.other_details">
 <ANCHOR id="libglbarcode-3.0-lgl-barcode-type" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html">
-<ANCHOR id="libglbarcode-3.0-lgl-barcode-type.synopsis" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#libglbarcode-3.0-lgl-barcode-type.synopsis">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode-type.other" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#libglbarcode-3.0-lgl-barcode-type.other">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode-type.object-hierarchy" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#libglbarcode-3.0-lgl-barcode-type.object-hierarchy">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode-type.includes" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#libglbarcode-3.0-lgl-barcode-type.includes">
 <ANCHOR id="libglbarcode-3.0-lgl-barcode-type.description" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#libglbarcode-3.0-lgl-barcode-type.description">
-<ANCHOR id="libglbarcode-3.0-lgl-barcode-type.details" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#libglbarcode-3.0-lgl-barcode-type.details">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode-type.functions_details" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#libglbarcode-3.0-lgl-barcode-type.functions_details">
+<ANCHOR id="libglbarcode-3.0-lgl-barcode-type.other_details" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#libglbarcode-3.0-lgl-barcode-type.other_details">
 <ANCHOR id="lglBarcodeType" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#lglBarcodeType">
-<ANCHOR id="LGL-BARCODE-TYPE-POSTNET:CAPS" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#LGL-BARCODE-TYPE-POSTNET:CAPS">
-<ANCHOR id="LGL-BARCODE-TYPE-POSTNET-5:CAPS" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#LGL-BARCODE-TYPE-POSTNET-5:CAPS">
-<ANCHOR id="LGL-BARCODE-TYPE-POSTNET-9:CAPS" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#LGL-BARCODE-TYPE-POSTNET-9:CAPS">
-<ANCHOR id="LGL-BARCODE-TYPE-POSTNET-11:CAPS" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#LGL-BARCODE-TYPE-POSTNET-11:CAPS">
-<ANCHOR id="LGL-BARCODE-TYPE-CEPNET:CAPS" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#LGL-BARCODE-TYPE-CEPNET:CAPS">
-<ANCHOR id="LGL-BARCODE-TYPE-ONECODE:CAPS" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#LGL-BARCODE-TYPE-ONECODE:CAPS">
-<ANCHOR id="LGL-BARCODE-TYPE-CODE39:CAPS" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#LGL-BARCODE-TYPE-CODE39:CAPS">
-<ANCHOR id="LGL-BARCODE-TYPE-CODE39-EXT:CAPS" href="libglbarcode-3.0/libglbarcode-3.0-lgl-barcode-type.html#LGL-BARCODE-TYPE-CODE39-EXT:CAPS">
diff --git a/docs/libglbarcode/html/left-insensitive.png b/docs/libglbarcode/html/left-insensitive.png
new file mode 100644 (file)
index 0000000..9b8005b
Binary files /dev/null and b/docs/libglbarcode/html/left-insensitive.png differ
index 48cab276723733c79792bf270990592938a46e1f..c518641ea922e1490796318103566648d4878634 100644 (file)
Binary files a/docs/libglbarcode/html/left.png and b/docs/libglbarcode/html/left.png differ
index a1d39f131fa88c768fd1c6eb6446c15d516b66e9..510369c0a63c093bb02e682ef78cbd4b9ffe904a 100644 (file)
@@ -2,30 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Barcode Factory</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlbarcode 3.0 Reference Manual: Barcode Factory</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlbarcode 3.0 Reference Manual">
 <link rel="up" href="api.html" title="API Reference">
 <link rel="prev" href="libglbarcode-3.0-lgl-barcode.html" title="lglBarcode">
 <link rel="next" href="libglbarcode-3.0-lgl-barcode-render-to-cairo.html" title="Cairo Renderer">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libglbarcode-3.0-lgl-barcode.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="api.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlbarcode 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglbarcode-3.0-lgl-barcode-render-to-cairo.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libglbarcode-3.0-lgl-barcode-create.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libglbarcode-3.0-lgl-barcode-create.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
+                  <a href="#libglbarcode-3.0-lgl-barcode-create.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+                  <a href="#libglbarcode-3.0-lgl-barcode-create.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="api.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libglbarcode-3.0-lgl-barcode.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglbarcode-3.0-lgl-barcode-render-to-cairo.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="libglbarcode-3.0-lgl-barcode-create"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <h2><span class="refentrytitle"><a name="libglbarcode-3.0-lgl-barcode-create.top_of_page"></a>Barcode Factory</span></h2>
 <p>Barcode Factory — Basic end-user barcode creation API</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="libglbarcode-3.0-lgl-barcode-create.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libglbarcode/lgl-barcode-create.h&gt;
-
-<a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="returnvalue">lglBarcode</span></a> *        <a class="link" href="libglbarcode-3.0-lgl-barcode-create.html#lgl-barcode-create" title="lgl_barcode_create ()">lgl_barcode_create</a>                  (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode-type.html#lglBarcodeType" title="enum lglBarcodeType"><span class="type">lglBarcodeType</span></a> type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> text_flag</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> checksum_flag</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *data</code></em>);
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode-create.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody><tr>
+<td class="function_type">
+<a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="returnvalue">lglBarcode</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglbarcode-3.0-lgl-barcode-create.html#lgl-barcode-create" title="lgl_barcode_create ()">lgl_barcode_create</a> <span class="c_punctuation">()</span>
+</td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode-create.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode-create.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;libglbarcode/lgl-barcode-create.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -56,67 +67,84 @@ barcode backend.
 </p>
 </div>
 <div class="refsect1">
-<a name="libglbarcode-3.0-lgl-barcode-create.details"></a><h2>Details</h2>
+<a name="libglbarcode-3.0-lgl-barcode-create.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="lgl-barcode-create"></a><h3>lgl_barcode_create ()</h3>
-<pre class="programlisting"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="returnvalue">lglBarcode</span></a> *        lgl_barcode_create                  (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode-type.html#lglBarcodeType" title="enum lglBarcodeType"><span class="type">lglBarcodeType</span></a> type</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> text_flag</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> checksum_flag</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>,
-                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *data</code></em>);</pre>
-<p>
-Create a new barcode structure, encoding <em class="parameter"><code>data</code></em> with selected barcode type and
-characteristics.
-</p>
-<p>
-Barcode dimensions (<em class="parameter"><code>w</code></em> and <em class="parameter"><code>h</code></em>) are in points ( 1 point = 1/72 inch ).
-If either <em class="parameter"><code>w</code></em> or <em class="parameter"><code>h</code></em> are zero, the barcode will be rendered in a nominal size
+<a name="lgl-barcode-create"></a><h3>lgl_barcode_create ()</h3>
+<pre class="programlisting"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="returnvalue">lglBarcode</span></a> *
+lgl_barcode_create (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode-type.html#lglBarcodeType" title="enum lglBarcodeType"><span class="type">lglBarcodeType</span></a> type</code></em>,
+                    <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> text_flag</code></em>,
+                    <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> checksum_flag</code></em>,
+                    <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> w</code></em>,
+                    <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> h</code></em>,
+                    <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *data</code></em>);</pre>
+<p>Create a new barcode structure, encoding <em class="parameter"><code>data</code></em>
+ with selected barcode type and
+characteristics.</p>
+<p>Barcode dimensions (<em class="parameter"><code>w</code></em>
+ and <em class="parameter"><code>h</code></em>
+) are in points ( 1 point = 1/72 inch ).
+If either <em class="parameter"><code>w</code></em>
+ or <em class="parameter"><code>h</code></em>
+ are zero, the barcode will be rendered in a nominal size
 appropriate for the barcode type and data.  The actual size of the resulting
 barcode may also be limited by required tolerances of line sizes and spacing
-for the given barcode type.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+for the given barcode type.</p>
+<div class="refsect3">
+<a name="id-1.3.3.7.2.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
-<td>Barcode type selection (<a class="link" href="libglbarcode-3.0-lgl-barcode-type.html#lglBarcodeType" title="enum lglBarcodeType"><span class="type">lglBarcodeType</span></a>)</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>text_flag</code></em> :</span></p></td>
-<td>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to show text, if supported by barcode type</td>
+<td class="parameter_name"><p>type</p></td>
+<td class="parameter_description"><p>Barcode type selection (<a class="link" href="libglbarcode-3.0-lgl-barcode-type.html#lglBarcodeType" title="enum lglBarcodeType"><span class="type">lglBarcodeType</span></a>)</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>checksum_flag</code></em> :</span></p></td>
-<td>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to include checksum, if supported or optional for barcode type</td>
+<td class="parameter_name"><p>text_flag</p></td>
+<td class="parameter_description"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to show text, if supported by barcode type</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>w</code></em> :</span></p></td>
-<td>Suggested width of barcode</td>
+<td class="parameter_name"><p>checksum_flag</p></td>
+<td class="parameter_description"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to include checksum, if supported or optional for barcode type</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>h</code></em> :</span></p></td>
-<td>Suggested height of barcode</td>
+<td class="parameter_name"><p>w</p></td>
+<td class="parameter_description"><p>Suggested width of barcode</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
-<td>Data to encode into barcode</td>
+<td class="parameter_name"><p>h</p></td>
+<td class="parameter_description"><p>Suggested height of barcode</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A newly allocated <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure.  Use <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-free" title="lgl_barcode_free ()"><code class="function">lgl_barcode_free()</code></a> to
-free it.</td>
+<td class="parameter_name"><p>data</p></td>
+<td class="parameter_description"><p>Data to encode into barcode</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+<div class="refsect3">
+<a name="id-1.3.3.7.2.7"></a><h4>Returns</h4>
+<p> A newly allocated <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure.  Use <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-free" title="lgl_barcode_free ()"><code class="function">lgl_barcode_free()</code></a> to
+free it.</p>
+<p></p>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode-create.other_details"></a><h2>Types and Values</h2>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index f15a3b97d158e4d4a046d905efa3ae2402ca6d13..9f60b4438c8244c3917e53528a8f315216424782 100644 (file)
@@ -2,30 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Cairo Renderer</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlbarcode 3.0 Reference Manual: Cairo Renderer</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlbarcode 3.0 Reference Manual">
 <link rel="up" href="api.html" title="API Reference">
 <link rel="prev" href="libglbarcode-3.0-lgl-barcode-create.html" title="Barcode Factory">
 <link rel="next" href="libglbarcode-3.0-lgl-barcode-type.html" title="Barcode Types">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libglbarcode-3.0-lgl-barcode-create.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="api.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlbarcode 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglbarcode-3.0-lgl-barcode-type.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libglbarcode-3.0-lgl-barcode-render-to-cairo.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libglbarcode-3.0-lgl-barcode-render-to-cairo.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
+                  <a href="#libglbarcode-3.0-lgl-barcode-render-to-cairo.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+                  <a href="#libglbarcode-3.0-lgl-barcode-render-to-cairo.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="api.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libglbarcode-3.0-lgl-barcode-create.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglbarcode-3.0-lgl-barcode-type.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="libglbarcode-3.0-lgl-barcode-render-to-cairo"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <h2><span class="refentrytitle"><a name="libglbarcode-3.0-lgl-barcode-render-to-cairo.top_of_page"></a>Cairo Renderer</span></h2>
 <p>Cairo Renderer — Render barcode to cairo context</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="libglbarcode-3.0-lgl-barcode-render-to-cairo.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libglbarcode/lgl-barcode-render-to-cairo.h&gt;
-
-<span class="returnvalue">void</span>                <a class="link" href="libglbarcode-3.0-lgl-barcode-render-to-cairo.html#lgl-barcode-render-to-cairo" title="lgl_barcode_render_to_cairo ()">lgl_barcode_render_to_cairo</a>         (<em class="parameter"><code>const <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
-                                                         <em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglbarcode-3.0-lgl-barcode-render-to-cairo.html#lgl-barcode-render-to-cairo-path" title="lgl_barcode_render_to_cairo_path ()">lgl_barcode_render_to_cairo_path</a>    (<em class="parameter"><code>const <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
-                                                         <em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>);
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode-render-to-cairo.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglbarcode-3.0-lgl-barcode-render-to-cairo.html#lgl-barcode-render-to-cairo" title="lgl_barcode_render_to_cairo ()">lgl_barcode_render_to_cairo</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglbarcode-3.0-lgl-barcode-render-to-cairo.html#lgl-barcode-render-to-cairo-path" title="lgl_barcode_render_to_cairo_path ()">lgl_barcode_render_to_cairo_path</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode-render-to-cairo.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode-render-to-cairo.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;libglbarcode/lgl-barcode-render-to-cairo.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -53,65 +76,84 @@ This section describes the cairo barcode renderer.
 </p>
 </div>
 <div class="refsect1">
-<a name="libglbarcode-3.0-lgl-barcode-render-to-cairo.details"></a><h2>Details</h2>
+<a name="libglbarcode-3.0-lgl-barcode-render-to-cairo.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
-<a name="lgl-barcode-render-to-cairo"></a><h3>lgl_barcode_render_to_cairo ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_barcode_render_to_cairo         (<em class="parameter"><code>const <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
-                                                         <em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>);</pre>
-<p>
-Render barcode to cairo context.  Context should be prepared with desired
+<a name="lgl-barcode-render-to-cairo"></a><h3>lgl_barcode_render_to_cairo ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_barcode_render_to_cairo (<em class="parameter"><code>const <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
+                             <em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cr</code></em>);</pre>
+<p>Render barcode to cairo context.  Context should be prepared with desired
 translation and appropriate scale.  Context should be translated such that
 the origin is at the desired location of the upper left hand corner of the
 barcode bounding box.  Context should be scaled such that all dimensions
 are in points ( 1 point = 1/72 inch ) and that positive y coordinates
-go down the surface.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+go down the surface.</p>
+<div class="refsect3">
+<a name="id-1.3.4.7.2.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>bc</code></em> :</span></p></td>
-<td>An <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure</td>
+<td class="parameter_name"><p>bc</p></td>
+<td class="parameter_description"><p>An <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td>
-<td>A <span class="type">cairo_t</span> context</td>
+<td class="parameter_name"><p>cr</p></td>
+<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> context</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
-<a name="lgl-barcode-render-to-cairo-path"></a><h3>lgl_barcode_render_to_cairo_path ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_barcode_render_to_cairo_path    (<em class="parameter"><code>const <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
-                                                         <em class="parameter"><code><span class="type">cairo_t</span> *cr</code></em>);</pre>
-<p>
-Render barcode to cairo context, but only create a path to be filled or
+<a name="lgl-barcode-render-to-cairo-path"></a><h3>lgl_barcode_render_to_cairo_path ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_barcode_render_to_cairo_path (<em class="parameter"><code>const <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
+                                  <em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cr</code></em>);</pre>
+<p>Render barcode to cairo context, but only create a path to be filled or
 tested against.  Context should be prepared with desired
 translation and appropriate scale.  Context should be translated such that
 the origin is at the desired location of the upper left hand corner of the
 barcode bounding box.  Context should be scaled such that all dimensions
 are in points ( 1 point = 1/72 inch ) and that positive y coordinates
-go down the surface.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+go down the surface.</p>
+<div class="refsect3">
+<a name="id-1.3.4.7.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>bc</code></em> :</span></p></td>
-<td>An <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure</td>
+<td class="parameter_name"><p>bc</p></td>
+<td class="parameter_description"><p>An <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td>
-<td>A <span class="type">cairo_t</span> context</td>
+<td class="parameter_name"><p>cr</p></td>
+<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> context</p></td>
+<td class="parameter_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
 </div>
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode-render-to-cairo.other_details"></a><h2>Types and Values</h2>
+</div>
+</div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 88e9018aba7c84d115cb288a11c579469d22890b..e4833ac7072ea1b393aedd3b6c5969939a8be3f1 100644 (file)
@@ -2,29 +2,26 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Barcode Types</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlbarcode 3.0 Reference Manual: Barcode Types</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlbarcode 3.0 Reference Manual">
 <link rel="up" href="api.html" title="API Reference">
 <link rel="prev" href="libglbarcode-3.0-lgl-barcode-render-to-cairo.html" title="Cairo Renderer">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="libglbarcode-3.0-lgl-barcode-render-to-cairo.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="api.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlbarcode 3.0 Reference Manual</th>
-<td> </td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libglbarcode-3.0-lgl-barcode-type.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libglbarcode-3.0-lgl-barcode-type.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
+                  <a href="#libglbarcode-3.0-lgl-barcode-type.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+                  <a href="#libglbarcode-3.0-lgl-barcode-type.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="api.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="libglbarcode-3.0-lgl-barcode-render-to-cairo.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><img src="right-insensitive.png" width="16" height="16" border="0"></td>
+</tr></table>
 <div class="refentry">
 <a name="libglbarcode-3.0-lgl-barcode-type"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <h2><span class="refentrytitle"><a name="libglbarcode-3.0-lgl-barcode-type.top_of_page"></a>Barcode Types</span></h2>
 <p>Barcode Types — Enumeration of supported barcode types</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="libglbarcode-3.0-lgl-barcode-type.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libglbarcode/lgl-barcode-type.h&gt;
-
-enum                <a class="link" href="libglbarcode-3.0-lgl-barcode-type.html#lglBarcodeType" title="enum lglBarcodeType">lglBarcodeType</a>;
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode-type.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody><tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="libglbarcode-3.0-lgl-barcode-type.html#lglBarcodeType" title="enum lglBarcodeType">lglBarcodeType</a></td>
+</tr></tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode-type.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode-type.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;libglbarcode/lgl-barcode-type.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -49,75 +61,88 @@ This section describes an enumeration for selecting one of the barcode types sup
 </p>
 </div>
 <div class="refsect1">
-<a name="libglbarcode-3.0-lgl-barcode-type.details"></a><h2>Details</h2>
+<a name="libglbarcode-3.0-lgl-barcode-type.functions_details"></a><h2>Functions</h2>
+</div>
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode-type.other_details"></a><h2>Types and Values</h2>
 <div class="refsect2">
 <a name="lglBarcodeType"></a><h3>enum lglBarcodeType</h3>
-<pre class="programlisting">typedef enum {
-        LGL_BARCODE_TYPE_POSTNET,        /* USPS Postnet Barcode (5, 9, or 11 digits) */
-        LGL_BARCODE_TYPE_POSTNET_5,      /* USPS Postnet Barcode (5 digits) */
-        LGL_BARCODE_TYPE_POSTNET_9,      /* USPS Postnet Barcode (9 digits) */
-        LGL_BARCODE_TYPE_POSTNET_11,     /* USPS Postnet Barcode (11 digits) */
-        LGL_BARCODE_TYPE_CEPNET,         /* Brazilian Postal Code */
-
-        LGL_BARCODE_TYPE_ONECODE,        /* USPS Intelligent Mail Barcode */
-
-        LGL_BARCODE_TYPE_CODE39,         /* Code 39 */
-        LGL_BARCODE_TYPE_CODE39_EXT,     /* Extended Code 39 (Supports full ASCII character set) */
-} lglBarcodeType;
-</pre>
 <p>
 This enumeration is used to select a built-in barcode type.  The currently supported barcode types are
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<div class="refsect3">
+<a name="id-1.3.5.8.2.4"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><a name="LGL-BARCODE-TYPE-POSTNET:CAPS"></a><span class="term"><code class="literal">LGL_BARCODE_TYPE_POSTNET</code></span></p></td>
-<td>    USPS Postnet Barcode (5, 9, or 11 digits)
+<td class="enum_member_name"><p><a name="LGL-BARCODE-TYPE-POSTNET:CAPS"></a>LGL_BARCODE_TYPE_POSTNET</p></td>
+<td class="enum_member_description">
+<p>    USPS Postnet Barcode (5, 9, or 11 digits)</p>
 </td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><a name="LGL-BARCODE-TYPE-POSTNET-5:CAPS"></a><span class="term"><code class="literal">LGL_BARCODE_TYPE_POSTNET_5</code></span></p></td>
-<td>  USPS Postnet Barcode (5 digits)
+<td class="enum_member_name"><p><a name="LGL-BARCODE-TYPE-POSTNET-5:CAPS"></a>LGL_BARCODE_TYPE_POSTNET_5</p></td>
+<td class="enum_member_description">
+<p>  USPS Postnet Barcode (5 digits)</p>
 </td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><a name="LGL-BARCODE-TYPE-POSTNET-9:CAPS"></a><span class="term"><code class="literal">LGL_BARCODE_TYPE_POSTNET_9</code></span></p></td>
-<td>  USPS Postnet Barcode (9 digits)
+<td class="enum_member_name"><p><a name="LGL-BARCODE-TYPE-POSTNET-9:CAPS"></a>LGL_BARCODE_TYPE_POSTNET_9</p></td>
+<td class="enum_member_description">
+<p>  USPS Postnet Barcode (9 digits)</p>
 </td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><a name="LGL-BARCODE-TYPE-POSTNET-11:CAPS"></a><span class="term"><code class="literal">LGL_BARCODE_TYPE_POSTNET_11</code></span></p></td>
-<td> USPS Postnet Barcode (11 digits)
+<td class="enum_member_name"><p><a name="LGL-BARCODE-TYPE-POSTNET-11:CAPS"></a>LGL_BARCODE_TYPE_POSTNET_11</p></td>
+<td class="enum_member_description">
+<p> USPS Postnet Barcode (11 digits)</p>
 </td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><a name="LGL-BARCODE-TYPE-CEPNET:CAPS"></a><span class="term"><code class="literal">LGL_BARCODE_TYPE_CEPNET</code></span></p></td>
-<td>     Brazilian Postal Code
+<td class="enum_member_name"><p><a name="LGL-BARCODE-TYPE-CEPNET:CAPS"></a>LGL_BARCODE_TYPE_CEPNET</p></td>
+<td class="enum_member_description">
+<p>     Brazilian Postal Code</p>
 </td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><a name="LGL-BARCODE-TYPE-ONECODE:CAPS"></a><span class="term"><code class="literal">LGL_BARCODE_TYPE_ONECODE</code></span></p></td>
-<td>    USPS Intelligent Mail Barcode
+<td class="enum_member_name"><p><a name="LGL-BARCODE-TYPE-ONECODE:CAPS"></a>LGL_BARCODE_TYPE_ONECODE</p></td>
+<td class="enum_member_description">
+<p>    USPS Intelligent Mail Barcode</p>
 </td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><a name="LGL-BARCODE-TYPE-CODE39:CAPS"></a><span class="term"><code class="literal">LGL_BARCODE_TYPE_CODE39</code></span></p></td>
-<td>     Code 39
+<td class="enum_member_name"><p><a name="LGL-BARCODE-TYPE-CODE39:CAPS"></a>LGL_BARCODE_TYPE_CODE39</p></td>
+<td class="enum_member_description">
+<p>     Code 39</p>
 </td>
+<td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><a name="LGL-BARCODE-TYPE-CODE39-EXT:CAPS"></a><span class="term"><code class="literal">LGL_BARCODE_TYPE_CODE39_EXT</code></span></p></td>
-<td> Extended Code 39 (Supports full ASCII character set)
+<td class="enum_member_name"><p><a name="LGL-BARCODE-TYPE-CODE39-EXT:CAPS"></a>LGL_BARCODE_TYPE_CODE39_EXT</p></td>
+<td class="enum_member_description">
+<p> Extended Code 39 (Supports full ASCII character set)</p>
 </td>
+<td class="enum_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
 </div>
 </div>
+</div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 97ce1bd4350c2d3d58682553df21fae40c3c8811..074f1ae46c3744fd4b62da26656300c3c138b2d5 100644 (file)
@@ -2,30 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>lglBarcode</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlbarcode 3.0 Reference Manual: lglBarcode</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlbarcode 3.0 Reference Manual">
 <link rel="up" href="api.html" title="API Reference">
 <link rel="prev" href="api.html" title="API Reference">
 <link rel="next" href="libglbarcode-3.0-lgl-barcode-create.html" title="Barcode Factory">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="api.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="api.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlbarcode 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglbarcode-3.0-lgl-barcode-create.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#libglbarcode-3.0-lgl-barcode.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#libglbarcode-3.0-lgl-barcode.description" class="shortcut">Description</a>
-</td></tr>
-</table>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts">
+<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span> 
+                  <a href="#libglbarcode-3.0-lgl-barcode.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span> 
+                  <a href="#libglbarcode-3.0-lgl-barcode.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
+</td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="api.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="api.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglbarcode-3.0-lgl-barcode-create.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+</tr></table>
 <div class="refentry">
 <a name="libglbarcode-3.0-lgl-barcode"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <h2><span class="refentrytitle"><a name="libglbarcode-3.0-lgl-barcode.top_of_page"></a>lglBarcode</span></h2>
 <p>lglBarcode — Barcode structure</p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv">
-<a name="libglbarcode-3.0-lgl-barcode.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">
-#include &lt;libglbarcode/lgl-barcode.h&gt;
-
-                    <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode">lglBarcode</a>;
-
-<a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="returnvalue">lglBarcode</span></a> *        <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-new" title="lgl_barcode_new ()">lgl_barcode_new</a>                     (<em class="parameter"><code><span class="type">void</span></code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-free" title="lgl_barcode_free ()">lgl_barcode_free</a>                    (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>);
-
-enum                <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeType" title="enum lglBarcodeShapeType">lglBarcodeShapeType</a>;
-                    <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShape" title="lglBarcodeShape">lglBarcodeShape</a>;
-                    <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeAny" title="lglBarcodeShapeAny">lglBarcodeShapeAny</a>;
-                    <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeLine" title="lglBarcodeShapeLine">lglBarcodeShapeLine</a>;
-                    <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeBox" title="lglBarcodeShapeBox">lglBarcodeShapeBox</a>;
-                    <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeChar" title="lglBarcodeShapeChar">lglBarcodeShapeChar</a>;
-                    <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeString" title="lglBarcodeShapeString">lglBarcodeShapeString</a>;
-                    <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeRing" title="lglBarcodeShapeRing">lglBarcodeShapeRing</a>;
-                    <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeHexagon" title="lglBarcodeShapeHexagon">lglBarcodeShapeHexagon</a>;
-
-<span class="returnvalue">void</span>                <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-line" title="lgl_barcode_add_line ()">lgl_barcode_add_line</a>                (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> length</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> width</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-box" title="lgl_barcode_add_box ()">lgl_barcode_add_box</a>                 (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> width</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> height</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-char" title="lgl_barcode_add_char ()">lgl_barcode_add_char</a>                (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> fsize</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> c</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-string" title="lgl_barcode_add_string ()">lgl_barcode_add_string</a>              (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> fsize</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *string</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> length</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-ring" title="lgl_barcode_add_ring ()">lgl_barcode_add_ring</a>                (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> radius</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> line_width</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-hexagon" title="lgl_barcode_add_hexagon ()">lgl_barcode_add_hexagon</a>             (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> height</code></em>);
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode.functions"></a><h2>Functions</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="functions_return">
+<col class="functions_name">
+</colgroup>
+<tbody>
+<tr>
+<td class="function_type">
+<a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="returnvalue">lglBarcode</span></a> *
+</td>
+<td class="function_name">
+<a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-new" title="lgl_barcode_new ()">lgl_barcode_new</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-free" title="lgl_barcode_free ()">lgl_barcode_free</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-line" title="lgl_barcode_add_line ()">lgl_barcode_add_line</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-box" title="lgl_barcode_add_box ()">lgl_barcode_add_box</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-char" title="lgl_barcode_add_char ()">lgl_barcode_add_char</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-string" title="lgl_barcode_add_string ()">lgl_barcode_add_string</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-ring" title="lgl_barcode_add_ring ()">lgl_barcode_add_ring</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">void</span>
+</td>
+<td class="function_name">
+<a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-hexagon" title="lgl_barcode_add_hexagon ()">lgl_barcode_add_hexagon</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode.other"></a><h2>Types and Values</h2>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="name">
+<col class="description">
+</colgroup>
+<tbody>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode">lglBarcode</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeType" title="enum lglBarcodeShapeType">lglBarcodeShapeType</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShape" title="lglBarcodeShape">lglBarcodeShape</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeAny" title="lglBarcodeShapeAny">lglBarcodeShapeAny</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeLine" title="lglBarcodeShapeLine">lglBarcodeShapeLine</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeBox" title="lglBarcodeShapeBox">lglBarcodeShapeBox</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeChar" title="lglBarcodeShapeChar">lglBarcodeShapeChar</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeString" title="lglBarcodeShapeString">lglBarcodeShapeString</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeRing" title="lglBarcodeShapeRing">lglBarcodeShapeRing</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword"> </td>
+<td class="function_name"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeHexagon" title="lglBarcodeShapeHexagon">lglBarcodeShapeHexagon</a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="screen">
+</pre>
+</div>
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode.includes"></a><h2>Includes</h2>
+<pre class="synopsis">#include &lt;libglbarcode/lgl-barcode.h&gt;
 </pre>
 </div>
 <div class="refsect1">
@@ -96,7 +177,362 @@ The section also defines a set of functions for constructing an <a class="link"
 </p>
 </div>
 <div class="refsect1">
-<a name="libglbarcode-3.0-lgl-barcode.details"></a><h2>Details</h2>
+<a name="libglbarcode-3.0-lgl-barcode.functions_details"></a><h2>Functions</h2>
+<div class="refsect2">
+<a name="lgl-barcode-new"></a><h3>lgl_barcode_new ()</h3>
+<pre class="programlisting"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="returnvalue">lglBarcode</span></a> *
+lgl_barcode_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>Allocate a new <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure.</p>
+<p>This function allocates a new <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure.</p>
+<div class="note"><p>
+      This function is intended to be used internally by barcode implementations.
+      Typically an end-user would use <a class="link" href="libglbarcode-3.0-lgl-barcode-create.html#lgl-barcode-create" title="lgl_barcode_create ()"><code class="function">lgl_barcode_create()</code></a> instead.
+</p></div>
+<div class="refsect3">
+<a name="id-1.3.2.8.2.7"></a><h4>Returns</h4>
+<p> A newly allocated <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure.  Use <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-free" title="lgl_barcode_free ()"><code class="function">lgl_barcode_free()</code></a> to
+free it.</p>
+<p></p>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-barcode-free"></a><h3>lgl_barcode_free ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_barcode_free (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>);</pre>
+<p>Free a previously allocated <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure.</p>
+<div class="refsect3">
+<a name="id-1.3.2.8.3.5"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody><tr>
+<td class="parameter_name"><p>bc</p></td>
+<td class="parameter_description"><p>The <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure to free</p></td>
+<td class="parameter_annotations"> </td>
+</tr></tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-barcode-add-line"></a><h3>lgl_barcode_add_line ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_barcode_add_line (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
+                      <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
+                      <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
+                      <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> length</code></em>,
+                      <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> width</code></em>);</pre>
+<p>Add a vertical line to barcode.  Coordinates are relative to top left corner
+of barcode.  All units are in points ( 1 point = 1/72 inch ).</p>
+<div class="note"><p>
+       This function is intended to be used internally by barcode implementations.
+</p></div>
+<div class="refsect3">
+<a name="id-1.3.2.8.4.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>bc</p></td>
+<td class="parameter_description"><p>An <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>x</p></td>
+<td class="parameter_description"><p>x coordinate of top of line</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>y</p></td>
+<td class="parameter_description"><p>y coordinate of top of line</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>length</p></td>
+<td class="parameter_description"><p>Length of line</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>width</p></td>
+<td class="parameter_description"><p>Width of line</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-barcode-add-box"></a><h3>lgl_barcode_add_box ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_barcode_add_box (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
+                     <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
+                     <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
+                     <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> width</code></em>,
+                     <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> height</code></em>);</pre>
+<p>Add a box to barcode.  Coordinates are relative to top left corner
+of barcode.  All units are in points ( 1 point = 1/72 inch ).</p>
+<div class="note"><p>
+       This function is intended to be used internally by barcode implementations.
+</p></div>
+<div class="refsect3">
+<a name="id-1.3.2.8.5.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>bc</p></td>
+<td class="parameter_description"><p>An <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>x</p></td>
+<td class="parameter_description"><p>x coordinate of top left corner of box</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>y</p></td>
+<td class="parameter_description"><p>y coordinate of top left corner of box</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>width</p></td>
+<td class="parameter_description"><p>Width of box</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>height</p></td>
+<td class="parameter_description"><p>Height of box</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-barcode-add-char"></a><h3>lgl_barcode_add_char ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_barcode_add_char (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
+                      <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
+                      <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
+                      <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> fsize</code></em>,
+                      <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> c</code></em>);</pre>
+<p>Add an ASCII character to barcode.  Coordinates are relative to top left corner
+of barcode.  All units are in points ( 1 point = 1/72 inch ).</p>
+<div class="note"><p>
+       This function is intended to be used internally by barcode implementations.
+</p></div>
+<div class="refsect3">
+<a name="id-1.3.2.8.6.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>bc</p></td>
+<td class="parameter_description"><p>An <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>x</p></td>
+<td class="parameter_description"><p>x coordinate of left baseline of character</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>y</p></td>
+<td class="parameter_description"><p>y coordinate of left baseline of character</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>fsize</p></td>
+<td class="parameter_description"><p>Font size</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>c</p></td>
+<td class="parameter_description"><p>Character to add</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-barcode-add-string"></a><h3>lgl_barcode_add_string ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_barcode_add_string (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
+                        <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
+                        <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
+                        <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> fsize</code></em>,
+                        <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *string</code></em>,
+                        <em class="parameter"><code><span class="type">gsize</span> length</code></em>);</pre>
+<p>Add a character string to barcode.  Coordinates are relative to top left corner
+of barcode.  All units are in points ( 1 point = 1/72 inch ).</p>
+<div class="note"><p>
+       This function is intended to be used internally by barcode implementations.
+</p></div>
+<div class="refsect3">
+<a name="id-1.3.2.8.7.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>bc</p></td>
+<td class="parameter_description"><p>An <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>x</p></td>
+<td class="parameter_description"><p>x coordinate of horizontal center of baseline of string</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>y</p></td>
+<td class="parameter_description"><p>y coordinate of horizontal center of baseline of string</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>fsize</p></td>
+<td class="parameter_description"><p>Font size</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>string</p></td>
+<td class="parameter_description"><p>String to add</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>length</p></td>
+<td class="parameter_description"><p>Number of bytes in string</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-barcode-add-ring"></a><h3>lgl_barcode_add_ring ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_barcode_add_ring (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
+                      <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
+                      <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
+                      <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> radius</code></em>,
+                      <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> line_width</code></em>);</pre>
+<p>Add a ring to barcode.  Coordinates are relative to top left corner
+of barcode.  All units are in points ( 1 point = 1/72 inch ).</p>
+<div class="note"><p>
+       This function is intended to be used internally by barcode implementations.
+</p></div>
+<div class="refsect3">
+<a name="id-1.3.2.8.8.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>bc</p></td>
+<td class="parameter_description"><p>An <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>x</p></td>
+<td class="parameter_description"><p>x coordinate of center of circle</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>y</p></td>
+<td class="parameter_description"><p>y coordinate of center of circle</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>radius</p></td>
+<td class="parameter_description"><p>Radius of ring (center of line)</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>line_width</p></td>
+<td class="parameter_description"><p>Width of line</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="lgl-barcode-add-hexagon"></a><h3>lgl_barcode_add_hexagon ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>
+lgl_barcode_add_hexagon (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
+                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
+                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
+                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> height</code></em>);</pre>
+<p>Add a regular hexagon (oriented with vertexes at top and bottom) to barcode.
+Coordinates are relative to top left corner of barcode.  All units are in
+points ( 1 point = 1/72 inch ).</p>
+<div class="note"><p>
+       This function is intended to be used internally by barcode implementations.
+</p></div>
+<div class="refsect3">
+<a name="id-1.3.2.8.9.6"></a><h4>Parameters</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>bc</p></td>
+<td class="parameter_description"><p>An <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>x</p></td>
+<td class="parameter_description"><p>x coordinate of top point of hexagon</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>y</p></td>
+<td class="parameter_description"><p>y coordinate of top point of hexagon</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>height</p></td>
+<td class="parameter_description"><p>Height of hexagon</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="refsect1">
+<a name="libglbarcode-3.0-lgl-barcode.other_details"></a><h2>Types and Values</h2>
 <div class="refsect2">
 <a name="lglBarcode"></a><h3>lglBarcode</h3>
 <pre class="programlisting">typedef struct {
@@ -106,108 +542,90 @@ The section also defines a set of functions for constructing an <a class="link"
         GList   *shapes;    /* List of lglBarcodeShape drawing primitives */
 } lglBarcode;
 </pre>
-<p>
-This structure contains the libglbarcode intermediate barcode format.  This
+<p>This structure contains the libglbarcode intermediate barcode format.  This
 structure contains a simple vectorized representation of the barcode.  This
 vectorized representation is easy to interpret by a rendering backend for
 either vector or raster formats.  A simple API is provided for constructing
-barcodes in this format.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+barcodes in this format.</p>
+<div class="refsect3">
+<a name="id-1.3.2.9.2.5"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcode.width"></a>width</code></em>;</span></p></td>
-<td>Width of barcode bounding box (points)</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcode.width"></a>width</code></em>;</p></td>
+<td class="struct_member_description"><p>Width of barcode bounding box (points)</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcode.height"></a>height</code></em>;</span></p></td>
-<td>Height of barcode bounding box (points)</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcode.height"></a>height</code></em>;</p></td>
+<td class="struct_member_description"><p>Height of barcode bounding box (points)</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglBarcode.shapes"></a>shapes</code></em>;</span></p></td>
-<td>List of <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShape" title="lglBarcodeShape"><span class="type">lglBarcodeShape</span></a> drawing primitives</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *<em class="structfield"><code><a name="lglBarcode.shapes"></a>shapes</code></em>;</p></td>
+<td class="struct_member_description"><p>List of <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShape" title="lglBarcodeShape"><span class="type">lglBarcodeShape</span></a> drawing primitives</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="lgl-barcode-new"></a><h3>lgl_barcode_new ()</h3>
-<pre class="programlisting"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="returnvalue">lglBarcode</span></a> *        lgl_barcode_new                     (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-Allocate a new <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure.
-</p>
-<p>
-This function allocates a new <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure.
-</p>
-<p>
-</p>
-<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Note</h3>
-<p>
-      This function is intended to be used internally by barcode implementations.
-      Typically an end-user would use <a class="link" href="libglbarcode-3.0-lgl-barcode-create.html#lgl-barcode-create" title="lgl_barcode_create ()"><code class="function">lgl_barcode_create()</code></a> instead.
-</p>
-</div>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A newly allocated <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure.  Use <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-free" title="lgl_barcode_free ()"><code class="function">lgl_barcode_free()</code></a> to
-free it.</td>
-</tr></tbody>
-</table></div>
 </div>
 <hr>
 <div class="refsect2">
-<a name="lgl-barcode-free"></a><h3>lgl_barcode_free ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_barcode_free                    (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>);</pre>
+<a name="lglBarcodeShapeType"></a><h3>enum lglBarcodeShapeType</h3>
 <p>
-Free a previously allocated <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure.
 </p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>bc</code></em> :</span></p></td>
-<td>The <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure to free</td>
-</tr></tbody>
+<div class="refsect3">
+<a name="id-1.3.2.9.3.4"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-BARCODE-SHAPE-LINE:CAPS"></a>LGL_BARCODE_SHAPE_LINE</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-BARCODE-SHAPE-BOX:CAPS"></a>LGL_BARCODE_SHAPE_BOX</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-BARCODE-SHAPE-CHAR:CAPS"></a>LGL_BARCODE_SHAPE_CHAR</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-BARCODE-SHAPE-STRING:CAPS"></a>LGL_BARCODE_SHAPE_STRING</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-BARCODE-SHAPE-RING:CAPS"></a>LGL_BARCODE_SHAPE_RING</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="LGL-BARCODE-SHAPE-HEXAGON:CAPS"></a>LGL_BARCODE_SHAPE_HEXAGON</p></td>
+<td class="enum_member_description"> </td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="lglBarcodeShapeType"></a><h3>enum lglBarcodeShapeType</h3>
-<pre class="programlisting">typedef enum {
-        LGL_BARCODE_SHAPE_LINE,
-        LGL_BARCODE_SHAPE_BOX,
-        LGL_BARCODE_SHAPE_CHAR,
-        LGL_BARCODE_SHAPE_STRING,
-        LGL_BARCODE_SHAPE_RING,
-        LGL_BARCODE_SHAPE_HEXAGON
-} lglBarcodeShapeType;
-</pre>
-<p>
-</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="lglBarcodeShape"></a><h3>lglBarcodeShape</h3>
-<pre class="programlisting">typedef union {
-
-        lglBarcodeShapeType    type;
-        lglBarcodeShapeAny     any;
-
-        lglBarcodeShapeLine    line;
-        lglBarcodeShapeBox     box;
-        lglBarcodeShapeChar    bchar;
-        lglBarcodeShapeString  string;
-        lglBarcodeShapeRing    ring;
-        lglBarcodeShapeHexagon hexagon;
-
-} lglBarcodeShape;
-</pre>
 <p>
 </p>
 </div>
@@ -239,11 +657,7 @@ Free a previously allocated <a class="link" href="libglbarcode-3.0-lgl-barcode.h
         gdouble              width;
 } lglBarcodeShapeLine;
 </pre>
-<p>
-A vertical line drawing primitive.
-</p>
-<p>
-</p>
+<p>A vertical line drawing primitive.</p>
 <pre class="programlisting">
 
 @ =  origin (x,y) from top left corner of barcode
@@ -260,38 +674,45 @@ A vertical line drawing primitive.
               width
 
 </pre>
-<p>
-</p>
-<p>
-All units are in points ( 1 point = 1/72 inch ).
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<p>All units are in points ( 1 point = 1/72 inch ).</p>
+<div class="refsect3">
+<a name="id-1.3.2.9.6.7"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeType" title="enum lglBarcodeShapeType"><span class="type">lglBarcodeShapeType</span></a> <em class="structfield"><code><a name="lglBarcodeShapeLine.type"></a>type</code></em>;</span></p></td>
-<td>Always <code class="literal">LGL_BARCODE_SHAPE_LINE</code>
-</td>
+<td class="struct_member_name"><p><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeType" title="enum lglBarcodeShapeType"><span class="type">lglBarcodeShapeType</span></a> <em class="structfield"><code><a name="lglBarcodeShapeLine.type"></a>type</code></em>;</p></td>
+<td class="struct_member_description"><p>Always <a class="link" href="libglbarcode-3.0-lgl-barcode.html#LGL-BARCODE-SHAPE-LINE:CAPS"><code class="literal">LGL_BARCODE_SHAPE_LINE</code></a></p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeLine.x"></a>x</code></em>;</span></p></td>
-<td>x coordinate of top of line</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeLine.x"></a>x</code></em>;</p></td>
+<td class="struct_member_description"><p>x coordinate of top of line</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeLine.y"></a>y</code></em>;</span></p></td>
-<td>y coordinate of top of line</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeLine.y"></a>y</code></em>;</p></td>
+<td class="struct_member_description"><p>y coordinate of top of line</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeLine.length"></a>length</code></em>;</span></p></td>
-<td>Length of line</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeLine.length"></a>length</code></em>;</p></td>
+<td class="struct_member_description"><p>Length of line</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeLine.width"></a>width</code></em>;</span></p></td>
-<td>Width of line</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeLine.width"></a>width</code></em>;</p></td>
+<td class="struct_member_description"><p>Width of line</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
 <a name="lglBarcodeShapeBox"></a><h3>lglBarcodeShapeBox</h3>
@@ -306,11 +727,7 @@ All units are in points ( 1 point = 1/72 inch ).
         gdouble              height;
 } lglBarcodeShapeBox;
 </pre>
-<p>
-A solid box drawing primitive.
-</p>
-<p>
-</p>
+<p>A solid box drawing primitive.</p>
 <pre class="programlisting">
 
 @ =  origin (x,y) from top left corner of barcode
@@ -327,38 +744,45 @@ A solid box drawing primitive.
                 width
 
 </pre>
-<p>
-</p>
-<p>
-All units are in points ( 1 point = 1/72 inch ).
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<p>All units are in points ( 1 point = 1/72 inch ).</p>
+<div class="refsect3">
+<a name="id-1.3.2.9.7.7"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeType" title="enum lglBarcodeShapeType"><span class="type">lglBarcodeShapeType</span></a> <em class="structfield"><code><a name="lglBarcodeShapeBox.type"></a>type</code></em>;</span></p></td>
-<td>Always <code class="literal">LGL_BARCODE_SHAPE_BOX</code>
-</td>
+<td class="struct_member_name"><p><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeType" title="enum lglBarcodeShapeType"><span class="type">lglBarcodeShapeType</span></a> <em class="structfield"><code><a name="lglBarcodeShapeBox.type"></a>type</code></em>;</p></td>
+<td class="struct_member_description"><p>Always <a class="link" href="libglbarcode-3.0-lgl-barcode.html#LGL-BARCODE-SHAPE-BOX:CAPS"><code class="literal">LGL_BARCODE_SHAPE_BOX</code></a></p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeBox.x"></a>x</code></em>;</span></p></td>
-<td>x coordinate of top left corner of box</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeBox.x"></a>x</code></em>;</p></td>
+<td class="struct_member_description"><p>x coordinate of top left corner of box</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeBox.y"></a>y</code></em>;</span></p></td>
-<td>y coordinate of top left corner of box</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeBox.y"></a>y</code></em>;</p></td>
+<td class="struct_member_description"><p>y coordinate of top left corner of box</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeBox.width"></a>width</code></em>;</span></p></td>
-<td>Width of box</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeBox.width"></a>width</code></em>;</p></td>
+<td class="struct_member_description"><p>Width of box</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeBox.height"></a>height</code></em>;</span></p></td>
-<td>Height of box</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeBox.height"></a>height</code></em>;</p></td>
+<td class="struct_member_description"><p>Height of box</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
 <a name="lglBarcodeShapeChar"></a><h3>lglBarcodeShapeChar</h3>
@@ -373,11 +797,7 @@ All units are in points ( 1 point = 1/72 inch ).
         gchar                c;
 } lglBarcodeShapeChar;
 </pre>
-<p>
-An single byte character drawing primitive.
-</p>
-<p>
-</p>
+<p>An single byte character drawing primitive.</p>
 <pre class="programlisting">
 
 @ =  origin (x,y) from top left corner of barcode
@@ -393,38 +813,45 @@ An single byte character drawing primitive.
       @ ----------------------
 
 </pre>
-<p>
-</p>
-<p>
-All units are in points ( 1 point = 1/72 inch ).
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<p>All units are in points ( 1 point = 1/72 inch ).</p>
+<div class="refsect3">
+<a name="id-1.3.2.9.8.7"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeType" title="enum lglBarcodeShapeType"><span class="type">lglBarcodeShapeType</span></a> <em class="structfield"><code><a name="lglBarcodeShapeChar.type"></a>type</code></em>;</span></p></td>
-<td>Always <code class="literal">LGL_BARCODE_SHAPE_CHAR</code>
-</td>
+<td class="struct_member_name"><p><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeType" title="enum lglBarcodeShapeType"><span class="type">lglBarcodeShapeType</span></a> <em class="structfield"><code><a name="lglBarcodeShapeChar.type"></a>type</code></em>;</p></td>
+<td class="struct_member_description"><p>Always <a class="link" href="libglbarcode-3.0-lgl-barcode.html#LGL-BARCODE-SHAPE-CHAR:CAPS"><code class="literal">LGL_BARCODE_SHAPE_CHAR</code></a></p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeChar.x"></a>x</code></em>;</span></p></td>
-<td>x coordinate of left baseline of character</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeChar.x"></a>x</code></em>;</p></td>
+<td class="struct_member_description"><p>x coordinate of left baseline of character</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeChar.y"></a>y</code></em>;</span></p></td>
-<td>y coordinate of left baseline of character</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeChar.y"></a>y</code></em>;</p></td>
+<td class="struct_member_description"><p>y coordinate of left baseline of character</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeChar.fsize"></a>fsize</code></em>;</span></p></td>
-<td>Font size</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeChar.fsize"></a>fsize</code></em>;</p></td>
+<td class="struct_member_description"><p>Font size</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> <em class="structfield"><code><a name="lglBarcodeShapeChar.c"></a>c</code></em>;</span></p></td>
-<td>Character to add</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> <em class="structfield"><code><a name="lglBarcodeShapeChar.c"></a>c</code></em>;</p></td>
+<td class="struct_member_description"><p>Character to add</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
 <a name="lglBarcodeShapeString"></a><h3>lglBarcodeShapeString</h3>
@@ -439,11 +866,7 @@ All units are in points ( 1 point = 1/72 inch ).
         gchar               *string;
 } lglBarcodeShapeString;
 </pre>
-<p>
-A character string drawing primitive.
-</p>
-<p>
-</p>
+<p>A character string drawing primitive.</p>
 <pre class="programlisting">
 
 @ =  origin (x,y) from top left corner of barcode
@@ -460,38 +883,45 @@ A character string drawing primitive.
                           x = horizontal center
 
 </pre>
-<p>
-</p>
-<p>
-All units are in points ( 1 point = 1/72 inch ).
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<p>All units are in points ( 1 point = 1/72 inch ).</p>
+<div class="refsect3">
+<a name="id-1.3.2.9.9.7"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeType" title="enum lglBarcodeShapeType"><span class="type">lglBarcodeShapeType</span></a> <em class="structfield"><code><a name="lglBarcodeShapeString.type"></a>type</code></em>;</span></p></td>
-<td>Always <code class="literal">LGL_BARCODE_SHAPE_STRING</code>
-</td>
+<td class="struct_member_name"><p><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeType" title="enum lglBarcodeShapeType"><span class="type">lglBarcodeShapeType</span></a> <em class="structfield"><code><a name="lglBarcodeShapeString.type"></a>type</code></em>;</p></td>
+<td class="struct_member_description"><p>Always <a class="link" href="libglbarcode-3.0-lgl-barcode.html#LGL-BARCODE-SHAPE-STRING:CAPS"><code class="literal">LGL_BARCODE_SHAPE_STRING</code></a></p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeString.x"></a>x</code></em>;</span></p></td>
-<td>x coordinate of horizontal center of baseline of string</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeString.x"></a>x</code></em>;</p></td>
+<td class="struct_member_description"><p>x coordinate of horizontal center of baseline of string</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeString.y"></a>y</code></em>;</span></p></td>
-<td>y coordinate of horizontal center of baseline of string</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeString.y"></a>y</code></em>;</p></td>
+<td class="struct_member_description"><p>y coordinate of horizontal center of baseline of string</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeString.fsize"></a>fsize</code></em>;</span></p></td>
-<td>Font size</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeString.fsize"></a>fsize</code></em>;</p></td>
+<td class="struct_member_description"><p>Font size</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglBarcodeShapeString.string"></a>string</code></em>;</span></p></td>
-<td>String to add</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="lglBarcodeShapeString.string"></a>string</code></em>;</p></td>
+<td class="struct_member_description"><p>String to add</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
 <a name="lglBarcodeShapeRing"></a><h3>lglBarcodeShapeRing</h3>
@@ -506,11 +936,7 @@ All units are in points ( 1 point = 1/72 inch ).
         gdouble              line_width;
 } lglBarcodeShapeRing;
 </pre>
-<p>
-A ring (an open circle) drawing primitive.
-</p>
-<p>
-</p>
+<p>A ring (an open circle) drawing primitive.</p>
 <pre class="programlisting">
 
 @ = origin (x,y) is centre of circle
@@ -527,38 +953,45 @@ A ring (an open circle) drawing primitive.
            `-....-'
 
 </pre>
-<p>
-</p>
-<p>
-All units are in points ( 1 point = 1/72 inch ).
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<p>All units are in points ( 1 point = 1/72 inch ).</p>
+<div class="refsect3">
+<a name="id-1.3.2.9.10.7"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeType" title="enum lglBarcodeShapeType"><span class="type">lglBarcodeShapeType</span></a> <em class="structfield"><code><a name="lglBarcodeShapeRing.type"></a>type</code></em>;</span></p></td>
-<td>Always <code class="literal">LGL_BARCODE_SHAPE_RING</code>
-</td>
+<td class="struct_member_name"><p><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeType" title="enum lglBarcodeShapeType"><span class="type">lglBarcodeShapeType</span></a> <em class="structfield"><code><a name="lglBarcodeShapeRing.type"></a>type</code></em>;</p></td>
+<td class="struct_member_description"><p>Always <a class="link" href="libglbarcode-3.0-lgl-barcode.html#LGL-BARCODE-SHAPE-RING:CAPS"><code class="literal">LGL_BARCODE_SHAPE_RING</code></a></p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeRing.x"></a>x</code></em>;</span></p></td>
-<td>x coordinate of center of circle</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeRing.x"></a>x</code></em>;</p></td>
+<td class="struct_member_description"><p>x coordinate of center of circle</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeRing.y"></a>y</code></em>;</span></p></td>
-<td>y coordinate of center of circle</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeRing.y"></a>y</code></em>;</p></td>
+<td class="struct_member_description"><p>y coordinate of center of circle</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeRing.radius"></a>radius</code></em>;</span></p></td>
-<td>Radius of ring (center of line)</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeRing.radius"></a>radius</code></em>;</p></td>
+<td class="struct_member_description"><p>Radius of ring (center of line)</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeRing.line-width"></a>line_width</code></em>;</span></p></td>
-<td>Width of line</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeRing.line-width"></a>line_width</code></em>;</p></td>
+<td class="struct_member_description"><p>Width of line</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
+</div>
 <hr>
 <div class="refsect2">
 <a name="lglBarcodeShapeHexagon"></a><h3>lglBarcodeShapeHexagon</h3>
@@ -572,11 +1005,7 @@ All units are in points ( 1 point = 1/72 inch ).
         gdouble              height;
 } lglBarcodeShapeHexagon;
 </pre>
-<p>
-A solid regular hexagon (oriented with vertexes at top and bottom) drawing primitive.
-</p>
-<p>
-</p>
+<p>A solid regular hexagon (oriented with vertexes at top and bottom) drawing primitive.</p>
 <pre class="programlisting">
 
 @ = origin (x,y) is top of hexagon
@@ -597,327 +1026,44 @@ A solid regular hexagon (oriented with vertexes at top and bottom) drawing primi
                  " ------------------
 
 </pre>
-<p>
-</p>
-<p>
-All units are in points ( 1 point = 1/72 inch ).
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
+<p>All units are in points ( 1 point = 1/72 inch ).</p>
+<div class="refsect3">
+<a name="id-1.3.2.9.11.7"></a><h4>Members</h4>
+<div class="informaltable"><table width="100%" border="0">
+<colgroup>
+<col width="300px" class="struct_members_name">
+<col class="struct_members_description">
+<col width="200px" class="struct_members_annotations">
+</colgroup>
 <tbody>
 <tr>
-<td><p><span class="term"><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeType" title="enum lglBarcodeShapeType"><span class="type">lglBarcodeShapeType</span></a> <em class="structfield"><code><a name="lglBarcodeShapeHexagon.type"></a>type</code></em>;</span></p></td>
-<td>Always <code class="literal">LGL_BARCODE_SHAPE_HEXAGON</code>
-</td>
+<td class="struct_member_name"><p><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeType" title="enum lglBarcodeShapeType"><span class="type">lglBarcodeShapeType</span></a> <em class="structfield"><code><a name="lglBarcodeShapeHexagon.type"></a>type</code></em>;</p></td>
+<td class="struct_member_description"><p>Always <a class="link" href="libglbarcode-3.0-lgl-barcode.html#LGL-BARCODE-SHAPE-HEXAGON:CAPS"><code class="literal">LGL_BARCODE_SHAPE_HEXAGON</code></a></p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeHexagon.x"></a>x</code></em>;</span></p></td>
-<td>x coordinate of top point of hexagon</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeHexagon.x"></a>x</code></em>;</p></td>
+<td class="struct_member_description"><p>x coordinate of top point of hexagon</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeHexagon.y"></a>y</code></em>;</span></p></td>
-<td>y coordinate of top point of hexagon</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeHexagon.y"></a>y</code></em>;</p></td>
+<td class="struct_member_description"><p>y coordinate of top point of hexagon</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeHexagon.height"></a>height</code></em>;</span></p></td>
-<td>Height of hexagon</td>
+<td class="struct_member_name"><p><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="lglBarcodeShapeHexagon.height"></a>height</code></em>;</p></td>
+<td class="struct_member_description"><p>Height of hexagon</p></td>
+<td class="struct_member_annotations"> </td>
 </tr>
 </tbody>
 </table></div>
 </div>
-<hr>
-<div class="refsect2">
-<a name="lgl-barcode-add-line"></a><h3>lgl_barcode_add_line ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_barcode_add_line                (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> length</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> width</code></em>);</pre>
-<p>
-Add a vertical line to barcode.  Coordinates are relative to top left corner
-of barcode.  All units are in points ( 1 point = 1/72 inch ).
-</p>
-<p>
-</p>
-<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Note</h3>
-<p>
-       This function is intended to be used internally by barcode implementations.
-</p>
-</div>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>bc</code></em> :</span></p></td>
-<td>An <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td>
-<td>x coordinate of top of line</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td>
-<td>y coordinate of top of line</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>length</code></em> :</span></p></td>
-<td>Length of line</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td>
-<td>Width of line</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-barcode-add-box"></a><h3>lgl_barcode_add_box ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_barcode_add_box                 (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> width</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> height</code></em>);</pre>
-<p>
-Add a box to barcode.  Coordinates are relative to top left corner
-of barcode.  All units are in points ( 1 point = 1/72 inch ).
-</p>
-<p>
-</p>
-<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Note</h3>
-<p>
-       This function is intended to be used internally by barcode implementations.
-</p>
-</div>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>bc</code></em> :</span></p></td>
-<td>An <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td>
-<td>x coordinate of top left corner of box</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td>
-<td>y coordinate of top left corner of box</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td>
-<td>Width of box</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>height</code></em> :</span></p></td>
-<td>Height of box</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-barcode-add-char"></a><h3>lgl_barcode_add_char ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_barcode_add_char                (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> fsize</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> c</code></em>);</pre>
-<p>
-Add an ASCII character to barcode.  Coordinates are relative to top left corner
-of barcode.  All units are in points ( 1 point = 1/72 inch ).
-</p>
-<p>
-</p>
-<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Note</h3>
-<p>
-       This function is intended to be used internally by barcode implementations.
-</p>
-</div>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>bc</code></em> :</span></p></td>
-<td>An <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td>
-<td>x coordinate of left baseline of character</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td>
-<td>y coordinate of left baseline of character</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fsize</code></em> :</span></p></td>
-<td>Font size</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>c</code></em> :</span></p></td>
-<td>Character to add</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-barcode-add-string"></a><h3>lgl_barcode_add_string ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_barcode_add_string              (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> fsize</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *string</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> length</code></em>);</pre>
-<p>
-Add a character string to barcode.  Coordinates are relative to top left corner
-of barcode.  All units are in points ( 1 point = 1/72 inch ).
-</p>
-<p>
-</p>
-<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Note</h3>
-<p>
-       This function is intended to be used internally by barcode implementations.
-</p>
-</div>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>bc</code></em> :</span></p></td>
-<td>An <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td>
-<td>x coordinate of horizontal center of baseline of string</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td>
-<td>y coordinate of horizontal center of baseline of string</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>fsize</code></em> :</span></p></td>
-<td>Font size</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>string</code></em> :</span></p></td>
-<td>String to add</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>length</code></em> :</span></p></td>
-<td>Number of bytes in string</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-barcode-add-ring"></a><h3>lgl_barcode_add_ring ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_barcode_add_ring                (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> radius</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> line_width</code></em>);</pre>
-<p>
-Add a ring to barcode.  Coordinates are relative to top left corner
-of barcode.  All units are in points ( 1 point = 1/72 inch ).
-</p>
-<p>
-</p>
-<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Note</h3>
-<p>
-       This function is intended to be used internally by barcode implementations.
-</p>
-</div>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>bc</code></em> :</span></p></td>
-<td>An <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td>
-<td>x coordinate of center of circle</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td>
-<td>y coordinate of center of circle</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>radius</code></em> :</span></p></td>
-<td>Radius of ring (center of line)</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>line_width</code></em> :</span></p></td>
-<td>Width of line</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="lgl-barcode-add-hexagon"></a><h3>lgl_barcode_add_hexagon ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                lgl_barcode_add_hexagon             (<em class="parameter"><code><a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> *bc</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> x</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> y</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> height</code></em>);</pre>
-<p>
-Add a regular hexagon (oriented with vertexes at top and bottom) to barcode.
-Coordinates are relative to top left corner of barcode.  All units are in
-points ( 1 point = 1/72 inch ).
-</p>
-<p>
-</p>
-<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Note</h3>
-<p>
-       This function is intended to be used internally by barcode implementations.
-</p>
-</div>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>bc</code></em> :</span></p></td>
-<td>An <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode"><span class="type">lglBarcode</span></a> structure</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td>
-<td>x coordinate of top point of hexagon</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td>
-<td>y coordinate of top point of hexagon</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>height</code></em> :</span></p></td>
-<td>Height of hexagon</td>
-</tr>
-</tbody>
-</table></div>
 </div>
 </div>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 29ec214b02c9e5f6a1a9cf03f0f0ee8dbb055a32..9ec1584abb11a0c89efe8f9104e77cbbcdceb8f1 100644 (file)
     </sub>
   </chapters>
   <functions>
+    <keyword type="function" name="lgl_barcode_new ()" link="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-new"/>
+    <keyword type="function" name="lgl_barcode_free ()" link="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-free"/>
+    <keyword type="function" name="lgl_barcode_add_line ()" link="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-line"/>
+    <keyword type="function" name="lgl_barcode_add_box ()" link="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-box"/>
+    <keyword type="function" name="lgl_barcode_add_char ()" link="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-char"/>
+    <keyword type="function" name="lgl_barcode_add_string ()" link="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-string"/>
+    <keyword type="function" name="lgl_barcode_add_ring ()" link="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-ring"/>
+    <keyword type="function" name="lgl_barcode_add_hexagon ()" link="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-hexagon"/>
     <keyword type="struct" name="lglBarcode" link="libglbarcode-3.0-lgl-barcode.html#lglBarcode"/>
-    <keyword type="function" name="lgl_barcode_new ()" link="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-new"/>
-    <keyword type="function" name="lgl_barcode_free ()" link="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-free"/>
     <keyword type="enum" name="enum lglBarcodeShapeType" link="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeType"/>
     <keyword type="union" name="lglBarcodeShape" link="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShape"/>
     <keyword type="struct" name="lglBarcodeShapeAny" link="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeAny"/>
     <keyword type="struct" name="lglBarcodeShapeString" link="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeString"/>
     <keyword type="struct" name="lglBarcodeShapeRing" link="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeRing"/>
     <keyword type="struct" name="lglBarcodeShapeHexagon" link="libglbarcode-3.0-lgl-barcode.html#lglBarcodeShapeHexagon"/>
-    <keyword type="function" name="lgl_barcode_add_line ()" link="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-line"/>
-    <keyword type="function" name="lgl_barcode_add_box ()" link="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-box"/>
-    <keyword type="function" name="lgl_barcode_add_char ()" link="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-char"/>
-    <keyword type="function" name="lgl_barcode_add_string ()" link="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-string"/>
-    <keyword type="function" name="lgl_barcode_add_ring ()" link="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-ring"/>
-    <keyword type="function" name="lgl_barcode_add_hexagon ()" link="libglbarcode-3.0-lgl-barcode.html#lgl-barcode-add-hexagon"/>
-    <keyword type="function" name="lgl_barcode_create ()" link="libglbarcode-3.0-lgl-barcode-create.html#lgl-barcode-create"/>
-    <keyword type="function" name="lgl_barcode_render_to_cairo ()" link="libglbarcode-3.0-lgl-barcode-render-to-cairo.html#lgl-barcode-render-to-cairo"/>
-    <keyword type="function" name="lgl_barcode_render_to_cairo_path ()" link="libglbarcode-3.0-lgl-barcode-render-to-cairo.html#lgl-barcode-render-to-cairo-path"/>
+    <keyword type="function" name="lgl_barcode_create ()" link="libglbarcode-3.0-lgl-barcode-create.html#lgl-barcode-create"/>
+    <keyword type="function" name="lgl_barcode_render_to_cairo ()" link="libglbarcode-3.0-lgl-barcode-render-to-cairo.html#lgl-barcode-render-to-cairo"/>
+    <keyword type="function" name="lgl_barcode_render_to_cairo_path ()" link="libglbarcode-3.0-lgl-barcode-render-to-cairo.html#lgl-barcode-render-to-cairo-path"/>
     <keyword type="enum" name="enum lglBarcodeType" link="libglbarcode-3.0-lgl-barcode-type.html#lglBarcodeType"/>
-    <keyword type="constant" name="LGL_BARCODE_TYPE_POSTNET" link="libglbarcode-3.0-lgl-barcode-type.html#LGL-BARCODE-TYPE-POSTNET:CAPS"/>
-    <keyword type="constant" name="LGL_BARCODE_TYPE_POSTNET_5" link="libglbarcode-3.0-lgl-barcode-type.html#LGL-BARCODE-TYPE-POSTNET-5:CAPS"/>
-    <keyword type="constant" name="LGL_BARCODE_TYPE_POSTNET_9" link="libglbarcode-3.0-lgl-barcode-type.html#LGL-BARCODE-TYPE-POSTNET-9:CAPS"/>
-    <keyword type="constant" name="LGL_BARCODE_TYPE_POSTNET_11" link="libglbarcode-3.0-lgl-barcode-type.html#LGL-BARCODE-TYPE-POSTNET-11:CAPS"/>
-    <keyword type="constant" name="LGL_BARCODE_TYPE_CEPNET" link="libglbarcode-3.0-lgl-barcode-type.html#LGL-BARCODE-TYPE-CEPNET:CAPS"/>
-    <keyword type="constant" name="LGL_BARCODE_TYPE_ONECODE" link="libglbarcode-3.0-lgl-barcode-type.html#LGL-BARCODE-TYPE-ONECODE:CAPS"/>
-    <keyword type="constant" name="LGL_BARCODE_TYPE_CODE39" link="libglbarcode-3.0-lgl-barcode-type.html#LGL-BARCODE-TYPE-CODE39:CAPS"/>
-    <keyword type="constant" name="LGL_BARCODE_TYPE_CODE39_EXT" link="libglbarcode-3.0-lgl-barcode-type.html#LGL-BARCODE-TYPE-CODE39-EXT:CAPS"/>
   </functions>
 </book>
index 6e646d744624014461f0eafe98ad906d31995638..b2fd77bb4707bef9cb28f1cc1f1b1dc7e9c54834 100644 (file)
@@ -2,22 +2,22 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Introduction</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlbarcode 3.0 Reference Manual: Introduction</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlbarcode 3.0 Reference Manual">
 <link rel="up" href="overview.html" title="LibGlbarcode Overview">
 <link rel="prev" href="overview.html" title="LibGlbarcode Overview">
 <link rel="next" href="api.html" title="API Reference">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="overview.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="overview.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlbarcode 3.0 Reference Manual</th>
-<td><a accesskey="n" href="api.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><a accesskey="u" href="overview.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
+<td><a accesskey="p" href="overview.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="api.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="libglbarcode-intro"></a><div class="titlepage"></div>
 Introduction to libglbarcode library
 </p>
 </td>
-<td valign="top" align="right"></td>
+<td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1">
-<a name="idp2652896"></a><h2>Overview</h2>
+<a name="id-1.2.2.3"></a><h2>Overview</h2>
 <p>
 Libglbarcode provides the core barcode functionality for <span class="application">glabels</span>.  It provides
 an intermediate barcode format, a small set of built-in barcode back-ends, and a cairo renderer.  While
@@ -41,7 +41,7 @@ simple architecture would easily support extending its functionality beyond the
 </p>
 </div>
 <div class="refsect1">
-<a name="idp2330032"></a><h2>Basic Usage</h2>
+<a name="id-1.2.2.4"></a><h2>Basic Usage</h2>
 <pre class="programlisting">
 
 #include &lt;libglbarcode/lgl-barcode-create.h&gt;
@@ -67,7 +67,7 @@ example (gchar   *data,
 </pre>
 </div>
 <div class="refsect1">
-<a name="idp3773680"></a><h2>Writing Renderers</h2>
+<a name="id-1.2.2.5"></a><h2>Writing Renderers</h2>
 <p>
 The <a class="link" href="libglbarcode-3.0-lgl-barcode.html#lglBarcode" title="lglBarcode">lglBarcode</a> structure is independent of
 barcode type, and consists of a simple list of drawing primitives.
@@ -161,6 +161,6 @@ lgl_barcode_render_to_xxx (const lglBarcode  *bc)
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
index 58a71033a31543a81ee2236598f1d5ad78f79e95..d604395b83061e1c7d9c22ee000e9ab3acd8f207 100644 (file)
@@ -2,27 +2,27 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>LibGlbarcode Overview</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<title>LibGlbarcode 3.0 Reference Manual: LibGlbarcode Overview</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="LibGlbarcode 3.0 Reference Manual">
 <link rel="up" href="index.html" title="LibGlbarcode 3.0 Reference Manual">
 <link rel="prev" href="index.html" title="LibGlbarcode 3.0 Reference Manual">
 <link rel="next" href="libglbarcode-intro.html" title="Introduction">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.20 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="index.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td> </td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">LibGlbarcode 3.0 Reference Manual</th>
-<td><a accesskey="n" href="libglbarcode-intro.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="10"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="index.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="libglbarcode-intro.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="overview"></a>LibGlbarcode Overview</h2></div></div></div>
-<div class="toc"><dl><dt>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="overview"></a>LibGlbarcode Overview</h1></div></div></div>
+<div class="toc"><dl class="toc"><dt>
 <span class="refentrytitle"><a href="libglbarcode-intro.html">Introduction</a></span><span class="refpurpose"> — 
 Introduction to libglbarcode library
 </span>
@@ -30,6 +30,6 @@ Introduction to libglbarcode library
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.20</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/libglbarcode/html/right-insensitive.png b/docs/libglbarcode/html/right-insensitive.png
new file mode 100644 (file)
index 0000000..f999f00
Binary files /dev/null and b/docs/libglbarcode/html/right-insensitive.png differ
index ed55207f1724d878d7f34739df09bc691de6ba5d..78f5875ae2a0f5ba25f5328d43ba33f10c933a39 100644 (file)
Binary files a/docs/libglbarcode/html/right.png and b/docs/libglbarcode/html/right.png differ
index d6f6c26ece096fcfb7fee1d4d8ea7896ca3aa765..705a5c9adc7c1717bad3c5aae7f2eb15371710ee 100644 (file)
@@ -1,15 +1,23 @@
+body
+{
+  font-family: cantarell, sans-serif;
+}
 .synopsis, .classsynopsis
 {
   /* tango:aluminium 1/2 */
   background: #eeeeec;
-  border: solid 1px #d3d7cf;
+  background: rgba(238, 238, 236, 0.5);
+  border: solid 1px rgb(238, 238, 236);
   padding: 0.5em;
 }
 .programlisting
 {
   /* tango:sky blue 0/1 */
+  /* fallback for no rgba support */
   background: #e6f3ff;
   border: solid 1px #729fcf;
+  background: rgba(114, 159, 207, 0.1);
+  border: solid 1px rgba(114, 159, 207, 0.2);
   padding: 0.5em;
 }
 .variablelist
@@ -27,7 +35,6 @@
   {
     position: relative;
     top: 0em ! important;
-    
   }
   /* this is needed so that the local anchors are displayed below the naviagtion */
   div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
    */
   body
   {
-    padding-top: 3.2em;
-    padding-bottom: 20em;
+    padding-top: 5em;
+    padding-bottom: 500px;
+    max-width: 60em;
+  }
+  p
+  {
+    max-width: 60em;
   }
   /* style and size the navigation bar */
   table.navigation#top
   {
     position: fixed;
-    /* tango:scarlet red 0/1 */
-    background: #ffe6e6;
-    border: solid 1px #ef2929;
+    background: #e2e2e2;
+    border-bottom: solid 1px #babdb6;
     margin-top: 0;
     margin-bottom: 0;
     top: 0;
   }
   .navigation a, .navigation a:visited
   {
-    /* tango:scarlet red 3 */
-    color: #a40000;
+    /* tango:sky blue 3 */
+    color: #204a87;
   }
   .navigation a:hover
   {
-    /* tango:scarlet red 1 */
-    color: #ef2929;
+    /* tango:sky blue 2 */
+    color: #3465a4;
   }
   td.shortcuts
   {
-    /* tango:scarlet red 1 */
-    color: #ef2929;
+    /* tango:sky blue 2 */
+    color: #3465a4;
     font-size: 80%;
     white-space: nowrap;
   }
+  td.shortcuts .dim
+  {
+    color: #babdb6;
+  }
+}
+@media screen and (min-width: 60em) {
+  /* screen larger than 60em */
+  body { margin: auto; }
+}
+@media screen and (max-width: 60em) {
+  /* screen less than 60em */
+  #nav_hierarchy { display: none; }
+  #nav_interfaces { display: none; }
+  #nav_prerequisites { display: none; }
+  #nav_derived_interfaces { display: none; }
+  #nav_implementations { display: none; }
+  #nav_child_properties { display: none; }
+  #nav_style_properties { display: none; }
+  #nav_index { display: none; }
+  #nav_glossary { display: none; }
+  .gallery_image { display: none; }
+  .property_flags { display: none; }
+  .signal_flags { display: none; }
+  .parameter_annotations { display: none; }
+  .enum_member_annotations { display: none; }
+  .struct_member_annotations { display: none; }
+  .union_member_annotations { display: none; }
+  /* now that a column is hidden, optimize space */
+  col.parameters_name { width: auto; }
+  col.parameters_description { width: auto; }
+  col.struct_members_name { width: auto; }
+  col.struct_members_description { width: auto; }
+  col.enum_members_name { width: auto; }
+  col.enum_members_description { width: auto; }
+  col.union_members_name { width: auto; }
+  col.union_members_description { width: auto; }
 }
 @media print {
   table.navigation {
   div.titlepage table.navigation {
     visibility: visible;
     display: table;
-    /* tango:scarlet red 0/1 */
-    background: #ffe6e6;
-    border: solid 1px #ef2929;
+    background: #e2e2e2;
+    border: solid 1px #babdb6;
     margin-top: 0;
     margin-bottom: 0;
     top: 0;
 
 .navigation .title
 {
-  font-size: 200%;
+  font-size: 120%;
 }
 
 div.gallery-float
@@ -132,6 +178,67 @@ a:hover
   color: #729fcf;
 }
 
+div.informaltable table
+{
+  border-collapse: separate;
+  border-spacing: 20px 3px;
+  border: none;
+}
+
+div.informaltable table td, div.informaltable table th
+{
+  vertical-align: top;
+}
+
+.function_type,
+.variable_type,
+.property_type,
+.signal_type,
+.parameter_name,
+.struct_member_name,
+.union_member_name,
+.define_keyword,
+.datatype_keyword,
+.typedef_keyword
+{
+  text-align: right;
+}
+
+/* dim non-primary columns */
+.c_punctuation,
+.function_type,
+.variable_type,
+.property_type,
+.signal_type,
+.define_keyword,
+.datatype_keyword,
+.typedef_keyword,
+.property_flags,
+.signal_flags,
+.parameter_annotations,
+.enum_member_annotations,
+.struct_member_annotations,
+.union_member_annotations
+{
+  color: #888a85;
+}
+
+.function_type a,
+.function_type a:visited,
+.function_type a:hover,
+.property_type a,
+.property_type a:visited,
+.property_type a:hover,
+.signal_type a,
+.signal_type a:visited,
+.signal_type a:hover,
+.signal_flags a,
+.signal_flags a:visited,
+.signal_flags a:hover
+{
+ color: #729fcf;
+}
+
 div.table table
 {
   border-collapse: collapse;
@@ -154,14 +261,43 @@ div.table table th
   background-color: #d3d7cf;
 }
 
+h4
+{
+  color: #555753;
+}
+
 hr
 {
-  /* tango:aluminium 3 */
-  color: #babdb6;
-  background: #babdb6;
+  /* tango:aluminium 1 */
+  color: #d3d7cf;
+  background: #d3d7cf;
   border: none 0px;
   height: 1px;
   clear: both;
+  margin: 2.0em 0em 2.0em 0em;
+}
+
+dl.toc dt
+{
+  padding-bottom: 0.25em;
+}
+
+dl.toc > dd > dl > dt
+{
+  padding-top: 0.25em;
+  padding-bottom: 0.25em;
+}
+
+dl.toc > dt
+{
+  padding-top: 1em;
+  padding-bottom: 0.5em;
+  font-weight: bold;
+}
+
+.parameter
+{
+  font-style: normal;
 }
 
 .footer
@@ -173,31 +309,70 @@ hr
   font-size: 80%;
 }
 
+.informalfigure,
+.figure
+{
+  margin: 1em;
+}
+
+.informalexample,
+.example
+{
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
 .warning
 {
   /* tango:orange 0/1 */
   background: #ffeed9;
+  background: rgba(252, 175, 62, 0.1);
   border-color: #ffb04f;
+  border-color: rgba(252, 175, 62, 0.2);
 }
 .note
 {
   /* tango:chameleon 0/0.5 */
   background: #d8ffb2;
+  background: rgba(138, 226, 52, 0.1);
   border-color: #abf562;
+  border-color: rgba(138, 226, 52, 0.2);
 }
-.note, .warning
+div.blockquote
+{
+  border-color: #eeeeec;
+}
+.note, .warning, div.blockquote
 {
   padding: 0.5em;
   border-width: 1px;
   border-style: solid;
+  margin: 2em;
 }
-.note h3, .warning h3
+.note p, .warning p
 {
-  margin-top: 0.0em
+  margin: 0;
 }
-.note p, .warning p
+
+div.warning h3.title,
+div.note h3.title
 {
-  margin-bottom: 0.0em
+  display: none;
+}
+
+p + div.section
+{
+  margin-top: 1em;
+}
+
+div.refnamediv,
+div.refsynopsisdiv,
+div.refsect1,
+div.refsect2,
+div.toc,
+div.section
+{
+  margin-bottom: 1em;
 }
 
 /* blob links */
@@ -210,11 +385,22 @@ h2 .extralinks, h3 .extralinks
   font-weight: normal;
 }
 
+.lineart
+{
+  color: #d3d7cf;
+  font-weight: normal;
+}
+
 .annotation
 {
   /* tango:aluminium 5 */
   color: #555753;
-  font-size: 80%;
+  font-weight: normal;
+}
+
+.structfield
+{
+  font-style: normal;
   font-weight: normal;
 }
 
@@ -237,6 +423,7 @@ h2 .extralinks, h3 .extralinks
 .listing_frame {
   /* tango:sky blue 1 */
   border: solid 1px #729fcf;
+  border: solid 1px rgba(114, 159, 207, 0.2);
   padding: 0px;
 }
 
@@ -245,20 +432,28 @@ h2 .extralinks, h3 .extralinks
   margin-bottom: 0px;
   padding: 0.5em;
 }
+.listing_lines {
+  /* this just adds visual clutter and
+     takes precious room from small screens */
+  display: none;
+}
 .listing_lines {
   /* tango:sky blue 0.5 */
   background: #a6c5e3;
+  background: rgba(114, 159, 207, 0.2);
   /* tango:aluminium 6 */
   color: #2e3436;
 }
 .listing_code {
   /* tango:sky blue 0 */
   background: #e6f3ff;
+  background: rgba(114, 159, 207, 0.1);
 }
 .listing_code .programlisting {
   /* override from previous */
   border: none 0px;
   padding: 0px;
+  background: none;
 }
 .listing_lines pre, .listing_code pre {
   margin: 0px;
diff --git a/docs/libglbarcode/html/up-insensitive.png b/docs/libglbarcode/html/up-insensitive.png
new file mode 100644 (file)
index 0000000..bda3ce2
Binary files /dev/null and b/docs/libglbarcode/html/up-insensitive.png differ
index 8eb591f3b8d09f472b1d32c003da9647394a3823..af46b2ada6174d22fd8cafaa79ea0125c5a891a7 100644 (file)
Binary files a/docs/libglbarcode/html/up.png and b/docs/libglbarcode/html/up.png differ
index 7dfa29cf140e9150bfc8e8d97aa1674dd64b554f..1a9d75d6975d4a5216e1afcd9d0bc93e93c01c1f 100644 (file)
@@ -1,6 +1,6 @@
 Summary: glabels is a GNOME program to create labels and business cards
 Name:      glabels
-Version:   3.2.0
+Version:   3.2.1
 Release:   1
 License: GPL
 Group: Applications/Publishing
index 1f75dfdc72239d98eeb8ded0fca8029b0e5f7f37..dd319930f452255a5d52813d5c85c6e20cbbb863 100644 (file)
@@ -49,9 +49,13 @@ REPORT_FILES = \
        $(DOC_MODULE)-undeclared.txt \
        $(DOC_MODULE)-unused.txt
 
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+gtkdoc-check.test: Makefile
+       $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
+               echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
+               chmod +x $@
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
 
-if ENABLE_GTK_DOC
 if GTK_DOC_BUILD_HTML
 HTML_BUILD_STAMP=html-build.stamp
 else
@@ -63,9 +67,11 @@ else
 PDF_BUILD_STAMP=
 endif
 
-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-else
-all-local:
+all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+.PHONY: all-gtk-doc
+
+if ENABLE_GTK_DOC
+all-local: all-gtk-doc
 endif
 
 docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
@@ -74,33 +80,44 @@ $(REPORT_FILES): sgml-build.stamp
 
 #### setup ####
 
+GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0=@echo "  DOC   Preparing build";
+
 setup-build.stamp:
-       -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-           echo '  DOC   Preparing build'; \
+       -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
            files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
            if test "x$$files" != "x" ; then \
                for file in $$files ; do \
+                   destdir=`dirname $(abs_builddir)/$$file` ;\
+                   test -d "$$destdir" || mkdir -p "$$destdir"; \
                    test -f $(abs_srcdir)/$$file && \
-                       cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+                       cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
                done; \
            fi; \
            test -d $(abs_srcdir)/tmpl && \
-               { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+               { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
                chmod -R u+w $(abs_builddir)/tmpl; } \
        fi
-       @touch setup-build.stamp
+       $(AM_V_at)touch setup-build.stamp
 
 #### scan ####
 
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-       @echo '  DOC   Scanning header files'
-       @_source_dir='' ; \
+GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0=@echo "  DOC   Scanning header files";
+
+GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0=@echo "  DOC   Introspecting gobjects";
+
+scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
+       $(GTK_DOC_V_SCAN)_source_dir='' ; \
        for i in $(DOC_SOURCE_DIR) ; do \
            _source_dir="$${_source_dir} --source-dir=$$i" ; \
        done ; \
        gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-       @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-           echo "  DOC   Introspecting gobjects"; \
+       $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
            scanobj_options=""; \
            gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
            if test "$(?)" = "0"; then \
@@ -115,22 +132,25 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
                test -f $$i || touch $$i ; \
            done \
        fi
-       @touch scan-build.stamp
+       $(AM_V_at)touch scan-build.stamp
 
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
        @true
 
 #### templates ####
 
+GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V))
+GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_TMPL_0=@echo "  DOC   Rebuilding template files";
+
 tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-       @echo '  DOC   Rebuilding template files'
-       @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-       @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+       $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+       $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
          if test -w $(abs_srcdir) ; then \
-           cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+           cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
          fi \
        fi
-       @touch tmpl-build.stamp
+       $(AM_V_at)touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
        @true
@@ -140,26 +160,34 @@ $(srcdir)/tmpl/*.sgml:
 
 #### xml ####
 
+GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0=@echo "  DOC   Building XML";
+
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-       @echo '  DOC   Building XML'
-       @-chmod -R u+w $(srcdir)
-       @_source_dir='' ; \
+       -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \
        for i in $(DOC_SOURCE_DIR) ; do \
            _source_dir="$${_source_dir} --source-dir=$$i" ; \
        done ; \
        gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
-       @touch sgml-build.stamp
+       $(AM_V_at)touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
        @true
 
 #### html ####
 
+GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0=@echo "  DOC   Building HTML";
+
+GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0=@echo "  DOC   Fixing cross-references";
+
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-       @echo '  DOC   Building HTML'
-       @rm -rf html
-       @mkdir html
-       @mkhtml_options=""; \
+       $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+       mkhtml_options=""; \
        gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
        if test "$(?)" = "0"; then \
          if test "x$(V)" = "x1"; then \
@@ -180,16 +208,18 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
            cp $(abs_builddir)/$$file $(abs_builddir)/html; \
          fi; \
        done;
-       @echo '  DOC   Fixing cross-references'
-       @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-       @touch html-build.stamp
+       $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+       $(AM_V_at)touch html-build.stamp
 
 #### pdf ####
 
+GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0=@echo "  DOC   Building PDF";
+
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-       @echo '  DOC   Building PDF'
-       @rm -f $(DOC_MODULE).pdf
-       @mkpdf_options=""; \
+       $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+       mkpdf_options=""; \
        gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
        if test "$(?)" = "0"; then \
          if test "x$(V)" = "x1"; then \
@@ -206,13 +236,16 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
          done; \
        fi; \
        gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-       @touch pdf-build.stamp
+       $(AM_V_at)touch pdf-build.stamp
 
 ##############
 
 clean-local:
        @rm -f *~ *.bak
        @rm -rf .libs
+       @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
+         rm -f $(DOC_MODULE).types; \
+       fi
 
 distclean-local:
        @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
@@ -222,7 +255,7 @@ distclean-local:
            rm -rf tmpl; \
        fi
 
-maintainer-clean-local: clean
+maintainer-clean-local:
        @rm -rf xml html
 
 install-data-local:
@@ -258,15 +291,17 @@ uninstall-local:
 #
 # Require gtk-doc when making dist
 #
-if ENABLE_GTK_DOC
-dist-check-gtkdoc:
+if HAVE_GTK_DOC
+dist-check-gtkdoc: docs
 else
 dist-check-gtkdoc:
-       @echo "*** gtk-doc must be installed and enabled in order to make dist"
+       @echo "*** gtk-doc is needed to run 'make dist'.         ***"
+       @echo "*** gtk-doc was not found when 'configure' ran.   ***"
+       @echo "*** please install gtk-doc and rerun 'configure'. ***"
        @false
 endif
 
-dist-hook: dist-check-gtkdoc dist-hook-local
+dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
        @mkdir $(distdir)/tmpl
        @mkdir $(distdir)/html
        @-cp ./tmpl/*.sgml $(distdir)/tmpl
index 91089ece41fdc9b38cfdbefd9205798d97d69b61..c4be6f9ff092e39f63ef3db329a69a9d1d69f3c8 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = help
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -60,12 +87,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -73,6 +106,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -118,6 +152,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -356,11 +391,11 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -496,15 +531,16 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-info install-info-am install-man install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
-       installcheck installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am install-man \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags-am uninstall uninstall-am
 
 @YELP_HELP_RULES@
 
index 682c2636c54dafc2016779b389d4eea7d69f7996..57bc9241f673368392f8f2199feca01125334184 100644 (file)
@@ -1,14 +1,13 @@
 # Czech translation for glabels help.
 # Copyright (C) 2010 glabels's COPYRIGHT HOLDER
 # This file is distributed under the same license as the glabels help.
-#
 # Marek Černocký <marek@manet.cz>, 2010, 2011, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: glabels\n"
-"POT-Creation-Date: 2013-04-18 11:17+0000\n"
-"PO-Revision-Date: 2013-04-26 14:29+0200\n"
+"Project-Id-Version: glabels glabels-3.2\n"
+"POT-Creation-Date: 2013-12-18 19:25+0000\n"
+"PO-Revision-Date: 2013-12-27 06:18+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -1049,6 +1048,23 @@ msgstr ""
 "nebo si přečtěte <link href=\"http://creativecommons.org/licenses/by-sa/3.0/"
 "\">výtah dokumentu pro neprávníky</link>."
 
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mancreate.page:340(media)
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/glabels-template-ellipse-label.png' "
+#| "md5='ba612c86b5fb8fcd2b5384ecc1c331d2'"
+msgctxt "_"
+msgid ""
+"external ref='figures/glabels-template-rect-label.png' "
+"md5='9c7ae1c1a888e1c9eefd19655d093971'"
+msgstr ""
+"external ref='figures/glabels-template-rect-label.png' "
+"md5='9c7ae1c1a888e1c9eefd19655d093971'"
+
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
@@ -1062,6 +1078,74 @@ msgstr ""
 "external ref='figures/glabels-template-ellipse-label.png' "
 "md5='ba612c86b5fb8fcd2b5384ecc1c331d2'"
 
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mancreate.page:439(media)
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/glabels-template-ellipse-label.png' "
+#| "md5='ba612c86b5fb8fcd2b5384ecc1c331d2'"
+msgctxt "_"
+msgid ""
+"external ref='figures/glabels-template-circle-label.png' "
+"md5='841e36a1f92aeed01e8fbaacc67758f1'"
+msgstr ""
+"external ref='figures/glabels-template-circle-label.png' "
+"md5='841e36a1f92aeed01e8fbaacc67758f1'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mancreate.page:500(media)
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/glabels-template-ellipse-label.png' "
+#| "md5='ba612c86b5fb8fcd2b5384ecc1c331d2'"
+msgctxt "_"
+msgid ""
+"external ref='figures/glabels-template-cd-label.png' "
+"md5='c7952ac1b26ecbfa53facfbbf6486841'"
+msgstr ""
+"external ref='figures/glabels-template-cd-label.png' "
+"md5='c7952ac1b26ecbfa53facfbbf6486841'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mancreate.page:726(media)
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/glabels-logo.png' "
+#| "md5='0c1e32afcbae0d2fc6976020c24a0a43'"
+msgctxt "_"
+msgid ""
+"external ref='figures/layouts-cdlabel.png' "
+"md5='0c41a95dc82b5a426e934751faf86872'"
+msgstr ""
+"external ref='figures/layouts-cdlabel.png' "
+"md5='0c41a95dc82b5a426e934751faf86872'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mancreate.page:789(media)
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/glabels-template-ellipse-label.png' "
+#| "md5='ba612c86b5fb8fcd2b5384ecc1c331d2'"
+msgctxt "_"
+msgid ""
+"external ref='figures/glabels-template-layout.png' "
+"md5='fe1c9652d5448b2e0ece086777d3a287'"
+msgstr ""
+"external ref='figures/glabels-template-layout.png' "
+"md5='fe1c9652d5448b2e0ece086777d3a287'"
+
 #: C/mancreate.page:11(info/desc)
 msgid "Create your templates manually."
 msgstr "Vytvářejte své šablony ručně."
@@ -2281,17 +2365,6 @@ msgstr ""
 "jednotlivých záznamů v externím zdroji dat."
 
 #: C/mergefeatures.page:31(page/p)
-#| msgid ""
-#| "The first step to performing a document merge is to prepare a source "
-#| "document that contains your merge data. This data could be mailing "
-#| "addresses or any other data that you wish to create unique labels or "
-#| "cards for. Currently back-ends only exist for text files and the "
-#| "evolution data server -- others are planned. The currently supported text-"
-#| "file format is very simple: each line is a record; fields are delimited "
-#| "by commas (CSV), tabs, or colons; and newlines can be embedded into "
-#| "fields by using the \"\\n\" entity. This file could be created using any "
-#| "text editor or could be created by another program or script. A common "
-#| "way of creating CSV files is to export them from a spreadsheet program."
 msgid ""
 "The first step to performing a document merge is to prepare a source "
 "document that contains your merge data. This data could be mailing addresses "
index 7b05d7b2880929db2acafd02925114bdae64a097..bc8b732e5ab5462df032f92506153d35f2513370 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
     <title>Περί του <app>gLabels</app></title>
     <p>Το <app>gLabels</app> γράφτηκε από τον <link href="mailto:evins@snaught.com">Jim Evins</link>. Για να βρείτε περισσότερες πληροφορίες σχετικά με το <app>gLabels</app>, παρακαλώ επισκεφθείτε την <link href="http://glabels.org" type="http">ιστοσελίδα του <app>gLabels</app></link>.</p>
     <p>Για να αναφέρετε ένα σφάλμα ή να κάνετε μια πρόταση σχετικά με την εφαρμογή ή αυτό το εγχειρίδιο, ακολουθήστε τις οδηγίες στο <link href="http://glabels.org/contact/" type="http">Σελίδα Επικοινωνίας του <app>gLabels</app></link>.</p>
 
-    <p> This program is distributed under the terms of the GNU
-      General Public license as published by the Free Software
-      Foundation; either version 3 of the License, or (at your option)
-      any later version. A copy of this license can be found at this
-      <link href="help:gpl" type="help">link</link>, or in the file
-      COPYING included with the source code of this program. </p>
+    <p>Αυτό το πρόγραμμα διανέμεται υπό τους όρους της GNU General Public license όπως έχει δημοσιευτεί από το Ίδρυμα Ελεύθερου λογισμικού είτε τηn 3η έκδοση της άδειας, είτε (κατ επιλογή σας) οποιασδήποτε νεότερης έκδοσης. Μπορείτε να βρείτε αντίγραφο αυτής της άδειας στον ακόλουθο <link href="help:gpl" type="help">link</link>, ή στο αρχείο COPYING που περιλαμβάνεται στον πηγαίο κώδικα αυτού του προγράμματος.</p>
 </page>
index 8acfa8639b4dd4aac1df123d4f1ffe1a1879dd6b..31696f928e10d155bd6bda80c4c899506104e224 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
    <title>Βασική χρήση</title>
     <section>
     <title>Για το άνοιγμα ενός αρχείου</title>
 
-      <p>To open a file, choose 
-        <guiseq><gui>File</gui><gui>Open</gui>
-       </guiseq> to display the <gui>Open File</gui> dialog.
-        Select the file that you want to open, then click
-        <gui>OK</gui>. The file is displayed in the display area
-        of the <app>gLabels</app> window. </p>
+      <p>Για να ανοίξετε ένα αρχείο, επιλέξτε <guiseq><gui>Αρχείο</gui><gui>Άνοιγμα</gui></guiseq> για να εμφανίσετε τον διάλογο <gui>Άνοιγμα Αρχείου</gui>. Επιλέξτε το αρχείο που θέλετε να ανοίξετε, πατήστε στο <gui>Εντάξει</gui> . Το αρχείο εμφανίζεται στην περιοχή εμφάνισης του παραθύρου <app>gLabels</app>.</p>
 
       <p>Μπορείτε επίσης να ανοίξετε πολλά αρχεία στο <app>gLabels</app>. Η εφαρμογή δημιουργεί ένα ξεχωριστό παράθυρο της εφαρμογής για κάθε ανοιχτό αρχείο.</p>
 
-      <p>The application records the paths and filenames of the
-        most recent files that you have edited and displays the files as menu
-        items on the <guiseq><gui>File</gui><gui>Recent Files</gui>
-        </guiseq> menu.</p>
+      <p>Η εφαρμογή καταγράφει τις διαδρομές και τα ονόματα των πιο πρόσφατων αρχείων που έχετε επεξεργαστεί και εμφανίζει τα αρχεία και ως στοιχεία μενού στο <guiseq><gui>Αρχείο</gui><gui>Πρόσφατα αρχεία</gui></guiseq> μενού.</p>
      </section>
 
      <section id="closefile">
     <title>Για το κλείσιμο ενός αρχείου</title>
 
-      <p>To close the current document, choose
-        <guiseq><gui>File</gui>
-        <gui>Close</gui></guiseq> to close the application
-        window.  If the current document is modified, a confirmation dialog
-        will be presented, allowing you to save the document or cancel
-        the command.  If the window being closed is the only open window,
-        <app>gLabels</app> will exit.</p>
+      <p>Για να κλείσετε το τρέχον έγγραφο, επιλέξτε <guiseq><gui>Αρχείο</gui><gui>Κλείσιμο</gui></guiseq> για να κλείσετε το παράθυρο της εφαρμογής. Εάν το τρέχον έγγραφο έχει τροποποιηθεί, ένα πλαίσιο διαλόγου επιβεβαίωσης θα παρουσιασθεί, επιτρέποντας σας να αποθηκεύσετε το έγγραφο ή να ακυρώσετε την εντολή. Αν το παράθυρο που κλείνει είναι το μόνο ανοικτό παράθυρο, το <app>gLabels</app> θα κλείσει.</p>
      </section>
      
      <section>
 
       <list><item>
 
-         <p>To save changes to an existing file, choose 
-            <guiseq><gui>File</gui>
-            <gui>Save</gui></guiseq>. </p>
+         <p>Για να αποθηκεύσετε τις αλλαγές σε ένα υπάρχον αρχείο, επιλέξτε <guiseq><gui>Αρχείο</gui><gui>Αποθήκευση</gui></guiseq>.</p>
 
        </item>
         <item>
 
-         <p>To save a new file or to save an existing file under a new
-            filename, choose <guiseq><gui>File</gui>
-            <gui>Save As</gui></guiseq>. Enter a name
-            for the file in the <gui>Save As</gui> dialog box,
-            then click <gui>OK</gui>.</p>
+         <p>Για να αποθηκεύσετε ένα νέο αρχείο ή να αποθηκεύσετε ένα υπάρχον αρχείο με ένα νέο όνομα αρχείου, επιλέξτε <guiseq><gui>Αρχείο</gui><gui>Αποθήκευση ως</gui></guiseq>. Πληκτρολογήστε ένα όνομα για το αρχείο στο παράθυρο διαλόγου <gui>Αποθήκευση ως</gui>, στη συνέχεια πατήστε στο <gui>Εντάξει</gui>.</p>
 
        </item>
       </list>
@@ -77,8 +69,6 @@
      <section>
     <title>Για την έξοδο από το <app>gLabels</app></title>
 
-      <p>To quit <app>gLabels</app>, choose <guiseq><gui>File</gui>
-        <gui>Quit</gui></guiseq>. This is equivalent to closing all open windows. 
-        See <link xref="basicusage#closefile"/>.</p>
+      <p>Για την έξοδο από το <app>gLabels</app>, επιλέξετε <guiseq><gui>Αρχείο</gui><gui>Έξοδος</gui></guiseq>. Αυτό είναι ισοδύναμο με το κλείσιμο όλων των ανοιχτών παραθύρων. Δείτε το <link xref="basicusage#closefile"/>.</p>
      </section>
 </page>
index 15db0c114249563a2c49a61021185e6d25288175..50d48363a4618715523ac2977bebd02e5471c873 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
     <title>Για να δημιουργήσετε νέα αντικείμενα</title>
index 7eda332c4d8022aafc32b9f491df065654fee1d0..127db0622637afb82239084ba1ebcb37d3a8c100 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
     
   <!-- ============= Customization ============================= -->
   <!-- Use this section to describe how to customize the application. -->
     <title>Ρυθμίσεις</title> 
-    <p>To configure <app>gLabels</app>, choose 
-      <guiseq> 
-       <gui>Settings</gui> 
-       <gui>Preferences</gui> 
-      </guiseq>. The 
-      <gui>Preferences</gui> dialog contains the following tabbed
-      sections:</p>
+    <p>Για να ρυθμίσετε το <app>gLabel </app>, επιλέξτε <guiseq><gui>Ρυθμίσεις</gui><gui>Προτιμήσεις</gui></guiseq>. Ο διάλογος <gui>Προτιμήσεις</gui> περιέχει τις ακόλουθες καρτέλες:</p>
 
   <section id="prefs-locale" style="2column">
     <title>Τοπική προσαρμογή</title>
        <p>Χρησιμοποιείστε αυτήν την ομάδα κουμπιών επιλογής για να καθορίσετε τις προτιμώμενες μονάδες σας. Επιλέξτε μία από τις ακόλουθες επιλογές:</p>
           <list>
                <item>
-               <p><gui>Points</gui></p>
-               <p>ΧÏ\81ήÏ\83η Ï\80Ï\8cνÏ\84Ï\89ν (1 Ï\80Ï\8cνÏ\84οÏ\82 pt = 1/72 ίντσας = 0.352778 mm).</p>
+               <p><gui>Στιγμές</gui></p>
+               <p>ΧÏ\81ήÏ\83η Ï\83Ï\84ιγμÏ\8eν (1 Ï\83ημείο pt = 1/72 ίντσας = 0.352778 mm).</p>
                </item>
                <item>
-               <p><gui>Inches</gui></p>
-               <p>ΧÏ\81ήÏ\83η Î\8aνÏ\84Ï\83αÏ\82.</p>
+               <p><gui>Ίντσες</gui></p>
+               <p>ΧÏ\81ήÏ\83η Î¹Î½Ï\84Ï\83Ï\8eν.</p>
                </item>
                <item>
-               <p><gui>Millimeters</gui></p>
-               <p>Χρήση Χιλιοστών.</p>
+               <p><gui>Χιλιοστά</gui></p>
+               <p>Χρήση χιλιοστών.</p>
                </item>
           </list>
           <p>Προεπιλεγμένο: <gui>Ίντσες</gui>.</p>
@@ -56,7 +62,7 @@
        <p>Χρησιμοποιήστε αυτή την ομάδα κουμπιών επιλογής για να καθορίσετε το μέγεθος της σελίδας της αρεσκείας σας. Αυτό θα καταστήσει πιο γρήγορο τον εντοπισμό των τύπων μέσων για εσάς όταν δημιουργείτε μια νέα ετικέτα ή κάρτα.</p>
           <list>
                <item>
-               <p><gui>US Letter</gui></p>
+               <p><gui>Επιστολή US</gui>.</p>
                <p>Τα περισσότερα από τα μέσα σας θα είναι στο μέγεθος σελίδας US Letter (8.5 x 11 ίντσες).</p>
                </item>
                <item>
        <p>Χρησιμοποιήστε αυτά τα στοιχεία ελέγχου για να ορίσετε τις προεπιλεγμένες ιδιότητες των νέων αντικειμένων κειμένου. Οι ιδιότητες αυτές είναι:</p>
           <list>
                <item>
-               <p><gui>Font</gui></p>
+               <p><gui>Γραμματοσειρά</gui></p>
                <p>Οι έλεγχοι αυτοί χρησιμοποιούνται για την επιλογή οικογένειας γραμματοσειράς και του μεγέθους γραμματοσειράς, καθώς και αν η γραμματοσειρά θα έχει έντονη γραφή ή με πλάγιους χαρακτήρες.</p>
                </item>
                <item>
-               <p><gui>Color</gui></p>
+               <p><gui>Χρώμα</gui></p>
                <p>Ο έλεγχος αυτός επιλέγει τη προεπιλογή του χρώματος του κειμένου.</p>
                </item>
                <item>
-               <p><gui>Alignment</gui></p>
+               <p><gui>Στοίχιση</gui></p>
                <p>Οι έλεγχοι αυτοί χρησιμοποιούνται για να επιλέξετε προεπιλογή της στοίχισης του κειμένου (αριστερά, κέντρο ή δεξιά).</p>
                </item>
           </list>
        <p>Χρησιμοποιήστε αυτά τα στοιχεία ελέγχου για να ορίσετε τις προεπιλεγμένες ιδιότητες γραμμών και περιγραμμάτων των νέων αντικειμένων. Οι ιδιότητες αυτές είναι:</p>
           <list>
                <item>
-               <p><gui>Width</gui></p>
+               <p><gui>Πλάτος</gui></p>
                <p>Ο έλεγχος αυτός επιλέγει τη προεπιλογή του πλάτους της γραμμής.</p>
                </item>
                <item>
-               <p><gui>Color</gui></p>
+               <p><gui>Χρώμα</gui></p>
                <p>Ο έλεγχος αυτός επιλέγει τη προεπιλογή του χρώματος της γραμμής.</p>
                </item>
           </list>
        <p>Χρησιμοποιήστε αυτά τα στοιχεία ελέγχου για να ορίσετε τη προεπιλεγμένη ιδιότητα γεμίσματος των νέων αντικειμένων κειμένου. Η ιδιότητα αυτή είναι:</p>
           <list>
                <item>
-               <p><gui>Color</gui></p>
+               <p><gui>Χρώμα</gui></p>
                <p>Ο έλεγχος αυτός επιλέγει τη προεπιλογή του χρώματος γεμίσματος.</p>
                </item>
           </list>
index 57bbc305a53877d7f2c1c56d6b6092d96a9d5368..028c8741e30bc3b3b4c7101b14ddcd7e0d2f9d5b 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
     <title>Για να δημιουργήσετε ενα προσαρμοσμένο πρότυπο</title>
 
-      <p>To create a new custom template, choose 
-        <guiseq><gui>File</gui>
-       <gui>Template Designer ...</gui></guiseq>
-       to display the <gui>Template Designer</gui> dialog.
-        This dialog will assist you in creating a custom template for
-        most types of label or card stationery that you may encounter.</p>
+      <p>Για να δημιουργήσετε ένα νέο προσαρμοσμένο πρότυπο, επιλέξτε <guiseq><gui>Αρχείο</gui><gui>Σχεδιαστής προτύπου ...</gui></guiseq> για να εμφανίσετε τον διάλογο <gui>Σχεδιαστής προτύπου</gui> . Αυτός ο διάλογος θα σας βοηθήσει να δημιουργείτε ένα προσαρμοσμένο πρότυπο για τα περισσότερα είδη της ετικέτας ή κάρτας που μπορεί να συναντήσετε.</p>
 
       <p>Αν προτιμάτε, μπορείτε να δημιουργήσετε τα πρότυπά σας χειροκίνητα. Για αυτή την επιλογή δείτε το <link xref="mancreate"/></p>
 
index 399bca47f1bdee670fd9a2b5ac24cb832d5e1d16..5925633081b2f35c9eed4f1144460e1815e06d6f 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
     <title>Για να επεξεργαστείτε τις ιδιότητες ενός αντικειμένου</title>
       <section id="other-stacking-order">
        <title>Αλλαγή σειράς στοίβαξης</title>
 
-       <p>Stacking order refers to relative position in the z-axis of
-          objects.  That is when objects overlap, which object will appear
-          on top of the other.  By default, newer objects will appear above
-          older objects.  To change this order, select one or more objects
-          and choose <guiseq> <gui>Objects</gui>
-          <gui>Order</gui>
-          <gui>Bring to Front</gui> </guiseq>
-          to raise the selection to the top of the stacking
-          order, or choose <guiseq> <gui>Objects</gui>
-          <gui>Order</gui>
-          <gui>Send to Back</gui> </guiseq>
-          to lower the selection to the bottom of the
-          stacking order.  These menuitems are also available by right-clicking
-          the display area when there is a non-empty selection.</p>
+       <p>Η σειρά στοίβαξης αναφέρεται σε σχετική θέση του άξονα z των αντικειμένων. Αυτό γίνεται όταν τα αντικείμενα επικαλύπτονται, ποιο αντικείμενο θα εμφανιστεί στην κορυφή του άλλου. Από προεπιλογή, τα νεότερα αντικείμενα θα εμφανίζονται πάνω από παλαιότερα αντικείμενα. Για να αλλάξετε αυτή τη σειρά, επιλέξτε ένα ή περισσότερα αντικείμενα και επιλέξτε <guiseq><gui>Αντικείμενα</gui><gui>Διάταξη</gui><gui>Σε πρώτο πλάνο</gui></guiseq> για να ανεβάσετε την επιλογή στην κορυφή της σειράς στοίβαξης, ή επιλέξτε <guiseq><gui>Αντικείμενα</gui><gui>Σειρά</gui><gui>Μεταφορά στο βάθος</gui></guiseq> για να κατεβάσετε την επιλογή στο κάτω μέρος της σειράς στοίβαξης. Αυτά τα στοιχεία μενού είναι επίσης διαθέσιμα δεξιοπατώντας στην περιοχή εμφάνισης όταν υπάρχει μια μη-κενή επιλογή.</p>
 
       </section>
 
       <section id="other-rotating-flipping">
        <title>Περιστροφή και αναστροφή αντικειμένων</title>
 
-       <p>Objects can be rotated 90 degrees in either direction, or flipped
-          horizontally or vertically, by choosing the appropriate menuitem
-          in the  <guiseq> <gui>Objects</gui>
-          <gui>Rotate/Flip</gui> </guiseq> sub-menu.  These
-          menuitems are also available by right-clicking
-          the display area when there is a non-empty selection.</p>
+       <p>Τα αντικείμενα μπορούν να περιστραφούν κατά 90 μοίρες και προς τις δύο κατευθύνσεις, είτε να αναστραφούν οριζόντια ή κάθετα, επιλέγοντας το κατάλληλο στοιχείο μενού στο υπομενού <guiseq><gui>Αντικείμενα</gui><gui>Περιστροφή/Αναστροφή</gui></guiseq>. Αυτά τα στοιχεία μενού είναι επίσης διαθέσιμα δεξιοπατώντας στην περιοχή οθόνης που υπάρχει μια μη-κενή επιλογή.</p>
 
          <note>
-         <p>
-         This feature could be useful when you are designing CD box inlays. For 
-          the spine caption, you need vertical aligned text. After you have created
-          a basic text box, choose <guiseq> <gui>Objects</gui><gui>Rotate/Flip</gui> </guiseq>
-          to rotate the text box according to your needs.
-         </p>
+         <p>Αυτό το χαρακτηριστικό θα μπορούσε να είναι χρήσιμο όταν σχεδιάζετε ένθετα κουτιού CD. Για τον τίτλο της κεντρικής στήλης, χρειάζεστε ένα κάθετα ευθυγραμμισμένο κείμενο. Αφού έχετε δημιουργήσει ένα βασικό πλαίσιο κειμένου, επιλέξτε <guiseq><gui>Αντικείμενα</gui><gui>Περιστροφή/Αναστροφή</gui></guiseq> για να περιστρέψετε το πλαίσιο κειμένου σύμφωνα με τις ανάγκες σας.</p>
          </note>
 
       </section>
       <section id="other-alignment">
        <title>Στοίχιση αντικειμένων</title>
 
-       <p>Objects can be aligned horizontally or vertically, relative to
-          one another, or relative to the center line of the label, by
-          choosing the appropriate menuitem from the  <guiseq>
-          <gui>Objects</gui>
-          <gui>Align Horizontal</gui>
-          </guiseq> or  <guiseq> <gui>Objects</gui>
-          <gui>Align Vertical</gui> </guiseq> sub-menus.
-          These menuitems are also available by right-clicking
-          the display area when there is a non-empty selection.</p>
+       <p>Τα αντικείμενα μπορούν να στοιχιστούν οριζόντια ή κάθετα, μεταξύ τους, ή σε σχέση με την κεντρική γραμμή της ετικέτας, επιλέγοντας το κατάλληλο στοιχείο από τα υπομενού <guiseq><gui>Αντικείμενα</gui><gui>Στοίχιση Οριζόντια</gui></guiseq> ή <guiseq><gui>Αντικείμενα</gui><gui>Στοίχιση Κάθετα</gui></guiseq>. Αυτά τα στοιχεία μενού είναι επίσης διαθέσιμα δεξιοπατώντας στην περιοχή οθόνης που υπάρχει μια μη-κενή επιλογή.</p>
 
       </section>
 
index 2191f31eda4fac079763be0a9ab67790fc903572..d053c4b34aa576b422b38a45f82d0a14ba2ad4a4 100644 (file)
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the glabels package.
 # Konstantinos Chortis <cograss@yahoo.com>, 2012.
 # surf <cograss@yahoo.com>, 2012.
-# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2013.
+# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2013, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels glabels-3_0\n"
-"POT-Creation-Date: 2013-04-17 11:32+0000\n"
-"PO-Revision-Date: 2013-04-18 14:16+0300\n"
+"POT-Creation-Date: 2014-01-07 08:05+0000\n"
+"PO-Revision-Date: 2014-01-05 17:02+0300\n"
 "Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
-"Language-Team: team@gnome.gr\n"
+"Language-Team: www.gnome.gr\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,1317 +18,1236 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/skipfields.page:45(None)
-msgid ""
-"@@image: 'figures/skip-fields-screenshot.png'; "
-"md5=eef4a81f48546bd7d3753656a3df9cb7"
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
 msgstr ""
-"@@image: 'figures/skip-fields-screenshot.png'; "
-"md5=eef4a81f48546bd7d3753656a3df9cb7"
+"Ελληνική μεταφραστική ομάδα GNOME\n"
+" Δημήτρης Σπίγγος <dmtrs32@gmail.com>, 2013, 2014\n"
+" Κωνσταντίνος Χόρτης <cograss@yahoo.com>, 2012\n"
+"Για περισσότερα δείτε http://www.gnome.gr/."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/skipfields.page:53(None)
-msgid ""
-"@@image: 'figures/skip-fields-output.png'; "
-"md5=b64d1a7fdf0d37e9a6d93f0bc2f9fa0d"
-msgstr ""
-"@@image: 'figures/skip-fields-output.png'; "
-"md5=b64d1a7fdf0d37e9a6d93f0bc2f9fa0d"
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:24
+msgctxt "_"
+msgid ""
+"external ref='figures/glabels-logo.png' "
+"md5='0c1e32afcbae0d2fc6976020c24a0a43'"
+msgstr ""
+"external ref='figures/glabels-logo.png' "
+"md5='0c1e32afcbae0d2fc6976020c24a0a43'"
+
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:47
+msgctxt "_"
+msgid ""
+"external ref='figures/introduction-glabels-main-window.png' "
+"md5='9ee2b2cc026ee8cba3c881b370a14313'"
+msgstr ""
+"external ref='figures/introduction-glabels-main-window.png' "
+"md5='9ee2b2cc026ee8cba3c881b370a14313'"
+
+#. (itstool) path: info/title
+#: C/index.page:7
+msgctxt "link"
+msgid "gLabels label and business card designer"
+msgstr "Σχεδιαστής ετικετών και επιχειρηματικών καρτών gLabels"
 
-#: C/skipfields.page:9(desc)
-msgid "How to skip blank address lines when doing a document merge."
-msgstr ""
-"Πως να παρακάμψετε τις κενές γραμμές διευθύνσεων όταν κάνετε μια συγχώνευση "
-"εγγράφου."
+#. (itstool) path: info/title
+#: C/index.page:8
+msgctxt "text"
+msgid "gLabels label and business card designer"
+msgstr "Σχεδιαστής ετικετών και επιχειρηματικών καρτών gLabels"
 
-#: C/skipfields.page:13(name) C/select.page:13(name) C/printfile.page:13(name)
-#: C/newlabel.page:13(name) C/multifile.page:13(name) C/merge.page:13(name)
-#: C/mergefeatures.page:13(name) C/merge-ex4.page:13(name)
-#: C/merge-ex3.page:13(name) C/merge-ex2.page:13(name)
-#: C/merge-ex1.page:13(name) C/mancreate.page:15(name)
-#: C/labelprop.page:13(name) C/index.page:11(name) C/editprop.page:13(name)
-#: C/customtemplate.page:13(name) C/customize.page:11(name)
-#: C/createnew.page:13(name) C/basicusage.page:13(name) C/about.page:13(name)
+#. (itstool) path: credit/name
+#: C/index.page:11 C/about.page:13 C/basicusage.page:13 C/createnew.page:13
+#: C/customize.page:11 C/customtemplate.page:13 C/editprop.page:13
+#: C/labelprop.page:13 C/mancreate.page:15 C/merge-ex1.page:13
+#: C/merge-ex2.page:13 C/merge-ex3.page:13 C/merge-ex4.page:13
+#: C/mergefeatures.page:13 C/merge.page:13 C/multifile.page:13
+#: C/newlabel.page:13 C/printfile.page:13 C/select.page:13
+#: C/skipfields.page:13
 msgid "Jim Evins"
 msgstr "Jim Evins"
 
-#: C/skipfields.page:14(email) C/select.page:14(email)
-#: C/printfile.page:14(email) C/newlabel.page:14(email)
-#: C/multifile.page:14(email) C/merge.page:14(email)
-#: C/mergefeatures.page:14(email) C/merge-ex4.page:14(email)
-#: C/merge-ex3.page:14(email) C/merge-ex2.page:14(email)
-#: C/merge-ex1.page:14(email) C/mancreate.page:16(email)
-#: C/labelprop.page:14(email) C/index.page:12(email) C/editprop.page:14(email)
-#: C/customtemplate.page:14(email) C/customize.page:12(email)
-#: C/createnew.page:14(email) C/basicusage.page:14(email)
-#: C/about.page:14(email)
-msgid "evins@snaught.com"
-msgstr "evins@snaught.com"
-
-#: C/skipfields.page:17(name) C/select.page:17(name) C/printfile.page:17(name)
-#: C/newlabel.page:17(name) C/multifile.page:17(name) C/merge.page:17(name)
-#: C/mergefeatures.page:17(name) C/merge-ex4.page:17(name)
-#: C/merge-ex3.page:17(name) C/merge-ex2.page:17(name)
-#: C/merge-ex1.page:17(name) C/mancreate.page:19(name)
-#: C/labelprop.page:17(name) C/index.page:15(name) C/editprop.page:17(name)
-#: C/customtemplate.page:17(name) C/customize.page:15(name)
-#: C/createnew.page:17(name) C/basicusage.page:17(name) C/about.page:17(name)
+#. (itstool) path: credit/name
+#: C/index.page:15 C/about.page:17 C/basicusage.page:17 C/createnew.page:17
+#: C/customize.page:15 C/customtemplate.page:17 C/editprop.page:17
+#: C/labelprop.page:17 C/mancreate.page:19 C/merge-ex1.page:17
+#: C/merge-ex2.page:17 C/merge-ex3.page:17 C/merge-ex4.page:17
+#: C/mergefeatures.page:17 C/merge.page:17 C/multifile.page:17
+#: C/newlabel.page:17 C/printfile.page:17 C/select.page:17
+#: C/skipfields.page:17
 msgid "Mario Blättermann"
 msgstr "Mario Blättermann"
 
-#: C/skipfields.page:18(email) C/select.page:18(email)
-#: C/printfile.page:18(email) C/newlabel.page:18(email)
-#: C/multifile.page:18(email) C/merge.page:18(email)
-#: C/mergefeatures.page:18(email) C/merge-ex4.page:18(email)
-#: C/merge-ex3.page:18(email) C/merge-ex2.page:18(email)
-#: C/merge-ex1.page:18(email) C/mancreate.page:20(email)
-#: C/labelprop.page:18(email) C/index.page:16(email) C/editprop.page:18(email)
-#: C/customtemplate.page:18(email) C/customize.page:16(email)
-#: C/createnew.page:18(email) C/basicusage.page:18(email)
-#: C/about.page:18(email)
-msgid "mariobl@gnome.org"
-msgstr "mariobl@gnome.org"
-
-#: C/skipfields.page:21(p) C/select.page:21(p) C/printfile.page:21(p)
-#: C/newlabel.page:21(p) C/multifile.page:21(p) C/merge.page:21(p)
-#: C/mergefeatures.page:21(p) C/merge-ex4.page:21(p) C/merge-ex3.page:21(p)
-#: C/merge-ex2.page:21(p) C/merge-ex1.page:21(p) C/mancreate.page:23(p)
-#: C/labelprop.page:21(p) C/index.page:19(p) C/editprop.page:21(p)
-#: C/customtemplate.page:21(p) C/customize.page:19(p) C/createnew.page:21(p)
-#: C/basicusage.page:21(p) C/about.page:21(p)
+#. (itstool) path: license/p
+#: C/index.page:19 C/about.page:21 C/basicusage.page:21 C/createnew.page:21
+#: C/customize.page:19 C/customtemplate.page:21 C/editprop.page:21
+#: C/labelprop.page:21 C/mancreate.page:23 C/merge-ex1.page:21
+#: C/merge-ex2.page:21 C/merge-ex3.page:21 C/merge-ex4.page:21
+#: C/mergefeatures.page:21 C/merge.page:21 C/multifile.page:21
+#: C/newlabel.page:21 C/printfile.page:21 C/select.page:21
+#: C/skipfields.page:21
 msgid "Creative Commons Share Alike 3.0"
 msgstr "Creative Commons Share Alike 3.0"
 
-#: C/skipfields.page:25(title)
-msgid "Skipping blank address lines"
-msgstr "Παράκαμψη κενών γραμμών διευθύνσεων"
-
-#: C/skipfields.page:27(p)
+#. (itstool) path: page/title
+#: C/index.page:23
 msgid ""
-"This feature can be best described by a simple example. In the following CSV "
-"file, column 5 (ADDR2) contains the second address line for each record. "
-"This field is empty in records 1 and 2, but not in record 3. (For this "
-"feature to work, the field must be completely empty -- any text, including "
-"spaces will defeat this feature.)"
+"<media type=\"image\" mime=\"image/png\" src=\"figures/glabels-logo.png"
+"\">gLabels logo</media> gLabels Manual"
 msgstr ""
-"Αυτό το χαρακτηριστικό μπορεί να περιγραφεί καλύτερα από ένα απλό "
-"παράδειγμα. Στο παρακάτω αρχείο CSV, στήλη 5 (ADDR2) περιέχεται δεύτερη "
-"γραμμή διευθύνσεων για κάθε εγγραφή. Το πεδίο αυτό είναι κενό στα βιβλία 1 "
-"και 2, αλλά όχι στο αρχείο 3. (Για να λειτουργήσει αυτό το χαρακτηριστικό, "
-"το πεδίο πρέπει να είναι εντελώς άδειο - κάθε κείμενοσυμπεριλαμβανομένων των "
-"διαστημάτων θα απενεργοποιήσει αυτή τη δυνατότητα.)"
+"<media type=\"image\" mime=\"image/png\" src=\"figures/glabels-logo.png"
+"\">λογότυπος του gLabels</media> Εγχειρίδιο του gLabels"
 
-#: C/skipfields.page:33(code)
-#, no-wrap
+#. (itstool) path: page/p
+#: C/index.page:28
 msgid ""
-"\n"
-"  LAST,FIRST,MI,ADDR1,ADDR2,CITY,STATE,ZIP\n"
-"  Summers,Joyce,,\"1630 Revello Dr\",,Sunnydale,CA,95037\n"
-"  McGarret,Steve,O,\"404 Piikoi Street\",,Honolulu,HI,96813\n"
-"  Kramer,Cosmo,,\"Apt 5B\",\"129 W. 81 St.\",\"New York\",NY,10024-7207\n"
-"  "
+"The <app>gLabels</app> application is a lightweight program for creating "
+"labels and business cards for the GNOME desktop environment. It is designed "
+"to work with various laser/ink-jet peel-off label and business card sheets "
+"that you'll find at most office supply stores."
 msgstr ""
-"\n"
-"  LAST,FIRST,MI,ADDR1,ADDR2,CITY,STATE,ZIP\n"
-"  Summers,Joyce,,\"1630 Revello Dr\",,Sunnydale,CA,95037\n"
-"  McGarret,Steve,O,\"404 Piikoi Street\",,Honolulu,HI,96813\n"
-"  Kramer,Cosmo,,\"Apt 5B\",\"129 W. 81 St.\",\"New York\",NY,10024-7207\n"
-"  "
+"Η εφαρμογή <app>gLabels</app> είναι ένα ελαφρύ πρόγραμμα για τη δημιουργία "
+"ετικετών και επαγγελματικών καρτών για το περιβάλλον GNOME. Έχει σχεδιαστεί "
+"για να λειτουργεί με διάφορα αυτοκόλλητες ετικέτες λέιζερ/ink-jet και φύλλα "
+"επαγγελματικών καρτών που θα βρείτε στα περισσότερα καταστήματα ειδών "
+"γραφείου."
 
-#: C/skipfields.page:40(p)
+#. (itstool) path: page/p
+#: C/index.page:35
 msgid ""
-"In the following screenshot, a single multiline text object has been created "
-"to format these addresses. Notice that ${ADDR2} representing the second "
-"address line is on a line by itself. (Any additional text on this line, "
-"including spaces would defeat this feature.)"
+"<app>gLabels</app> can be used to design address labels, name tags, price "
+"tags, cd/dvd labels, or just about anything else that is organized in a "
+"regular pattern on a sheet of paper. Labels (or cards) can contain text, "
+"images, lines, shapes, and barcodes. <app>gLabels</app> also includes a "
+"document-merge feature which lets you print a unique label for each record "
+"from an external data source, such as a CSV file or an <app>Evolution</app> "
+"address book."
 msgstr ""
-"Στο παρακάτω στιγμιότυπο, ένα μόνο αντικείμενο κειμένου πολλών γραμμών έχει "
-"δημιουργηθεί για να διαμορφώσετε αυτές τις διευθύνσεις. Παρατηρήστε ότι το "
-"${ADDR2} που αντιπροσωπεύει τη δεύτερη γραμμή διεύθυνσης είναι σε μια γραμμή "
-"από μόνη της. (Κάθε πρόσθετο κείμενο σε αυτή τη γραμμή συμπεριλαμβανομένων "
-"των διαστημάτων θα απενεργοποιήσει αυτή τη δυνατότητα.)"
+"Η εφαρμογή <app>gLabels</app> μπορεί να χρησιμοποιηθεί για την σχεδίαση "
+"ετικετών διευθύνσεων, ετικετών ονομάτων, ετικετών τιμών, ετικετών CD/DVD, ή "
+"οτιδήποτε άλλου που διοργανώνεται σε μια οργανωμένη δομή ενός φύλλου "
+"χαρτιού. Οι ετικέτες (ή κάρτες) μπορεί να περιέχουν κείμενο, εικόνες, "
+"γραμμές, σχήματα, και barcodes. Το <app>gLabels</app> περιλαμβάνει επίσης το "
+"χαρακτηριστικό συγχώνευσης εγγραφου το οποίο σας επιτρέπει να εκτυπώσετε μια "
+"μοναδική ετικέτα για κάθε εγγραφή από μια εξωτερική πηγή δεδομένων, όπως ένα "
+"αρχείο CSV ή <app>Evolution</app> βιβλίου διευθύνσεων."
 
-#: C/skipfields.page:46(p)
-msgid "Multi-line address"
-msgstr "Διεύθυνση πολλαπλών γραμμών"
+#. (itstool) path: figure/title
+#. (itstool) path: figure/desc
+#: C/index.page:45 C/index.page:46
+msgid "<app>gLabels</app> main window"
+msgstr "Το κύριο παράθυρο του <app>gLabels</app>"
 
-#: C/skipfields.page:49(p)
-msgid ""
-"Printing this label results in the following output. Notice that the line "
-"containing the ${ADDR2} field is completely skipped for the first two "
-"records, without printing a blank line."
-msgstr ""
-"Η εκτύπωση αυτής της ετικέτας έχει ως αποτέλεσμα την ακόλουθη έξοδο. "
-"Παρατηρήστε ότι η γραμμή που περιέχει το ${ADDR2} πεδίο παραλείπεται εντελώς "
-"για τα δύο πρώτα βιβλία, χωρίς να εκτυπώσετε μια κενή γραμμή."
+#. (itstool) path: media/p
+#: C/index.page:48
+msgid "<app>gLabels</app> main window."
+msgstr "Το κύριο παράθυρο του <app>gLabels</app>."
 
-#: C/skipfields.page:54(p)
-msgid "Output"
-msgstr "Αποτέλεσμα"
+#. (itstool) path: section/title
+#: C/index.page:53
+msgid "Usage"
+msgstr "Χρήση"
 
-#: C/select.page:9(desc)
-msgid "How to select objects."
-msgstr "Πως να επιλέξετε αντικείμενα."
+#. (itstool) path: section/title
+#: C/index.page:57
+msgid "Document Merging"
+msgstr "Συγχώνευση εγγράφων"
 
-#: C/select.page:25(title)
-msgid "To select objects"
-msgstr "Για να επιλέξετε αντικείμενα"
+#. (itstool) path: section/title
+#: C/index.page:61
+msgid "Advanced usage"
+msgstr "Χρήση για προχωρημένους"
 
-#: C/select.page:27(p)
-msgid ""
-"A prerequisite for performing operations on objects is the selection of "
-"individual objects or groups of objects. The display area must be in the "
-"object selection mode to create new selections, as indicated by an arrow "
-"cursor. The object selection mode is selected by the <guiseq><gui>Objects</"
-"gui><gui>Select Mode</gui></guiseq> menu item, or the corresponding command "
-"on the <gui>Drawing Toolbar</gui>."
-msgstr ""
-"Απαραίτητη προϋπόθεση της εκτέλεσης εργασιών για αντικείμενα είναι η επιλογή "
-"των επιμέρους αντικειμένων ή ομάδων αντικειμένων. Η περιοχή προβολής πρέπει "
-"να είναι σε κατάσταση επιλογής αντικειμένου για να δημιουργήσετε νέες "
-"επιλογές, όπως υποδεικνύεται από ένα βέλος δρομέα. Η κατάσταση επιλογής "
-"αντικειμένου μπορεί να επιλεγεί από το στοιχείο μενού "
-"<guiseq><gui>Αντικείμενα</gui><gui>Επιλογή Κατάστασης</gui></guiseq>, ή την "
-"αντίστοιχη εντολή στο<gui>Εργαλείο Σχεδίασης</gui>."
+#. (itstool) path: info/desc
+#: C/about.page:9
+msgid "Information about <app>gLabels</app>."
+msgstr "Πληροφορίες για το <app>gLabels</app>."
 
-#: C/select.page:38(title)
-msgid "Selecting a single object"
-msgstr "Επιλέγοντας ένα μεμονωμένο αντικείμενο"
+#. (itstool) path: page/title
+#: C/about.page:25
+msgid "About <app>gLabels</app>"
+msgstr "Περί του <app>gLabels</app>"
 
-#: C/select.page:39(p)
+#. (itstool) path: page/p
+#: C/about.page:27
 msgid ""
-"A single object can be selected simply by clicking on the desired object in "
-"the display area. Once selected the object will be highlighted with a set of "
-"resizing handles."
+"<app>gLabels</app> was written by <link href=\"mailto:evins@snaught.com"
+"\">Jim Evins</link>. To find more information about <app>gLabels</app>, "
+"please visit the <link href=\"http://glabels.org\" type=\"http"
+"\"><app>gLabels</app> Web page</link>."
 msgstr ""
-"Ένα μεμονωμένο αντικείμενο μπορεί να επιλεγεί απλώς κάνοντας κλικ στο "
-"επιθυμητό αντικείμενο στην οθόνη. Μόλις επιλεγεί το αντικείμενο, θα "
-"επισημανθεί με μια σειρά από λαβές αλλαγής μεγέθους."
-
-#: C/select.page:46(title)
-msgid "Aggregate object selections"
-msgstr "Συγκεντρωτικές επιλογές αντικειμένου"
+"Το <app>gLabels</app> γράφτηκε από τον <link href=\"mailto:evins@snaught.com"
+"\">Jim Evins</link>. Για να βρείτε περισσότερες πληροφορίες σχετικά με το "
+"<app>gLabels</app>, παρακαλώ επισκεφθείτε την <link href=\"http://glabels.org"
+"\" type=\"http\">ιστοσελίδα του <app>gLabels</app></link>."
 
-#: C/select.page:47(p)
+#. (itstool) path: page/p
+#: C/about.page:31
 msgid ""
-"Multiple objects can be selected by first selecting the first object as "
-"above and then by holding the <key>Ctrl</key> key while selecting additional "
-"objects. Individual objects can be added to an existing selection at any "
-"time by holding the <key>Ctrl</key> key while selecting the desired objects. "
-"All objects can also be selected by using the <guiseq><gui>Edit</"
-"gui><gui>Select All</gui></guiseq> menu item. All objects in an aggregate "
-"object selection will be highlighted."
+"To report a bug or make a suggestion regarding this application or this "
+"manual, follow the directions at the <link href=\"http://glabels.org/contact/"
+"\" type=\"http\"><app>gLabels</app> Contact Page</link>."
 msgstr ""
-"Πολλαπλά αντικείμενα μπορούν να επιλεγούν πρώτα επιλέγοντας το πρώτο "
-"αντικείμενο όπως παραπάνω και στη συνέχεια κρατώντας πατημένο το πλήκτρο "
-"<key>Ctrl</key> για την επιλογή επιπλέον αντικειμένων. Μεμονωμένα "
-"αντικείμενα μπορούν να προστεθούν σε μια υπάρχουσα επιλογή σε οποιαδήποτε "
-"στιγμή, κρατώντας πατημένο το <key>Ctrl</key> κατά την επιλογή των "
-"επιθυμητών αντικειμένων. Όλα τα αντικείμενα μπορούν επίσης επιλεγούν με τη "
-"χρήση του στοιχείου μενού <guiseq><gui>Επεξεργασία</gui> <gui>Επιλογή Όλων</"
-"gui></guiseq>. Όλα τα αντικείμενα στο σύνολο τους θα επισημανθούν."
-
-#: C/select.page:60(title)
-msgid "Area selections"
-msgstr "Επιλογές περιοχής"
+"Για να αναφέρετε ένα σφάλμα ή να κάνετε μια πρόταση σχετικά με την εφαρμογή "
+"ή αυτό το εγχειρίδιο, ακολουθήστε τις οδηγίες στο <link href=\"http://"
+"glabels.org/contact/\" type=\"http\">Σελίδα Επικοινωνίας του <app>gLabels</"
+"app></link>."
 
-#: C/select.page:62(p)
+#. (itstool) path: page/p
+#: C/about.page:37
 msgid ""
-"Multiple objects can also be selected by clicking an empty area and dragging "
-"to form a rectangular area. When released, all objects contained in the area "
-"will form an aggregate selection. An area selection can be used to add to an "
-"existing selection by holding the <key>Ctrl</key> key while performing the "
-"selection."
+"This program is distributed under the terms of the GNU General Public "
+"license as published by the Free Software Foundation; either version 3 of "
+"the License, or (at your option) any later version. A copy of this license "
+"can be found at this <link href=\"help:gpl\" type=\"help\">link</link>, or "
+"in the file COPYING included with the source code of this program."
 msgstr ""
-"ΠολλαÏ\80λά Î±Î½Ï\84ικείμενα Î¼Ï\80οÏ\81οÏ\8dν ÎµÏ\80ίÏ\83ηÏ\82 Î½Î± ÎµÏ\80ιλεγοÏ\8dν ÎºÎ¬Î½Î¿Î½Ï\84αÏ\82 ÎºÎ»Î¹Îº Ï\83ε Î¼Î¹Î± ÎºÎµÎ½Î® "
-"Ï\80εÏ\81ιοÏ\87ή ÎºÎ±Î¹ Î½Î± Ï\83Ï\8dÏ\81εÏ\84ε Ï\8eÏ\83Ï\84ε Î½Î± Ï\83Ï\87ημαÏ\84ίÏ\83εÏ\84ε Î¼Î¹Î± Î¿Ï\81θογÏ\8eνια Ï\80εÏ\81ιοÏ\87ή. Î\8cÏ\84αν "
-"αφήσετε το κουμπί, όλα τα αντικείμενα που περιέχονται στην περιοχή θα "
-"αÏ\80οÏ\84ελέÏ\83οÏ\85ν Î¼Î¹Î± Ï\83Ï\85γκενÏ\84Ï\81Ï\89Ï\84ική ÎµÏ\80ιλογή. Î\9cια ÎµÏ\80ιλογή Ï\80εÏ\81ιοÏ\87ήÏ\82, Î¼Ï\80οÏ\81εί Î½Î± "
-"χρησιμοποιηθεί για να προσθέσετε σε μια υπάρχουσα επιλογή κρατώντας πατημένο "
-"Ï\84ο Ï\80λήκÏ\84Ï\81ο <key>Ctrl</key> ÎºÎ±Ï\84ά Ï\84ην ÎµÎºÏ\84έλεÏ\83η Ï\84ηÏ\82 ÎµÏ\80ιλογής."
+"Î\91Ï\85Ï\84Ï\8c Ï\84ο Ï\80Ï\81Ï\8cγÏ\81αμμα Î´Î¹Î±Î½Î­Î¼ÎµÏ\84αι Ï\85Ï\80Ï\8c Ï\84οÏ\85Ï\82 Ï\8cÏ\81οÏ\85Ï\82 Ï\84ηÏ\82 GNU General Public license "
+"Ï\8cÏ\80Ï\89Ï\82 Î­Ï\87ει Î´Î·Î¼Î¿Ï\83ιεÏ\85Ï\84εί Î±Ï\80Ï\8c Ï\84ο Î\8aδÏ\81Ï\85μα Î\95λεÏ\8dθεÏ\81οÏ\85 Î»Î¿Î³Î¹Ï\83μικοÏ\8d ÎµÎ¯Ï\84ε Ï\84ηn 3η Î­ÎºÎ´Î¿Ï\83η "
+"της άδειας, είτε (κατ επιλογή σας) οποιασδήποτε νεότερης έκδοσης. Μπορείτε "
+"να Î²Ï\81είÏ\84ε Î±Î½Ï\84ίγÏ\81αÏ\86ο Î±Ï\85Ï\84ήÏ\82 Ï\84ηÏ\82 Î¬Î´ÎµÎ¹Î±Ï\82 Ï\83Ï\84ον Î±ÎºÏ\8cλοÏ\85θο <link href=\"help:gpl\" "
+"type=\"help\">link</link>, ή στο αρχείο COPYING που περιλαμβάνεται στον "
+"Ï\80ηγαίο ÎºÏ\8eδικα Î±Ï\85Ï\84οÏ\8d Ï\84οÏ\85 Ï\80Ï\81ογÏ\81άμμαÏ\84ος."
 
-#: C/select.page:72(title)
-msgid "Unselecting objects"
-msgstr "Αποεπιλογή αντικειμένων"
+#. (itstool) path: info/desc
+#: C/basicusage.page:9
+msgid "Handling files and quit the application."
+msgstr "Διαχείριση αρχείων και έξοδος της εφαρμογής."
 
-#: C/select.page:74(p)
-msgid ""
-"Individual objects can be removed from an existing selection by holding the "
-"<key>Ctrl</key> key while clicking on a previously selected object. An "
-"entire selection can be dismissed by using the <guiseq><gui>Edit</"
-"gui><gui>Un-select All</gui></guiseq> menu item or by simply clicking any "
-"empty space in the display area. Once an object is unselected its highlight "
-"is removed."
-msgstr ""
-"Μεμονωμένα αντικείμενα μπορούν να αφαιρεθούν από μια υπάρχουσα επιλογή "
-"κρατώντας πατημένο το πλήκτρο <key>Ctrl</key> καί παράλληλα κάνοντας κλικ σε "
-"ένα ήδη επιλεγμένο αντικείμενο. Μια πολλαπλή επιλογή μπορεί να απορριφθεί με "
-"τη χρήση του στοιχείου μενού <guiseq><gui>Επεξεργασία</gui><gui>Αποεπιλογή "
-"Όλων</gui></guiseq> ή κάνοντας απλώς κλικ σε οποιοδήποτε κενό χώρο στην "
-"περιοχή. Όταν ένα αντικείμενο αποεπιλέγεται ο τονισμός του αφαιρείται."
+#. (itstool) path: page/title
+#: C/basicusage.page:25
+msgid "Basic usage"
+msgstr "Βασική χρήση"
 
-#: C/select.page:86(title)
-msgid "Clipboard Commands"
-msgstr "Εντολές προχείρου"
+#. (itstool) path: section/title
+#: C/basicusage.page:28
+msgid "To open a file"
+msgstr "Για το άνοιγμα ενός αρχείου"
 
-#: C/select.page:88(p)
+#. (itstool) path: section/p
+#: C/basicusage.page:30
 msgid ""
-"Object selections can be manipulated using the standard clipboard operations "
-"<gui>Cut</gui>, <gui>Copy</gui>, <gui>Paste</gui>, and <gui>Delete</gui>."
+"To open a file, choose <guiseq><gui>File</gui><gui>Open</gui> </guiseq> to "
+"display the <gui>Open File</gui> dialog. Select the file that you want to "
+"open, then click <gui>OK</gui>. The file is displayed in the display area of "
+"the <app>gLabels</app> window."
 msgstr ""
-"Χειρισμός των επιλογών αντικειμένων γίνεται επίσης χρησιμοποιώντας τις "
-"τυπικές λειτουργίες του προχείρου <gui>Αποκοπή</gui>, <gui>Αντιγραφή</gui>, "
-"<gui>Επικόλληση</gui>, και <gui>Διαγραφή</gui>."
-
-#: C/select.page:94(title)
-msgid "<gui>Cut</gui> (<keyseq><key>Ctrl</key><key>X</key></keyseq>)"
-msgstr "<gui>Αποκοπή</gui> (<keyseq><key>Ctrl</key><key>X</key></keyseq>)"
+"Για να ανοίξετε ένα αρχείο, επιλέξτε <guiseq><gui>Αρχείο</gui><gui>Άνοιγμα</"
+"gui></guiseq> για να εμφανίσετε τον διάλογο <gui>Άνοιγμα Αρχείου</gui>. "
+"Επιλέξτε το αρχείο που θέλετε να ανοίξετε, πατήστε στο <gui>Εντάξει</gui> . "
+"Το αρχείο εμφανίζεται στην περιοχή εμφάνισης του παραθύρου <app>gLabels</"
+"app>."
 
-#: C/select.page:96(p)
+#. (itstool) path: section/p
+#: C/basicusage.page:37
 msgid ""
-"Moves selected objects to the clipboard. The objects are then available for "
-"pasting back into the current document or another document."
+"You can also open multiple files in <app>gLabels</app>. The application "
+"creates a separate application window for each open file."
 msgstr ""
-"Μετακινεί τα επιλεγμένα αντικείμενα στο πρόχειρο. Τα αντικείμενα στη "
-"συνέχεια είναι διαθέσιμα για την επικόλληση στο τρέχον έγγραφο ή άλλο "
-"έγγραφο."
-
-#: C/select.page:103(title)
-msgid "<gui>Copy</gui> (<keyseq><key>Ctrl</key><key>C</key></keyseq>)"
-msgstr "<gui>Αντιγραφή</gui> (<keyseq><key>Ctrl</key><key>C</key></keyseq>)"
+"Μπορείτε επίσης να ανοίξετε πολλά αρχεία στο <app>gLabels</app>. Η εφαρμογή "
+"δημιουργεί ένα ξεχωριστό παράθυρο της εφαρμογής για κάθε ανοιχτό αρχείο."
 
-#: C/select.page:105(p)
+#. (itstool) path: section/p
+#: C/basicusage.page:41
 msgid ""
-"Copies selected objects to the clipboard without deleting them. The objects "
-"are then available for pasting back into the current document or another "
-"document."
+"The application records the paths and filenames of the most recent files "
+"that you have edited and displays the files as menu items on the "
+"<guiseq><gui>File</gui><gui>Recent Files</gui> </guiseq> menu."
 msgstr ""
-"Î\91νÏ\84ιγÏ\81άÏ\86ει Ï\84α ÎµÏ\80ιλεγμένα Î±Î½Ï\84ικείμενα Ï\83Ï\84ο Ï\80Ï\81Ï\8cÏ\87ειÏ\81ο, Ï\87Ï\89Ï\81ίÏ\82 Ï\84η Î´Î¹Î±Î³Ï\81αÏ\86ή Ï\84οÏ\85Ï\82. "
-"Τα αντικείμενα στη συνέχεια είναι διαθέσιμα για την επικόλληση στο τρέχον "
-"έγγραφο ή άλλο έγγραφο."
+"Î\97 ÎµÏ\86αÏ\81μογή ÎºÎ±Ï\84αγÏ\81άÏ\86ει Ï\84ιÏ\82 Î´Î¹Î±Î´Ï\81ομέÏ\82 ÎºÎ±Î¹ Ï\84α Î¿Î½Ï\8cμαÏ\84α Ï\84Ï\89ν Ï\80ιο Ï\80Ï\81Ï\8cÏ\83Ï\86αÏ\84Ï\89ν Î±Ï\81Ï\87είÏ\89ν "
+"που έχετε επεξεργαστεί και εμφανίζει τα αρχεία και ως στοιχεία μενού στο "
+"<guiseq><gui>Αρχείο</gui><gui>Πρόσφατα αρχεία</gui></guiseq> μενού."
 
-#: C/select.page:112(title)
-msgid "<gui>Paste</gui> (<keyseq><key>Ctrl</key><key>V</key></keyseq>)"
-msgstr "<gui>Επικόλληση</gui> (<keyseq><key>Ctrl</key><key>V</key></keyseq>)"
+#. (itstool) path: section/title
+#: C/basicusage.page:48
+msgid "To close a file"
+msgstr "Για το κλείσιμο ενός αρχείου"
 
-#: C/select.page:114(p)
+#. (itstool) path: section/p
+#: C/basicusage.page:50
 msgid ""
-"Pastes objects from the clipboard into the current document. <app>gLabels</"
-"app> can only paste objects from another <app>gLabels</app> document."
+"To close the current document, choose <guiseq><gui>File</gui> <gui>Close</"
+"gui></guiseq> to close the application window. If the current document is "
+"modified, a confirmation dialog will be presented, allowing you to save the "
+"document or cancel the command. If the window being closed is the only open "
+"window, <app>gLabels</app> will exit."
 msgstr ""
-"Επικολλά αντικείμενα από το πρόχειρο στο τρέχον έγγραφο. Το <app>gLabels</"
-"app> μπορεί να επικολλήσει μόνο αντικείμενα από ένα άλλο <app>gLabels</app> "
-"έγγραφο."
+"Για να κλείσετε το τρέχον έγγραφο, επιλέξτε <guiseq><gui>Αρχείο</"
+"gui><gui>Κλείσιμο</gui></guiseq> για να κλείσετε το παράθυρο της εφαρμογής. "
+"Εάν το τρέχον έγγραφο έχει τροποποιηθεί, ένα πλαίσιο διαλόγου επιβεβαίωσης "
+"θα παρουσιασθεί, επιτρέποντας σας να αποθηκεύσετε το έγγραφο ή να ακυρώσετε "
+"την εντολή. Αν το παράθυρο που κλείνει είναι το μόνο ανοικτό παράθυρο, το "
+"<app>gLabels</app> θα κλείσει."
 
-#: C/select.page:121(title)
-msgid "<gui>Delete</gui> (<key>Del</key>)"
-msgstr "<gui>Διαγραφή</gui> (<key>Del</key>)"
+#. (itstool) path: section/title
+#: C/basicusage.page:60
+msgid "To save a file"
+msgstr "Για την αποθήκευση ενός αρχείου"
 
-#: C/select.page:123(p)
-msgid "Deletes selected objects without placing them on the clipboard."
-msgstr ""
-"Διαγράφει τα επιλεγμένα αντικείμενα χωρίς να τα τοποθετεί στο πρόχειρο."
+#. (itstool) path: section/p
+#: C/basicusage.page:62
+msgid "You can save files in the following ways:"
+msgstr "Μπορείτε να αποθηκεύετε αρχεία με τους εξής τρόπους:"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/printfile.page:47(None)
+#. (itstool) path: item/p
+#: C/basicusage.page:66
 msgid ""
-"@@image: 'figures/print-copies.png'; md5=ee473352947fe25c7adaa9f9a052c3e9"
+"To save changes to an existing file, choose <guiseq><gui>File</gui> "
+"<gui>Save</gui></guiseq>."
 msgstr ""
-"@@image: 'figures/print-copies.png'; md5=ee473352947fe25c7adaa9f9a052c3e9"
+"Για να αποθηκεύσετε τις αλλαγές σε ένα υπάρχον αρχείο, επιλέξτε "
+"<guiseq><gui>Αρχείο</gui><gui>Αποθήκευση</gui></guiseq>."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/printfile.page:70(None)
+#. (itstool) path: item/p
+#: C/basicusage.page:73
 msgid ""
-"@@image: 'figures/print-merge.png'; md5=ee70bd2150a6cd46e96ce5c0531eb47b"
+"To save a new file or to save an existing file under a new filename, choose "
+"<guiseq><gui>File</gui> <gui>Save As</gui></guiseq>. Enter a name for the "
+"file in the <gui>Save As</gui> dialog box, then click <gui>OK</gui>."
 msgstr ""
-"@@image: 'figures/print-merge.png'; md5=ee70bd2150a6cd46e96ce5c0531eb47b"
-
-#: C/printfile.page:9(desc)
-msgid "How to print your labels and cards."
-msgstr "Πως να εκτυπώσετε τις ετικέτες και τις κάρτες σας."
+"Για να αποθηκεύσετε ένα νέο αρχείο ή να αποθηκεύσετε ένα υπάρχον αρχείο με "
+"ένα νέο όνομα αρχείου, επιλέξτε <guiseq><gui>Αρχείο</gui><gui>Αποθήκευση ως</"
+"gui></guiseq>. Πληκτρολογήστε ένα όνομα για το αρχείο στο παράθυρο διαλόγου "
+"<gui>Αποθήκευση ως</gui>, στη συνέχεια πατήστε στο <gui>Εντάξει</gui>."
 
-#: C/printfile.page:25(title)
-msgid "To print labels and cards"
-msgstr "Για να εκτυπώσετε τις ετικέτες και τις κάρτες σας"
+#. (itstool) path: section/title
+#: C/basicusage.page:84
+msgid "To quit <app>gLabels</app>"
+msgstr "Για την έξοδο από το <app>gLabels</app>"
 
-#: C/printfile.page:27(p)
+#. (itstool) path: section/p
+#: C/basicusage.page:86
 msgid ""
-"To print labels or cards, choose <guiseq><gui>File</gui><gui>Print</gui></"
-"guiseq> to display the <gui>Print</gui> dialog. Once print options have been "
-"selected, click <gui>Print</gui> to print the labels or cards. To simply "
-"preview the results, click <gui>Print Preview</gui> instead."
+"To quit <app>gLabels</app>, choose <guiseq><gui>File</gui> <gui>Quit</gui></"
+"guiseq>. This is equivalent to closing all open windows. See <link xref="
+"\"basicusage#closefile\"/>."
 msgstr ""
-"Για να εκτυπώσετε ετικέτες ή κάρτες, επιλέξτε <guiseq><gui>Αρχείο</"
-"gui><gui>Εκτύπωση</gui></guiseq> για να εμφανίσετε το διάλογο <gui>Εκτύπωση</"
-"gui>. Μόλις οι επιλογές εκτύπωσης έχουν επιλεγεί, κάντε κλικ στην επιλογή "
-"<gui>Εκτύπωση</gui> για να εκτυπώσετε τις ετικέτες ή τις κάρτες. Για να "
-"κάνετε προεπισκόπηση των αποτελεσμάτων, κάντε κλικ στην επιλογή "
-"<gui>Προεπισκόπηση εκτύπωσης</gui>."
+"Για την έξοδο από το <app>gLabels</app>, επιλέξετε <guiseq><gui>Αρχείο</"
+"gui><gui>Έξοδος</gui></guiseq>. Αυτό είναι ισοδύναμο με το κλείσιμο όλων των "
+"ανοιχτών παραθύρων. Δείτε το <link xref=\"basicusage#closefile\"/>."
+
+#. (itstool) path: info/desc
+#: C/createnew.page:9
+msgid "Create new objects within your document."
+msgstr "Δημιουργήστε νέα αντικείμενα μέσα στο έγγραφό σας."
+
+#. (itstool) path: page/title
+#: C/createnew.page:25
+msgid "To create new objects"
+msgstr "Για να δημιουργήσετε νέα αντικείμενα"
 
-#: C/printfile.page:34(p)
+#. (itstool) path: page/p
+#: C/createnew.page:27
 msgid ""
-"The <gui>Print</gui> dialog allows you to specify the following print "
-"options:"
+"Objects are created by choosing the appropriate selection under the "
+"<guiseq><gui>Objects</gui><gui>Create Object</gui></guiseq> submenu or the "
+"<gui>Drawing Toolbar</gui>. This will place the display area into object "
+"creation mode as indicated by its cursor. To return to the default object "
+"selection mode without creating an object, choose <guiseq><gui>Objects</"
+"gui><gui>Select Mode</gui></guiseq>. This will return the display area's "
+"cursor to the default selection arrow."
 msgstr ""
-"Ο διάλογος <gui>Εκτύπωση</gui> σας επιτρέπει να ορίσετε τις ακόλουθες "
-"επιλογές εκτύπωσης:"
+"Τα αντικείμενα δημιουργούνται επιλέγοντας την κατάλληλη επιλογή στο υπομενού "
+"<guiseq><gui>Αντικείμενα</gui><gui>Δημιουργία αντικειμένου</gui></guiseq> ή "
+"στο <gui>Εργαλεία Σχεδίασης</gui>. Αυτό θα θέσει την περιοχή της οθόνης σε "
+"λειτουργία δημιουργίας αντικειμένων, όπως υποδεικνύεται από το δρομέα του. "
+"Για να επιστρέψετε στην προεπιλεγμένη λειτουργία επιλογής αντικειμένου, "
+"χωρίς να δημιουργήσετε ένα αντικείμενο, επιλέξτε <guiseq><gui>Αντικείμενα</"
+"gui><gui>Λειτουργία Επιλογής</gui></guiseq>. Αυτό θα επιστρέψει τον κέρσορα "
+"της οθόνης στο βέλος προεπιλογής."
 
-#: C/printfile.page:38(title)
-msgid "The Labels Tab of the Print Dialog"
-msgstr "Η καρτέλα Ετικέτες του παραθύρου διαλόγου Εκτύπωση"
+#. (itstool) path: page/p
+#: C/createnew.page:35
+msgid "The following describes the object creation mode for each object type:"
+msgstr ""
+"Το ακόλουθο περιγράφει τη λειτουργία δημιουργίας αντικειμένου για κάθε τύπο "
+"αντικειμένου:"
 
-#: C/printfile.page:41(title)
-msgid "Print control (Simple)"
-msgstr "Έλεγχος εκτύπωσης (Απλός)"
+#. (itstool) path: section/title
+#: C/createnew.page:39 C/customize.page:80
+msgid "Text"
+msgstr "Κείμενο"
 
-#: C/printfile.page:43(p)
+#. (itstool) path: section/p
+#: C/createnew.page:40
 msgid ""
-"For simple labels or cards (no document merge), the job tabbed section "
-"contains the following copy controls."
+"Click the desired location of the upper left corner of the text object. New "
+"text objects are initialized with the string \"Text.\" To change this text, "
+"or other properties, see <link xref=\"editprop\"/>."
 msgstr ""
-"Για απλές ετικέτες ή κάρτες (δεν υπάρχει συγχώνευση εγγράφου), η καρτέλα "
-"εργασίας περιέχει τα ακόλουθα στοιχεία ελέγχου αντιγραφής."
+"Κάντε κλικ στην επιθυμητή θέση της επάνω αριστερής γωνίας του αντικειμένου "
+"του κειμένου. Τα νέα αντικείμενα κειμένου αρχικοποιούνται με τη συμβολοσειρά "
+"\"Κείμενο.\" Για να αλλάξετε αυτό το κείμενο, ή άλλες ιδιότητες, δείτε το "
+"<link xref=\"editprop\"/>."
 
-#: C/printfile.page:48(p) C/editprop.page:36(p)
-msgid "Print Copy Controls"
-msgstr "Στοιχεία ελέγχου εκτύπωσης αντιγραφής"
+#. (itstool) path: section/title
+#: C/createnew.page:47
+msgid "Box"
+msgstr "Πλαίσιο"
 
-#. ==== End of Figure ====
-#: C/printfile.page:52(p)
+#. (itstool) path: section/p
+#: C/createnew.page:48
 msgid ""
-"The number of copies of the label can be selected by choosing the number of "
-"full sheets to print, or a specific subset of labels on a single sheet."
+"Click the desired location of the upper left corner of the box object and "
+"drag to the desired location of the lower right corner. If you simply click "
+"in a single location, a square box will be created. To change properties of "
+"the box object, see <link xref=\"editprop\"/>."
 msgstr ""
-"Ο αριθμός των αντιγράφων της ετικέτας μπορεί να επιλεγεί από την επιλογή του "
-"αριθμού ολόκληρων φύλλων για εκτύπωση ή ένα συγκεκριμένο υποσύνολο ετικετών "
-"σε ένα φύλλο."
+"Κάντε κλικ στην επιθυμητή θέση της επάνω αριστερής γωνίας του αντικειμένου "
+"πλαίσιο και σύρετε στην επιθυμητή θέση της κάτω δεξιά γωνίας. Αν απλά κάνετε "
+"κλικ σε μία θέση, ένα τετράγωνο κουτί θα δημιουργηθεί. Για να αλλάξετε τις "
+"ιδιότητες του αντικειμένου κουτί, δείτε το <link xref=\"editprop\"/>."
+
+#. (itstool) path: section/title
+#: C/createnew.page:56 C/customize.page:101
+msgid "Line"
+msgstr "Γραμμή"
 
-#: C/printfile.page:56(p)
+#. (itstool) path: section/p
+#: C/createnew.page:57
 msgid ""
-"The mini-preview can also be used to graphically select the subset of labels "
-"by clicking the first label on the mini-preview and dragging to the last "
-"label."
+"Click the desired location of one end of the line object and drag to the "
+"desired location of the other end. If you simply click in a single location, "
+"a diagonal line will be created. To change properties of the line object, "
+"see <link xref=\"editprop\"/>."
 msgstr ""
-"Η μίνι-προεπισκόπηση μπορεί επίσης να χρησιμοποιηθεί για να επιλέξετε "
-"γραφικά το υποσύνολο των ετικετών κάνοντας κλικ στην πρώτη ετικέτα στη μίνι-"
-"προεπισκόπηση και σύροντας στην τελευταία ετικέτα."
+"Κάντε κλικ στην επιθυμητή θέση από το ένα άκρο της γραμμής του αντικειμένου "
+"και σύρετε στην επιθυμητή θέση του άλλου άκρου. Αν απλά κάνετε κλικ σε μία "
+"θέση, μια διαγώνια γραμμή θα δημιουργηθεί. Για να αλλάξετε τις ιδιότητες του "
+"αντικειμένου γραμμής, δείτε το <link xref=\"editprop\"/>."
 
-#: C/printfile.page:63(title)
-msgid "Print control (Merge)"
-msgstr "Έλεγχος εκτύπωσης (Συγχώνευση)"
+#. (itstool) path: section/title
+#: C/createnew.page:65
+msgid "Ellipse"
+msgstr "Έλλειψη"
 
-#: C/printfile.page:65(p)
+#. (itstool) path: section/p
+#: C/createnew.page:66
 msgid ""
-"For labels or cards using the document merge (also known as \"mail merge\") "
-"capability, the job tabbed section contains the following merge controls "
-"instead of copy controls."
+"Click the desired location of the upper left corner of the ellipse object "
+"and drag to the desired location of the lower right corner. If you simply "
+"click in a single location, a circle will be created. To change properties "
+"of the ellipse object, see <link xref=\"editprop\"/>."
 msgstr ""
-"Î\93ια ÎµÏ\84ικέÏ\84εÏ\82 Î® ÎºÎ¬Ï\81Ï\84εÏ\82 Ï\80οÏ\85 Ï\87Ï\81ηÏ\83ιμοÏ\80οιοÏ\8dν Ï\84η Î´Ï\85ναÏ\84Ï\8cÏ\84ηÏ\84α Ï\83Ï\85γÏ\87Ï\8eνεÏ\85Ï\83ηÏ\82 ÎµÎ³Î³Ï\81άÏ\86ου "
-"(επίσης γνωστή ως \"συγχώνευση αλληλογραφίας\") , η καρτέλα εργασίας "
-"περιέχει τα ακόλουθα στοιχεία ελέγχου συγχώνευσης αντί των στοιχείων ελέγχου "
-"ανÏ\84ιγÏ\81άÏ\86οÏ\85."
+"Î\9aάνÏ\84ε ÎºÎ»Î¹Îº Ï\83Ï\84ην ÎµÏ\80ιθÏ\85μηÏ\84ή Î¸Î­Ï\83η Ï\84ηÏ\82 ÎµÏ\80άνÏ\89 Î±Ï\81ιÏ\83Ï\84εÏ\81ήÏ\82 Î³Ï\89νίαÏ\82 Ï\84οÏ\85 Î±Î½Ï\84ικειμένου "
+"έλλειψης και σύρετε στην επιθυμητή θέση της κάτω δεξιά γωνίας. Αν απλά "
+"κάνετε κλικ σε μία θέση, θα δημιουργηθεί ένας κύκλος. Για να αλλάξετε τις "
+"ιδιÏ\8cÏ\84ηÏ\84εÏ\82 Ï\84οÏ\85 Î±Î½Ï\84ικειμένοÏ\85 Î­Î»Î»ÎµÎ¹Ï\88ηÏ\82, Î´ÎµÎ¯Ï\84ε Ï\84ο <link xref=\"editprop\"/>."
 
-#: C/printfile.page:71(p)
-msgid "Print Document Merge Controls"
-msgstr "Εκτύπωση εγγράφων στοιχεία ελέγχου συγχώνευσης"
+#. (itstool) path: section/title
+#: C/createnew.page:74
+msgid "Image"
+msgstr "Εικόνα"
 
-#. ==== End of Figure ====
-#: C/printfile.page:75(p)
+#. (itstool) path: section/p
+#: C/createnew.page:75
 msgid ""
-"The total number of labels or cards printed is the product of the number of "
-"records in the merge source and the number of copies selected. If multiple "
-"copies are selected, these can be either collated (copies of the same record "
-"grouped together) or un-collated (one copy each record is printed before "
-"next copy)."
+"Click the desired location of the upper left corner of the image object and "
+"drag to the desired location of the lower right corner. If you simply click "
+"in a single location, a square will be created. New image objects are "
+"initialized with a simple checkerboard image. To change this image, or other "
+"properties of the image object, see <link xref=\"editprop\"/>."
 msgstr ""
-"Ο συνολικός αριθμός των τυπωμένων ετικετών ή καρτών είναι το γινόμενο του "
-"αριθμού εγγραφών στην πηγή συγχώνευσης και τον αριθμό των αντιγράφων που "
-"επιλέξατε. Εάν έχουν επιλεγεί πολλαπλά αντίγραφα, αυτά μπορεί να είναι είτε "
-"ταξινομημένα (αντίγραφα της ίδιας εγγραφής ομαδοποιούνται) ή μη-ταξινομημένα "
-"(ένα αντίγραφο κάθε εγγραφής έχει τυπωθεί πριν από το επόμενο αντίγραφο)."
+"Κάντε κλικ στην επιθυμητή θέση της επάνω αριστερής γωνίας του αντικειμένου "
+"της εικόνας και σύρετε στην επιθυμητή θέση της κάτω δεξιά γωνίας. Αν απλά "
+"κάνετε κλικ σε μία θέση, ένα τετράγωνο θα δημιουργηθεί. Τα νέα αντικείμενα "
+"εικόνας αρχικοποιούνται με μια απλό εικόνα σκακιέρας. Για να αλλάξετε αυτή "
+"την εικόνα, ή άλλες ιδιότητες του αντικειμένου εικόνας, δείτε το <link xref="
+"\"editprop\"/>."
 
-#: C/printfile.page:82(p)
-msgid ""
-"Printing can begin on any label on the first sheet. This can be selected "
-"with the <gui>Start on label</gui> spinbutton."
-msgstr ""
-"Η εκτύπωση μπορεί να αρχίσει από οποιαδήποτε ετικέτα στο πρώτο φύλλο. Αυτό "
-"μπορεί να επιλεγχθεί με το κουμπί <gui>Έναρξη στην ετικέτα</gui> spinbutton."
+#. (itstool) path: section/title
+#: C/createnew.page:85
+msgid "Barcode"
+msgstr "Barcode γραμμικός κώδικας"
 
-#: C/printfile.page:86(p)
+#. (itstool) path: section/p
+#: C/createnew.page:86
 msgid ""
-"The mini-preview can also be used to graphically select this first label, by "
-"clicking on the desired label in the mini-preview."
+"Click the desired location of the upper left corner of the barcode object. "
+"New barcode objects are initialized to a POSTNET barcode with representative "
+"data. To change data and properties of the barcode object, see <link xref="
+"\"editprop\"/>."
 msgstr ""
-"Η μίνι-προεπισκόπηση μπορεί επίσης να χρησιμοποιηθεί για να επιλέξετε "
-"γραφικά της πρώτης ετικέτας, κάνοντας κλικ στην ετικέτα που θέλετε στη μίνι-"
-"προεπισκόπηση."
-
-#: C/printfile.page:93(title)
-msgid "Options"
-msgstr "Επιλογές"
+"Κάντε κλικ στην επιθυμητή θέση της επάνω αριστερής γωνίας του αντικειμένου "
+"barcode. Τα νέα αντικείμενα barcode αρχικοποιούνται σε POSTNET barcode με "
+"αντιπροσωπευτικά στοιχεία. Για να αλλάξετε τα δεδομένα και τις ιδιότητες του "
+"αντικειμένου barcode, δείτε το <link xref=\"editprop\"/>."
 
-#: C/printfile.page:94(p)
-msgid "The following options can also be selected."
-msgstr "Οι ακόλουθες επιλογές μπορούν επίσης να επιλεγούν."
+#. (itstool) path: info/desc
+#: C/customize.page:9
+msgid "Customize <app>gLabels</app> to match your needs."
+msgstr "Προσαρμογή του <app>gLabels</app> για να ταιριάξει με τις ανάγκες σας."
 
-#: C/printfile.page:97(gui)
-msgid "print outlines"
-msgstr "εκτύπωση περιγραμμάτων"
+#. (itstool) path: page/title
+#: C/customize.page:25
+msgid "Settings"
+msgstr "Ρυθμίσεις"
 
-#: C/printfile.page:98(p)
+#. (itstool) path: page/p
+#: C/customize.page:26
 msgid ""
-"Print outlines of labels. This option is useful for dry-runs, to test "
-"printer alignment."
+"To configure <app>gLabels</app>, choose <guiseq> <gui>Settings</gui> "
+"<gui>Preferences</gui> </guiseq>. The <gui>Preferences</gui> dialog contains "
+"the following tabbed sections:"
 msgstr ""
-"Εκτύπωση περιγραμμάτων των ετικετών. Αυτή η επιλογή είναι χρήσιμη για να "
-"ελέγξετε την ευθυγράμμιση του εκτυπωτή."
+"Για να ρυθμίσετε το <app>gLabel </app>, επιλέξτε <guiseq><gui>Ρυθμίσεις</"
+"gui><gui>Προτιμήσεις</gui></guiseq>. Ο διάλογος <gui>Προτιμήσεις</gui> "
+"περιέχει τις ακόλουθες καρτέλες:"
+
+#. (itstool) path: section/title
+#: C/customize.page:35
+msgid "Locale"
+msgstr "Τοπική προσαρμογή"
 
-#: C/printfile.page:102(gui)
-msgid "print in reverse"
-msgstr "εκτύπωση με αντιστροφή"
+#. (itstool) path: section/title
+#: C/customize.page:37
+msgid "Units"
+msgstr "Μονάδες"
 
-#: C/printfile.page:103(p)
+#. (itstool) path: section/p
+#: C/customize.page:38
 msgid ""
-"Prints the labels as mirror images. This option is useful for printing on "
-"clear labels that will be viewed from the reverse side (e.g. in a car "
-"window)."
+"Use this radio button group to specify your preferred units. Select one of "
+"the following options:"
 msgstr ""
-"Εκτυπώνει τις ετικέτες ως εικόνες καθρέφτη. Αυτή η επιλογή είναι χρήσιμη για "
-"την εκτύπωση σε διαφανείς ετικέτες που θα προβάλονται από την ανάποδη πλευρά "
-"(π.χ. σε ένα παράθυρο του αυτοκινήτου)."
+"Χρησιμοποιείστε αυτήν την ομάδα κουμπιών επιλογής για να καθορίσετε τις "
+"προτιμώμενες μονάδες σας. Επιλέξτε μία από τις ακόλουθες επιλογές:"
 
-#: C/printfile.page:108(gui)
-msgid "print crop marks"
-msgstr "εκτύπωση σημείων κοπής"
+#. (itstool) path: item/p
+#: C/customize.page:42
+msgid "<gui>Points</gui>"
+msgstr "<gui>Στιγμές</gui>"
 
-#: C/printfile.page:109(p)
-msgid ""
-"Prints crop marks along the edge of the sheet. This option is useful for "
-"printing on blank stock, to be cut after printing. This option does not work "
-"well with all templates."
-msgstr ""
-"Εκτυπώνει σημάδια κοπής κατά μήκος της άκρης του φύλλου. Αυτή η επιλογή "
-"είναι χρήσιμη για την εκτύπωση σε λευκό υλικό, ώστε να κοπεί μετά από την "
-"εκτύπωση. Αυτή η επιλογή δεν λειτουργεί καλά με όλα τα πρότυπα."
+#. (itstool) path: item/p
+#: C/customize.page:43
+msgid "Use points (1 point = 1/72 in = 0.352778 mm)."
+msgstr "Χρήση στιγμών (1 σημείο pt = 1/72 ίντσας = 0.352778 mm)."
 
-#: C/newlabel.page:9(desc)
-msgid "Create a new label or card in <app>gLabels</app>."
-msgstr "Δημιουργία μιας νέας ετικέτας ή κάρτας στο <app>gLabels</app>."
+#. (itstool) path: item/p
+#: C/customize.page:46
+msgid "<gui>Inches</gui>"
+msgstr "<gui>Ίντσες</gui>"
 
-#: C/newlabel.page:25(title)
-msgid "To create a new label or card"
-msgstr "Για τη δημιουργία μιας νέας ετικέτας ή κάρτας"
+#. (itstool) path: item/p
+#: C/customize.page:47
+msgid "Use Inches."
+msgstr "Χρήση ιντσών."
 
-#: C/newlabel.page:27(p)
-msgid ""
-"To create a new label or business card, choose <guiseq><gui>File</"
-"gui><gui>New</gui></guiseq> to display the <gui>New Label or Card</gui> "
-"dialog. Select the media type and orientation for the new document, then "
-"click <gui>OK</gui>. A new document is displayed in the display area of the "
-"<app>gLabels</app> window."
-msgstr ""
-"Για να δημιουργήσετε μια νέα ετικέτα ή κάρτα, επιλέξτε <guiseq><gui>Αρχείο</"
-"gui><gui>Νέο</gui> </guiseq> για να εμφανίσετε το διάλογο <gui>Νέα ετικέτα ή "
-"κάρτα</gui>. Επιλέξτε τον τύπο και τον προσανατολισμό για το νέο έγγραφο, "
-"κάντε κλικ στο κουμπί <gui>OK</gui>. Ένα νέο έγγραφο εμφανίζεται στην οθόνη "
-"του <app>gLabels</app> παραθύρου."
+#. (itstool) path: item/p
+#: C/customize.page:50
+msgid "<gui>Millimeters</gui>"
+msgstr "<gui>Χιλιοστά</gui>"
 
-#: C/multifile.page:9(desc)
-msgid "How to open multiple files at once by using the command line."
-msgstr "Πως να ανοίξετε πολλά αρχεία ταυτόχρονα με χρήση της γραμμής εντολών."
+#. (itstool) path: item/p
+#: C/customize.page:51
+msgid "Use Millimeters."
+msgstr "Χρήση χιλιοστών."
 
-#: C/multifile.page:25(title)
-msgid "To open multiple files from the command line"
-msgstr "Για να ανοίξετε πολλά αρχεία ταυτόχρονα με χρήση της γραμμής εντολών"
+#. (itstool) path: section/p
+#: C/customize.page:54
+msgid "Default: <gui>Inches</gui>."
+msgstr "Προεπιλεγμένο: <gui>Ίντσες</gui>."
+
+#. (itstool) path: section/title
+#: C/customize.page:58
+msgid "Default page size"
+msgstr "Προκαθορισμένο μέγεθος σελίδας"
 
-#: C/multifile.page:27(p)
+#. (itstool) path: section/p
+#: C/customize.page:59
 msgid ""
-"You can run <app>gLabels</app> from a command line and open a single file or "
-"multiple files. To open multiple files from a command line, type the "
-"following command, then press <key>Return</key>:"
+"Use this radio button group to specify your prefered page size. This will "
+"make it quicker for you to locate media types when creating a new label or "
+"card."
 msgstr ""
-"Μπορείτε να εκτελέσετε το <app>gLabels</app> από τη γραμμή εντολών και να "
-"ανοίξετε ένα ή περισσότερα αρχεία. Για να ανοίξετε πολλά αρχεία από τη "
-"γραμμή εντολών, πληκτρολογήστε την ακόλουθη εντολή και πατήστε <key>Return</"
-"key>:"
-
-#: C/multifile.page:33(var)
-msgid "file1.glabels file2.glabels file3.glabels"
-msgstr "αρχείο1.glabels αρχείο2.glabels αρχείο3.glabels"
+"Χρησιμοποιήστε αυτή την ομάδα κουμπιών επιλογής για να καθορίσετε το μέγεθος "
+"της σελίδας της αρεσκείας σας. Αυτό θα καταστήσει πιο γρήγορο τον εντοπισμό "
+"των τύπων μέσων για εσάς όταν δημιουργείτε μια νέα ετικέτα ή κάρτα."
 
-#: C/multifile.page:32(cmd)
-msgid "glabels <placeholder-1/>"
-msgstr "glabels <placeholder-1/>"
+#. (itstool) path: item/p
+#: C/customize.page:64
+msgid "<gui>US Letter</gui>"
+msgstr "<gui>Επιστολή US</gui>."
 
-#: C/multifile.page:36(p)
+#. (itstool) path: item/p
+#: C/customize.page:65
 msgid ""
-"When the application starts, the files that you specify are displayed in "
-"separate <app>gLabels</app> windows."
+"Most of your media will be of the US Letter page size (8.5 x 11 inches)."
 msgstr ""
-"Όταν ξεκινά η εφαρμογή, τα αρχεία που έχετε καθορίσει εμφανίζονται σε "
-"ξεχωριστά <app>gLabels</app> παράθυρα."
-
-#: C/merge.page:9(desc)
-msgid "Merge a data source to create multiple documents."
-msgstr "Συγχώνευση μιας πηγής δεδομένων για τη δημιουργία πολλαπλών εγγράφων."
+"Τα περισσότερα από τα μέσα σας θα είναι στο μέγεθος σελίδας US Letter (8.5 x "
+"11 ίντσες)."
 
-#: C/merge.page:25(title)
-msgid "Document merge tutorial"
-msgstr "Εκμάθηση συγχώνευσης εγγράφου"
+#. (itstool) path: item/p
+#: C/customize.page:68
+msgid "<gui>ISO A4</gui>"
+msgstr "<gui>ISO A4</gui>"
 
-#: C/merge.page:27(p)
-msgid ""
-"Document Merge (sometimes called \"Mail Merge\") is a powerful feature that "
-"allows a unique label or card to be printed for each record in an external "
-"data source. It is however, the most mis-understood feature of <app>glabels</"
-"app>. The following examples will step through a couple of common tasks "
-"using the document merge feature."
+#. (itstool) path: item/p
+#: C/customize.page:69
+msgid "Most of your media will be of the ISO A4 page size (210 x 297 mm)."
 msgstr ""
-"Η Συγχώνευση εγγράφου (μερικές φορές ονομάζεται \"Συγχώνευση αλληλογραφίας"
-"\") είναι ένα ισχυρό χαρακτηριστικό που επιτρέπει μια μοναδική ετικέτα ή "
-"κάρτα πρέπει να εκτυπωθεί για κάθε εγγραφή σε μία εξωτερική πηγή δεδομένων. "
-"Είναι ωστόσο, το πιο παρεξηγημένο χαρακτηριστικό του <app>glabels</app>. Τα "
-"παραδείγματα που ακολουθούν θα δείξει μέσω μερικών απλών εργασιών τη χρήση "
-"της δυνατότητας συγχώνευσης εγγράφου."
+"Τα περισσότερα από τα μέσα σας θα είναι ISO A4 page μέγεθος σελίδας (210 x "
+"297 mm)."
 
-#: C/mergefeatures.page:9(desc)
-msgid "What you may expect from a document merge."
-msgstr "Τι μπορείτε να περιμένετε από μια συγχώνευση εγγράφου."
+#. (itstool) path: section/p
+#: C/customize.page:72
+msgid "Default: <gui>US Letter</gui>."
+msgstr "Προεπιλεγμένο: <gui>US Letter</gui>."
 
-#: C/mergefeatures.page:25(title)
-msgid "Performing a document merge"
-msgstr "Εκτέλεση μιας συγχώνευσης εγγράφου"
+#. (itstool) path: section/title
+#: C/customize.page:77
+msgid "Object Defaults"
+msgstr "Εξ'ορισμού ιδιότητες αντικειμένου"
 
-#: C/mergefeatures.page:27(p)
+#. (itstool) path: section/p
+#: C/customize.page:81
 msgid ""
-"Document Merge (sometimes called \"Mail Merge\") is a powerful feature that "
-"allows a unique label or card to be printed for each record in an external "
-"data source."
+"Use these controls to set the default properties of new text objects. These "
+"properties are:"
 msgstr ""
-"Η Συγχώνευση εγγράφου (μερικές φορές ονομάζεται \"Συγχώνευση αλληλογραφίας"
-"\") είναι ένα ισχυρό χαρακτηριστικό που επιτρέπει μια μοναδική ετικέτα ή "
-"κάρτα να εκτυπωθεί για κάθε εγγραφή σε μία εξωτερική πηγή δεδομένων."
+"Χρησιμοποιήστε αυτά τα στοιχεία ελέγχου για να ορίσετε τις προεπιλεγμένες "
+"ιδιότητες των νέων αντικειμένων κειμένου. Οι ιδιότητες αυτές είναι:"
+
+#. (itstool) path: item/p
+#: C/customize.page:85
+msgid "<gui>Font</gui>"
+msgstr "<gui>Γραμματοσειρά</gui>"
 
-#: C/mergefeatures.page:31(p)
-#| msgid ""
-#| "The first step to performing a document merge is to prepare a source "
-#| "document that contains your merge data. This data could be mailing "
-#| "addresses or any other data that you wish to create unique labels or "
-#| "cards for. Currently back-ends only exist for text files and the "
-#| "evolution data server -- others are planned. The currently supported text-"
-#| "file format is very simple: each line is a record; fields are delimited "
-#| "by commas (CSV), tabs, or colons; and newlines can be embedded into "
-#| "fields by using the \"\\n\" entity. This file could be created using any "
-#| "text editor or could be created by another program or script. A common "
-#| "way of creating CSV files is to export them from a spreadsheet program."
+#. (itstool) path: item/p
+#: C/customize.page:86
 msgid ""
-"The first step to performing a document merge is to prepare a source "
-"document that contains your merge data. This data could be mailing addresses "
-"or any other data that you wish to create unique labels or cards for. "
-"Currently back-ends only exist for text files and the evolution data server "
-"-- others are planned. The currently supported text-file format is very "
-"simple: each line is a record; fields are delimited by commas (CSV), tabs, "
-"or colons; and newlines can be embedded into fields by using the \"\\n\" "
-"entity. This file could be created using any text editor or could be created "
-"by another program or script. A common way of creating CSV files is to "
-"export them from a spreadsheet program or from address book applications."
+"These controls are used to select font family and font size, and whether the "
+"font should bold or in italics."
 msgstr ""
-"Το πρώτο βήμα για την εκτέλεση της συγχώνευσης ενός εγγράφου είναι να "
-"προετοιμαστεί ένα πηγαίο έγγραφο που περιέχει τα δεδομένα συγχώνευσής σας. "
-"Αυτά τα δεδομένα μπορεί να είναι ταχυδρομικές διευθύνσεις ή οποιαδήποτε άλλα "
-"δεδομένα που θέλετε να δημιουργήσετε μοναδικές ετικέτες ή κάρτες. Προς το "
-"παρόν τα νωτιαία υπάρχουν μόνο για αρχεία κειμένου και του διακομιστή "
-"δεδομένων evolution -- έχουν προγραμματιστεί κι άλλα. Η παρούσα υποστήριξη "
-"μορφής κειμένου-αρχείου είναι πολύ απλή: κάθε γραμμή είναι μια εγγραφή· τα "
-"πεδία είναι οριοθετημένα με κόμματα (CSV​​), στηλοθέτες, ή διπλές τελείες "
-"και νέες γραμμές μπορούν να ενσωματωθούν σε πεδία, χρησιμοποιώντας την "
-"οντότητα \"\\n\". Αυτό το αρχείο μπορεί να δημιουργηθεί χρησιμοποιώντας "
-"οποιοδήποτε πρόγραμμα επεξεργασίας κειμένου ή θα μπορούσε να δημιουργηθεί "
-"από κάποιο άλλο πρόγραμμα ή σενάριο. Ένας συνήθης τρόπος για τη δημιουργία "
-"αρχείων CSV είναι η εξαγωγή τους από ένα πρόγραμμα υπολογιστικών φύλλων ή "
-"από εφαρμογές βιβλίου διευθύνσεων."
+"Οι έλεγχοι αυτοί χρησιμοποιούνται για την επιλογή οικογένειας γραμματοσειράς "
+"και του μεγέθους γραμματοσειράς, καθώς και αν η γραμματοσειρά θα έχει έντονη "
+"γραφή ή με πλάγιους χαρακτήρες."
 
-#: C/mergefeatures.page:45(p)
+#. (itstool) path: item/p
+#: C/customize.page:90 C/customize.page:110 C/customize.page:122
+msgid "<gui>Color</gui>"
+msgstr "<gui>Χρώμα</gui>"
+
+#. (itstool) path: item/p
+#: C/customize.page:91
+msgid "This control selects the default text color."
+msgstr "Ο έλεγχος αυτός επιλέγει τη προεπιλογή του χρώματος του κειμένου."
+
+#. (itstool) path: item/p
+#: C/customize.page:94
+msgid "<gui>Alignment</gui>"
+msgstr "<gui>Στοίχιση</gui>"
+
+#. (itstool) path: item/p
+#: C/customize.page:95
 msgid ""
-"To export a CSV file from <app>kaddressbook</app>, first select the contacts "
-"you wish to export. Click on the first contact, then press and hold "
-"<key>Ctrl</key> and click on the other desired contacts to select them. Then "
-"choose <guiseq><gui>File</gui><gui>Export</gui><gui>Export CSV File</gui></"
-"guiseq>."
+"These controls are used to select the default text alignment (left, center "
+"or right)."
 msgstr ""
-"Για εξαγωγή ενός αρχείου CSV από το <app>kaddressbook</app>, πρώτα επιλέξτε "
-"τις επαφές που επιθυμείτε να εξάγετε. Πατήστε στην πρώτη επαφή, έπειτα "
-"πατήστε και κρατήστε πατημένο το <key>Ctrl</key> και πατήστε σε άλλες "
-"επιθυμητές επαφές για να τις επιλέξετε. Έπειτα επιλέξτε "
-"<guiseq><gui>Αρχείο</gui><gui>Εξαγωγή</gui><gui>Εξαγωγή αρχείου "
-"CSV</gui></guiseq>."
+"Οι έλεγχοι αυτοί χρησιμοποιούνται για να επιλέξετε προεπιλογή της στοίχισης "
+"του κειμένου (αριστερά, κέντρο ή δεξιά)."
 
-#: C/mergefeatures.page:52(p)
+#. (itstool) path: section/p
+#: C/customize.page:102
 msgid ""
-"In the <gui>Select Contacts</gui> window, enable the button <gui>Selected "
-"contacts</gui> (which should be enabled by default anyway). Then click on "
-"<gui>OK</gui>. In the <gui>Save As</gui> dialog, choose the desired folder "
-"and a name for the file and click on <gui>Save</gui>."
+"Use these controls to set the default properties of lines and outlines of "
+"new objects. These properties are:"
 msgstr ""
-"Στο παράθυρο <gui>Επιλογή επαφών</gui>, ενεργοποιήστε το κουμπί "
-"<gui>Επιλεγμένες επαφές</gui> (που πρέπει να ενεργοποιηθούν από προεπιλογή "
-"οπωσδήποτε). Έπειτα πατήστε στο <gui>Εντάξει</gui>. Στον διάλογο "
-"<gui>Αποθήκευση ως</gui>, επιλέξτε τον επιθυμητό φάκελο και ένα όνομα για το "
-"αρχείο και πατήστε στο <gui>Αποθήκευση</gui>."
+"Χρησιμοποιήστε αυτά τα στοιχεία ελέγχου για να ορίσετε τις προεπιλεγμένες "
+"ιδιότητες γραμμών και περιγραμμάτων των νέων αντικειμένων. Οι ιδιότητες "
+"αυτές είναι:"
+
+#. (itstool) path: item/p
+#: C/customize.page:106
+msgid "<gui>Width</gui>"
+msgstr "<gui>Πλάτος</gui>"
+
+#. (itstool) path: item/p
+#: C/customize.page:107
+msgid "This control selects the default line width."
+msgstr "Ο έλεγχος αυτός επιλέγει τη προεπιλογή του πλάτους της γραμμής."
+
+#. (itstool) path: item/p
+#: C/customize.page:111
+msgid "This control selects the default line color."
+msgstr "Ο έλεγχος αυτός επιλέγει τη προεπιλογή του χρώματος της γραμμής."
 
-#: C/mergefeatures.page:62(p)
+#. (itstool) path: section/title
+#: C/customize.page:117
+msgid "Fill"
+msgstr "Γέμισμα"
+
+#. (itstool) path: section/p
+#: C/customize.page:118
 msgid ""
-"To export a CSV file from <app>Thunderbird</app>, click on the <gui>Address "
-"Book</gui> toolbar button or choose <guiseq><gui>Tools </gui><gui>Address "
-"Book</gui></guiseq> from the menu. Then select the contacts you wish to "
-"export. Click on the first contact, then press and hold <key>Ctrl</key> and "
-"click on the other desired contacts to select them. Then choose "
-"<guiseq><gui>Tools</gui><gui>Export</gui></guiseq>."
+"Use this control to set the default fill property of new objects. This "
+"property is:"
 msgstr ""
-"Για εξαγωγή ενός αρχείου CSV από το <app>Thunderbird</app>, πατήστε στο "
-"κουμπί εργαλειοθήκης <gui>Βιβλίο διευθύνσεων</gui> ή επιλέξτε "
-"<guiseq><gui>Εργαλεία</gui><gui>Βιβλίο διευθύνσεων</gui></guiseq> από το "
-"μενού. Έπειτα επιλέξτε τις επαφές που επιθυμείτε να εξάγετε. Πατήστε στην "
-"πρώτη επαφή, έπειτα πατήστε και κρατήστε πατημένο το <key>Ctrl</key> και "
-"πατήστε τις άλλες επιθυμητές επαφές για να τις επιλέξετε. Έπειτα επιλέξτε "
-"<guiseq><gui>Εργαλεία</gui><gui>Εξαγωγή</gui></guiseq>."
+"Χρησιμοποιήστε αυτά τα στοιχεία ελέγχου για να ορίσετε τη προεπιλεγμένη "
+"ιδιότητα γεμίσματος των νέων αντικειμένων κειμένου. Η ιδιότητα αυτή είναι:"
+
+#. (itstool) path: item/p
+#: C/customize.page:123
+msgid "This control selects the default fill color."
+msgstr "Ο έλεγχος αυτός επιλέγει τη προεπιλογή του χρώματος γεμίσματος."
+
+#. (itstool) path: info/desc
+#: C/customtemplate.page:9
+msgid "Create your own templates for stationery products."
+msgstr "Δημιουργήστε τα δικά σας πρότυπα για προϊόντα γραφικής ύλης."
+
+#. (itstool) path: page/title
+#: C/customtemplate.page:25
+msgid "To create a custom template"
+msgstr "Για να δημιουργήσετε ενα προσαρμοσμένο πρότυπο"
 
-#: C/mergefeatures.page:71(p)
+#. (itstool) path: page/p
+#: C/customtemplate.page:27
 msgid ""
-"In the file chooser window, choose the desired folder and a name for the "
-"file and change the value of the drop-down button in the right bottom corner "
-"to <gui>Comma Separated</gui>. Finally, click on <gui>Save</gui>."
+"To create a new custom template, choose <guiseq><gui>File</gui> "
+"<gui>Template Designer ...</gui></guiseq> to display the <gui>Template "
+"Designer</gui> dialog. This dialog will assist you in creating a custom "
+"template for most types of label or card stationery that you may encounter."
 msgstr ""
-"Στο παράθυρο επιλογέα αρχείου, επιλέξτε τον επιθυμητό φάκελο και ένα όνομα "
-"για το αρχείο και αλλάξτε την τιμή του πτυσσόμενου κουμπιού στην κάτω δεξιά "
-"γωνία σε <gui>Διαχωριζόμενα με κόμμα</gui>. Τελικά, πατήστε στο "
-"<gui>Αποθήκευση</gui>."
+"Για να δημιουργήσετε ένα νέο προσαρμοσμένο πρότυπο, επιλέξτε "
+"<guiseq><gui>Αρχείο</gui><gui>Σχεδιαστής προτύπου ...</gui></guiseq> για να "
+"εμφανίσετε τον διάλογο <gui>Σχεδιαστής προτύπου</gui> . Αυτός ο διάλογος θα "
+"σας βοηθήσει να δημιουργείτε ένα προσαρμοσμένο πρότυπο για τα περισσότερα "
+"είδη της ετικέτας ή κάρτας που μπορεί να συναντήσετε."
 
-#: C/mergefeatures.page:79(p)
+#. (itstool) path: page/p
+#: C/customtemplate.page:34
 msgid ""
-"A label must then be configured to \"point at\" this data file. To configure "
-"the merge properties of a document, choose <guiseq><gui>Objects</"
-"gui><gui>Merge Properties</gui></guiseq> menu item to display the <gui>merge "
-"properties</gui> dialog. This dialog is used to select the exact data file "
-"format and file name (location) of the merge data."
+"If you prefer, you can create your templates manually. For this option see "
+"<link xref=\"mancreate\"/>"
 msgstr ""
-"Μια ετικέτα πρέπει στη συνέχεια να ρυθμιστεί ώστε να \"δείχνει\" το αρχείο "
-"δεδομένων. Για να ρυθμίσετε τις ιδιότητες συγχώνευσης ενός εγγράφου, "
-"επιλέξτετο στοιχείο μενού <guiseq><gui>Αντικείμενα</gui><gui>ιδιότητες "
-"συγχώνευσης</gui></guiseq> για να εμφανίσετε το διάλογο <gui>ιδιότητες "
-"συγχώνευσης</gui> . Αυτό το πλαίσιο διαλόγου χρησιμοποιείται για να "
-"επιλέξετε την ακριβή μορφή αρχείου δεδομένων και το όνομα αρχείου (θέση) των "
-"δεδομένων συγχώνευσης."
+"Αν προτιμάτε, μπορείτε να δημιουργήσετε τα πρότυπά σας χειροκίνητα. Για αυτή "
+"την επιλογή δείτε το <link xref=\"mancreate\"/>"
 
-#: C/mergefeatures.page:87(p)
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/editprop.page:35
+msgctxt "_"
 msgid ""
-"Finally, once the label has been configured for a data file, field keys can "
-"be inserted into text objects and used as source or data for barcode objects "
-"and image filenames for image objects. See <link xref=\"editprop\"/> for "
-"more information on using merge data for these object types."
+"external ref='figures/object-editor-sidebar.png' "
+"md5='68be18416cc17964992fe0c7e311e0ef'"
 msgstr ""
-"Τέλος, όταν η ετικέτα έχει ρυθμιστεί για ένα αρχείο δεδομένων, κλειδιά "
-"πεδίου μπορούν να εισαχθούν σε αντικείμενα κειμένου και να χρησιμοποιούνται "
-"ως πηγή ή δεδομένα για τα αντικείμενα barcode και ονόματα αρχείων εικόνα για "
-"τα αντικείμενα εικόνας. Δείτε το <link xref=\"editprop\"/> για περισσότερες "
-"πληροφορίες σχετικά με τη χρήση δεδομένων συγχώνευσης για αυτούς τους τύπους "
-"αντικειμένων."
+"external ref='figures/object-editor-sidebar.png' "
+"md5='68be18416cc17964992fe0c7e311e0ef'"
+
+#. (itstool) path: info/desc
+#: C/editprop.page:9
+msgid "Change the properties of objects."
+msgstr "Αλλαγή ιδιοτήτων αντικειμένων."
+
+#. (itstool) path: page/title
+#: C/editprop.page:25
+msgid "To edit object properties"
+msgstr "Για να επεξεργαστείτε τις ιδιότητες ενός αντικειμένου"
 
-#: C/mergefeatures.page:93(p)
+#. (itstool) path: section/p
+#: C/editprop.page:29
 msgid ""
-"Now that your label is configured, <app>gLabels</app> will print a unique "
-"label for each record in your source document -- substituting fields from "
-"each record for field keys in the all text, barcode, and image objects."
+"Most object properties can be modified through the object editor sidebar, "
+"illustrated below. To use the object editor, a single object must first be "
+"selected. See <link xref=\"select\"/>."
 msgstr ""
-"Τώρα που η ετικέτα σας έχει ρυθμιστεί, το <app>gLabels</app> θα εκτυπώσει "
-"μια μοναδική ετικέτα για κάθε εγγραφή στο έγγραφό προέλευσης σας - "
-"αντικαθιστώντας τα πεδία από κάθε εγγραφή για κλειδιά πεδίου σε όλο το "
-"κείμενο, το barcode, καθώς και τα αντικείμενα εικόνας."
+"Οι περισσότερες ιδιότητες του αντικειμένου μπορούν να τροποποιηθούν μέσω της "
+"πλευρικής στήλης επεξεργασίας αντικειμένου, που απεικονίζεται παρακάτω. Για "
+"να χρησιμοποιήσετε το πρόγραμμα επεξεργασίας αντικειμένου, πρέπει πρώτα να "
+"επιλεγεί ένα μόνο αντικείμενο. Δείτε το <link xref=\"select\"/>."
+
+#. (itstool) path: media/p
+#: C/editprop.page:36 C/printfile.page:48
+msgid "Print Copy Controls"
+msgstr "Στοιχεία ελέγχου εκτύπωσης αντιγραφής"
 
-#: C/mergefeatures.page:98(p)
+#. (itstool) path: section/p
+#: C/editprop.page:40
 msgid ""
-"See <link xref=\"merge\"/> for a detailed tutorial on the document merge "
-"feature."
+"The object editor will contain a subset of the following tabbed sections, "
+"depending on object type:"
 msgstr ""
-"Δείτε το <link xref=\"merge\"/> για λεπτομερή εκμάθηση της δυνατότητας "
-"συγχώνευσης εγγράφου."
-
-#: C/merge-ex4.page:9(desc)
-msgid "Create address labels from a vCard file."
-msgstr "Δημιουργία ετικετών διευθύνσεων από ένα αρχείο vCard."
+"Ο επεξεργαστής αντικειμένου θα περιέχει ένα υποσύνολο από τις ακόλουθες "
+"καρτέλες, ανάλογα με τον τύπο του αντικειμένου:"
 
-#: C/merge-ex4.page:25(title)
-msgid "Example 4: Address Labels Using a vCard file"
-msgstr "Παράδειγμα 4: Ετικέτες διευθύνσεων χρησιμοποιώντας ένα αρχείο vCard"
+#. (itstool) path: section/title
+#: C/editprop.page:44
+msgid "Text Tabbed Section (Text objects)"
+msgstr "Τμήμα καρτέλας κειμένου (Αντικείμενα κειμένου)"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/merge-ex3.page:53(None)
+#. (itstool) path: section/p
+#: C/editprop.page:46
 msgid ""
-"@@image: 'figures/merge-ex3-1.png'; md5=fb5bf719857fb0a49517ecb50124384d"
+"This section contains a small editor for changing the content of a text "
+"object. It also contains a dropdown menu of available document merge keys, "
+"that can be inserted into text."
 msgstr ""
-"@@image: 'figures/merge-ex3-1.png'; md5=fb5bf719857fb0a49517ecb50124384d"
+"Η ενότητα αυτή περιλαμβάνει ένα μικρό επεξεργαστή για να αλλάξει το "
+"περιεχόμενο ενός αντικειμένου κειμένου. Περιέχει επίσης ένα αναπτυσσόμενο "
+"μενού από διαθέσιμα κλειδιά συγχώνευσης εγγράφων, που μπορούν να εισαχθούν "
+"στο κείμενο."
+
+#. (itstool) path: section/title
+#: C/editprop.page:53
+msgid "Image Tabbed Section (Image objects)"
+msgstr "Τμήμα καρτέλας εικόνας (Αντικείμενα εικόνας)"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/merge-ex3.page:74(None)
+#. (itstool) path: section/p
+#: C/editprop.page:55
 msgid ""
-"@@image: 'figures/merge-ex3-2.png'; md5=51fe322868241d083ec83ae824d927d7"
+"This section contains a file entry with preview to select image files. The "
+"browse button can be used to easily locate image files. Alternatively, a "
+"document merge key can be used instead to provide a filename at print time."
 msgstr ""
-"@@image: 'figures/merge-ex3-2.png'; md5=51fe322868241d083ec83ae824d927d7"
+"Η ενότητα αυτή περιέχει μια καταχώρηση αρχείου με προεπισκόπηση για να "
+"επιλέξετε αρχεία εικόνας. Το κουμπί περιήγησης μπορεί να χρησιμοποιηθεί για "
+"να εντοπίσετε εύκολα τα αρχεία εικόνας. Εναλλακτικά, μπορεί να "
+"χρησιμοποιηθεί ένα κλειδί συγχώνευσης εγγράφων αντ αυτού για να παρέχει ένα "
+"αρχείο κατά το χρόνο εκτύπωσης."
+
+#. (itstool) path: section/title
+#: C/editprop.page:63
+msgid "Data Tabbed Section (Barcode objects)"
+msgstr "Τμήμα καρτέλας δεδομένων (Αντικείμενα barcode)"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/merge-ex3.page:88(None)
+#. (itstool) path: section/p
+#: C/editprop.page:65
 msgid ""
-"@@image: 'figures/merge-ex3-3.png'; md5=f731f35b38ddd51499e636733bacc7a6"
+"This section contains a text entry to enter literal barcode data. "
+"Alternatively, a document merge key can be used to provide this data at "
+"print time."
 msgstr ""
-"@@image: 'figures/merge-ex3-3.png'; md5=f731f35b38ddd51499e636733bacc7a6"
+"Αυτή η ενότητα περιέχει μια είσοδο κειμένου για να εισαγάγετε τα δεδομένα "
+"barcode. Εναλλακτικά, μπορεί να χρησιμοποιηθεί ένα κλειδί συγχώνευσης "
+"εγγράφων αντ' αυτού για να παρέχει δεδομένα κατά το χρόνο εκτύπωσης."
+
+#. (itstool) path: section/title
+#: C/editprop.page:72
+msgid "Style Tabbed Section (Text objects)"
+msgstr "Τμήμα καρτέλας στύλ (Αντικείμενα κειμένου)"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/merge-ex3.page:99(None)
+#. (itstool) path: section/p
+#: C/editprop.page:74
 msgid ""
-"@@image: 'figures/merge-ex3-4.png'; md5=4415be9d5b59fb57093077bcaece014a"
+"This section contains controls to select text properties, including font "
+"family, font size, font weight, color, and text justification."
 msgstr ""
-"@@image: 'figures/merge-ex3-4.png'; md5=4415be9d5b59fb57093077bcaece014a"
+"Η ενότητα αυτή περιλαμβάνει στοιχεία ελέγχου για να επιλέξετε τις ιδιότητες "
+"κειμένου, συμπεριλαμβανομένης της οικογένειας γραμματοσειρών, του μεγέθους "
+"της γραμματοσειράς, βάρους της γραμματοσειράς, χρώματος, και στοίχισης του "
+"κειμένου."
 
-#: C/merge-ex3.page:9(desc)
+#. (itstool) path: section/title
+#: C/editprop.page:81
+msgid "Style Tabbed Section (Barcode objects)"
+msgstr "Τμήμα καρτέλας στύλ (Αντικείμενα barcode)"
+
+#. (itstool) path: section/p
+#: C/editprop.page:83
 msgid ""
-"Create address labels from the <app>Evolution</app> address book entries."
+"This section contains controls to select barcode properties, including "
+"barcode style, color, whether to print text, and whether to include a "
+"checksum digit."
 msgstr ""
-"Δημιουργία ετικετών διευθύνσεων από καταχωρήσεις του βιβλίου διευθύνσεων του "
-"<app>Evolution</app>."
+"Η ενότητα αυτή περιλαμβάνει στοιχεία ελέγχου για να επιλέξετε τις ιδιότητες "
+"barcode, συμπεριλαμβανομένων των στυλ barcode, του χρώματος, αν θέλετε να "
+"εκτυπώσετε κείμενο, και αν πρέπει να περιλαμβάνουν ψηφίο αθροίσματος ελέγχου."
 
-#: C/merge-ex3.page:25(title)
-msgid "Example 3: Address Labels Using the <app>Evolution</app> Addressbook"
-msgstr ""
-"Παράδειγμα 3: Ετικέτες διευθύνσεων από καταχωρήσεις του βιβλίου διευθύνσεων "
-"του <app>Evolution</app>"
+#. (itstool) path: section/title
+#: C/editprop.page:90
+msgid "Line Tabbed Section"
+msgstr "Τμήμα καρτέλας γραμμής"
 
-#: C/merge-ex3.page:27(p)
+#. (itstool) path: section/p
+#: C/editprop.page:92
 msgid ""
-"Our last party was a great success, and now we need to print mailing address "
-"labels for the invitations to a new one. To simplify this, we can use the "
-"<app>Evolution</app> addressbook, because the address data of all our "
-"friends is stored there."
+"This section contains controls to select properties of lines and outlines. "
+"These properties include line width and color."
 msgstr ""
-"Το τελευταίο μας πάρτυ ήταν μεγάλη επιτυχία, και τώρα πρέπει να εκτυπώσετε "
-"ετικέτες ταχυδρομικών διευθύνσεων για τις προσκλήσεις. Για να απλουστευθεί "
-"αυτό, μπορούμε να χρησιμοποιήσουμε το βιβλίο διευθύνσεων του <app>Evolution</"
-"app> , επειδή τα δεδομένα των διευθύνσεων όλων των φίλων μας είναι "
-"αποθηκευμένα εκεί."
+"Η ενότητα αυτή περιλαμβάνει στοιχεία ελέγχου για να επιλέξετε τις ιδιότητες "
+"γραμμών και περιγραμμάτων. Αυτές οι ιδιότητες περιλαμβάνουν το πλάτος "
+"γραμμής και το χρώμα."
 
-#: C/merge-ex3.page:33(p)
+#. (itstool) path: section/title
+#: C/editprop.page:98
+msgid "Fill Tabbed Section"
+msgstr "Τμήμα καρτέλας γεμμίσματος"
+
+#. (itstool) path: section/p
+#: C/editprop.page:100
 msgid ""
-"Depending on how your copy of <app>gLabels</app> was packaged, this option "
-"could be unavailable. Support for the <app>Evolution</app> addressbook will "
-"only be available if the <app>evolution-data-server</app> and its "
-"development files were present when <app>gLabels</app> was built. Please "
-"keep this in mind if you build <app>gLabels</app> directly from source."
+"This section contains controls to select fill properties of box and ellipse "
+"objects. Currently the only fill property is fill color."
 msgstr ""
-"Ανάλογα με το πως το αντίγραφό <app>gLabels</app> ήταν συσκευασμένο , αυτή η "
-"επιλογή μπορεί να είναι μη διαθέσιμη. Υποστήριξη για το βιβλίο διευθύνσεων "
-"του <app>Evolution</app> είναι διαθέσιμη μόνο αν το <app>evolution-data-"
-"server</app> και τα αρχεία ανάπτυξης του ήταν παρόντα όταν οικοδομήθηκε το "
-"<app>gLabels</app> . Παρακαλώ κρατήστε αυτό κατά νου, αν οικοδομήσετε το "
-"<app>gLabels</app> απευθείας από πηγαίο κώδικα."
+"Η ενότητα αυτή περιλαμβάνει στοιχεία ελέγχου για να επιλέξετε τις ιδιότητες "
+"γεμίσματος των αντικειμένων πλαισίου και έλλειψης. Επί του παρόντος η μόνη "
+"ιδιότητα γεμίσματος είναι το χρώμα γεμίσματος."
+
+#. (itstool) path: section/title
+#: C/editprop.page:107
+msgid "Size Tabbed Section (All except line objects)"
+msgstr "Τμήμα καρτέλας μεγέθος (Όλα εκτός των γραμμών)"
 
-#: C/merge-ex3.page:39(p)
+#. (itstool) path: section/p
+#: C/editprop.page:109
 msgid ""
-"If the <app>gLabels</app> package from your distribution lacks this support, "
-"you may wish to contact the package maintainer or file a bug against the "
-"package to request it."
+"This section contains controls to select the width and height of an object. "
+"A checkbox is provided, so that the current aspect ratio can be locked while "
+"manipulating the width and height controls. Image objects also provide a "
+"button to reset the size to the image's natural size (Assumes 72DPI)."
 msgstr ""
-"Εάν απο το πακέτο <app>gLabels</app> της διανομής σας λείπει αυτή η "
-"υποστήριξη, μπορεί να θελήσετε να επικοινωνήσετε με το συντηρητή πακέτου ή "
-"συντάξτε μια αναφορά σφάλματος για το πακέτο για να το ζητήσετε."
+"Η ενότητα αυτή περιλαμβάνει στοιχεία ελέγχου για να επιλέξετε το πλάτος και "
+"το ύψος ενός αντικειμένου. Ένα κουτάκι παρέχεται, έτσι ώστε η τρέχουσα "
+"αναλογία να μπορεί να κλειδωθεί, ενώ χειρίζονται οι έλεγχοι πλάτους και "
+"ύψους. Αντικείμενα εικόνας παρέχουν επίσης ένα κουμπί για να επαναφέρετε το "
+"μέγεθος στο φυσικό μέγεθος της εικόνας (θεωρεί δεδομένο 72DPI)."
+
+#. (itstool) path: section/title
+#: C/editprop.page:118
+msgid "Size Tabbed Section (Line objects)"
+msgstr "Τμήμα καρτέλας μεγέθος (Αντικείμενα γραμμών)"
 
-#: C/merge-ex3.page:44(p)
+#. (itstool) path: section/p
+#: C/editprop.page:120
 msgid ""
-"In <app>glabels</app> we have created a new <app>gLabels</app> document "
-"using the Avery 5512 \"Address Labels\" template. Next we use the "
-"<guiseq><gui>Objects</gui><gui>Merge Properties</gui></guiseq> menu item to "
-"display the <gui>Merge properties</gui> dialog. We use this dialog to select "
-"the source type (in our case <gui>Data from default Evolution addressbook</"
-"gui>) as shown."
+"This section contains controls to select the length and angle of a line "
+"object."
 msgstr ""
-"Στο <app>glabels</app> έχουμε δημιουργήσει ένα νέο έγγραφο <app>glabels</"
-"app> χρησιμοποιώντας το πρότυπο Avery 5512 \"Ετικέτες διευθύνσεων\" . Στη "
-"συνέχεια χρησιμοποιούμε το στοιχείο μενού <guiseq><gui>Αντικείμενα</"
-"gui><gui>Ιδιότητες συγχώνευσης</gui></guiseq> για να εμφανίσουμε το διάλογο "
-"<gui>ιδιότητες συγχώνευσης</gui> . Χρησιμοποιούμε αυτό το παράθυρο για να "
-"επιλέξουμε τον τύπο της πηγής (σε περίπτωση μας από <gui>Data from default "
-"Evolution addressbook</gui>) όπως φαίνεται."
+"Η ενότητα αυτή περιλαμβάνει στοιχεία ελέγχου για να επιλέξετε το μήκος και "
+"τη γωνία ενός αντικειμένου γραμμής."
 
-#: C/merge-ex3.page:54(p) C/merge-ex2.page:53(p) C/merge-ex1.page:51(p)
-msgid "Merge properties dialog"
-msgstr "Διάλογος ιδιοτήτων συγχώνευσης"
+#. (itstool) path: section/title
+#: C/editprop.page:126
+msgid "Position Tabbed Section"
+msgstr "Τμήμα καρτέλας θέση"
 
-#. ==== End of Figure ====
-#: C/merge-ex3.page:58(p)
-msgid ""
-"Once we have chosen <gui>Data from default Evolution addressbook </gui> as "
-"our merge source, we will get a full list of its content. Initially, all "
-"entries are checked. Assuming we were planning a really big party, we could "
-"leave this selection untouched (but let's keep our budget in mind). We will "
-"now select or unselect certain entries by clicking on the appropriate "
-"checkboxes, or we could use the <gui>Select all</gui> and <gui>Unselect all "
-"</gui> buttons to activate or deactivate all entries in the address book."
+#. (itstool) path: section/p
+#: C/editprop.page:128
+msgid "This section contains controls to change the position of an object."
 msgstr ""
-"Αφού έχουμε επιλέξει <gui>Δεδομένα από το προεπιλεγμένο βιβλίο διευθύνσεων "
-"Evolution </gui> ως πηγή συγχώνευσης μας, θα πάρουμε έναν πλήρη κατάλογο του "
-"περιεχομένου του. Αρχικά, όλες οι εγγραφές είναι επιλεγμένες. Υποθέτοντας "
-"ότι σχεδιάζαμε ένα πολύ μεγάλο πάρτι, θα μπορούσαμε να αφήσουμε ανέπαφη αυτή "
-"η επιλογή (αλλά ας έχουμε τον προϋπολογισμό μας στο μυαλό μας). Τώρα θα "
-"επιλέξουμε ή θα αποεπιλέξουμε ορισμένες καταχωρήσεις, κάνοντας κλικ στα "
-"κατάλληλα πλαίσια ελέγχου, ή θα μπορούσαμε να χρησιμοποιήσουμε το "
-"<gui>Επιλογή όλων</gui> και <gui>Αποεπιλογή όλων</gui> για να ενεργοποιήσετε "
-"ή να απενεργοποιήσετε όλες τις καταχωρήσεις στο βιβλίο διευθύνσεων."
+"Η ενότητα αυτή περιλαμβάνει στοιχεία ελέγχου για να αλλάξετε τη θέση ενός "
+"αντικειμένου."
 
-#: C/merge-ex3.page:66(p)
-msgid ""
-"We can also view each entry in more detail by clicking on the appropriate "
-"expander (the little triangles) as shown. Once we are satisfied with the "
-"selections in this dialog, we will click the <gui>OK</gui> button to accept "
-"the changes."
+#. (itstool) path: section/title
+#: C/editprop.page:135
+msgid "Shadow Tabbed Section (All except barcode objects)"
+msgstr "Τμήμα καρτέλας σκίαση (Όλα εκτός των barcode)"
+
+#. (itstool) path: section/p
+#: C/editprop.page:137
+msgid "This section contains controls to add a shadow to an object."
 msgstr ""
-"Μπορούμε επίσης να δούμε κάθε καταχώρηση με περισσότερες λεπτομέρειες "
-"κάνοντας κλικ στο κατάλληλο διαστολέα (τα μικρά τρίγωνα) , όπως φαίνεται. "
-"Όταν είμαστε ικανοποιημένοι με τις επιλογές αυτού του διαλόγου, θα κάνουμε "
-"κλικ στο <gui>ΟΚ</gui> για να δεχτούμε τις αλλαγές."
+"Η ενότητα αυτή περιλαμβάνει στοιχεία ελέγχου για τη σκίαση ενός αντικειμένου."
 
-#: C/merge-ex3.page:71(p) C/merge-ex2.page:67(p) C/merge-ex1.page:60(p)
-msgid ""
-"Now we start adding objects to our <app>glabels</app> document as shown."
+#. (itstool) path: section/title
+#: C/editprop.page:146
+msgid "Other Manipulations of Objects"
+msgstr "Άλλοι Χειρισμοί Αντικειμένων"
+
+#. (itstool) path: section/p
+#: C/editprop.page:148
+msgid "Objects can also be manipulated in the following ways."
 msgstr ""
-"Τώρα αρχίζουμε να προσθέτουμε αντικείμενα στο αρχείο <app>glabels</app> όπως "
-"φαίνεται."
+"Τα αντικείμενα μπορούν επίσης να χειριστούν με τους ακόλουθους τρόπους."
 
-#: C/merge-ex3.page:75(p) C/merge-ex2.page:71(p) C/merge-ex1.page:64(p)
-msgid "Adding objects"
-msgstr "Προσθήκη αντικειμένων"
+#. (itstool) path: section/title
+#: C/editprop.page:151
+msgid "Moving and Resizing Objects"
+msgstr "Μετακίνηση και Αλλαγή μεγέθους αντικειμένων"
 
-#. ==== End of Figure ====
-#: C/merge-ex3.page:79(p)
+#. (itstool) path: section/p
+#: C/editprop.page:153
 msgid ""
-"In this example we have a single text object again. This text object "
-"contains all of our merge fields organized on multiple lines as a mailing "
-"address."
+"Objects can be moved by simply clicking on a selected object and dragging "
+"the object to its new location. If the object is part of an aggregate "
+"selection, all objects in the selection will move with the object being "
+"dragged, maintaining their relative positions to one another. If no object "
+"is selected, clicking on an object will create a new selection containing "
+"that object. See <link xref=\"select\"/>."
 msgstr ""
-"Σε αυτό το παράδειγμα έχουμε ένα μόνο αντικείμενο κειμένου πάλι. Αυτό το "
-"αντικείμενο κειμένου περιέχει όλα τα πεδία συγχώνευσης μας οργανωμένα σε "
-"πολλές γραμμές, ως διευθύνσεις αλληλογραφίας."
+"Τα αντικείμενα μπορούν να μετακινηθούν κάνοντας απλώς κλικ σε ένα επιλεγμένο "
+"αντικείμενο και σύροντας το αντικείμενο στη νέα του θέση. Εάν το αντικείμενο "
+"είναι μέρος μιας συνολικής επιλογής, όλα τα αντικείμενα της επιλογής θα "
+"μετακινηθούν με το αντικείμενο που σύρατε, διατηρώντας τις σχετικές τους "
+"θέσει το ένα με το άλλο. Εάν δεν είναι επιλεγμένο ένα αντικείμενο, κάνοντας "
+"κλικ σε κάποιο αντικείμενο θα δημιουργήσει μια νέα επιλογή που περιέχει αυτό "
+"το αντικείμενο. Δείτε το <link xref=\"select\"/>."
 
-#: C/merge-ex3.page:82(p)
+#. (itstool) path: section/p
+#: C/editprop.page:161
 msgid ""
-"Now we can print our address labels by selecting the <guiseq><gui>File</"
-"gui><gui>Print</gui></guiseq> menu item. This will display the print dialog "
-"as shown below."
+"A selected object can be resized by clicking one of its resize handle and "
+"dragging it to obtain the new size."
 msgstr ""
-"Τώρα μπορούμε να τυπώσουμε τις ετικέτες διευθύνσεων μας επιλέγοντας το "
-"στοιχείο μενού <guiseq><gui>Αρχείο</gui><gui>Εκτύπωση</gui></guiseq>. Αυτό "
-"θα εμφανιστεί το πλαίσιο διαλόγου εκτύπωσης, όπως φαίνεται παρακάτω."
+"Ένα επιλεγμένο αντικείμενο μπορεί να μεταβληθεί κάνοντας κλικ σε μία από τις "
+"λαβές αλλαγής μεγέθους και σύροντας τα για να αποκτήσετε το νέο μέγεθος."
 
-#: C/merge-ex3.page:89(p) C/merge-ex2.page:89(p)
-msgid "Printing address labels"
-msgstr "Εκτύπωση ετικετών διευθύνσεων"
+#. (itstool) path: section/title
+#: C/editprop.page:167
+msgid "Changing Stacking Order"
+msgstr "Αλλαγή σειράς στοίβαξης"
 
-#. ==== End of Figure ====
-#: C/merge-ex3.page:93(p) C/merge-ex2.page:93(p) C/merge-ex1.page:89(p)
+#. (itstool) path: section/p
+#: C/editprop.page:169
 msgid ""
-"Just to make sure our labels are going to look okay, we select the "
-"<gui>Print outlines</gui> option and click <gui>Print Preview</gui>. This "
-"will display a print preview dialog as shown below."
+"Stacking order refers to relative position in the z-axis of objects. That is "
+"when objects overlap, which object will appear on top of the other. By "
+"default, newer objects will appear above older objects. To change this "
+"order, select one or more objects and choose <guiseq> <gui>Objects</gui> "
+"<gui>Order</gui> <gui>Bring to Front</gui> </guiseq> to raise the selection "
+"to the top of the stacking order, or choose <guiseq> <gui>Objects</gui> "
+"<gui>Order</gui> <gui>Send to Back</gui> </guiseq> to lower the selection to "
+"the bottom of the stacking order. These menuitems are also available by "
+"right-clicking the display area when there is a non-empty selection."
 msgstr ""
-"Απλά για να βεβαιωθούμε ότι ετικέτες μας πρόκειται να φαίνονται σωστά, "
-"επιλέγουμε την επιλογή <gui>Εκτύπωση περιγραμμάτων</gui> και κάνουμε κλικ "
-"στο <gui>Προεπισκόπηση εκτύπωσης</gui>. Αυτό θα εμφανίσει ένα παράθυρο "
-"προεπισκόπησης εκτύπωσης, όπως φαίνεται παρακάτω."
+"Η σειρά στοίβαξης αναφέρεται σε σχετική θέση του άξονα z των αντικειμένων. "
+"Αυτό γίνεται όταν τα αντικείμενα επικαλύπτονται, ποιο αντικείμενο θα "
+"εμφανιστεί στην κορυφή του άλλου. Από προεπιλογή, τα νεότερα αντικείμενα θα "
+"εμφανίζονται πάνω από παλαιότερα αντικείμενα. Για να αλλάξετε αυτή τη σειρά, "
+"επιλέξτε ένα ή περισσότερα αντικείμενα και επιλέξτε "
+"<guiseq><gui>Αντικείμενα</gui><gui>Διάταξη</gui><gui>Σε πρώτο πλάνο</gui></"
+"guiseq> για να ανεβάσετε την επιλογή στην κορυφή της σειράς στοίβαξης, ή "
+"επιλέξτε <guiseq><gui>Αντικείμενα</gui><gui>Σειρά</gui><gui>Μεταφορά στο "
+"βάθος</gui></guiseq> για να κατεβάσετε την επιλογή στο κάτω μέρος της σειράς "
+"στοίβαξης. Αυτά τα στοιχεία μενού είναι επίσης διαθέσιμα δεξιοπατώντας στην "
+"περιοχή εμφάνισης όταν υπάρχει μια μη-κενή επιλογή."
 
-#: C/merge-ex3.page:100(p)
-msgid "Addess labels preview"
-msgstr "Προεπισκόπηση ετικετών διευθύνσεων"
+#. (itstool) path: section/title
+#: C/editprop.page:187
+msgid "Rotating and Flipping Objects"
+msgstr "Περιστροφή και αναστροφή αντικειμένων"
 
-#. ==== End of Figure ====
-#: C/merge-ex3.page:104(p) C/merge-ex2.page:104(p)
+#. (itstool) path: section/p
+#: C/editprop.page:189
 msgid ""
-"Everything looks good, so we can now load up our printer with the "
-"appropriate label stock, print our address labels and start mailing our "
-"party invitations."
+"Objects can be rotated 90 degrees in either direction, or flipped "
+"horizontally or vertically, by choosing the appropriate menuitem in the "
+"<guiseq> <gui>Objects</gui> <gui>Rotate/Flip</gui> </guiseq> sub-menu. These "
+"menuitems are also available by right-clicking the display area when there "
+"is a non-empty selection."
 msgstr ""
-"Τα πάντα φαίνονται εντάξει, έτσι μπορούμε τώρα να φορτώσουμε τον εκτυπωτή "
-"μας με το κατάλληλο υλικό ετικετών, να εκτυπώσουμε τις ετικέτες διευθύνσεων "
-"μας και να αρχίσουμε να ταχυδρομούμε τις προσκλήσεις του πάρτι μας."
+"Τα αντικείμενα μπορούν να περιστραφούν κατά 90 μοίρες και προς τις δύο "
+"κατευθύνσεις, είτε να αναστραφούν οριζόντια ή κάθετα, επιλέγοντας το "
+"κατάλληλο στοιχείο μενού στο υπομενού <guiseq><gui>Αντικείμενα</"
+"gui><gui>Περιστροφή/Αναστροφή</gui></guiseq>. Αυτά τα στοιχεία μενού είναι "
+"επίσης διαθέσιμα δεξιοπατώντας στην περιοχή οθόνης που υπάρχει μια μη-κενή "
+"επιλογή."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/merge-ex2.page:52(None)
+#. (itstool) path: note/p
+#: C/editprop.page:197
 msgid ""
-"@@image: 'figures/merge-ex2-1.png'; md5=817abd0c8deb8a0b95acb7881d8ddb85"
+"This feature could be useful when you are designing CD box inlays. For the "
+"spine caption, you need vertical aligned text. After you have created a "
+"basic text box, choose <guiseq> <gui>Objects</gui><gui>Rotate/Flip</gui> </"
+"guiseq> to rotate the text box according to your needs."
 msgstr ""
-"@@image: 'figures/merge-ex2-1.png'; md5=817abd0c8deb8a0b95acb7881d8ddb85"
+"Αυτό το χαρακτηριστικό θα μπορούσε να είναι χρήσιμο όταν σχεδιάζετε ένθετα "
+"κουτιού CD. Για τον τίτλο της κεντρικής στήλης, χρειάζεστε ένα κάθετα "
+"ευθυγραμμισμένο κείμενο. Αφού έχετε δημιουργήσει ένα βασικό πλαίσιο "
+"κειμένου, επιλέξτε <guiseq><gui>Αντικείμενα</gui><gui>Περιστροφή/Αναστροφή</"
+"gui></guiseq> για να περιστρέψετε το πλαίσιο κειμένου σύμφωνα με τις ανάγκες "
+"σας."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/merge-ex2.page:70(None)
-msgid ""
-"@@image: 'figures/merge-ex2-2.png'; md5=2012870be14752300e0cde420471714a"
-msgstr ""
-"@@image: 'figures/merge-ex2-2.png'; md5=2012870be14752300e0cde420471714a"
+#. (itstool) path: section/title
+#: C/editprop.page:208
+msgid "Aligning Objects"
+msgstr "Στοίχιση αντικειμένων"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/merge-ex2.page:88(None)
+#. (itstool) path: section/p
+#: C/editprop.page:210
 msgid ""
-"@@image: 'figures/merge-ex2-3.png'; md5=c347460091d8eef9f4ec89557fa9f1e2"
-msgstr ""
-"@@image: 'figures/merge-ex2-3.png'; md5=c347460091d8eef9f4ec89557fa9f1e2"
+"Objects can be aligned horizontally or vertically, relative to one another, "
+"or relative to the center line of the label, by choosing the appropriate "
+"menuitem from the <guiseq> <gui>Objects</gui> <gui>Align Horizontal</gui> </"
+"guiseq> or <guiseq> <gui>Objects</gui> <gui>Align Vertical</gui> </guiseq> "
+"sub-menus. These menuitems are also available by right-clicking the display "
+"area when there is a non-empty selection."
+msgstr ""
+"Τα αντικείμενα μπορούν να στοιχιστούν οριζόντια ή κάθετα, μεταξύ τους, ή σε "
+"σχέση με την κεντρική γραμμή της ετικέτας, επιλέγοντας το κατάλληλο στοιχείο "
+"από τα υπομενού <guiseq><gui>Αντικείμενα</gui><gui>Στοίχιση Οριζόντια</gui></"
+"guiseq> ή <guiseq><gui>Αντικείμενα</gui><gui>Στοίχιση Κάθετα</gui></guiseq>. "
+"Αυτά τα στοιχεία μενού είναι επίσης διαθέσιμα δεξιοπατώντας στην περιοχή "
+"οθόνης που υπάρχει μια μη-κενή επιλογή."
+
+#. (itstool) path: section/title
+#: C/editprop.page:223
+msgid "Using the Property Bar"
+msgstr "Χρήση της μπάρας ιδιοτήτων"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/merge-ex2.page:99(None)
+#. (itstool) path: section/p
+#: C/editprop.page:225
 msgid ""
-"@@image: 'figures/merge-ex2-4.png'; md5=30d12e946a79e27211b835e38742671c"
+"The property bar can be used to change some common properties of objects en-"
+"masse. These properties include font family, font size, font weight, text "
+"alignment, text color, fill color, line or outline color, and line width. "
+"The property bar also controls the defaults for these properties for any "
+"newly created objects."
 msgstr ""
-"@@image: 'figures/merge-ex2-4.png'; md5=30d12e946a79e27211b835e38742671c"
+"Η μπάρα ιδιοτήτων μπορεί να χρησιμοποιηθεί για να αλλάξετε κάποιες κοινές "
+"ιδιότητες των αντικειμένων μαζικά. Αυτές οι ιδιότητες περιλαμβάνουν τύπο "
+"γραμματοσειράς, μέγεθος γραμματοσειράς, βάρος γραμματοσειράς, στοίχιση του "
+"κειμένου, το χρώμα κειμένου, χρώμα γεμίσματος, γραμμής ή χρώμα "
+"περιγράμματος, και το πλάτος γραμμής. Η μπάρα ιδιοτήτων ελέγχει επίσης τις "
+"προεπιλογές για αυτές τις ιδιότητες σε κάθε νεοσύστατο αντικείμενο."
 
-#: C/merge-ex2.page:9(desc)
-msgid "Create address labels from a CSV file."
-msgstr "Δημιουργία ετικετών διευθύνσεων από ένα αρχείο CSV."
+#. (itstool) path: info/desc
+#: C/labelprop.page:9
+msgid "How to change the properties of a label or business card."
+msgstr "Πως να αλλάξετε τις ιδιότητες μιας ετικέτας ή επαγγελματικής κάρτας."
 
-#: C/merge-ex2.page:25(title)
-msgid "Example 2: Address labels"
-msgstr "Παράδειγμα 2: Ετικέτες διευθύνσεων"
+#. (itstool) path: page/title
+#: C/labelprop.page:25
+msgid "To change label properties"
+msgstr "Για να αλλάξετε τις ιδιότητες ετικέτας"
 
-#: C/merge-ex2.page:27(p)
+#. (itstool) path: page/p
+#: C/labelprop.page:27
 msgid ""
-"In this example we are going to throw a party and need to print mailing "
-"address labels for our invitations. We have a list of our closest friends "
-"that we created in <app>gnumeric</app> and exported as the following CSV "
-"file. It should be noted that not everyone has a middle initial or a two "
-"line address."
+"To change the media type and/or orientation of a label, choose "
+"<guiseq><gui>File</gui> <gui>Properties</gui></guiseq> to display the "
+"<gui>Label properties</gui> dialog. Select the new media type and "
+"orientation for the document, then click <gui>OK</gui>."
 msgstr ""
-"Σε Î±Ï\85Ï\84Ï\8c Ï\84ο Ï\80αÏ\81άδειγμα Î¸Î­Î»Î¿Ï\85με Î½Î± ÎºÎ¬Î½Î¿Ï\85με Î­Î½Î± Ï\80άÏ\81Ï\84ι ÎºÎ±Î¹ Î½Î± ÎµÎºÏ\84Ï\85Ï\80Ï\8eÏ\83οÏ\85με "
-"εÏ\84ικέÏ\84εÏ\82 Î´Î¹ÎµÏ\85θÏ\8dνÏ\83εÏ\89ν Î±Î»Î»Î·Î»Î¿Î³Ï\81αÏ\86ίαÏ\82 Î³Î¹Î± Ï\84ιÏ\82 Ï\80Ï\81οÏ\83κλήÏ\83ειÏ\82 Î¼Î±Ï\82. Î\88Ï\87οÏ\85με Î¼Î¹Î± Î»Î¯Ï\83Ï\84α "
-"αÏ\80Ï\8c Ï\84οÏ\85Ï\82 Ï\83Ï\84ενÏ\8cÏ\84εÏ\81οÏ\85Ï\82 Ï\86ίλοÏ\85Ï\82 Î¼Î±Ï\82, Ï\80οÏ\85 Î´Î·Î¼Î¹Î¿Ï\85Ï\81γήÏ\83αμε Î¼Îµ Ï\84ο <app>gnumeric</app> "
-"και ÎµÎ¾Î®Ï\87θηÏ\83αν Ï\89Ï\82 Ï\84ο Î±ÎºÏ\8cλοÏ\85θο Î±Ï\81Ï\87είο CSV. Î\98α Ï\80Ï\81έÏ\80ει Î½Î± Ï\83ημειÏ\89θεί Ï\8cÏ\84ι Î´ÎµÎ½ "
-"έχουν όλοι μεσαίο αρχικό ή δύο γραμμές διευθύνσεων."
+"Î\93ια Î½Î± Î±Î»Î»Î¬Î¾ÎµÏ\84ε Ï\84ον Ï\84Ï\8dÏ\80ο Î¼Î­Ï\83Ï\89ν ÎºÎ±Î¹/ή Ï\84ον Ï\80Ï\81οÏ\83αναÏ\84ολιÏ\83μÏ\8c Ï\84ηÏ\82 ÎµÏ\84ικέÏ\84αÏ\82, "
+"εÏ\80ιλέξÏ\84ε <guiseq><gui>Î\91Ï\81Ï\87είο</gui><gui>Î\99διÏ\8cÏ\84ηÏ\84εÏ\82</gui></guiseq> Î³Î¹Î± Î½α "
+"εμÏ\86ανίÏ\83εÏ\84ε Ï\84ον Î´Î¹Î¬Î»Î¿Î³Î¿ <gui>Î\99διÏ\8cÏ\84ηÏ\84εÏ\82 ÎµÏ\84ικέÏ\84αÏ\82</gui> . Î\95Ï\80ιλέξÏ\84ε Ï\84ον Î½Î­Î¿ Ï\84Ï\8dÏ\80ο "
+"μέÏ\83Ï\89ν ÎºÎ±Î¹ Ï\84ον Ï\80Ï\81οÏ\83αναÏ\84ολιÏ\83μÏ\8c Î³Î¹Î± Ï\84ο Î­Î³Î³Ï\81αÏ\86ο, Î­Ï\80ειÏ\84α Ï\80αÏ\84ήÏ\83Ï\84ε Ï\83Ï\84ο "
+"<gui>Εντάξει</gui>."
 
-#: C/merge-ex2.page:33(code)
-#, no-wrap
-msgid ""
-"\n"
-"LAST,FIRST,MI,ADDR1,ADDR2,CITY,STATE,ZIP\n"
-",,,,,,,\n"
-"Critter,Ess,S,\"123 Faux St.\",,Alexandria,VA,22310\n"
-"Doe,John,,\"Apt 1X\",\"451 Mystery St.\",Trenton,NJ,08601\n"
-"Summers,Joyce,,\"1630 Revello Dr\",,Sunnydale,CA,95037\n"
-"McGarret,Steve,O,\"404 Piikoi Street\",,Honolulu,HI,96813\n"
-"Kramer,Cosmo,,\"Apt 5B\",\"129 W. 81 St.\",\"New York\",NY,10024-7207\n"
-"      "
-msgstr ""
-"\n"
-"LAST,FIRST,MI,ADDR1,ADDR2,CITY,STATE,ZIP\n"
-",,,,,,,\n"
-"Critter,Ess,S,\"123 Faux St.\",,Alexandria,VA,22310\n"
-"Doe,John,,\"Apt 1X\",\"451 Mystery St.\",Trenton,NJ,08601\n"
-"Summers,Joyce,,\"1630 Revello Dr\",,Sunnydale,CA,95037\n"
-"McGarret,Steve,O,\"404 Piikoi Street\",,Honolulu,HI,96813\n"
-"Kramer,Cosmo,,\"Apt 5B\",\"129 W. 81 St.\",\"New York\",NY,10024-7207\n"
-"      "
+#. (itstool) path: info/desc
+#: C/license.page:8
+msgid "Legal information."
+msgstr "Νομικές πληροφορίες."
+
+#. (itstool) path: page/title
+#: C/license.page:11
+msgid "License"
+msgstr "Άδεια χρήσης"
 
-#: C/merge-ex2.page:43(p)
+#. (itstool) path: page/p
+#: C/license.page:12
 msgid ""
-"In <app>glabels</app> we have created a new <app>glabels</app> document "
-"using the Avery 5512 \"Address Labels\" template. Next we use the "
-"<guiseq><gui>Objects</gui><gui>Merge Properties</gui></guiseq> menu item to "
-"display the <gui>merge properties</gui> dialog. We use this dialog to select "
-"the source type (in our case CSV with keys on line 1) and the merge source "
-"(filename) as shown."
+"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
+"Unported license."
 msgstr ""
-"Στο <app>glabels</app> έχουμε δημιουργήσει ένα νέο έγγραφο <app>glabels</"
-"app> χρησιμοποιώντας το πρότυπο Avery 5512 \"Ετικέτες διευθύνσεων\" . Στη "
-"συνέχεια χρησιμοποιούμε το στοιχείο μενού <guiseq><gui>Αντικείμενα</"
-"gui><gui>Ιδιότητες συγχώνευσης</gui></guiseq> για να εμφανιστεί ο διάλογος "
-"<gui>ιδιότητες συγχώνευσης</gui> . Θα χρησιμοποιήσουμε αυτό το παράθυρο για "
-"να επιλέξουμε τον τύπο της πηγής (στη περίπτωσή μας CSV με τα κλειδιά στη "
-"γραμμή 1) και την πηγή συγχώνευσης (όνομα αρχείου) όπως φαίνεται."
+"Το έργο διανέμεται υπό τους όρους της άδειας Creative Commons Attribution-"
+"Share Alike 3.0 Unported."
 
-#. ==== End of Figure ====
-#: C/merge-ex2.page:57(p)
-msgid ""
-"Before applying the merge source, we uncheck the first record since it only "
-"contains empty fields. It is an artifact of our original <app>gnumeric</app> "
-"spreadsheet and would simply waste our first label. We could also unselect "
-"any other records that we didn't want to print a label for."
-msgstr ""
-"Πριν από την εφαρμογή της πηγής συγχώνευσης, αποεπιλέξτε το πρώτο αρχείο "
-"δεδομένου ότι περιέχει μόνο κενά πεδία. Πρόκειται για ένα κατασκεύασμα του "
-"αρχικού υπολογιστικού φύλλου του <app>gnumeric</app> μας και θα χάσουμε απλά "
-"την πρώτη ετικέτα μας. Θα μπορούσαμε επίσης να αποεπιλέξουμε οποιεσδήποτε "
-"άλλες εγγραφές που δεν θέλουμε να εκτυπώσουμε μια ετικέτα."
-
-#. ==== End of Figure ====
-#: C/merge-ex2.page:62(p) C/merge-ex1.page:55(p)
-msgid ""
-"We can also view each record in more detail by clicking on the appropriate "
-"expander (the little triangles) as shown. Once we are satisfied with the "
-"selections in this dialog we click <gui>OK</gui> to accept the changes."
-msgstr ""
-"Μπορούμε επίσης να δούμε κάθε καταχώρηση με περισσότερες λεπτομέρειες "
-"κάνοντας κλικ στο κατάλληλο διαστολέα (τα μικρά τρίγωνα) , όπως φαίνεται. "
-"Όταν είμαστε ικανοποιημένοι με τις επιλογές αυτού του διαλόγου, θα κάνουμε "
-"κλικ στο <gui>ΟΚ</gui> για να δεχτούμε τις αλλαγές."
-
-#. ==== End of Figure ====
-#: C/merge-ex2.page:75(p)
-msgid ""
-"In this example we have a single text object. This text object contains all "
-"of our merge fields organized on multiple lines as a mailing address. Notice "
-"that fields ${ADDR1} and ${ADDR2} are each located with no other text on "
-"their own lines. When <app>glabels</app> encounters a field as the only text "
-"on a line, it will not expand the line if the field is empty."
-msgstr ""
-"Σε αυτό το παράδειγμα έχουμε ένα μόνο αντικείμενο κειμένου. Αυτό το "
-"αντικείμενο κειμένου περιέχει όλα τα πεδία συγχώνευσης μας οργανωμένα σε "
-"πολλές γραμμές, ως μια ταχυδρομική διεύθυνση. Σημειώστε ότι τα πεδία "
-"${ADDR1} και ${ADDR2} δεν έχει άλλο κείμενο μέσα στις δικές τους γραμμές. "
-"Όταν το <app>glabels</app> συναντά ένα πεδίο ως το μόνο κείμενο σε μια "
-"γραμμή, δεν θα επεκτείνει τη γραμμή αν το πεδίο είναι κενό."
-
-#: C/merge-ex2.page:82(p)
-msgid ""
-"Now we can print our address labels by selecting the <guiseq><gui>File</"
-"gui><gui>Print</gui></guiseq> menu item. This will display print dialog as "
-"shown below."
-msgstr ""
-"Τώρα μπορούμε να τυπώσουμε τις ετικέτες διευθύνσεων μας επιλέγοντας το "
-"στοιχείο μενού <guiseq><gui>Αρχείο</gui><gui>Εκτύπωση</gui></guiseq>. Αυτό "
-"θα εμφανίσει το πλαίσιο διαλόγου εκτύπωσης όπως φαίνεται παρακάτω."
-
-#: C/merge-ex2.page:100(p)
-msgid "Address labels preview"
-msgstr "Προεπισκόπηση ετικετών διευθύνσεων"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/merge-ex1.page:50(None)
-msgid ""
-"@@image: 'figures/merge-ex1-1.png'; md5=c1fe7f5f05a81d9c04f9d03bb7071798"
-msgstr ""
-"@@image: 'figures/merge-ex1-1.png'; md5=c1fe7f5f05a81d9c04f9d03bb7071798"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/merge-ex1.page:63(None)
-msgid ""
-"@@image: 'figures/merge-ex1-2.png'; md5=45c30ca8de2478387404c7c5f45cf3d0"
-msgstr ""
-"@@image: 'figures/merge-ex1-2.png'; md5=45c30ca8de2478387404c7c5f45cf3d0"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/merge-ex1.page:84(None)
-msgid ""
-"@@image: 'figures/merge-ex1-3.png'; md5=1c23af6c90e5185cdc9e14d19baeb9f6"
-msgstr ""
-"@@image: 'figures/merge-ex1-3.png'; md5=1c23af6c90e5185cdc9e14d19baeb9f6"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/merge-ex1.page:95(None)
-msgid ""
-"@@image: 'figures/merge-ex1-4.png'; md5=1cc9f9adcb5a6e98ff5068531e6933f0"
-msgstr ""
-"@@image: 'figures/merge-ex1-4.png'; md5=1cc9f9adcb5a6e98ff5068531e6933f0"
-
-#: C/merge-ex1.page:9(desc)
-msgid "Create name tags from a CSV file."
-msgstr "Δημιουργήστε ετικέτες ονομάτων από ένα αρχείο CSV."
-
-#: C/merge-ex1.page:25(title)
-msgid "Example 1: Name Tags"
-msgstr "Παράδειγμα 1: Ετικέτες Ονομάτων"
-
-#: C/merge-ex1.page:27(p)
-msgid ""
-"In this example we are organizing an orientation party for the new crew "
-"members of our ship. We have a list of freshman crew members that we created "
-"in <app>gnumeric</app> and exported as the following CSV file. We could have "
-"created this file by using a text editor, but heck it is the 23rd century."
-msgstr ""
-"Σε αυτό το παράδειγμα διοργανώνουμε ένα πάρτι για τον προσανατολισμό των "
-"νέων μελών του πληρώματος του πλοίου μας. Έχουμε μια λίστα με τα καινούρια "
-"μέλη του πληρώματος που δημιουργήσαμε στο <app>gnumeric</app> και εξήχθησαν "
-"ως το ακόλουθο αρχείο CSV. Θα μπορούσαμε να έχουμε δημιουργήσει αυτό το "
-"αρχείο, χρησιμοποιώντας ένα πρόγραμμα επεξεργασίας κειμένου, αλλά τι στο "
-"καλό αυτός είναι ο 23ος αιώνας."
-
-#: C/merge-ex1.page:33(code)
-#, no-wrap
-msgid ""
-"\n"
-"Name,Department,SN\n"
-"\"Jim Kirk\",Management,\"SC937-0176 CEC\"\n"
-"\"Mr. Spock\",Sciences,S179-276SP\n"
-"\"Leonard McCoy\",Medicine,unknown\n"
-"\"Montgomery Scott\",Engineering,SE-197-54T\n"
-"      "
-msgstr ""
-"\n"
-"Name,Department,SN\n"
-"\"Jim Kirk\",Management,\"SC937-0176 CEC\"\n"
-"\"Mr. Spock\",Sciences,S179-276SP\n"
-"\"Leonard McCoy\",Medicine,unknown\n"
-"\"Montgomery Scott\",Engineering,SE-197-54T\n"
-"      "
-
-#: C/merge-ex1.page:41(p)
-msgid ""
-"In <app>gLabels</app> we have created a new <app>glabels</app> document "
-"using the Avery 5395 \"Name Badge Labels\" template. Next we use the "
-"<guiseq><gui>Objects</gui><gui>Merge Properties</gui></guiseq> menu item to "
-"display the <gui>merge properties</gui> dialog. We use this dialog to select "
-"the source type (in our case CSV with keys on line 1) and the merge source "
-"(filename) as shown."
-msgstr ""
-"Στο <app>glabels</app> έχουμε δημιουργήσει ένα νέο έγγραφο <app>glabels</"
-"app> χρησιμοποιώντας το πρότυπο Avery 5395 \"Ετικέτες διευθύνσεων\" . Στη "
-"συνέχεια χρησιμοποιούμε το στοιχείο μενού <guiseq><gui>Αντικείμενα</"
-"gui><gui>Ιδιότητες συγχώνευσης</gui></guiseq> για να εμφανιστεί ο διάλογος "
-"<gui>ιδιότητες συγχώνευσης</gui> . Θα χρησιμοποιήσουμε αυτό το παράθυρο για "
-"να επιλέξουμε τον τύπο της πηγής (στη περίπτωσή μας CSV με τα κλειδιά στη "
-"γραμμή 1) και την πηγή συγχώνευσης (όνομα αρχείου) όπως φαίνεται."
+#. (itstool) path: page/p
+#: C/license.page:20
+msgid "You are free:"
+msgstr "Μπορείτε ελεύθερα:"
 
-#. ==== End of Figure ====
-#: C/merge-ex1.page:68(p)
-msgid ""
-"In this example we have added three text objects and a barcode object. The "
-"first text object contains only simple literal text (\"Hello, my name is\"). "
-"The second text object contains a single merge field (\"${Name}\") "
-"corresponding to the first field of a record (first column of a line) which "
-"contains the new crew member's full name. The third text field contains both "
-"literal text (\"Department: \") followed by a single merge field "
-"(\"${Department}\") corresponding to the second field or the crew member's "
-"department. The barcode object is configured to use field (or key) \"SN\" "
-"which contains our crew member's starfleet serial number."
-msgstr ""
-"Σε αυτό το παράδειγμα έχουμε προσθέσει τρία αντικείμενα κειμένου και ένα "
-"αντικείμενο ραβδοκώδικα barcode. Το πρώτο αντικείμενο κειμένου περιέχει μόνο "
-"απλό κείμενο κατά γράμμα (\"Hello, my name is\"). Το δεύτερο αντικείμενο "
-"κειμένου περιέχει ένα πεδίο συγχώνευσης (\"${Name}\") που αντιστοιχεί στο "
-"πρώτο πεδίο μιας εγγραφής (πρώτη στήλη της γραμμής) , η οποία περιλαμβάνει "
-"το πλήρες όνομα του νέου μέλους του πληρώματος. Το τρίτο πεδίο κειμένου "
-"περιέχει τόσο κυριολεκτικό κείμενο (\"Department: \") που ακολουθείται από "
-"ένα πεδίο συγχώνευσης (\"${Department}\") που αντιστοιχεί στο δεύτερο πεδίο "
-"ή τμήμα των μελών του πληρώματος. Το αντικείμενο barcode έχει ρυθμιστεί να "
-"χρησιμοποιεί τομέα (ή κλειδί) \"SN\" που περιέχει τον αριθμό σειράς "
-"Starfleet μέλους του πληρώματος μας."
+#. (itstool) path: item/title
+#: C/license.page:25
+msgid "<em>To share</em>"
+msgstr "<em>Για να μοιραστείτε</em>"
 
-#: C/merge-ex1.page:78(p)
-msgid ""
-"Now we can print our name tags by selecting the <guiseq><gui>File</"
-"gui><gui>Print</gui></guiseq> menu item. This will display print dialog as "
-"shown below."
-msgstr ""
-"Τώρα μπορούμε να τυπώσουμε τις ετικέτες ονομάτων μας επιλέγοντας το στοιχείο "
-"μενού <guiseq><gui>Αρχείο</gui><gui>Εκτύπωση</gui></guiseq>. Αυτό θα "
-"εμφανίσει το πλαίσιο διαλόγου εκτύπωσης όπως φαίνεται παρακάτω."
+#. (itstool) path: item/p
+#: C/license.page:26
+msgid "To copy, distribute and transmit the work."
+msgstr "Να αντιγράψετε, να διανείμετε και να μεταδόσετε το έργο."
 
-#: C/merge-ex1.page:85(p)
-msgid "Printing name tags"
-msgstr "Εκτύπωση ετικετών ονομάτων"
+#. (itstool) path: item/title
+#: C/license.page:29
+msgid "<em>To remix</em>"
+msgstr "<em>Για να τροποποιήσετε</em>"
 
-#: C/merge-ex1.page:96(p)
-msgid "Name tags preview"
-msgstr "Προεπισκόπηση ετικετών ονομάτων"
+#. (itstool) path: item/p
+#: C/license.page:30
+msgid "To adapt the work."
+msgstr "Να προσαρμόσετε το έργο."
 
-#. ==== End of Figure ====
-#: C/merge-ex1.page:100(p)
-msgid ""
-"Everything looks good, so we can now load up our printer with the "
-"appropriate label stock, print our name tags and start beaming our guests "
-"aboard."
-msgstr ""
-"Τα πάντα φαίνονται εντάξει, έτσι μπορούμε τώρα να φορτώσουμε τον εκτυπωτή "
-"μας με το κατάλληλο υλικό ετικετών, να εκτυπώσουμε τις ετικέτες ονομάτων μας "
-"και να αρχίσουμε να ανεβάζουμε τους καλεσμένους μας στο κατάστρωμα."
+#. (itstool) path: page/p
+#: C/license.page:33
+msgid "Under the following conditions:"
+msgstr "Υπό τους εξής όρους:"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/mancreate.page:341(None)
-msgid ""
-"@@image: 'figures/glabels-template-rect-label.png'; "
-"md5=9c7ae1c1a888e1c9eefd19655d093971"
-msgstr ""
-"@@image: 'figures/glabels-template-rect-label.png'; "
-"md5=9c7ae1c1a888e1c9eefd19655d093971"
+#. (itstool) path: item/title
+#: C/license.page:38
+msgid "<em>Attribution</em>"
+msgstr "<em>Απόδοση</em>"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/mancreate.page:393(None)
+#. (itstool) path: item/p
+#: C/license.page:39
 msgid ""
-"@@image: 'figures/glabels-template-ellipse-label.png'; "
-"md5=ba612c86b5fb8fcd2b5384ecc1c331d2"
+"You must attribute the work in the manner specified by the author or "
+"licensor (but not in any way that suggests that they endorse you or your use "
+"of the work)."
 msgstr ""
-"@@image: 'figures/glabels-template-ellipse-label.png'; "
-"md5=ba612c86b5fb8fcd2b5384ecc1c331d2"
+"Πρέπει να αναφέρετε την πηγή του έργου με τον τρόπο που καθορίζεται από το "
+"δημιουργό του ή αυτόν που παρέχει την άδεια (αλλά όχι με τρόπο που να εννοεί "
+"ότι εγκρίνουν εσάς ή τη δική σας χρήση του έργου)."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/mancreate.page:440(None)
-msgid ""
-"@@image: 'figures/glabels-template-circle-label.png'; "
-"md5=841e36a1f92aeed01e8fbaacc67758f1"
-msgstr ""
-"@@image: 'figures/glabels-template-circle-label.png'; "
-"md5=841e36a1f92aeed01e8fbaacc67758f1"
+#. (itstool) path: item/title
+#: C/license.page:46
+msgid "<em>Share Alike</em>"
+msgstr "<em>Παρόμοια διανομή</em>"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/mancreate.page:501(None)
+#. (itstool) path: item/p
+#: C/license.page:47
 msgid ""
-"@@image: 'figures/glabels-template-cd-label.png'; "
-"md5=c7952ac1b26ecbfa53facfbbf6486841"
+"If you alter, transform, or build upon this work, you may distribute the "
+"resulting work only under the same, similar or a compatible license."
 msgstr ""
-"@@image: 'figures/glabels-template-cd-label.png'; "
-"md5=c7952ac1b26ecbfa53facfbbf6486841"
+"Αν μετατρέψετε, μετασχηματίσετε ή επεκτείνετε αυτό το έργο, μπορείτε να "
+"αναδιανείμετε το αποτέλεσμα υπό την ίδια, παρόμοια ή συμβατή άδεια χρήσης."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/mancreate.page:727(None)
+#. (itstool) path: page/p
+#: C/license.page:53
 msgid ""
-"@@image: 'figures/layouts-cdlabel.png'; md5=0c41a95dc82b5a426e934751faf86872"
+"For the full text of the license, see the <link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</"
+"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
+"sa/3.0/\">Commons Deed</link>."
 msgstr ""
-"@@image: 'figures/layouts-cdlabel.png'; md5=0c41a95dc82b5a426e934751faf86872"
+"Για το πλήρες κείμενο της άδειας, δείτε τον <link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/legalcode\">ιστότοπο CreativeCommons</"
+"link>, ή διαβάστε όλη την <link href=\"http://creativecommons.org/licenses/"
+"by-sa/3.0/\">Πράξη Commons</link>."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/mancreate.page:790(None)
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mancreate.page:392
+msgctxt "_"
 msgid ""
-"@@image: 'figures/glabels-template-layout.png'; "
-"md5=fe1c9652d5448b2e0ece086777d3a287"
+"external ref='figures/glabels-template-ellipse-label.png' "
+"md5='ba612c86b5fb8fcd2b5384ecc1c331d2'"
 msgstr ""
-"@@image: 'figures/glabels-template-layout.png'; "
-"md5=fe1c9652d5448b2e0ece086777d3a287"
+"external ref='figures/glabels-template-ellipse-label.png' "
+"md5='ba612c86b5fb8fcd2b5384ecc1c331d2'"
 
-#: C/mancreate.page:11(desc)
+#. (itstool) path: info/desc
+#: C/mancreate.page:11
 msgid "Create your templates manually."
 msgstr "Δημιουργήστε τα πρότυπά σας χειροκίνητα."
 
-#: C/mancreate.page:27(title)
+#. (itstool) path: page/title
+#: C/mancreate.page:27
 msgid "Manually creating new templates"
 msgstr "Χειροκίνητη δημιουργία νέων προτύπων"
 
-#. ******************
-#: C/mancreate.page:34(p)
+#. (itstool) path: page/p
+#: C/mancreate.page:34
 msgid ""
 "This page is a reference guide to manually creating <app>gLabels</app> "
 "templates. <app>gLabels</app> templates are defined in simple XML files as "
@@ -1343,7 +1262,8 @@ msgstr ""
 "περιγράφει επίσης άλλα αρχεία XML που χρησιμοποιούνται από <app>gLabels</"
 "app>)."
 
-#: C/mancreate.page:39(p)
+#. (itstool) path: page/p
+#: C/mancreate.page:39
 msgid ""
 "Manually created template files should be placed in the <file>${HOME}/."
 "glabels</file> and be named with a <file>.template</file> extension."
@@ -1352,7 +1272,8 @@ msgstr ""
 "${HOME}/.glabels</file> και υπό την ονομασία <file>.template</file> "
 "επέκτασης."
 
-#: C/mancreate.page:43(p)
+#. (itstool) path: note/p
+#: C/mancreate.page:43
 msgid ""
 "<app>gLabels</app> searches for templates in several other locations as "
 "defined here:"
@@ -1360,27 +1281,27 @@ msgstr ""
 "Το <app>gLabels</app> αναζητά για πρότυπα σε διάφορες άλλες τοποθεσίες, όπως "
 "ορίζεται εδώ:"
 
-#: C/mancreate.page:46(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:46
 msgid "Location"
 msgstr "Τοποθεσία"
 
-#: C/mancreate.page:47(p) C/mancreate.page:174(p) C/mancreate.page:238(p)
-#: C/mancreate.page:302(p) C/mancreate.page:365(p) C/mancreate.page:416(p)
-#: C/mancreate.page:463(p) C/mancreate.page:536(p) C/mancreate.page:563(p)
-#: C/mancreate.page:601(p) C/mancreate.page:635(p) C/mancreate.page:677(p)
-#: C/mancreate.page:754(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:47 C/mancreate.page:173 C/mancreate.page:237
+#: C/mancreate.page:301 C/mancreate.page:364 C/mancreate.page:415
+#: C/mancreate.page:462 C/mancreate.page:535 C/mancreate.page:562
+#: C/mancreate.page:600 C/mancreate.page:634 C/mancreate.page:676
+#: C/mancreate.page:753
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: C/mancreate.page:54(file)
-msgid "${prefix}/share/libglabels-3.0/templates"
-msgstr "${prefix}/share/libglabels-3.0/templates"
-
-#: C/mancreate.page:55(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:55
 msgid "Predefined templates distributed with <app>gLabels</app>."
 msgstr "Προκαθορισμένα πρότυπα διανέμονται με το <app>gLabels</app>."
 
-#: C/mancreate.page:56(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:56
 msgid ""
 "<file>${prefix}</file> is usually <file>/usr</file> or <file>/usr/local</"
 "file>, depending on where <app>gLabels</app> was installed."
@@ -1388,21 +1309,19 @@ msgstr ""
 "Το <file>${prefix}</file> είναι συνήθως το <file>/usr</file> ή το <file>/usr/"
 "local</file>, ανάλογα με το που εγκαταστάθηκε το <app>gLabels</app>."
 
-#: C/mancreate.page:60(file)
-msgid "${XDG_CONFIG_HOME}/libglabels/templates"
-msgstr "${XDG_CONFIG_HOME}/libglabels/templates"
-
-#: C/mancreate.page:61(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:61
 msgid ""
-"User defined templates created with the <app>gLabels</app><gui>Template "
+"User defined templates created with the <app>gLabels</app> <gui>Template "
 "Designer</gui>. <em>Do not put manually created templates in this directory."
 "</em>"
 msgstr ""
-"Καθοριζόμενα από το χρήστη πρότυπα που δημιουργούνται με το "
-"<app>gLabels</app><gui>Σχεδιαστής προτύπου</gui>. <em>Μην βάζετε χειροκίνητα "
-"δημιουργηθέντα πρότυπα σε αυτόν τον κατάλογο.</em>"
+"Καθοριζόμενα από τον χρήστη πρότυπα με το <app>gLabels</app><gui>Σχεδιαστής "
+"προτύπου</gui>. <em>Μην βάζετε χειροκίνητα δημιουργηθέντα πρότυπα σε αυτόν "
+"τον κατάλογο.</em>"
 
-#: C/mancreate.page:63(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:63
 msgid ""
 "If <file>${XDG_CONFIG_HOME}</file> is not defined, it defaults to <file>"
 "${HOME}/.config</file>."
@@ -1410,37 +1329,37 @@ msgstr ""
 "Εάν το <file>${XDG_CONFIG_HOME}</file> δεν έχει ορισθεί, είναι εξ ορισμού το "
 "<file>${HOME}/.config</file>."
 
-#: C/mancreate.page:67(file)
-msgid "${HOME}/.glabels"
-msgstr "${HOME}/.glabels"
-
-#: C/mancreate.page:68(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:68
 msgid ""
 "User defined templates that have been created manually should be placed in "
-"this directory. Older versions of the <app>gLabels</app><gui>Template "
+"this directory. Older versions of the <app>gLabels</app> <gui>Template "
 "Designer</gui> (prior to 3.0) would also put templates in this directory."
 msgstr ""
 "Καθοριζόμενα από το χρήστη πρότυπα που έχουν δημιουργηθεί χειροκίνητα θα "
 "πρέπει να τοποθετούνται σε αυτόν τον κατάλογο. Παλαιότερες εκδόσεις του "
 "<app>gLabels</app><gui>Σχεδιαστής προτύπου</gui> (πριν από 3.0) θα θέσουν "
-"επίσης τα πρότυπα σε αυτόν τον κατάλογο."
+"επίσης να τοποθετούν τα πρότυπα σε αυτόν τον κατάλογο."
 
-#: C/mancreate.page:76(p)
+#. (itstool) path: note/p
+#: C/mancreate.page:76
 msgid ""
 "Completed template files can be sent to the <app>gLabels</app> template "
 "<link href=\"mailto:glabels-templates@lists.sourceforge.net\">mailing list</"
 "link> for possible inclusion in future versions of <app>gLabels</app>."
 msgstr ""
-"Ολοκληρωμένα αρχεία προτύπων μπορούν να σταλούν στο πρότυπο "
-"<app>gLabels</app> <link href=\"mailto:glabels-"
-"templates@lists.sourceforge.net\">λίστα αλληλογραφίας</link> για πιθανή "
-"συμπερίληψη σε μελλοντικές εκδόσεις του <app>gLabels</app>."
+"Ολοκληρωμένα αρχεία προτύπων μπορούν να σταλούν στο πρότυπο <app>gLabels</"
+"app> <link href=\"mailto:glabels-templates@lists.sourceforge.net\">λίστα "
+"αλληλογραφίας</link> για πιθανή συμπερίληψη σε μελλοντικές εκδόσεις του "
+"<app>gLabels</app>."
 
-#: C/mancreate.page:90(title)
+#. (itstool) path: section/title
+#: C/mancreate.page:90
 msgid "Assumptions/caveats"
 msgstr "Προϋποθέσεις/επισημάνσεις"
 
-#: C/mancreate.page:93(p)
+#. (itstool) path: item/p
+#: C/mancreate.page:93
 msgid ""
 "A sheet contains only one size of label or card (if a sheet contains more "
 "than one size of item, it can be split into multiple templates for multiple "
@@ -1450,44 +1369,44 @@ msgstr ""
 "περιέχει περισσότερα από ένα μεγέθη του στοιχείου, μπορεί να χωριστεί σε "
 "πολλά πρότυπα για την εκτύπωση πολλαπλών εκτυπώσεων)"
 
-#: C/mancreate.page:98(p)
-msgid ""
-"Distances can be expressed in units of <code translate=\"no\">pt</code>, "
-"<code translate=\"no\">in</code>, <code translate=\"no\">mm</code>, <code "
-"translate=\"no\">cm</code>, or <code translate=\"no\">pc</code>. For "
-"example: \"<code translate=\"no\">1.0in</code>\" or \"<code translate=\"no"
-"\">2.54cm</code>\". If no units are specified, computer points (<code "
-"translate=\"no\">pt</code>) will be assumed (1 <em>pt</em> = 1/72 <em>in</"
-"em> = 0.352778 <em>mm</em>)."
-msgstr ""
-"Αποστάσεις μπορούν να εκφράζονται σε μονάδες <code translate=\"no\">pt</"
-"code>, <code translate=\"no\">in</code>, <code translate=\"no\">mm</code>, "
-"<code translate=\"no\">cm</code>, ή <code translate=\"no\">pc</code>. Για "
-"παράδειγμα: \"<code translate=\"no\">1.0in</code>\" ή \"<code translate=\"no"
-"\">2.54cm</code>\". Εάν δεν έχουν καθοριστεί μονάδες, θα χρησημοποιηθεί ο "
-"πόντος (<code translate=\"no\">pt</code>) (1 <em>pt</em> = 1/72 <em>in</em> "
-"= 0.352778 <em>mm</em>)."
-
-#: C/mancreate.page:119(title)
+#. (itstool) path: item/p
+#: C/mancreate.page:98
+msgid ""
+"Distances can be expressed in units of <code>pt</code>, <code>in</code>, "
+"<code>mm</code>, <code>cm</code>, or <code>pc</code>. For example: "
+"\"<code>1.0in</code>\" or \"<code>2.54cm</code>\". If no units are "
+"specified, computer points (<code>pt</code>) will be assumed (1 <em>pt</em> "
+"= 1/72 <em>in</em> = 0.352778 <em>mm</em>)."
+msgstr ""
+"Οι αποστάσεις μπορούν να εκφράζονται σε μονάδες <code>pt</code>, <code>in</"
+"code>, <code>mm</code>, <code>cm</code>, ή <code>pc</code>. Για παράδειγμα: "
+"\"<code>1.0in</code>\" ή \"<code>2.54cm</code>\". Αν δεν έχουν καθοριστεί "
+"μονάδες, θα χρησιμοποιηθούν οι στιγμές υπολογιστή (<code>pt</code>) (1 "
+"<em>pt</em> = 1/72 <em>in</em> = 0.352778 <em>mm</em>)."
+
+#. (itstool) path: section/title
+#: C/mancreate.page:118
 msgid "Template Files"
 msgstr "Αρχεία προτύπων"
 
-#: C/mancreate.page:121(p)
+#. (itstool) path: section/p
+#: C/mancreate.page:120
 msgid ""
-"A template file contains a single <code translate=\"no\">Glabels-templates</"
-"code> top-level node."
+"A template file contains a single <code>Glabels-templates</code> top-level "
+"node."
 msgstr ""
-"Ένα πρότυπο περιέχει ένα μόνο κόμβο υψηλού επιπέδου<code translate=\"no"
-"\">Glabels-templates</code>."
+"Ένα αρχείο προτύπου περιέχει ένα μόνο κόμβο υψηλού επιπέδου<code >Glabels-"
+"templates</code>."
 
-#: C/mancreate.page:124(code)
+#. (itstool) path: section/code
+#: C/mancreate.page:123
 #, no-wrap
 msgid ""
 "\n"
 "&lt;?xml version=\"1.0\"?&gt;\n"
 "&lt;Glabels-templates&gt;\n"
 "\n"
-"   <var its:translate=\"yes\">...templates...</var>\n"
+"   <var>...templates...</var>\n"
 "\n"
 "&lt;/Glabels-templates&gt;"
 msgstr ""
@@ -1499,122 +1418,69 @@ msgstr ""
 "\n"
 "&lt;/Glabels-templates&gt;"
 
-#: C/mancreate.page:133(title)
+#. (itstool) path: listing/title
+#: C/mancreate.page:132
 msgid "Example Template"
-msgstr "Παράδειγμα Προτύπου"
-
-#: C/mancreate.page:134(desc)
-msgid ""
-"Example <app>gLabels</app> template file containing a single <code translate="
-"\"no\">Template</code> node."
-msgstr ""
-"Παράδειγμα ενός προτύπου <app>gLabels</app> που περιέχει ένα μόνο <code "
-"translate=\"no\">Template</code> κόμβο."
+msgstr "Παράδειγμα προτύπου"
 
-#: C/mancreate.page:136(code)
-#, no-wrap
+#. (itstool) path: listing/desc
+#: C/mancreate.page:133
 msgid ""
-"\n"
-"&lt;?xml version=\"1.0\"?&gt;\n"
-"&lt;Glabels-templates&gt;\n"
-"\n"
-"  &lt;Template brand=\"Avery\" part=\"8160\" size=\"US-Letter\" description=\"Mailing Labels\"&gt;\n"
-"    &lt;Meta category=\"label\"/&gt;\n"
-"    &lt;Meta category=\"mail\"/&gt;\n"
-"    &lt;Meta product_url=\"http://www.avery.com/avery/en_us/\"/&gt;\n"
-"    &lt;Label-rectangle id=\"0\" width=\"189pt\" height=\"72pt\" round=\"5pt\"&gt;\n"
-"      &lt;Markup-margin size=\"5pt\"/&gt;\n"
-"      &lt;Layout nx=\"3\" ny=\"10\" x0=\"11.25pt\" y0=\"36pt\" dx=\"200pt\" dy=\"72pt\"/&gt;\n"
-"    &lt;/Label-rectangle&gt;\n"
-"  &lt;/Template&gt;\n"
-"\n"
-"&lt;/Glabels-templates&gt;"
+"Example <app>gLabels</app> template file containing a single <code>Template</"
+"code> node."
 msgstr ""
-"\n"
-"&lt;?xml version=\"1.0\"?&gt;\n"
-"&lt;Glabels-templates&gt;\n"
-"\n"
-"  &lt;Template brand=\"Avery\" part=\"8160\" size=\"US-Letter\" description=\"Mailing Labels\"&gt;\n"
-"    &lt;Meta category=\"label\"/&gt;\n"
-"    &lt;Meta category=\"mail\"/&gt;\n"
-"    &lt;Meta product_url=\"http://www.avery.com/avery/en_us/\"/&gt;\n"
-"    &lt;Label-rectangle id=\"0\" width=\"189pt\" height=\"72pt\" round=\"5pt\"&gt;\n"
-"      &lt;Markup-margin size=\"5pt\"/&gt;\n"
-"      &lt;Layout nx=\"3\" ny=\"10\" x0=\"11.25pt\" y0=\"36pt\" dx=\"200pt\" dy=\"72pt\"/&gt;\n"
-"    &lt;/Label-rectangle&gt;\n"
-"  &lt;/Template&gt;\n"
-"\n"
-"&lt;/Glabels-templates&gt;"
+"Παράδειγμα ενός προτύπου <app>gLabels</app> που περιέχει ένα μόνο κόμβο "
+"<code>Template</code>."
 
-#: C/mancreate.page:164(title)
-msgid "<span translate=\"no\">Template</span> Node"
-msgstr "Κόμβος <span translate=\"no\">Template</span>"
+#. (itstool) path: section/title
+#: C/mancreate.page:163
+msgid "<code>Template</code> Node"
+msgstr "Κόμβος <code>Template</code>"
 
-#: C/mancreate.page:166(p)
+#. (itstool) path: section/p
+#: C/mancreate.page:165
 msgid ""
-"A <code translate=\"no\">Template</code> node describes a single stationery "
-"product. It must contain one instance of any type of Label node (<code "
-"translate=\"no\">Label-rectangle</code>, <code translate=\"no\">Label-round</"
-"code>, or <code translate=\"no\">Label-cd</code>)."
+"A <code>Template</code> node describes a single stationery product. It must "
+"contain one instance of any type of Label node (<code>Label-rectangle</"
+"code>, <code>Label-round</code>, or <code>Label-cd</code>)."
 msgstr ""
-"Ένας <code translate=\"no\">Template</code> κόμβος περιγράφει ένα μόνο "
-"προϊόν γραφικής ύλης. Πρέπει να περιέχει ένα παράδειγμα για κάθε τύπο κόμβου "
-"ετικέτα (<code translate=\"no\">Label-rectangle</code>, <code translate=\"no"
-"\">Label-round</code>, ή <code translate=\"no\">Label-cd</code>)."
+"Ένας κόμβος <code>Template</code> περιγράφει ένα μόνο προϊόν γραφικής ύλης. "
+"Πρέπει να περιέχει ένα παράδειγμα για κάθε τύπο κόμβου ετικέτας (<code>Label-"
+"rectangle</code>, <code>Label-round</code>, ή <code >Label-cd</code>)."
 
-#: C/mancreate.page:174(p) C/mancreate.page:302(p) C/mancreate.page:365(p)
-#: C/mancreate.page:416(p) C/mancreate.page:463(p) C/mancreate.page:536(p)
-#: C/mancreate.page:563(p) C/mancreate.page:601(p) C/mancreate.page:635(p)
-#: C/mancreate.page:677(p) C/mancreate.page:754(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:173 C/mancreate.page:301 C/mancreate.page:364
+#: C/mancreate.page:415 C/mancreate.page:462 C/mancreate.page:535
+#: C/mancreate.page:562 C/mancreate.page:600 C/mancreate.page:634
+#: C/mancreate.page:676 C/mancreate.page:753
 msgid "Property"
 msgstr "Ιδιότητα"
 
-#: C/mancreate.page:180(code)
-#, no-wrap
-msgid "brand"
-msgstr "μάρκα"
-
-#: C/mancreate.page:181(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:180
 msgid "Brand or manufacturer of stationery product. E.g. \"Avery\""
 msgstr "Η μάρκα ή ο κατασκευαστής του προϊόντος γραφικής ύλης. Π.χ. \"Avery\""
 
-#: C/mancreate.page:184(code)
-#, no-wrap
-msgid "part"
-msgstr "είδος"
-
-#: C/mancreate.page:185(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:184
 msgid "Part number or name of stationery product. E.g. \"8160\""
 msgstr "Κωδικός αριθμός ή το όνομα του προϊόντος γραφικής ύλης. Π.χ. \"8160\""
 
-#: C/mancreate.page:188(code) C/mancreate.page:542(code)
-#, no-wrap
-msgid "size"
-msgstr "μέγεθος"
-
-#: C/mancreate.page:189(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:188
 msgid ""
-"Size of sheet. E.g., \"<code translate=\"no\">US-Letter</code>\", \"<code "
-"translate=\"no\">A4</code>\", ..."
+"Size of sheet. E.g., \"<code>US-Letter</code>\", \"<code>A4</code>\", ..."
 msgstr ""
-"Το μέγεθος του φύλλου. Π.χ., \"<code translate=\"no\">US-Letter</code>\", "
-"\"<code translate=\"no\">A4</code>\", ..."
-
-#: C/mancreate.page:194(code)
-#, no-wrap
-msgid "description"
-msgstr "περιγραφή"
+"Το μέγεθος του φύλλου. Π.χ., \"<code>US-Letter</code>\", \"<code>A4</code>"
+"\", ..."
 
-#: C/mancreate.page:195(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:194
 msgid "Description of stationery product. E.g, \"Mailing Labels.\""
 msgstr "Περιγραφή του προϊόντος γραφικής ύλης. π.χ. \"Mailing Labels.\""
 
-#: C/mancreate.page:198(code)
-#, no-wrap
-msgid "_description"
-msgstr "_περιγραφή"
-
-#: C/mancreate.page:199(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:198
 msgid ""
 "Translatable description of stationery product. E.g, \"Mailing Labels."
 "\" (Only useful for predefined templates)"
@@ -1622,32 +1488,18 @@ msgstr ""
 "Μεταφράσιμη περιγραφή του προϊόντος γραφικής ύλης. Π.χ., \"Ετικέτες "
 "αλληλογραφίας.\" (Χρήσιμο μόνο για προκαθορισμένα πρότυπα)"
 
-#: C/mancreate.page:203(code) C/mancreate.page:312(code)
-#: C/mancreate.page:375(code) C/mancreate.page:481(code)
-#, no-wrap
-msgid "width"
-msgstr "πλάτος"
-
-#: C/mancreate.page:204(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:203
 msgid "Page width. Only valid if size=\"Other\""
 msgstr "Πλάτος σελίδας. Ισχύει μόνο εάν το size=\"Other\""
 
-#: C/mancreate.page:207(code) C/mancreate.page:316(code)
-#: C/mancreate.page:379(code) C/mancreate.page:486(code)
-#, no-wrap
-msgid "height"
-msgstr "ύψος"
-
-#: C/mancreate.page:208(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:207
 msgid "Page height. Only valid if size=\"Other\""
 msgstr "Ύψος σελίδας. Ισχύει μόνο εάν το size=\"Other\""
 
-#: C/mancreate.page:211(code)
-#, no-wrap
-msgid "equiv"
-msgstr "αντίστοιχο"
-
-#: C/mancreate.page:212(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:211
 msgid ""
 "Equivalent part number. If this property is present, the template is a clone "
 "of another template of the same brand. The template will inherit all "
@@ -1662,45 +1514,43 @@ msgstr ""
 "προκαθορισμένο πρότυπο - <app>gLabels</app> δεν υποστηρίζει προς το παρόν "
 "διαβίβαση αναφορών."
 
-#: C/mancreate.page:230(title)
-msgid "<span translate=\"no\">Meta</span> Node"
-msgstr "Κόμβος <span translate=\"no\">Meta</span>"
+#. (itstool) path: section/title
+#: C/mancreate.page:229
+msgid "<code>Meta</code> Node"
+msgstr "Κόμβος <code>Meta</code>"
 
-#: C/mancreate.page:232(p)
+#. (itstool) path: section/p
+#: C/mancreate.page:231
 msgid ""
-"A <code translate=\"no\">Meta</code> node contains some additional "
-"information about the template. A <code translate=\"no\">Template</code> "
-"node may contain zero or more <code translate=\"no\">Meta</code> nodes."
+"A <code>Meta</code> node contains some additional information about the "
+"template. A <code>Template</code> node may contain zero or more <code>Meta</"
+"code> nodes."
 msgstr ""
-"Ενας κόμβος <code translate=\"no\">Meta</code> περιέχει μερικές πρόσθετες "
-"πληροφορίες για το πρότυπο. Ενας κόμβος <code translate=\"no\">Template</"
-"code> μπορεί να περιέχει μηδέν ή περισσότερους <code translate=\"no\">Meta</"
-"code> κόμβους."
+"Ένας κόμβος <code>Meta</code> περιέχει μερικές πρόσθετες πληροφορίες για το "
+"πρότυπο. Ένας κόμβος <code>Template</code> μπορεί να περιέχει μηδέν ή "
+"περισσότερους κόμβους <code>Meta</code>."
 
-#: C/mancreate.page:238(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:237
 msgid "Subnode"
 msgstr "Subnode"
 
-#: C/mancreate.page:244(code)
-#, no-wrap
-msgid "category"
-msgstr "κατηγορία"
-
-#: C/mancreate.page:245(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:244
 msgid ""
 "A category for the template. A template can belong to multiple categories by "
-"simply adding multiple <code translate=\"no\">Meta</code> nodes to the "
-"parent <code translate=\"no\">Template</code> node. Template categories are "
-"used by the <app>gLabels</app><gui>New Label Dialog</gui> to filter the "
-"results of template searches."
+"simply adding multiple <code>Meta</code> nodes to the parent <code>Template</"
+"code> node. Template categories are used by the <app>gLabels</app> <gui>New "
+"Label Dialog</gui> to filter the results of template searches."
 msgstr ""
 "Η κατηγορία του προτύπου. Ένα πρότυπο μπορεί να ανήκει σε πολλές κατηγορίες "
-"προσθέτοντας απλά πολλαπλούς <code translate=\"no\">Μετα</code> κόμβους στο "
-"μητρικό <code translate=\"no\">Πρότυπο</code> κόμβο. Οι κατηγορίες προτύπων "
-"χρησιμοποιούνται από το <app>gLabels</app><gui>Νέο διάλογο ετικέτας</gui> "
-"για Î½Î± Ï\86ιλÏ\84Ï\81άÏ\81ονÏ\84αι Ï\84α Î±Ï\80οÏ\84ελέÏ\83μαÏ\84α Ï\84Ï\89ν Î±Î½Î±Î¶Î·Ï\84ήÏ\83εÏ\89ν Ï\80Ï\81οÏ\84Ï\8dÏ\80οÏ\85."
+"προσθέτοντας απλά πολλαπλούς κόμβους <code>Meta</code> στον μητρικό κόμβο "
+"<code>Template</code>. Οι κατηγορίες προτύπων χρησιμοποιούνται από το "
+"<app>gLabels</app><gui>Νέος διάλογος ετικέτας</gui> για να φιλτράρονται τα "
+"αποτελέσματα των αναζητήσεων προτύπου."
 
-#: C/mancreate.page:252(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:251
 msgid ""
 "The value of this category must match a predefined category ID defined in "
 "the file <file>${prefix}/libglabels-3.0/templates/categories.xml</file>. "
@@ -1711,67 +1561,8 @@ msgstr ""
 "libglabels-3.0/templates/categories.xml</file>. Επί του παρόντος τα "
 "καθορισμένα αναγνωριστικά κατηγοριών περιλαμβάνουν:"
 
-#: C/mancreate.page:256(code)
-#, no-wrap
-msgid "label"
-msgstr "ετικέτα"
-
-#: C/mancreate.page:257(code)
-#, no-wrap
-msgid "round-label"
-msgstr "στρογγυλή-ετικέτα"
-
-#: C/mancreate.page:258(code)
-#, no-wrap
-msgid "elliptical-label"
-msgstr "ελλειπτικη-ετικέτα"
-
-#: C/mancreate.page:259(code)
-#, no-wrap
-msgid "square-label"
-msgstr "τετράγωνη-ετικέτα"
-
-#: C/mancreate.page:260(code)
-#, no-wrap
-msgid "rectangle-label"
-msgstr "παραλληλόγραμμη-ετικέτα"
-
-#: C/mancreate.page:261(code)
-#, no-wrap
-msgid "card"
-msgstr "κάρτα"
-
-#: C/mancreate.page:262(code)
-#, no-wrap
-msgid "business-card"
-msgstr "επαγγελματική κάρτα"
-
-#: C/mancreate.page:263(code)
-#, no-wrap
-msgid "media"
-msgstr "μέσο"
-
-#: C/mancreate.page:264(code)
-#, no-wrap
-msgid "mail"
-msgstr "αλληλογραφία"
-
-#: C/mancreate.page:265(code)
-#, no-wrap
-msgid "foldable"
-msgstr "αναδιπλούμενο"
-
-#: C/mancreate.page:266(code)
-#, no-wrap
-msgid "photo"
-msgstr "φωτογραφία"
-
-#: C/mancreate.page:273(code)
-#, no-wrap
-msgid "product_url"
-msgstr "url_προϊόντος"
-
-#: C/mancreate.page:274(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:273
 msgid ""
 "A URL pointing to the vendor's webpage for the specific product, if "
 "available."
@@ -1779,7 +1570,8 @@ msgstr ""
 "Μια διεύθυνση URL που παραπέμπει στην ιστοσελίδα του προμηθευτή για το "
 "συγκεκριμένο προϊόν, εάν υπάρχει."
 
-#: C/mancreate.page:278(p)
+#. (itstool) path: note/p
+#: C/mancreate.page:277
 msgid ""
 "Suggestions for additional categories can be sent to the <app>gLabels</app> "
 "developer's <link href=\"mailto:glabels-devel@lists.sourceforge.net"
@@ -1789,51 +1581,46 @@ msgstr ""
 "και στη <link href=\"mailto:glabels-devel@lists.sourceforge.net\">λίστα "
 "αλληλογραφίας</link> προγραμματιστών."
 
-#: C/mancreate.page:281(p)
+#. (itstool) path: note/p
+#: C/mancreate.page:280
 msgid "Product URLs may be of limited use, because they may not be permanent."
 msgstr ""
 "Διευθύνσεις URL προϊόντων μπορεί να είναι περιορισμένης χρήσης, επειδή "
 "μπορεί να μην είναι μόνιμες."
 
-#: C/mancreate.page:294(title)
-msgid "<span translate=\"no\">Label-rectangle</span> Node"
-msgstr "Κόμβος <span translate=\"no\">Label-rectangle</span>"
+#. (itstool) path: section/title
+#: C/mancreate.page:293
+msgid "<code>Label-rectangle</code> Node"
+msgstr "Κόμβος <code>Label-rectangle</code>"
 
-#: C/mancreate.page:296(p)
+#. (itstool) path: section/p
+#: C/mancreate.page:295
 msgid ""
-"A <code translate=\"no\">Label-rectangle</code> node describes the "
-"dimensions of a single label or business card that is rectangular in shape "
-"(may have rounded edges)."
+"A <code>Label-rectangle</code> node describes the dimensions of a single "
+"label or business card that is rectangular in shape (may have rounded edges)."
 msgstr ""
-"Ένας κόμβος <code translate=\"no\">Label-rectangle</code> περιγράφει τις "
-"διαÏ\83Ï\84άÏ\83ειÏ\82 Î¼Î¯Î±Ï\82 ÎµÏ\84ικέÏ\84αÏ\82 Î® ÎµÏ\80ιÏ\87ειÏ\81ημαÏ\84ικήÏ\82 ÎºÎ¬Ï\81Ï\84αÏ\82 Ï\80οÏ\85 ÎµÎ¯Î½Î±Î¹ Ï\80αÏ\81αλληλÏ\8cγÏ\81αμμη "
+"Ένας κόμβος <code>Label-rectangle</code> περιγράφει τις διαστάσεις μίας "
+"εÏ\84ικέÏ\84αÏ\82 Î® ÎµÏ\80ιÏ\87ειÏ\81ημαÏ\84ικήÏ\82 ÎºÎ¬Ï\81Ï\84αÏ\82 Ï\80οÏ\85 ÎµÎ¯Î½Î±Î¹ Ï\80αÏ\81αλληλÏ\8cγÏ\81αμμη Ï\83Ï\84ο Ï\83Ï\87ήμα "
 "(μπορεί να έχει στρογγυλεμένες ακμές)."
 
-#: C/mancreate.page:308(code) C/mancreate.page:371(code)
-#: C/mancreate.page:422(code) C/mancreate.page:469(code)
-#, no-wrap
-msgid "id"
-msgstr "id"
-
-#: C/mancreate.page:309(p) C/mancreate.page:372(p) C/mancreate.page:423(p)
-#: C/mancreate.page:470(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:308 C/mancreate.page:371 C/mancreate.page:422
+#: C/mancreate.page:469
 msgid "Reserved for future use. Should always be 0."
 msgstr "Προορίζεται για μελλοντική χρήση. Θα πρέπει πάντα να είναι 0."
 
-#: C/mancreate.page:313(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:312
 msgid "Width of label/card"
 msgstr "Πλάτος ετικέτας/κάρτας"
 
-#: C/mancreate.page:317(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:316
 msgid "Heigth of label/card"
 msgstr "Ύψος ετικέτας/κάρτας"
 
-#: C/mancreate.page:320(code)
-#, no-wrap
-msgid "round"
-msgstr "στρογγυλή"
-
-#: C/mancreate.page:321(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:320
 msgid ""
 "Radius of corners. For items with square edges (business cards), the radius "
 "should be 0."
@@ -1841,12 +1628,8 @@ msgstr ""
 "Ακτίνα γωνιών. Για στοιχεία με τετράγωνες άκρες (επαγγελματικές κάρτες), η "
 "ακτίνα θα πρέπει να είναι 0."
 
-#: C/mancreate.page:325(code)
-#, no-wrap
-msgid "x_waste"
-msgstr "x_waste"
-
-#: C/mancreate.page:326(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:325
 msgid ""
 "Amount of horizontal waste (over-print) to allow. This is useful for "
 "minimizing alignment problems when using non-white backgrounds (e.g. images)."
@@ -1855,12 +1638,8 @@ msgstr ""
 "για την ελαχιστοποίηση των προβλημάτων ευθυγράμμισης κατά τη χρήση μη-λευκού "
 "υπόβαθρου (π.χ. εικόνες)."
 
-#: C/mancreate.page:331(code)
-#, no-wrap
-msgid "y_waste"
-msgstr "y_waste"
-
-#: C/mancreate.page:332(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:331
 msgid ""
 "Amount of vertical waste (over-print) to allow. This is useful for "
 "minimizing alignment problems when using non-white backgrounds (e.g. images)."
@@ -1869,37 +1648,37 @@ msgstr ""
 "για την ελαχιστοποίηση των προβλημάτων ευθυγράμμισης κατά τη χρήση μη-λευκού "
 "υπόβαθρου (π.χ. εικόνες)."
 
-#: C/mancreate.page:340(desc) C/mancreate.page:342(p)
-msgid "<span translate=\"no\">Label-rectangle</span> parameters"
-msgstr "<span translate=\"no\">Label-rectangle</span> παράμετροι"
+#. (itstool) path: figure/desc
+#: C/mancreate.page:339
+msgid "<code>Label-rectangle</code> parameters"
+msgstr "Παράμετροι <code>Label-rectangle</code>"
 
-#: C/mancreate.page:357(title)
-msgid "<span translate=\"no\">Label-ellipse</span> Node"
-msgstr "Κόμβος <span translate=\"no\">Label-ellipse</span>"
+#. (itstool) path: section/title
+#: C/mancreate.page:356
+msgid "<code>Label-ellipse</code> Node"
+msgstr "Κόμβος <code>Label-ellipse</code>"
 
-#: C/mancreate.page:359(p)
+#. (itstool) path: section/p
+#: C/mancreate.page:358
 msgid ""
-"A <code translate=\"no\">Label-ellipse</code> node describes the dimensions "
-"of a single label or business card that is elliptic in shape."
+"A <code>Label-ellipse</code> node describes the dimensions of a single label "
+"or business card that is elliptic in shape."
 msgstr ""
-"Ένας κόμβος <code translate=\"no\">Label-ellipse</code> περιγράφει τις "
-"διαÏ\83Ï\84άÏ\83ειÏ\82 Î¼Î¯Î±Ï\82 ÎµÏ\84ικέÏ\84αÏ\82 Î® ÎµÏ\80ιÏ\87ειÏ\81ιμαÏ\84ικήÏ\82 ÎºÎ¬Ï\81Ï\84αÏ\82 Ï\80οÏ\85 ÎµÎ»Î»ÎµÎ¹Ï\80Ï\84ική."
+"Ένας κόμβος <code>Label-ellipse</code> περιγράφει τις διαστάσεις μίας "
+"εÏ\84ικέÏ\84αÏ\82 Î® ÎµÏ\80ιÏ\87ειÏ\81ημαÏ\84ικήÏ\82 ÎºÎ¬Ï\81Ï\84αÏ\82 Ï\80οÏ\85 ÎµÎ¯Î½Î±Î¹ ÎµÎ»Î»ÎµÎ¹Ï\80Ï\84ική Ï\83Ï\84ο Ï\83Ï\87ήμα."
 
-#: C/mancreate.page:376(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:375
 msgid "Width of the ellipse"
 msgstr "Πλάτος της έλλειψης"
 
-#: C/mancreate.page:380(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:379
 msgid "Heigth of the ellipse"
 msgstr "Ύψος της έλλειψης"
 
-#: C/mancreate.page:383(code) C/mancreate.page:430(code)
-#: C/mancreate.page:491(code)
-#, no-wrap
-msgid "waste"
-msgstr "waste"
-
-#: C/mancreate.page:384(p) C/mancreate.page:431(p) C/mancreate.page:492(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:383 C/mancreate.page:430 C/mancreate.page:491
 msgid ""
 "Amount of waste (over-print) to allow. This is useful for minimizing "
 "alignment problems when using non-white backgrounds (e.g. images)."
@@ -1908,59 +1687,62 @@ msgstr ""
 "ελαχιστοποίηση των προβλημάτων ευθυγράμμισης κατά τη χρήση μη-λευκού "
 "υπόβαθρου (π.χ. εικόνες)."
 
-#: C/mancreate.page:392(desc) C/mancreate.page:394(p)
-#: C/mancreate.page:439(desc) C/mancreate.page:441(p)
-msgid "<span translate=\"no\">Label-ellipse</span> parameters"
-msgstr "<span translate=\"no\">Label-ellipse</span> παράμετροι"
+#. (itstool) path: figure/desc
+#: C/mancreate.page:391
+msgid "<span>Label-ellipse</span> parameters"
+msgstr "Παράμετροι <span>Label-ellipse</span>"
+
+#. (itstool) path: media/p
+#. (itstool) path: figure/desc
+#: C/mancreate.page:393 C/mancreate.page:438
+msgid "<code>Label-ellipse</code> parameters"
+msgstr "Παράμετροι <code>Label-ellipse</code>"
 
-#: C/mancreate.page:409(title)
-msgid "<span translate=\"no\">Label-round</span> Node"
-msgstr "Κόμβος <span translate=\"no\">Label-round</span>"
+#. (itstool) path: section/title
+#: C/mancreate.page:408
+msgid "<code>Label-round</code> Node"
+msgstr "Κόμβος <code>Label-round</code>"
 
-#: C/mancreate.page:411(p)
+#. (itstool) path: section/p
+#: C/mancreate.page:410
 msgid ""
-"A <code translate=\"no\">Label-round</code> node describes the dimensions of "
-"a simple round label (not a CD)."
+"A <code>Label-round</code> node describes the dimensions of a simple round "
+"label (not a CD)."
 msgstr ""
-"Ένας κόμβος <code translate=\"no\">Label-round</code> περιγράφει τις "
-"διαστάσεις μιας απλής στρογγυλής ετικέτας (όχι ενός CD)."
-
-#: C/mancreate.page:426(code) C/mancreate.page:473(code)
-#: C/mancreate.page:615(code)
-#, no-wrap
-msgid "radius"
-msgstr "ακτίνα"
+"Ένας κόμβος <code>Label-round</code> περιγράφει τις διαστάσεις μιας απλής "
+"στρογγυλής ετικέτας (όχι ενός CD)."
 
-#: C/mancreate.page:427(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:426
 msgid "Radius (1/2 diameter) of label"
 msgstr "Ακτίνα (1/2 της διαμέτρου) της ετικέτας"
 
-#: C/mancreate.page:456(title)
-msgid "<span translate=\"no\">Label-cd</span> Node"
-msgstr "Κόμβος <span translate=\"no\">Label-cd</span>"
+#. (itstool) path: section/title
+#: C/mancreate.page:455
+msgid "<code>Label-cd</code> Node"
+msgstr "Κόμβος <code>Label-cd</code>"
 
-#: C/mancreate.page:458(p)
+#. (itstool) path: section/p
+#: C/mancreate.page:457
 msgid ""
-"A <code translate=\"no\">Label-cd</code> node describes the dimensions of a "
-"CD, DVD, or business card CD."
+"A <code>Label-cd</code> node describes the dimensions of a CD, DVD, or "
+"business card CD."
 msgstr ""
-"Ένας κόμβος <code translate=\"no\">Label-cd</code> περιγράφει τις διαστάσεις "
-"ενός CD, DVD, CD ή κάρτας επιχείρησης."
+"Ένας κόμβος <code>Label-cd</code> περιγράφει τις διαστάσεις ενός CD, DVD, CD "
+"επαγγελματικής κάρτας."
 
-#: C/mancreate.page:474(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:473
 msgid "Outer radius of label"
 msgstr "Εξωτερική ακτίνα της ετικέτας"
 
-#: C/mancreate.page:477(code)
-#, no-wrap
-msgid "hole"
-msgstr "τρύπα"
-
-#: C/mancreate.page:478(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:477
 msgid "Radius of concentric hole"
 msgstr "Ακτίνα ομοκεντρικής τρύπας"
 
-#: C/mancreate.page:482(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:481
 msgid ""
 "If present, the label is clipped to the given width. (Useful for \"business "
 "card CDs\")."
@@ -1968,7 +1750,8 @@ msgstr ""
 "Αν υπάρχει, η ετικέτα αποκόπτεται στο συγκεκριμένο πλάτος. (Χρήσιμο για "
 "\"CDs επαγγελματικών καρτών\")."
 
-#: C/mancreate.page:487(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:486
 msgid ""
 "If present, the label is clipped to the given height. (Useful for \"business "
 "card CDs\")."
@@ -1976,19 +1759,18 @@ msgstr ""
 "Αν υπάρχει, η ετικέτα αποκόπτεται στο συγκεκριμένο ύψος. (Χρήσιμο για \"CDs "
 "επαγγελματικών καρτών\")."
 
-#: C/mancreate.page:500(desc)
-msgid "<span translate=\"no\">Label-cd</span> parameters"
-msgstr "<span translate=\"no\">Label-cd</span> παράμετροι"
+#. (itstool) path: figure/desc
+#: C/mancreate.page:499
+msgid "<code>Label-cd</code> parameters"
+msgstr "Παράμετροι <code>Label-cd</code>"
 
-#: C/mancreate.page:502(p)
-msgid "CD label parameters"
-msgstr "Παράμετροι ετικέτας CD"
+#. (itstool) path: section/title
+#: C/mancreate.page:516
+msgid "<code>Markup</code> Nodes"
+msgstr "Κόμβοι <code>Markup</code>"
 
-#: C/mancreate.page:517(title)
-msgid "<span translate=\"no\">Markup</span> Nodes"
-msgstr "Κόμβος <span translate=\"no\">Markup</span>"
-
-#: C/mancreate.page:519(p)
+#. (itstool) path: section/p
+#: C/mancreate.page:518
 msgid ""
 "Templates may contain optional markup nodes. These nodes are used to "
 "describe a simple set of markup lines that are visible in the <app>glabels</"
@@ -2003,19 +1785,21 @@ msgstr ""
 "πτυχές, γραμμές κέντρου, ειδικές περιοχές, ή άλλες χρήσιμες υποδείξεις για "
 "τον χρήστη ενός προτύπου."
 
-#: C/mancreate.page:529(title)
-msgid "<span translate=\"no\">Markup-margin</span> Node"
-msgstr "Κόμβος <span translate=\"no\">Markup-margin</span>"
+#. (itstool) path: section/title
+#: C/mancreate.page:528
+msgid "<code>Markup-margin</code> Node"
+msgstr "Κόμβος <code>Markup-margin</code>"
 
-#: C/mancreate.page:531(p)
+#. (itstool) path: section/p
+#: C/mancreate.page:530
 msgid ""
-"A <code translate=\"no\">Markup-margin</code> describes a margin along all "
-"edges of a label."
+"A <code>Markup-margin</code> describes a margin along all edges of a label."
 msgstr ""
-"Ένας κόμβος <code translate=\"no\">Markup-margin</code> περιγράφει ένα "
-"περιθώριο κατά μήκος όλων των άκρων μιας ετικέτας."
+"Ένας <code>Markup-margin</code> περιγράφει ένα περιθώριο κατά μήκος όλων των "
+"άκρων μιας ετικέτας."
 
-#: C/mancreate.page:543(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:542
 msgid ""
 "Size of the margin. I.e. the distance of the margin line from the edge of "
 "the card/label."
@@ -2023,192 +1807,158 @@ msgstr ""
 "Μέγεθος του περιθωρίου. Ήτοι η απόσταση της γραμμή περιθωρίου βυθίσεως από "
 "την άκρη της κάρτας/ετικέτας."
 
-#: C/mancreate.page:557(title)
-msgid "<span translate=\"no\">Markup-line</span> Node"
-msgstr "Κόμβος <span translate=\"no\">Markup-line</span>"
+#. (itstool) path: section/title
+#: C/mancreate.page:556
+msgid "<code>Markup-line</code> Node"
+msgstr "Κόμβος <code>Markup-line</code>"
 
-#: C/mancreate.page:559(p)
-msgid ""
-"A <code translate=\"no\">Markup-line</code> node describes a markup line."
-msgstr ""
-"Ένας κόμβος <code translate=\"no\">Markup-line</code> περιγράφει μια γραμμή "
-"σήμανσης."
-
-#: C/mancreate.page:569(code) C/mancreate.page:641(code)
-#: C/mancreate.page:683(code)
-#, no-wrap
-msgid "x1"
-msgstr "x1"
+#. (itstool) path: section/p
+#: C/mancreate.page:558
+msgid "A <code>Markup-line</code> node describes a markup line."
+msgstr "Ένας κόμβος <code>Markup-line</code> περιγράφει μια γραμμή σήμανσης."
 
-#: C/mancreate.page:570(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:569
 msgid "x coordinate of 1st endpoint of the line segment."
 msgstr "x συντεταγμένη του 1ου τελικού σημείου του ευθύγραμμου τμήματος."
 
-#: C/mancreate.page:573(code) C/mancreate.page:645(code)
-#: C/mancreate.page:687(code)
-#, no-wrap
-msgid "y1"
-msgstr "y1"
-
-#: C/mancreate.page:574(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:573
 msgid "y coordinate of 1st endpoint of the line segment."
 msgstr "y συντεταγμένη του 1ου τελικού σημείου του ευθύγραμμου τμήματος."
 
-#: C/mancreate.page:577(code)
-#, no-wrap
-msgid "x2"
-msgstr "x2"
-
-#: C/mancreate.page:578(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:577
 msgid "x coordinate of 2st endpoint of the line segment."
 msgstr "x συντεταγμένη του 2ου τελικού σημείου του ευθύγραμμου τμήματος."
 
-#: C/mancreate.page:581(code)
-#, no-wrap
-msgid "y2"
-msgstr "y2"
-
-#: C/mancreate.page:582(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:581
 msgid "y coordinate of 2st endpoint of the line segment."
 msgstr "y συντεταγμένη του 2ου τελικού σημείου του ευθύγραμμου τμήματος."
 
-#: C/mancreate.page:595(title)
-msgid "<span translate=\"no\">Markup-circle</span> Node"
-msgstr "Κόμβος <span translate=\"no\">Markup-circle</span>"
-
-#: C/mancreate.page:597(p)
-msgid ""
-"A <code translate=\"no\">Markup-circle</code> describes a markup circle."
-msgstr ""
-"Ένας κόμβος <code translate=\"no\">Markup-circle</code> περιγράφει ένα κύκλο "
-"σήμανσης."
+#. (itstool) path: section/title
+#: C/mancreate.page:594
+msgid "<code>Markup-circle</code> Node"
+msgstr "Κόμβος <code>Markup-circle</code>"
 
-#: C/mancreate.page:607(code) C/mancreate.page:768(code)
-#, no-wrap
-msgid "x0"
-msgstr "x0"
+#. (itstool) path: section/p
+#: C/mancreate.page:596
+msgid "A <code>Markup-circle</code> describes a markup circle."
+msgstr "Ένα <code>Markup-circle</code> περιγράφει έναν κύκλο σήμανσης."
 
-#: C/mancreate.page:608(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:607
 msgid "x coordinate of circle origin (center)."
 msgstr "x συντενταγμένη του κέντρου του κύκλου (center)."
 
-#: C/mancreate.page:611(code) C/mancreate.page:773(code)
-#, no-wrap
-msgid "y0"
-msgstr "y0"
-
-#: C/mancreate.page:612(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:611
 msgid "y coordinate of circle origin (center)."
 msgstr "y συντενταγμένη του κέντρου του κύκλου (center)."
 
-#: C/mancreate.page:616(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:615
 msgid "Radius of circle."
 msgstr "Ακτίνα του κύκλου."
 
-#: C/mancreate.page:629(title)
-msgid "<span translate=\"no\">Markup-rect</span> Node"
-msgstr "Κόμβος <span translate=\"no\">Markup-rect</span>"
+#. (itstool) path: section/title
+#: C/mancreate.page:628
+msgid "<code>Markup-rect</code> Node"
+msgstr "Κόμβος <code>Markup-rect</code>"
 
-#: C/mancreate.page:631(p)
-msgid ""
-"A <code translate=\"no\">Markup-rect</code> describes a markup rectangle."
-msgstr ""
-"Ένας κόμβος <code translate=\"no\">Markup-rect</code> περιγράφει ένα "
-"παραλληλόγραμμο σήμανσης."
+#. (itstool) path: section/p
+#: C/mancreate.page:630
+msgid "A <code>Markup-rect</code> describes a markup rectangle."
+msgstr "Ένα <code>Markup-rect</code> περιγράφει ένα παραλληλόγραμμο σήμανσης."
 
-#: C/mancreate.page:642(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:641
 msgid "x coordinate of upper left corner of rectangle."
 msgstr "x συντεταγμένη της πάνω αριστερής γωνίας του παραλληλόγραμμου."
 
-#: C/mancreate.page:646(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:645
 msgid "y coordinate of upper left corner of rectangle."
 msgstr "y συντεταγμένη της πάνω αριστερής γωνίας του παραλληλόγραμμου."
 
-#: C/mancreate.page:649(code) C/mancreate.page:691(code)
-#, no-wrap
-msgid "w"
-msgstr "w"
-
-#: C/mancreate.page:650(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:649
 msgid "Width of rectangle."
 msgstr "Το πλάτος του παραλληλόγραμμου."
 
-#: C/mancreate.page:653(code) C/mancreate.page:695(code)
-#, no-wrap
-msgid "h"
-msgstr "h"
-
-#: C/mancreate.page:654(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:653
 msgid "Height of rectangle."
 msgstr "Το ύψος του παραλληλόγραμμου."
 
-#: C/mancreate.page:657(code)
-#, no-wrap
-msgid "r"
-msgstr "r"
-
-#: C/mancreate.page:658(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:657
 msgid "Radius of rounded corners of rectangle."
 msgstr "Ακτίνα των στρογγυλεμένων γωνιών του παραλληλόγραμμου."
 
-#: C/mancreate.page:671(title)
-msgid "<span translate=\"no\">Markup-ellipse</span> Node"
-msgstr "Κόμβος <span translate=\"no\">Markup-ellipse</span>"
+#. (itstool) path: section/title
+#: C/mancreate.page:670
+msgid "<code>Markup-ellipse</code> Node"
+msgstr "Κόμβος <code>Markup-ellipse</code>"
 
-#: C/mancreate.page:673(p)
-msgid ""
-"A <code translate=\"no\">Markup-ellipse</code> describes a markup ellipse."
-msgstr ""
-"Ένας κόμβος <code translate=\"no\">Markup-ellipse</code> περιγράφει μία "
-"ελλειπτική σήμανση."
+#. (itstool) path: section/p
+#: C/mancreate.page:672
+msgid "A <code>Markup-ellipse</code> describes a markup ellipse."
+msgstr "Ένα <code>Markup-ellipse</code> περιγράφει μία ελλειπτική σήμανση."
 
-#: C/mancreate.page:684(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:683
 msgid "x coordinate of upper left corner of ellipse."
 msgstr "x συντεταγμένη της πάνω αριστερής γωνίας της έλλειψης."
 
-#: C/mancreate.page:688(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:687
 msgid "y coordinate of upper left corner of ellipse."
 msgstr "y συντεταγμένη της πάνω αριστερής γωνίας της έλλειψης."
 
-#: C/mancreate.page:692(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:691
 msgid "Width of ellipse."
 msgstr "Πλάτος της έλλειψης."
 
-#: C/mancreate.page:696(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:695
 msgid "Height of ellipse."
 msgstr "Ύψος της έλλειψης."
 
-#: C/mancreate.page:714(title)
-msgid "<span translate=\"no\">Layout</span> Node"
-msgstr "Κόμβος <span translate=\"no\">Layout</span>"
+#. (itstool) path: section/title
+#: C/mancreate.page:713
+msgid "<code>Layout</code> Node"
+msgstr "Κόμβος <code>Layout</code>"
 
-#: C/mancreate.page:716(p)
+#. (itstool) path: section/p
+#: C/mancreate.page:715
 msgid ""
-"A label node may contain multiple <code translate=\"no\">Layout</code> "
-"children. If labels are arranged in a simple grid pattern, only one layout "
-"is needed. However, if labels are arranged in multiple grids, such as a "
-"running bond pattern, multiple <code translate=\"no\">Layout</code> tags can "
-"be used."
+"A label node may contain multiple <code>Layout</code> children. If labels "
+"are arranged in a simple grid pattern, only one layout is needed. However, "
+"if labels are arranged in multiple grids, such as a running bond pattern, "
+"multiple <code>Layout</code> tags can be used."
 msgstr ""
-"Ένας κόμβος ετικέτας μπoρεί να περιέχει πoλλαπλά <code translate=\"no"
-"\">Layout</code> παιδιά. Αν οι ετικέτες είναι τοποθετημένες σε ένα απλό "
-"σχέδιο πλέγματος, μόνο μία διάταξη είναι αναγκαία. Ωστόσο, αν οι ετικέτες "
-"είναι τοποθετημένες σε πολλαπλά πλέγματα, όπως το τρέξιμο του προτύπου "
-"ομολόγων, πολλαπλές ετικέτες <code translate=\"no\">Layout</code> μπορούν να "
-"χρησιμοποιηθούν."
+"Ένας κόμβος ετικέτας μπορεί να περιέχει πολλαπλές θυγατρικές <code >Layout</"
+"code> παιδιά. Αν οι ετικέτες είναι τοποθετημένες σε ένα απλό σχέδιο "
+"πλέγματος, μόνο μία διάταξη είναι αναγκαία. Ωστόσο, αν οι υποδείγματος "
+"ομολόγων, πολλαπλές ετικέτες <code>Layout</code> μπορούν να χρησιμοποιηθούν."
 
-#: C/mancreate.page:721(p)
+#. (itstool) path: section/p
+#: C/mancreate.page:720
 msgid "A common example for multiple layouts is a sheet with three CD labels:"
 msgstr ""
 "Ένα κοινό παράδειγμα για πολλαπλές διατάξεις είναι ένα φύλλο με τρεις "
 "ετικέτες CD:"
 
-#: C/mancreate.page:726(desc) C/mancreate.page:728(p)
+#. (itstool) path: figure/desc
+#: C/mancreate.page:725
 msgid "CD label sheet"
 msgstr "Φύλλο ετικετών CD"
 
-#. ==== End of Figure ====
-#: C/mancreate.page:733(p)
+#. (itstool) path: section/p
+#: C/mancreate.page:732
 msgid ""
 "The two labels on the left edge can be assigned to a grid, assuming we can "
 "define the coordinates for the top left label and the distance to the second "
@@ -2225,7 +1975,8 @@ msgstr ""
 "δεύτερη διάταξη, με μοναδικές συντεταγμένες για την πάνω αριστερή γωνία της "
 "εν λόγω ετικέτας."
 
-#: C/mancreate.page:741(p)
+#. (itstool) path: note/p
+#: C/mancreate.page:740
 msgid ""
 "You can define multiple layouts only if the labels on the sheet have the "
 "same shape. If your sheet contains different shapes, you have to define each "
@@ -2239,29 +1990,23 @@ msgstr ""
 "εκδόσεις του <app>gLabels</app> πιθανότατα θα είναι σε θέση να συνδέουν τα "
 "εν λόγω φύλλα με διαφορετικά σχήματα σε ένα ενιαίο πρότυπο."
 
-#: C/mancreate.page:749(p)
+#. (itstool) path: note/p
+#: C/mancreate.page:748
 msgid "A single label can always be treated as a grid of one."
 msgstr "Μία μόνο ετικέτα πάντα μπορεί να αντιμετωπισθεί ως πλέγμα."
 
-#: C/mancreate.page:760(code)
-#, no-wrap
-msgid "nx"
-msgstr "nx"
-
-#: C/mancreate.page:761(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:760
 msgid "Number of labels/cards across in the grid (horizontal)"
 msgstr "Ο αριθμός των ετικετών/καρτών σε ολόκληρο το πλέγμα (οριζόντια)"
 
-#: C/mancreate.page:764(code)
-#, no-wrap
-msgid "ny"
-msgstr "ny"
-
-#: C/mancreate.page:765(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:764
 msgid "Number of labels/cards across in the grid (vertical)"
 msgstr "Ο αριθμός των ετικετών/καρτών σε ολόκληρο το πλέγμα (κάθετα)"
 
-#: C/mancreate.page:769(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:768
 msgid ""
 "Distance from left edge of sheet to the left edge of the left column of "
 "cards/labels in the layout."
@@ -2269,7 +2014,8 @@ msgstr ""
 "Η απόσταση από την αριστερή άκρη του φύλλου με το αριστερό άκρο της "
 "αριστερής στήλης των καρτών/ετικετών στη διάταξη."
 
-#: C/mancreate.page:774(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:773
 msgid ""
 "Distance from the top edge of sheet to the top edge of the top row of labels/"
 "cards in the layout."
@@ -2277,1035 +2023,1631 @@ msgstr ""
 "Η απόσταση από την αριστερή άκρη του φύλλου με το αριστερό άκρο της πρώτης "
 "σειράς των καρτών/ετικετών στη διάταξη."
 
-#: C/mancreate.page:778(code)
-#, no-wrap
-msgid "dx"
-msgstr "dx"
-
-#: C/mancreate.page:779(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:778
 msgid "Horizontal pitch of grid."
 msgstr "Οριζόντιο βήμα του πλέγματος."
 
-#: C/mancreate.page:782(code)
-#, no-wrap
-msgid "dy"
-msgstr "dy"
-
-#: C/mancreate.page:783(p)
+#. (itstool) path: td/p
+#: C/mancreate.page:782
 msgid "Vertical pitch of grid."
 msgstr "Κάθετο βήμα του πλέγματος."
 
-#: C/mancreate.page:789(desc)
-msgid "<span translate=\"no\">Layout</span> parameters"
-msgstr "<span translate=\"no\">Layout</span> παράμετροι"
+#. (itstool) path: figure/desc
+#: C/mancreate.page:788
+msgid "<code>Layout</code> parameters"
+msgstr "Παράμετροι <code>Layout</code>"
 
-#: C/mancreate.page:791(p)
-msgid "<span translate=\"no\">Layout</span> Parameters"
-msgstr "<span translate=\"no\">Layout</span> Παράμετροι"
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/merge-ex1.page:50
+msgctxt "_"
+msgid ""
+"external ref='figures/merge-ex1-1.png' md5='c1fe7f5f05a81d9c04f9d03bb7071798'"
+msgstr ""
+"external ref='figures/merge-ex1-1.png' md5='c1fe7f5f05a81d9c04f9d03bb7071798'"
 
-#: C/license.page:8(desc)
-msgid "Legal information."
-msgstr "Νομικές πληροφορίες."
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/merge-ex1.page:63
+msgctxt "_"
+msgid ""
+"external ref='figures/merge-ex1-2.png' md5='45c30ca8de2478387404c7c5f45cf3d0'"
+msgstr ""
+"external ref='figures/merge-ex1-2.png' md5='45c30ca8de2478387404c7c5f45cf3d0'"
 
-#: C/license.page:11(title)
-msgid "License"
-msgstr "Άδεια χρήσης"
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/merge-ex1.page:84
+msgctxt "_"
+msgid ""
+"external ref='figures/merge-ex1-3.png' md5='1c23af6c90e5185cdc9e14d19baeb9f6'"
+msgstr ""
+"external ref='figures/merge-ex1-3.png' md5='1c23af6c90e5185cdc9e14d19baeb9f6'"
 
-#: C/license.page:12(p)
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/merge-ex1.page:95
+msgctxt "_"
 msgid ""
-"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
-"Unported license."
+"external ref='figures/merge-ex1-4.png' md5='1cc9f9adcb5a6e98ff5068531e6933f0'"
 msgstr ""
-"Το έργο διανέμεται υπό τους όρους της άδειας Creative Commons Attribution-"
-"Share Alike 3.0 Unported."
+"external ref='figures/merge-ex1-4.png' md5='1cc9f9adcb5a6e98ff5068531e6933f0'"
 
-#: C/license.page:20(p)
-msgid "You are free:"
-msgstr "Μπορείτε ελεύθερα:"
+#. (itstool) path: info/desc
+#: C/merge-ex1.page:9
+msgid "Create name tags from a CSV file."
+msgstr "Δημιουργήστε ετικέτες ονομάτων από ένα αρχείο CSV."
 
-#: C/license.page:25(em)
-msgid "To share"
-msgstr "Να μοιραστείτε"
+#. (itstool) path: page/title
+#: C/merge-ex1.page:25
+msgid "Example 1: Name Tags"
+msgstr "Παράδειγμα 1: Ετικέτες Ονομάτων"
 
-#: C/license.page:26(p)
-msgid "To copy, distribute and transmit the work."
-msgstr "Να αντιγράψετε, να διανείμετε και να μεταδόσετε το έργο."
+#. (itstool) path: page/p
+#: C/merge-ex1.page:27
+msgid ""
+"In this example we are organizing an orientation party for the new crew "
+"members of our ship. We have a list of freshman crew members that we created "
+"in <app>gnumeric</app> and exported as the following CSV file. We could have "
+"created this file by using a text editor, but heck it is the 23rd century."
+msgstr ""
+"Σε αυτό το παράδειγμα διοργανώνουμε ένα πάρτι για τον προσανατολισμό των "
+"νέων μελών του πληρώματος του πλοίου μας. Έχουμε μια λίστα με τα καινούρια "
+"μέλη του πληρώματος που δημιουργήσαμε στο <app>gnumeric</app> και εξήχθησαν "
+"ως το ακόλουθο αρχείο CSV. Θα μπορούσαμε να έχουμε δημιουργήσει αυτό το "
+"αρχείο, χρησιμοποιώντας ένα πρόγραμμα επεξεργασίας κειμένου, αλλά τι στο "
+"καλό αυτός είναι ο 23ος αιώνας."
 
-#: C/license.page:29(em)
-msgid "To remix"
-msgstr "Να τροποποιήσετε"
+#. (itstool) path: page/code
+#: C/merge-ex1.page:33
+#, no-wrap
+msgid ""
+"\n"
+"Name,Department,SN\n"
+"\"Jim Kirk\",Management,\"SC937-0176 CEC\"\n"
+"\"Mr. Spock\",Sciences,S179-276SP\n"
+"\"Leonard McCoy\",Medicine,unknown\n"
+"\"Montgomery Scott\",Engineering,SE-197-54T\n"
+"      "
+msgstr ""
+"\n"
+"Name,Department,SN\n"
+"\"Jim Kirk\",Management,\"SC937-0176 CEC\"\n"
+"\"Mr. Spock\",Sciences,S179-276SP\n"
+"\"Leonard McCoy\",Medicine,unknown\n"
+"\"Montgomery Scott\",Engineering,SE-197-54T\n"
+"      "
 
-#: C/license.page:30(p)
-msgid "To adapt the work."
-msgstr "Να προσαρμόσετε το έργο."
+#. (itstool) path: page/p
+#: C/merge-ex1.page:41
+msgid ""
+"In <app>gLabels</app> we have created a new <app>glabels</app> document "
+"using the Avery 5395 \"Name Badge Labels\" template. Next we use the "
+"<guiseq> <gui>Objects</gui> <gui>Merge Properties</gui> </guiseq> menu item "
+"to display the <gui>merge properties</gui> dialog. We use this dialog to "
+"select the source type (in our case CSV with keys on line 1) and the merge "
+"source (filename) as shown."
+msgstr ""
+"Στο <app>glabels</app> έχουμε δημιουργήσει ένα νέο έγγραφο <app>glabels</"
+"app> χρησιμοποιώντας το πρότυπο Avery 5395 \"Ετικέτες ονόματος σημάτων\" . "
+"Στη συνέχεια χρησιμοποιούμε το στοιχείο μενού <guiseq><gui>Αντικείμενα</"
+"gui><gui>Ιδιότητες συγχώνευσης</gui></guiseq> για να εμφανιστεί ο διάλογος "
+"<gui>ιδιότητες συγχώνευσης</gui> . Θα χρησιμοποιήσουμε αυτόν τον διάλογο για "
+"να επιλέξουμε τον τύπο της πηγής (στη περίπτωσή μας CSV με τα κλειδιά στη "
+"γραμμή 1) και την πηγή συγχώνευσης (όνομα αρχείου) όπως φαίνεται."
 
-#: C/license.page:33(p)
-msgid "Under the following conditions:"
-msgstr "Υπό τους εξής όρους:"
+#. (itstool) path: media/p
+#: C/merge-ex1.page:51 C/merge-ex2.page:53 C/merge-ex3.page:54
+msgid "Merge properties dialog"
+msgstr "Διάλογος ιδιοτήτων συγχώνευσης"
 
-#: C/license.page:38(em)
-msgid "Attribution"
-msgstr "Απόδοση"
+#. (itstool) path: page/p
+#: C/merge-ex1.page:55 C/merge-ex2.page:62
+msgid ""
+"We can also view each record in more detail by clicking on the appropriate "
+"expander (the little triangles) as shown. Once we are satisfied with the "
+"selections in this dialog we click <gui>OK</gui> to accept the changes."
+msgstr ""
+"Μπορούμε επίσης να δούμε κάθε καταχώρηση με περισσότερες λεπτομέρειες "
+"κάνοντας κλικ στο κατάλληλο διαστολέα (τα μικρά τρίγωνα) , όπως φαίνεται. "
+"Όταν είμαστε ικανοποιημένοι με τις επιλογές αυτού του διαλόγου, θα κάνουμε "
+"κλικ στο <gui>ΟΚ</gui> για να δεχτούμε τις αλλαγές."
 
-#: C/license.page:39(p)
+#. (itstool) path: page/p
+#: C/merge-ex1.page:60 C/merge-ex2.page:67 C/merge-ex3.page:71
 msgid ""
-"You must attribute the work in the manner specified by the author or "
-"licensor (but not in any way that suggests that they endorse you or your use "
-"of the work)."
+"Now we start adding objects to our <app>glabels</app> document as shown."
 msgstr ""
-"Πρέπει να αναφέρετε την πηγή του έργου με τον τρόπο που καθορίζεται από το "
-"δημιουργό του ή αυτόν που παρέχει την άδεια (αλλά όχι με τρόπο που να εννοεί "
-"ότι εγκρίνουν εσάς ή τη δική σας χρήση του έργου)."
+"Τώρα αρχίζουμε να προσθέτουμε αντικείμενα στο αρχείο <app>glabels</app> όπως "
+"φαίνεται."
 
-#: C/license.page:46(em)
-msgid "Share Alike"
-msgstr "Διανομή με ίδιους όρους"
+#. (itstool) path: media/p
+#: C/merge-ex1.page:64 C/merge-ex2.page:71 C/merge-ex3.page:75
+msgid "Adding objects"
+msgstr "Προσθήκη αντικειμένων"
 
-#: C/license.page:47(p)
+#. (itstool) path: page/p
+#: C/merge-ex1.page:68
 msgid ""
-"If you alter, transform, or build upon this work, you may distribute the "
-"resulting work only under the same, similar or a compatible license."
+"In this example we have added three text objects and a barcode object. The "
+"first text object contains only simple literal text (\"Hello, my name is\"). "
+"The second text object contains a single merge field (\"${Name}\") "
+"corresponding to the first field of a record (first column of a line) which "
+"contains the new crew member's full name. The third text field contains both "
+"literal text (\"Department: \") followed by a single merge field "
+"(\"${Department}\") corresponding to the second field or the crew member's "
+"department. The barcode object is configured to use field (or key) \"SN\" "
+"which contains our crew member's starfleet serial number."
 msgstr ""
-"Αν μετατρέψετε, μετασχηματίσετε ή επεκτείνετε αυτό το έργο, μπορείτε να "
-"αναδιανείμετε το αποτέλεσμα υπό την ίδια, παρόμοια ή συμβατή άδεια χρήσης."
+"Σε αυτό το παράδειγμα έχουμε προσθέσει τρία αντικείμενα κειμένου και ένα "
+"αντικείμενο ραβδοκώδικα barcode. Το πρώτο αντικείμενο κειμένου περιέχει μόνο "
+"απλό κείμενο κατά γράμμα (\"Hello, my name is\"). Το δεύτερο αντικείμενο "
+"κειμένου περιέχει ένα πεδίο συγχώνευσης (\"${Name}\") που αντιστοιχεί στο "
+"πρώτο πεδίο μιας εγγραφής (πρώτη στήλη της γραμμής) , η οποία περιλαμβάνει "
+"το πλήρες όνομα του νέου μέλους του πληρώματος. Το τρίτο πεδίο κειμένου "
+"περιέχει τόσο κυριολεκτικό κείμενο (\"Department: \") που ακολουθείται από "
+"ένα πεδίο συγχώνευσης (\"${Department}\") που αντιστοιχεί στο δεύτερο πεδίο "
+"ή τμήμα των μελών του πληρώματος. Το αντικείμενο barcode έχει ρυθμιστεί να "
+"χρησιμοποιεί τομέα (ή κλειδί) \"SN\" που περιέχει τον αριθμό σειράς "
+"Starfleet μέλους του πληρώματος μας."
 
-#: C/license.page:53(p)
+#. (itstool) path: page/p
+#: C/merge-ex1.page:78
 msgid ""
-"For the full text of the license, see the <link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</"
-"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
-"sa/3.0/\">Commons Deed</link>."
+"Now we can print our name tags by selecting the <guiseq> <gui>File</gui> "
+"<gui>Print</gui> </guiseq> menu item. This will display print dialog as "
+"shown below."
 msgstr ""
-"Για το πλήρες κείμενο της άδειας, δείτε τον <link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/legalcode\">ιστότοπο CreativeCommons</"
-"link>, ή διαβάστε όλη την <link href=\"http://creativecommons.org/licenses/"
-"by-sa/3.0/\">Πράξη Commons</link>."
-
-#: C/labelprop.page:9(desc)
-msgid "How to change the properties of a label or business card."
-msgstr "Πως να αλλάξετε τις ιδιότητες μιας ετικέτας ή επαγγελματικής κάρτας."
+"Τώρα μπορούμε να τυπώσουμε τις ετικέτες ονομάτων μας επιλέγοντας το στοιχείο "
+"μενού <guiseq><gui>Αρχείο</gui><gui>Εκτύπωση</gui></guiseq>. Αυτό θα "
+"εμφανίσει το πλαίσιο διαλόγου εκτύπωσης όπως φαίνεται παρακάτω."
 
-#: C/labelprop.page:25(title)
-msgid "To change label properties"
-msgstr "Για να αλλάξετε τις ιδιότητες ετικέτας"
+#. (itstool) path: media/p
+#: C/merge-ex1.page:85
+msgid "Printing name tags"
+msgstr "Εκτύπωση ετικετών ονομάτων"
 
-#: C/labelprop.page:27(p)
+#. (itstool) path: page/p
+#: C/merge-ex1.page:89 C/merge-ex2.page:93 C/merge-ex3.page:93
 msgid ""
-"To change the media type and/or orientation of a label, choose "
-"<guiseq><gui>File</gui><gui>Properties</gui></guiseq> to display the "
-"<gui>Label properties</gui> dialog. Select the new media type and "
-"orientation for the document, then click <gui>OK</gui>."
+"Just to make sure our labels are going to look okay, we select the "
+"<gui>Print outlines</gui> option and click <gui>Print Preview</gui>. This "
+"will display a print preview dialog as shown below."
 msgstr ""
-"Για να αλλάξετε τον τύπο μέσων και/ή τον προσανατολισμό της ετικέτας, "
-"επιλέξτε <guiseq><gui>Αρχείο</gui><gui>Ιδιότητες</gui></guiseq> για να "
-"εμφανίσετε το παράθυρο <gui>ιδιότητες ετικέτας</gui> . Επιλέξτε τον νέο τύπο "
-"μέσων και τον προσανατολισμό για το έγγραφο, έπειτα κάντε κλικ στο <gui>ΟΚ</"
-"gui>."
+"Απλά για να βεβαιωθούμε ότι ετικέτες μας πρόκειται να φαίνονται σωστά, "
+"επιλέγουμε την επιλογή <gui>Εκτύπωση περιγραμμάτων</gui> και κάνουμε κλικ "
+"στο <gui>Προεπισκόπηση εκτύπωσης</gui>. Αυτό θα εμφανίσει ένα παράθυρο "
+"προεπισκόπησης εκτύπωσης, όπως φαίνεται παρακάτω."
+
+#. (itstool) path: media/p
+#: C/merge-ex1.page:96
+msgid "Name tags preview"
+msgstr "Προεπισκόπηση ετικετών ονομάτων"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/index.page:24(None)
+#. (itstool) path: page/p
+#: C/merge-ex1.page:100
 msgid ""
-"@@image: 'figures/glabels-logo.png'; md5=0c1e32afcbae0d2fc6976020c24a0a43"
+"Everything looks good, so we can now load up our printer with the "
+"appropriate label stock, print our name tags and start beaming our guests "
+"aboard."
 msgstr ""
-"@@image: 'figures/glabels-logo.png'; md5=0c1e32afcbae0d2fc6976020c24a0a43"
+"Τα πάντα φαίνονται εντάξει, έτσι μπορούμε τώρα να φορτώσουμε τον εκτυπωτή "
+"μας με το κατάλληλο υλικό ετικετών, να εκτυπώσουμε τις ετικέτες ονομάτων μας "
+"και να αρχίσουμε να ανεβάζουμε τους καλεσμένους μας στο κατάστρωμα."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/index.page:47(None)
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/merge-ex2.page:52
+msgctxt "_"
 msgid ""
-"@@image: 'figures/introduction-glabels-main-window.png'; "
-"md5=9ee2b2cc026ee8cba3c881b370a14313"
+"external ref='figures/merge-ex2-1.png' md5='817abd0c8deb8a0b95acb7881d8ddb85'"
 msgstr ""
-"@@image: 'figures/introduction-glabels-main-window.png'; "
-"md5=9ee2b2cc026ee8cba3c881b370a14313"
-
-#: C/index.page:7(title) C/index.page:8(title)
-msgid "gLabels label and business card designer"
-msgstr "Σχεδιαστής ετικετών και επιχειρηματικών καρτών gLabels"
+"external ref='figures/merge-ex2-1.png' md5='817abd0c8deb8a0b95acb7881d8ddb85'"
 
-#: C/index.page:23(title)
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/merge-ex2.page:70
+msgctxt "_"
 msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/glabels-logo.png"
-"\">gLabels logo</media> gLabels Manual"
+"external ref='figures/merge-ex2-2.png' md5='2012870be14752300e0cde420471714a'"
 msgstr ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/glabels-"
-"logo.png\">λογότυπος του gLabels</media> Εγχειρίδιο του gLabels"
+"external ref='figures/merge-ex2-2.png' md5='2012870be14752300e0cde420471714a'"
 
-#: C/index.page:28(p)
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/merge-ex2.page:88
+msgctxt "_"
 msgid ""
-"The <app>gLabels</app> application is a lightweight program for creating "
-"labels and business cards for the GNOME desktop environment. It is designed "
-"to work with various laser/ink-jet peel-off label and business card sheets "
-"that you'll find at most office supply stores."
+"external ref='figures/merge-ex2-3.png' md5='c347460091d8eef9f4ec89557fa9f1e2'"
 msgstr ""
-"Η εφαρμογή <app>gLabels</app> είναι ένα ελαφρύ πρόγραμμα για τη δημιουργία "
-"ετικετών και επαγγελματικών καρτών για το περιβάλλον GNOME. Έχει σχεδιαστεί "
-"για να λειτουργεί με διάφορα αυτοκόλλητες ετικέτες λέιζερ/ink-jet και φύλλα "
-"επαγγελματικών καρτών που θα βρείτε στα περισσότερα καταστήματα ειδών "
-"γραφείου."
+"external ref='figures/merge-ex2-3.png' md5='c347460091d8eef9f4ec89557fa9f1e2'"
 
-#: C/index.page:35(p)
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/merge-ex2.page:99
+msgctxt "_"
 msgid ""
-"<app>gLabels</app> can be used to design address labels, name tags, price "
-"tags, cd/dvd labels, or just about anything else that is organized in a "
-"regular pattern on a sheet of paper. Labels (or cards) can contain text, "
-"images, lines, shapes, and barcodes. <app>gLabels</app> also includes a "
-"document-merge feature which lets you print a unique label for each record "
-"from an external data source, such as a CSV file or an <app>Evolution</app> "
-"address book."
+"external ref='figures/merge-ex2-4.png' md5='30d12e946a79e27211b835e38742671c'"
 msgstr ""
-"Η εφαρμογή <app>gLabels</app> μπορεί να χρησιμοποιηθεί για την σχεδίαση "
-"ετικετών διευθύνσεων, ετικετών ονομάτων, ετικετών τιμών, ετικετών CD/DVD, ή "
-"οτιδήποτε άλλου που διοργανώνεται σε μια οργανωμένη δομή ενός φύλλου "
-"χαρτιού. Οι ετικέτες (ή κάρτες) μπορεί να περιέχουν κείμενο, εικόνες, "
-"γραμμές, σχήματα, και barcodes. Το <app>gLabels</app> περιλαμβάνει επίσης το "
-"χαρακτηριστικό συγχώνευσης εγγραφου το οποίο σας επιτρέπει να εκτυπώσετε μια "
-"μοναδική ετικέτα για κάθε εγγραφή από μια εξωτερική πηγή δεδομένων, όπως ένα "
-"αρχείο CSV ή <app>Evolution</app> βιβλίου διευθύνσεων."
+"external ref='figures/merge-ex2-4.png' md5='30d12e946a79e27211b835e38742671c'"
 
-#: C/index.page:45(title) C/index.page:46(desc)
-msgid "<app>gLabels</app> main window"
-msgstr "Το κύριο παράθυρο του <app>gLabels</app>"
+#. (itstool) path: info/desc
+#: C/merge-ex2.page:9
+msgid "Create address labels from a CSV file."
+msgstr "Δημιουργία ετικετών διευθύνσεων από ένα αρχείο CSV."
 
-#: C/index.page:48(p)
-msgid "<app>gLabels</app> main window."
-msgstr "Το κύριο παράθυρο του <app>gLabels</app>."
+#. (itstool) path: page/title
+#: C/merge-ex2.page:25
+msgid "Example 2: Address labels"
+msgstr "Παράδειγμα 2: Ετικέτες διευθύνσεων"
 
-#: C/index.page:53(title)
-msgid "Usage"
-msgstr "Χρήση"
+#. (itstool) path: page/p
+#: C/merge-ex2.page:27
+msgid ""
+"In this example we are going to throw a party and need to print mailing "
+"address labels for our invitations. We have a list of our closest friends "
+"that we created in <app>gnumeric</app> and exported as the following CSV "
+"file. It should be noted that not everyone has a middle initial or a two "
+"line address."
+msgstr ""
+"Σε αυτό το παράδειγμα θέλουμε να κάνουμε ένα πάρτι και να εκτυπώσουμε "
+"ετικέτες διευθύνσεων αλληλογραφίας για τις προσκλήσεις μας. Έχουμε μια λίστα "
+"από τους στενότερους φίλους μας, που δημιουργήσαμε με το <app>gnumeric</app> "
+"και εξήχθησαν ως το ακόλουθο αρχείο CSV. Θα πρέπει να σημειωθεί ότι δεν "
+"έχουν όλοι μεσαίο αρχικό ή δύο γραμμές διευθύνσεων."
 
-#: C/index.page:57(title)
-msgid "Document Merging"
-msgstr "Συγχώνευση εγγράφων"
+#. (itstool) path: page/code
+#: C/merge-ex2.page:33
+#, no-wrap
+msgid ""
+"\n"
+"LAST,FIRST,MI,ADDR1,ADDR2,CITY,STATE,ZIP\n"
+",,,,,,,\n"
+"Critter,Ess,S,\"123 Faux St.\",,Alexandria,VA,22310\n"
+"Doe,John,,\"Apt 1X\",\"451 Mystery St.\",Trenton,NJ,08601\n"
+"Summers,Joyce,,\"1630 Revello Dr\",,Sunnydale,CA,95037\n"
+"McGarret,Steve,O,\"404 Piikoi Street\",,Honolulu,HI,96813\n"
+"Kramer,Cosmo,,\"Apt 5B\",\"129 W. 81 St.\",\"New York\",NY,10024-7207\n"
+"      "
+msgstr ""
+"\n"
+"LAST,FIRST,MI,ADDR1,ADDR2,CITY,STATE,ZIP\n"
+",,,,,,,\n"
+"Critter,Ess,S,\"123 Faux St.\",,Alexandria,VA,22310\n"
+"Doe,John,,\"Apt 1X\",\"451 Mystery St.\",Trenton,NJ,08601\n"
+"Summers,Joyce,,\"1630 Revello Dr\",,Sunnydale,CA,95037\n"
+"McGarret,Steve,O,\"404 Piikoi Street\",,Honolulu,HI,96813\n"
+"Kramer,Cosmo,,\"Apt 5B\",\"129 W. 81 St.\",\"New York\",NY,10024-7207\n"
+"      "
+
+#. (itstool) path: page/p
+#: C/merge-ex2.page:43
+msgid ""
+"In <app>glabels</app> we have created a new <app>glabels</app> document "
+"using the Avery 5512 \"Address Labels\" template. Next we use the <guiseq> "
+"<gui>Objects</gui> <gui>Merge Properties</gui> </guiseq> menu item to "
+"display the <gui>merge properties</gui> dialog. We use this dialog to select "
+"the source type (in our case CSV with keys on line 1) and the merge source "
+"(filename) as shown."
+msgstr ""
+"Στο <app>glabels</app> έχουμε δημιουργήσει ένα νέο έγγραφο <app>glabels</"
+"app> χρησιμοποιώντας το πρότυπο Avery 5512 \"Ετικέτες διευθύνσεων\" . Στη "
+"συνέχεια χρησιμοποιούμε το στοιχείο μενού <guiseq><gui>Αντικείμενα</"
+"gui><gui>Ιδιότητες συγχώνευσης</gui></guiseq> για να εμφανιστεί ο διάλογος "
+"<gui>ιδιότητες συγχώνευσης</gui> . Θα χρησιμοποιήσουμε αυτόν τον διάλογο για "
+"να επιλέξουμε τον τύπο της πηγής (στη περίπτωσή μας CSV με τα κλειδιά στη "
+"γραμμή 1) και την πηγή συγχώνευσης (όνομα αρχείου) όπως φαίνεται."
+
+#. (itstool) path: page/p
+#: C/merge-ex2.page:57
+msgid ""
+"Before applying the merge source, we uncheck the first record since it only "
+"contains empty fields. It is an artifact of our original <app>gnumeric</app> "
+"spreadsheet and would simply waste our first label. We could also unselect "
+"any other records that we didn't want to print a label for."
+msgstr ""
+"Πριν από την εφαρμογή της πηγής συγχώνευσης, αποεπιλέξτε το πρώτο αρχείο "
+"δεδομένου ότι περιέχει μόνο κενά πεδία. Πρόκειται για ένα κατασκεύασμα του "
+"αρχικού υπολογιστικού φύλλου του <app>gnumeric</app> μας και θα χάσουμε απλά "
+"την πρώτη ετικέτα μας. Θα μπορούσαμε επίσης να αποεπιλέξουμε οποιεσδήποτε "
+"άλλες εγγραφές που δεν θέλουμε να εκτυπώσουμε μια ετικέτα."
+
+#. (itstool) path: page/p
+#: C/merge-ex2.page:75
+msgid ""
+"In this example we have a single text object. This text object contains all "
+"of our merge fields organized on multiple lines as a mailing address. Notice "
+"that fields ${ADDR1} and ${ADDR2} are each located with no other text on "
+"their own lines. When <app>glabels</app> encounters a field as the only text "
+"on a line, it will not expand the line if the field is empty."
+msgstr ""
+"Σε αυτό το παράδειγμα έχουμε ένα μόνο αντικείμενο κειμένου. Αυτό το "
+"αντικείμενο κειμένου περιέχει όλα τα πεδία συγχώνευσης μας οργανωμένα σε "
+"πολλές γραμμές, ως μια ταχυδρομική διεύθυνση. Σημειώστε ότι τα πεδία "
+"${ADDR1} και ${ADDR2} δεν έχει άλλο κείμενο μέσα στις δικές τους γραμμές. "
+"Όταν το <app>glabels</app> συναντά ένα πεδίο ως το μόνο κείμενο σε μια "
+"γραμμή, δεν θα επεκτείνει τη γραμμή αν το πεδίο είναι κενό."
+
+#. (itstool) path: page/p
+#: C/merge-ex2.page:82
+msgid ""
+"Now we can print our address labels by selecting the <guiseq> <gui>File</"
+"gui> <gui>Print</gui> </guiseq> menu item. This will display print dialog as "
+"shown below."
+msgstr ""
+"Τώρα μπορούμε να τυπώσουμε τις ετικέτες διευθύνσεων μας επιλέγοντας το "
+"στοιχείο μενού <guiseq><gui>Αρχείο</gui><gui>Εκτύπωση</gui></guiseq>. Αυτό "
+"θα εμφανίσει τον διάλογο εκτύπωσης όπως φαίνεται παρακάτω."
+
+#. (itstool) path: media/p
+#: C/merge-ex2.page:89 C/merge-ex3.page:89
+msgid "Printing address labels"
+msgstr "Εκτύπωση ετικετών διευθύνσεων"
+
+#. (itstool) path: media/p
+#: C/merge-ex2.page:100
+msgid "Address labels preview"
+msgstr "Προεπισκόπηση ετικετών διευθύνσεων"
+
+#. (itstool) path: page/p
+#: C/merge-ex2.page:104 C/merge-ex3.page:104
+msgid ""
+"Everything looks good, so we can now load up our printer with the "
+"appropriate label stock, print our address labels and start mailing our "
+"party invitations."
+msgstr ""
+"Τα πάντα φαίνονται εντάξει, έτσι μπορούμε τώρα να φορτώσουμε τον εκτυπωτή "
+"μας με το κατάλληλο υλικό ετικετών, να εκτυπώσουμε τις ετικέτες διευθύνσεων "
+"μας και να αρχίσουμε να ταχυδρομούμε τις προσκλήσεις του πάρτι μας."
+
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/merge-ex3.page:53
+msgctxt "_"
+msgid ""
+"external ref='figures/merge-ex3-1.png' md5='fb5bf719857fb0a49517ecb50124384d'"
+msgstr ""
+"external ref='figures/merge-ex3-1.png' md5='fb5bf719857fb0a49517ecb50124384d'"
+
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/merge-ex3.page:74
+msgctxt "_"
+msgid ""
+"external ref='figures/merge-ex3-2.png' md5='51fe322868241d083ec83ae824d927d7'"
+msgstr ""
+"external ref='figures/merge-ex3-2.png' md5='51fe322868241d083ec83ae824d927d7'"
+
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/merge-ex3.page:88
+msgctxt "_"
+msgid ""
+"external ref='figures/merge-ex3-3.png' md5='f731f35b38ddd51499e636733bacc7a6'"
+msgstr ""
+"external ref='figures/merge-ex3-3.png' md5='f731f35b38ddd51499e636733bacc7a6'"
+
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/merge-ex3.page:99
+msgctxt "_"
+msgid ""
+"external ref='figures/merge-ex3-4.png' md5='4415be9d5b59fb57093077bcaece014a'"
+msgstr ""
+"external ref='figures/merge-ex3-4.png' md5='4415be9d5b59fb57093077bcaece014a'"
+
+#. (itstool) path: info/desc
+#: C/merge-ex3.page:9
+msgid ""
+"Create address labels from the <app>Evolution</app> address book entries."
+msgstr ""
+"Δημιουργία ετικετών διευθύνσεων από καταχωρήσεις του βιβλίου διευθύνσεων του "
+"<app>Evolution</app>."
+
+#. (itstool) path: page/title
+#: C/merge-ex3.page:25
+msgid "Example 3: Address Labels Using the <app>Evolution</app> Addressbook"
+msgstr ""
+"Παράδειγμα 3: Ετικέτες διευθύνσεων από καταχωρήσεις του βιβλίου διευθύνσεων "
+"του <app>Evolution</app>"
+
+#. (itstool) path: page/p
+#: C/merge-ex3.page:27
+msgid ""
+"Our last party was a great success, and now we need to print mailing address "
+"labels for the invitations to a new one. To simplify this, we can use the "
+"<app>Evolution</app> addressbook, because the address data of all our "
+"friends is stored there."
+msgstr ""
+"Το τελευταίο μας πάρτυ ήταν μεγάλη επιτυχία, και τώρα πρέπει να εκτυπώσετε "
+"ετικέτες ταχυδρομικών διευθύνσεων για τις προσκλήσεις. Για να απλουστευθεί "
+"αυτό, μπορούμε να χρησιμοποιήσουμε το βιβλίο διευθύνσεων του <app>Evolution</"
+"app> , επειδή τα δεδομένα των διευθύνσεων όλων των φίλων μας είναι "
+"αποθηκευμένα εκεί."
+
+#. (itstool) path: note/p
+#: C/merge-ex3.page:33
+msgid ""
+"Depending on how your copy of <app>gLabels</app> was packaged, this option "
+"could be unavailable. Support for the <app>Evolution</app> addressbook will "
+"only be available if the <app>evolution-data-server</app> and its "
+"development files were present when <app>gLabels</app> was built. Please "
+"keep this in mind if you build <app>gLabels</app> directly from source."
+msgstr ""
+"Ανάλογα με το πως το αντίγραφό <app>gLabels</app> ήταν συσκευασμένο , αυτή η "
+"επιλογή μπορεί να είναι μη διαθέσιμη. Υποστήριξη για το βιβλίο διευθύνσεων "
+"του <app>Evolution</app> είναι διαθέσιμη μόνο αν το <app>evolution-data-"
+"server</app> και τα αρχεία ανάπτυξης του ήταν παρόντα όταν οικοδομήθηκε το "
+"<app>gLabels</app> . Παρακαλώ κρατήστε αυτό κατά νου, αν οικοδομήσετε το "
+"<app>gLabels</app> απευθείας από πηγαίο κώδικα."
+
+#. (itstool) path: note/p
+#: C/merge-ex3.page:39
+msgid ""
+"If the <app>gLabels</app> package from your distribution lacks this support, "
+"you may wish to contact the package maintainer or file a bug against the "
+"package to request it."
+msgstr ""
+"Εάν απο το πακέτο <app>gLabels</app> της διανομής σας λείπει αυτή η "
+"υποστήριξη, μπορεί να θελήσετε να επικοινωνήσετε με το συντηρητή πακέτου ή "
+"συντάξτε μια αναφορά σφάλματος για το πακέτο για να το ζητήσετε."
+
+#. (itstool) path: page/p
+#: C/merge-ex3.page:44
+msgid ""
+"In <app>glabels</app> we have created a new <app>gLabels</app> document "
+"using the Avery 5512 \"Address Labels\" template. Next we use the <guiseq> "
+"<gui>Objects</gui> <gui>Merge Properties</gui></guiseq> menu item to display "
+"the <gui>Merge properties</gui> dialog. We use this dialog to select the "
+"source type (in our case <gui>Data from default Evolution addressbook</gui>) "
+"as shown."
+msgstr ""
+"Στο <app>glabels</app> έχουμε δημιουργήσει ένα νέο έγγραφο <app>glabels</"
+"app> χρησιμοποιώντας το πρότυπο Avery 5512 \"Ετικέτες διευθύνσεων\". Στη "
+"συνέχεια χρησιμοποιούμε το στοιχείο μενού <guiseq><gui>Αντικείμενα</"
+"gui><gui>Ιδιότητες συγχώνευσης</gui></guiseq> για να εμφανίσουμε το διάλογο "
+"<gui>ιδιότητες συγχώνευσης</gui>. Χρησιμοποιούμε αυτόν τον διάλογο για να "
+"επιλέξουμε τον τύπο της πηγής (σε περίπτωση μας από <gui>Data from default "
+"Evolution addressbook</gui>) όπως φαίνεται."
+
+#. (itstool) path: page/p
+#: C/merge-ex3.page:58
+msgid ""
+"Once we have chosen <gui>Data from default Evolution addressbook </gui> as "
+"our merge source, we will get a full list of its content. Initially, all "
+"entries are checked. Assuming we were planning a really big party, we could "
+"leave this selection untouched (but let's keep our budget in mind). We will "
+"now select or unselect certain entries by clicking on the appropriate "
+"checkboxes, or we could use the <gui>Select all</gui> and <gui>Unselect all "
+"</gui> buttons to activate or deactivate all entries in the address book."
+msgstr ""
+"Αφού έχουμε επιλέξει <gui>Δεδομένα από το προεπιλεγμένο βιβλίο διευθύνσεων "
+"Evolution </gui> ως πηγή συγχώνευσης μας, θα πάρουμε έναν πλήρη κατάλογο του "
+"περιεχομένου του. Αρχικά, όλες οι εγγραφές είναι επιλεγμένες. Υποθέτοντας "
+"ότι σχεδιάζαμε ένα πολύ μεγάλο πάρτι, θα μπορούσαμε να αφήσουμε ανέπαφη αυτή "
+"η επιλογή (αλλά ας έχουμε τον προϋπολογισμό μας στο μυαλό μας). Τώρα θα "
+"επιλέξουμε ή θα αποεπιλέξουμε ορισμένες καταχωρήσεις, κάνοντας κλικ στα "
+"κατάλληλα πλαίσια ελέγχου, ή θα μπορούσαμε να χρησιμοποιήσουμε το "
+"<gui>Επιλογή όλων</gui> και <gui>Αποεπιλογή όλων</gui> για να ενεργοποιήσετε "
+"ή να απενεργοποιήσετε όλες τις καταχωρήσεις στο βιβλίο διευθύνσεων."
+
+#. (itstool) path: page/p
+#: C/merge-ex3.page:66
+msgid ""
+"We can also view each entry in more detail by clicking on the appropriate "
+"expander (the little triangles) as shown. Once we are satisfied with the "
+"selections in this dialog, we will click the <gui>OK</gui> button to accept "
+"the changes."
+msgstr ""
+"Μπορούμε επίσης να δούμε κάθε καταχώρηση με περισσότερες λεπτομέρειες "
+"κάνοντας κλικ στο κατάλληλο διαστολέα (τα μικρά τρίγωνα) , όπως φαίνεται. "
+"Όταν είμαστε ικανοποιημένοι με τις επιλογές αυτού του διαλόγου, θα κάνουμε "
+"κλικ στο <gui>ΟΚ</gui> για να δεχτούμε τις αλλαγές."
+
+#. (itstool) path: page/p
+#: C/merge-ex3.page:79
+msgid ""
+"In this example we have a single text object again. This text object "
+"contains all of our merge fields organized on multiple lines as a mailing "
+"address."
+msgstr ""
+"Σε αυτό το παράδειγμα έχουμε ένα μόνο αντικείμενο κειμένου πάλι. Αυτό το "
+"αντικείμενο κειμένου περιέχει όλα τα πεδία συγχώνευσης μας οργανωμένα σε "
+"πολλές γραμμές, ως διευθύνσεις αλληλογραφίας."
+
+#. (itstool) path: page/p
+#: C/merge-ex3.page:82
+msgid ""
+"Now we can print our address labels by selecting the <guiseq> <gui>File</"
+"gui> <gui>Print</gui> </guiseq> menu item. This will display the print "
+"dialog as shown below."
+msgstr ""
+"Τώρα μπορούμε να τυπώσουμε τις ετικέτες διευθύνσεων μας επιλέγοντας το "
+"στοιχείο μενού <guiseq><gui>Αρχείο</gui><gui>Εκτύπωση</gui></guiseq>. Αυτό "
+"θα εμφανίσει τον διάλογο εκτύπωσης όπως φαίνεται παρακάτω."
+
+#. (itstool) path: media/p
+#: C/merge-ex3.page:100
+msgid "Addess labels preview"
+msgstr "Προεπισκόπηση ετικετών διευθύνσεων"
+
+#. (itstool) path: info/desc
+#: C/merge-ex4.page:9
+msgid "Create address labels from a vCard file."
+msgstr "Δημιουργία ετικετών διευθύνσεων από ένα αρχείο vCard."
+
+#. (itstool) path: page/title
+#: C/merge-ex4.page:25
+msgid "Example 4: Address Labels Using a vCard file"
+msgstr "Παράδειγμα 4: Ετικέτες διευθύνσεων χρησιμοποιώντας ένα αρχείο vCard"
+
+#. (itstool) path: info/desc
+#: C/mergefeatures.page:9
+msgid "What you may expect from a document merge."
+msgstr "Τι μπορείτε να περιμένετε από μια συγχώνευση εγγράφου."
+
+#. (itstool) path: page/title
+#: C/mergefeatures.page:25
+msgid "Performing a document merge"
+msgstr "Εκτέλεση μιας συγχώνευσης εγγράφου"
+
+#. (itstool) path: page/p
+#: C/mergefeatures.page:27
+msgid ""
+"Document Merge (sometimes called \"Mail Merge\") is a powerful feature that "
+"allows a unique label or card to be printed for each record in an external "
+"data source."
+msgstr ""
+"Η Συγχώνευση εγγράφου (μερικές φορές ονομάζεται \"Συγχώνευση αλληλογραφίας"
+"\") είναι ένα ισχυρό χαρακτηριστικό που επιτρέπει μια μοναδική ετικέτα ή "
+"κάρτα να εκτυπωθεί για κάθε εγγραφή σε μία εξωτερική πηγή δεδομένων."
+
+#. (itstool) path: page/p
+#: C/mergefeatures.page:31
+msgid ""
+"The first step to performing a document merge is to prepare a source "
+"document that contains your merge data. This data could be mailing addresses "
+"or any other data that you wish to create unique labels or cards for. "
+"Currently back-ends only exist for text files and the evolution data server "
+"-- others are planned. The currently supported text-file format is very "
+"simple: each line is a record; fields are delimited by commas (CSV), tabs, "
+"or colons; and newlines can be embedded into fields by using the \"\\n\" "
+"entity. This file could be created using any text editor or could be created "
+"by another program or script. A common way of creating CSV files is to "
+"export them from a spreadsheet program or from address book applications."
+msgstr ""
+"Το πρώτο βήμα για την εκτέλεση της συγχώνευσης ενός εγγράφου είναι να "
+"προετοιμαστεί ένα πηγαίο έγγραφο που περιέχει τα δεδομένα συγχώνευσής σας. "
+"Αυτά τα δεδομένα μπορεί να είναι ταχυδρομικές διευθύνσεις ή οποιαδήποτε άλλα "
+"δεδομένα που θέλετε να δημιουργήσετε μοναδικές ετικέτες ή κάρτες. Προς το "
+"παρόν τα νωτιαία υπάρχουν μόνο για αρχεία κειμένου και του διακομιστή "
+"δεδομένων evolution -- έχουν προγραμματιστεί κι άλλα. Η παρούσα υποστήριξη "
+"μορφής κειμένου-αρχείου είναι πολύ απλή: κάθε γραμμή είναι μια εγγραφή· τα "
+"πεδία είναι οριοθετημένα με κόμματα (CSV​​), στηλοθέτες, ή διπλές τελείες και "
+"νέες γραμμές μπορούν να ενσωματωθούν σε πεδία, χρησιμοποιώντας την οντότητα "
+"\"\\n\". Αυτό το αρχείο μπορεί να δημιουργηθεί χρησιμοποιώντας οποιοδήποτε "
+"πρόγραμμα επεξεργασίας κειμένου ή θα μπορούσε να δημιουργηθεί από κάποιο "
+"άλλο πρόγραμμα ή σενάριο. Ένας συνήθης τρόπος για τη δημιουργία αρχείων CSV "
+"είναι η εξαγωγή τους από ένα πρόγραμμα υπολογιστικών φύλλων ή από εφαρμογές "
+"βιβλίου διευθύνσεων."
+
+#. (itstool) path: note/p
+#: C/mergefeatures.page:45
+msgid ""
+"To export a CSV file from <app>kaddressbook</app>, first select the contacts "
+"you wish to export. Click on the first contact, then press and hold "
+"<key>Ctrl</key> and click on the other desired contacts to select them. Then "
+"choose <guiseq><gui>File</gui><gui>Export</gui> <gui>Export CSV File</gui></"
+"guiseq>."
+msgstr ""
+"Για εξαγωγή ενός αρχείου CSV από το <app>kaddressbook</app>, πρώτα επιλέξτε "
+"τις επαφές που επιθυμείτε να εξάγετε. Πατήστε στην πρώτη επαφή, έπειτα "
+"πατήστε και κρατήστε πατημένο το <key>Ctrl</key> και πατήστε στις άλλες "
+"επιθυμητές επαφές για να τις επιλέξετε. Έπειτα επιλέξτε <guiseq><gui>Αρχείο</"
+"gui><gui>Εξαγωγή</gui><gui>Εξαγωγή αρχείου CSV</gui></guiseq>."
+
+#. (itstool) path: note/p
+#: C/mergefeatures.page:52
+msgid ""
+"In the <gui>Select Contacts</gui> window, enable the button <gui>Selected "
+"contacts</gui> (which should be enabled by default anyway). Then click on "
+"<gui>OK</gui>. In the <gui>Save As</gui> dialog, choose the desired folder "
+"and a name for the file and click on <gui>Save</gui>."
+msgstr ""
+"Στο παράθυρο <gui>Επιλογή επαφών</gui>, ενεργοποιήστε το κουμπί "
+"<gui>Επιλεγμένες επαφές</gui> (που πρέπει να ενεργοποιηθούν από προεπιλογή "
+"οπωσδήποτε). Έπειτα πατήστε στο <gui>Εντάξει</gui>. Στον διάλογο "
+"<gui>Αποθήκευση ως</gui>, επιλέξτε τον επιθυμητό φάκελο και ένα όνομα για το "
+"αρχείο και πατήστε στο <gui>Αποθήκευση</gui>."
+
+#. (itstool) path: note/p
+#: C/mergefeatures.page:62
+msgid ""
+"To export a CSV file from <app>Thunderbird</app>, click on the <gui>Address "
+"Book</gui> toolbar button or choose <guiseq><gui>Tools </gui><gui>Address "
+"Book</gui></guiseq> from the menu. Then select the contacts you wish to "
+"export. Click on the first contact, then press and hold <key>Ctrl</key> and "
+"click on the other desired contacts to select them. Then choose "
+"<guiseq><gui>Tools</gui><gui>Export</gui> </guiseq>."
+msgstr ""
+"Για εξαγωγή ενός αρχείου CSV από το <app>Thunderbird</app>, πατήστε στο "
+"κουμπί εργαλειοθήκης <gui>Βιβλίο διευθύνσεων</gui> ή επιλέξτε "
+"<guiseq><gui>Εργαλεία</gui><gui>Βιβλίο διευθύνσεων</gui></guiseq> από το "
+"μενού. Έπειτα επιλέξτε τις επαφές που επιθυμείτε να εξάγετε. Πατήστε στην "
+"πρώτη επαφή, έπειτα πατήστε και κρατήστε πατημένο το <key>Ctrl</key> και "
+"πατήστε τις άλλες επιθυμητές επαφές για να τις επιλέξετε. Έπειτα επιλέξτε "
+"<guiseq><gui>Εργαλεία</gui><gui>Εξαγωγή</gui></guiseq>."
+
+#. (itstool) path: note/p
+#: C/mergefeatures.page:71
+msgid ""
+"In the file chooser window, choose the desired folder and a name for the "
+"file and change the value of the drop-down button in the right bottom corner "
+"to <gui>Comma Separated</gui>. Finally, click on <gui>Save</gui>."
+msgstr ""
+"Στο παράθυρο επιλογέα αρχείου, επιλέξτε τον επιθυμητό φάκελο και ένα όνομα "
+"για το αρχείο και αλλάξτε την τιμή του πτυσσόμενου κουμπιού στην κάτω δεξιά "
+"γωνία σε <gui>Διαχωριζόμενα με κόμμα</gui>. Τελικά, πατήστε στο "
+"<gui>Αποθήκευση</gui>."
+
+#. (itstool) path: page/p
+#: C/mergefeatures.page:79
+msgid ""
+"A label must then be configured to \"point at\" this data file. To configure "
+"the merge properties of a document, choose <guiseq><gui>Objects</gui> "
+"<gui>Merge Properties</gui></guiseq> menu item to display the <gui>merge "
+"properties</gui> dialog. This dialog is used to select the exact data file "
+"format and file name (location) of the merge data."
+msgstr ""
+"Μια ετικέτα πρέπει στη συνέχεια να ρυθμιστεί ώστε να \"δείχνει\" το αρχείο "
+"δεδομένων. Για να ρυθμίσετε τις ιδιότητες συγχώνευσης ενός εγγράφου, "
+"επιλέξτε το στοιχείο μενού <guiseq><gui>Αντικείμενα</gui><gui>Ιδιότητες "
+"συγχώνευσης</gui></guiseq> για να εμφανίσετε τον διάλογο <gui>ιδιότητες "
+"συγχώνευσης</gui>. Αυτός ο διάλογος χρησιμοποιείται για να επιλέξετε την "
+"ακριβή μορφή αρχείου δεδομένων και το όνομα αρχείου (θέση) των δεδομένων "
+"συγχώνευσης."
+
+#. (itstool) path: page/p
+#: C/mergefeatures.page:87
+msgid ""
+"Finally, once the label has been configured for a data file, field keys can "
+"be inserted into text objects and used as source or data for barcode objects "
+"and image filenames for image objects. See <link xref=\"editprop\"/> for "
+"more information on using merge data for these object types."
+msgstr ""
+"Τέλος, όταν η ετικέτα έχει ρυθμιστεί για ένα αρχείο δεδομένων, κλειδιά "
+"πεδίου μπορούν να εισαχθούν σε αντικείμενα κειμένου και να χρησιμοποιούνται "
+"ως πηγή ή δεδομένα για τα αντικείμενα barcode και ονόματα αρχείων εικόνα για "
+"τα αντικείμενα εικόνας. Δείτε το <link xref=\"editprop\"/> για περισσότερες "
+"πληροφορίες σχετικά με τη χρήση δεδομένων συγχώνευσης για αυτούς τους τύπους "
+"αντικειμένων."
 
-#: C/index.page:61(title)
-msgid "Advanced usage"
-msgstr "Χρήση για προχωρημένους"
+#. (itstool) path: page/p
+#: C/mergefeatures.page:93
+msgid ""
+"Now that your label is configured, <app>gLabels</app> will print a unique "
+"label for each record in your source document -- substituting fields from "
+"each record for field keys in the all text, barcode, and image objects."
+msgstr ""
+"Τώρα που η ετικέτα σας έχει ρυθμιστεί, το <app>gLabels</app> θα εκτυπώσει "
+"μια μοναδική ετικέτα για κάθε εγγραφή στο έγγραφό προέλευσης σας - "
+"αντικαθιστώντας τα πεδία από κάθε εγγραφή για κλειδιά πεδίου σε όλο το "
+"κείμενο, το barcode, καθώς και τα αντικείμενα εικόνας."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/editprop.page:35(None)
+#. (itstool) path: page/p
+#: C/mergefeatures.page:98
 msgid ""
-"@@image: 'figures/object-editor-sidebar.png'; "
-"md5=68be18416cc17964992fe0c7e311e0ef"
+"See <link xref=\"merge\"/> for a detailed tutorial on the document merge "
+"feature."
 msgstr ""
-"@@image: 'figures/object-editor-sidebar.png'; "
-"md5=68be18416cc17964992fe0c7e311e0ef"
+"Δείτε το <link xref=\"merge\"/> για λεπτομερή εκμάθηση της δυνατότητας "
+"συγχώνευσης εγγράφου."
 
-#: C/editprop.page:9(desc)
-msgid "Change the properties of objects."
-msgstr "Αλλαγή ιδιοτήτων αντικειμένων."
+#. (itstool) path: info/desc
+#: C/merge.page:9
+msgid "Merge a data source to create multiple documents."
+msgstr "Συγχώνευση μιας πηγής δεδομένων για τη δημιουργία πολλαπλών εγγράφων."
 
-#: C/editprop.page:25(title)
-msgid "To edit object properties"
-msgstr "Για να επεξεργαστείτε τις ιδιότητες ενός αντικειμένου"
+#. (itstool) path: page/title
+#: C/merge.page:25
+msgid "Document merge tutorial"
+msgstr "Εκμάθηση συγχώνευσης εγγράφου"
 
-#: C/editprop.page:29(p)
+#. (itstool) path: page/p
+#: C/merge.page:27
 msgid ""
-"Most object properties can be modified through the object editor sidebar, "
-"illustrated below. To use the object editor, a single object must first be "
-"selected. See <link xref=\"select\"/>."
+"Document Merge (sometimes called \"Mail Merge\") is a powerful feature that "
+"allows a unique label or card to be printed for each record in an external "
+"data source. It is however, the most mis-understood feature of <app>glabels</"
+"app>. The following examples will step through a couple of common tasks "
+"using the document merge feature."
 msgstr ""
-"Οι περισσότερες ιδιότητες του αντικειμένου μπορούν να τροποποιηθούν μέσω της "
-"πλευρικής στήλης επεξεργασίας αντικειμένου, που απεικονίζεται παρακάτω. Για "
-"να χρησιμοποιήσετε το πρόγραμμα επεξεργασίας αντικειμένου, πρέπει πρώτα να "
-"επιλεγεί ένα μόνο αντικείμενο. Δείτε το <link xref=\"select\"/>."
+"Η Συγχώνευση εγγράφου (μερικές φορές ονομάζεται \"Συγχώνευση αλληλογραφίας"
+"\") είναι ένα ισχυρό χαρακτηριστικό που επιτρέπει μια μοναδική ετικέτα ή "
+"κάρτα πρέπει να εκτυπωθεί για κάθε εγγραφή σε μία εξωτερική πηγή δεδομένων. "
+"Είναι ωστόσο, το πιο παρεξηγημένο χαρακτηριστικό του <app>glabels</app>. Τα "
+"παραδείγματα που ακολουθούν θα δείξει μέσω μερικών απλών εργασιών τη χρήση "
+"της δυνατότητας συγχώνευσης εγγράφου."
 
-#. ==== End of Figure ====
-#: C/editprop.page:40(p)
-msgid ""
-"The object editor will contain a subset of the following tabbed sections, "
-"depending on object type:"
-msgstr ""
-"Ο επεξεργαστής αντικειμένου θα περιέχει ένα υποσύνολο από τις ακόλουθες "
-"καρτέλες, ανάλογα με τον τύπο του αντικειμένου:"
+#. (itstool) path: info/desc
+#: C/multifile.page:9
+msgid "How to open multiple files at once by using the command line."
+msgstr "Πως να ανοίξετε πολλά αρχεία ταυτόχρονα με χρήση της γραμμής εντολών."
 
-#: C/editprop.page:44(title)
-msgid "Text Tabbed Section (Text objects)"
-msgstr "Τμήμα καρτέλας κειμένου (Αντικείμενα κειμένου)"
+#. (itstool) path: page/title
+#: C/multifile.page:25
+msgid "To open multiple files from the command line"
+msgstr "Για να ανοίξετε πολλά αρχεία ταυτόχρονα με χρήση της γραμμής εντολών"
 
-#: C/editprop.page:46(p)
+#. (itstool) path: page/p
+#: C/multifile.page:27
 msgid ""
-"This section contains a small editor for changing the content of a text "
-"object. It also contains a dropdown menu of available document merge keys, "
-"that can be inserted into text."
+"You can run <app>gLabels</app> from a command line and open a single file or "
+"multiple files. To open multiple files from a command line, type the "
+"following command, then press <key>Return</key>:"
 msgstr ""
-"Η ενότητα αυτή περιλαμβάνει ένα μικρό επεξεργαστή για να αλλάξει το "
-"περιεχόμενο ενός αντικειμένου κειμένου. Περιέχει επίσης ένα αναπτυσσόμενο "
-"μενού από διαθέσιμα κλειδιά συγχώνευσης εγγράφων, που μπορούν να εισαχθούν "
-"στο κείμενο."
-
-#: C/editprop.page:53(title)
-msgid "Image Tabbed Section (Image objects)"
-msgstr "Τμήμα καρτέλας εικόνας (Αντικείμενα εικόνας)"
+"Μπορείτε να εκτελέσετε το <app>gLabels</app> από τη γραμμή εντολών και να "
+"ανοίξετε ένα ή περισσότερα αρχεία. Για να ανοίξετε πολλά αρχεία από τη "
+"γραμμή εντολών, πληκτρολογήστε την ακόλουθη εντολή και πατήστε <key>Return</"
+"key>:"
 
-#: C/editprop.page:55(p)
+#. (itstool) path: page/p
+#: C/multifile.page:32
 msgid ""
-"This section contains a file entry with preview to select image files. The "
-"browse button can be used to easily locate image files. Alternatively, a "
-"document merge key can be used instead to provide a filename at print time."
+"<cmd>glabels <var>file1.glabels file2.glabels file3.glabels</var> </cmd>"
 msgstr ""
-"Η ενότητα αυτή περιέχει μια καταχώρηση αρχείου με προεπισκόπηση για να "
-"επιλέξετε αρχεία εικόνας. Το κουμπί περιήγησης μπορεί να χρησιμοποιηθεί για "
-"να εντοπίσετε εύκολα τα αρχεία εικόνας. Εναλλακτικά, μπορεί να "
-"χρησιμοποιηθεί ένα κλειδί συγχώνευσης εγγράφων αντ αυτού για να παρέχει ένα "
-"αρχείο κατά το χρόνο εκτύπωσης."
-
-#: C/editprop.page:63(title)
-msgid "Data Tabbed Section (Barcode objects)"
-msgstr "Τμήμα καρτέλας δεδομένων (Αντικείμενα barcode)"
+"<cmd>glabels <var>file1.glabels file2.glabels file3.glabels</var> </cmd>"
 
-#: C/editprop.page:65(p)
+#. (itstool) path: page/p
+#: C/multifile.page:36
 msgid ""
-"This section contains a text entry to enter literal barcode data. "
-"Alternatively, a document merge key can be used to provide this data at "
-"print time."
+"When the application starts, the files that you specify are displayed in "
+"separate <app>gLabels</app> windows."
 msgstr ""
-"Αυτή η ενότητα περιέχει μια είσοδο κειμένου για να εισαγάγετε τα δεδομένα "
-"barcode. Εναλλακτικά, μπορεί να χρησιμοποιηθεί ένα κλειδί συγχώνευσης "
-"εγγράφων αντ' αυτού για να παρέχει δεδομένα κατά το χρόνο εκτύπωσης."
+"Όταν ξεκινά η εφαρμογή, τα αρχεία που έχετε καθορίσει εμφανίζονται σε "
+"ξεχωριστά <app>gLabels</app> παράθυρα."
 
-#: C/editprop.page:72(title)
-msgid "Style Tabbed Section (Text objects)"
-msgstr "Τμήμα καρτέλας στύλ (Αντικείμενα κειμένου)"
+#. (itstool) path: info/desc
+#: C/newlabel.page:9
+msgid "Create a new label or card in <app>gLabels</app>."
+msgstr "Δημιουργία μιας νέας ετικέτας ή κάρτας στο <app>gLabels</app>."
+
+#. (itstool) path: page/title
+#: C/newlabel.page:25
+msgid "To create a new label or card"
+msgstr "Για τη δημιουργία μιας νέας ετικέτας ή κάρτας"
 
-#: C/editprop.page:74(p)
+#. (itstool) path: page/p
+#: C/newlabel.page:27
 msgid ""
-"This section contains controls to select text properties, including font "
-"family, font size, font weight, color, and text justification."
+"To create a new label or business card, choose <guiseq><gui>File</"
+"gui><gui>New</gui></guiseq> to display the <gui>New Label or Card</gui> "
+"dialog. Select the media type and orientation for the new document, then "
+"click <gui>OK</gui>. A new document is displayed in the display area of the "
+"<app>gLabels</app> window."
 msgstr ""
-"Η ενότητα αυτή περιλαμβάνει στοιχεία ελέγχου για να επιλέξετε τις ιδιότητες "
-"κειμένου, συμπεριλαμβανομένης της οικογένειας γραμματοσειρών, του μεγέθους "
-"της γραμματοσειράς, βάρους της γραμματοσειράς, χρώματος, και στοίχισης του "
-"κειμένου."
-
-#: C/editprop.page:81(title)
-msgid "Style Tabbed Section (Barcode objects)"
-msgstr "Τμήμα καρτέλας στύλ (Αντικείμενα barcode)"
+"Για να δημιουργήσετε μια νέα ετικέτα ή κάρτα, επιλέξτε <guiseq><gui>Αρχείο</"
+"gui><gui>Νέο</gui> </guiseq> για να εμφανίσετε το διάλογο <gui>Νέα ετικέτα ή "
+"κάρτα</gui>. Επιλέξτε τον τύπο και τον προσανατολισμό για το νέο έγγραφο, "
+"κάντε κλικ στο κουμπί <gui>OK</gui>. Ένα νέο έγγραφο εμφανίζεται στην οθόνη "
+"του <app>gLabels</app> παραθύρου."
 
-#: C/editprop.page:83(p)
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/printfile.page:47
+msgctxt "_"
 msgid ""
-"This section contains controls to select barcode properties, including "
-"barcode style, color, whether to print text, and whether to include a "
-"checksum digit."
+"external ref='figures/print-copies.png' "
+"md5='ee473352947fe25c7adaa9f9a052c3e9'"
 msgstr ""
-"Η ενότητα αυτή περιλαμβάνει στοιχεία ελέγχου για να επιλέξετε τις ιδιότητες "
-"barcode, συμπεριλαμβανομένων των στυλ barcode, του χρώματος, αν θέλετε να "
-"εκτυπώσετε κείμενο, και αν πρέπει να περιλαμβάνουν ψηφίο αθροίσματος ελέγχου."
-
-#: C/editprop.page:90(title)
-msgid "Line Tabbed Section"
-msgstr "Τμήμα καρτέλας γραμμής"
+"external ref='figures/print-copies.png' "
+"md5='ee473352947fe25c7adaa9f9a052c3e9'"
 
-#: C/editprop.page:92(p)
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/printfile.page:70
+msgctxt "_"
 msgid ""
-"This section contains controls to select properties of lines and outlines. "
-"These properties include line width and color."
+"external ref='figures/print-merge.png' md5='ee70bd2150a6cd46e96ce5c0531eb47b'"
 msgstr ""
-"Η ενότητα αυτή περιλαμβάνει στοιχεία ελέγχου για να επιλέξετε τις ιδιότητες "
-"γραμμών και περιγραμμάτων. Αυτές οι ιδιότητες περιλαμβάνουν το πλάτος "
-"γραμμής και το χρώμα."
+"external ref='figures/print-merge.png' md5='ee70bd2150a6cd46e96ce5c0531eb47b'"
 
-#: C/editprop.page:98(title)
-msgid "Fill Tabbed Section"
-msgstr "Τμήμα καρτέλας γεμμίσματος"
+#. (itstool) path: info/desc
+#: C/printfile.page:9
+msgid "How to print your labels and cards."
+msgstr "Πως να εκτυπώσετε τις ετικέτες και τις κάρτες σας."
+
+#. (itstool) path: page/title
+#: C/printfile.page:25
+msgid "To print labels and cards"
+msgstr "Για να εκτυπώσετε τις ετικέτες και τις κάρτες σας"
 
-#: C/editprop.page:100(p)
+#. (itstool) path: page/p
+#: C/printfile.page:27
 msgid ""
-"This section contains controls to select fill properties of box and ellipse "
-"objects. Currently the only fill property is fill color."
+"To print labels or cards, choose <guiseq><gui>File</gui><gui>Print</gui> </"
+"guiseq> to display the <gui>Print</gui> dialog. Once print options have been "
+"selected, click <gui>Print</gui> to print the labels or cards. To simply "
+"preview the results, click <gui>Print Preview</gui> instead."
 msgstr ""
-"Η ενότητα αυτή περιλαμβάνει στοιχεία ελέγχου για να επιλέξετε τις ιδιότητες "
-"γεμίσματος των αντικειμένων πλαισίου και έλλειψης. Επί του παρόντος η μόνη "
-"ιδιότητα γεμίσματος είναι το χρώμα γεμίσματος."
-
-#: C/editprop.page:107(title)
-msgid "Size Tabbed Section (All except line objects)"
-msgstr "Τμήμα καρτέλας μεγέθος (Όλα εκτός των γραμμών)"
+"Για να εκτυπώσετε ετικέτες ή κάρτες, επιλέξτε <guiseq><gui>Αρχείο</"
+"gui><gui>Εκτύπωση</gui></guiseq> για να εμφανίσετε τον διάλογο "
+"<gui>Εκτύπωση</gui>. Μόλις οι επιλογές εκτύπωσης έχουν επιλεγεί, πατήστε "
+"στην επιλογή <gui>Εκτύπωση</gui> για να εκτυπώσετε τις ετικέτες ή τις "
+"κάρτες. Για να κάνετε προεπισκόπηση των αποτελεσμάτων, πατήστε στην επιλογή "
+"<gui>Προεπισκόπηση εκτύπωσης</gui>."
 
-#: C/editprop.page:109(p)
+#. (itstool) path: page/p
+#: C/printfile.page:34
 msgid ""
-"This section contains controls to select the width and height of an object. "
-"A checkbox is provided, so that the current aspect ratio can be locked while "
-"manipulating the width and height controls. Image objects also provide a "
-"button to reset the size to the image's natural size (Assumes 72DPI)."
+"The <gui>Print</gui> dialog allows you to specify the following print "
+"options:"
 msgstr ""
-"Η ενότητα αυτή περιλαμβάνει στοιχεία ελέγχου για να επιλέξετε το πλάτος και "
-"το ύψος ενός αντικειμένου. Ένα κουτάκι παρέχεται, έτσι ώστε η τρέχουσα "
-"αναλογία να μπορεί να κλειδωθεί, ενώ χειρίζονται οι έλεγχοι πλάτους και "
-"ύψους. Αντικείμενα εικόνας παρέχουν επίσης ένα κουμπί για να επαναφέρετε το "
-"μέγεθος στο φυσικό μέγεθος της εικόνας (θεωρεί δεδομένο 72DPI)."
+"Ο διάλογος <gui>Εκτύπωση</gui> σας επιτρέπει να ορίσετε τις ακόλουθες "
+"επιλογές εκτύπωσης:"
 
-#: C/editprop.page:118(title)
-msgid "Size Tabbed Section (Line objects)"
-msgstr "Τμήμα καρτέλας μεγέθος (Αντικείμενα γραμμών)"
+#. (itstool) path: section/title
+#: C/printfile.page:38
+msgid "The Labels Tab of the Print Dialog"
+msgstr "Η καρτέλα Ετικέτες του παραθύρου διαλόγου Εκτύπωση"
+
+#. (itstool) path: section/title
+#: C/printfile.page:41
+msgid "Print control (Simple)"
+msgstr "Έλεγχος εκτύπωσης (Απλός)"
 
-#: C/editprop.page:120(p)
+#. (itstool) path: section/p
+#: C/printfile.page:43
 msgid ""
-"This section contains controls to select the length and angle of a line "
-"object."
+"For simple labels or cards (no document merge), the job tabbed section "
+"contains the following copy controls."
 msgstr ""
-"Η ενότητα αυτή περιλαμβάνει στοιχεία ελέγχου για να επιλέξετε το μήκος και "
-"τη γωνία ενός αντικειμένου γραμμής."
-
-#: C/editprop.page:126(title)
-msgid "Position Tabbed Section"
-msgstr "Τμήμα καρτέλας θέση"
+"Για απλές ετικέτες ή κάρτες (δεν υπάρχει συγχώνευση εγγράφου), η καρτέλα "
+"εργασίας περιέχει τα ακόλουθα στοιχεία ελέγχου αντιγραφής."
 
-#: C/editprop.page:128(p)
-msgid "This section contains controls to change the position of an object."
+#. (itstool) path: section/p
+#: C/printfile.page:52
+msgid ""
+"The number of copies of the label can be selected by choosing the number of "
+"full sheets to print, or a specific subset of labels on a single sheet."
 msgstr ""
-"Η ενότητα αυτή περιλαμβάνει στοιχεία ελέγχου για να αλλάξετε τη θέση ενός "
-"αντικειμένου."
-
-#: C/editprop.page:135(title)
-msgid "Shadow Tabbed Section (All except barcode objects)"
-msgstr "Τμήμα καρτέλας σκίαση (Όλα εκτός των barcode)"
+"Ο αριθμός των αντιγράφων της ετικέτας μπορεί να επιλεγεί από την επιλογή του "
+"αριθμού ολόκληρων φύλλων για εκτύπωση ή ένα συγκεκριμένο υποσύνολο ετικετών "
+"σε ένα φύλλο."
 
-#: C/editprop.page:137(p)
-msgid "This section contains controls to add a shadow to an object."
+#. (itstool) path: section/p
+#: C/printfile.page:56
+msgid ""
+"The mini-preview can also be used to graphically select the subset of labels "
+"by clicking the first label on the mini-preview and dragging to the last "
+"label."
 msgstr ""
-"Η ενότητα αυτή περιλαμβάνει στοιχεία ελέγχου για τη σκίαση ενός αντικειμένου."
+"Η μίνι-προεπισκόπηση μπορεί επίσης να χρησιμοποιηθεί για να επιλέξετε "
+"γραφικά το υποσύνολο των ετικετών κάνοντας κλικ στην πρώτη ετικέτα στη μίνι-"
+"προεπισκόπηση και σύροντας στην τελευταία ετικέτα."
 
-#: C/editprop.page:146(title)
-msgid "Other Manipulations of Objects"
-msgstr "Άλλοι Χειρισμοί Αντικειμένων"
+#. (itstool) path: section/title
+#: C/printfile.page:63
+msgid "Print control (Merge)"
+msgstr "Έλεγχος εκτύπωσης (Συγχώνευση)"
 
-#: C/editprop.page:148(p)
-msgid "Objects can also be manipulated in the following ways."
+#. (itstool) path: section/p
+#: C/printfile.page:65
+msgid ""
+"For labels or cards using the document merge (also known as \"mail merge\") "
+"capability, the job tabbed section contains the following merge controls "
+"instead of copy controls."
 msgstr ""
-"Τα αντικείμενα μπορούν επίσης να χειριστούν με τους ακόλουθους τρόπους."
+"Για ετικέτες ή κάρτες που χρησιμοποιούν τη δυνατότητα συγχώνευσης εγγράφου "
+"(επίσης γνωστή ως \"συγχώνευση αλληλογραφίας\") , η καρτέλα εργασίας "
+"περιέχει τα ακόλουθα στοιχεία ελέγχου συγχώνευσης αντί των στοιχείων ελέγχου "
+"αντιγράφου."
 
-#: C/editprop.page:151(title)
-msgid "Moving and Resizing Objects"
-msgstr "Μετακίνηση και Αλλαγή μεγέθους αντικειμένων"
+#. (itstool) path: media/p
+#: C/printfile.page:71
+msgid "Print Document Merge Controls"
+msgstr "Εκτύπωση εγγράφων στοιχεία ελέγχου συγχώνευσης"
 
-#: C/editprop.page:153(p)
+#. (itstool) path: section/p
+#: C/printfile.page:75
 msgid ""
-"Objects can be moved by simply clicking on a selected object and dragging "
-"the object to its new location. If the object is part of an aggregate "
-"selection, all objects in the selection will move with the object being "
-"dragged, maintaining their relative positions to one another. If no object "
-"is selected, clicking on an object will create a new selection containing "
-"that object. See <link xref=\"select\"/>."
+"The total number of labels or cards printed is the product of the number of "
+"records in the merge source and the number of copies selected. If multiple "
+"copies are selected, these can be either collated (copies of the same record "
+"grouped together) or un-collated (one copy each record is printed before "
+"next copy)."
 msgstr ""
-"Τα αντικείμενα μπορούν να μετακινηθούν κάνοντας απλώς κλικ σε ένα επιλεγμένο "
-"αντικείμενο και σύροντας το αντικείμενο στη νέα του θέση. Εάν το αντικείμενο "
-"είναι μέρος μιας συνολικής επιλογής, όλα τα αντικείμενα της επιλογής θα "
-"μετακινηθούν με το αντικείμενο που σύρατε, διατηρώντας τις σχετικές τους "
-"θέσει το ένα με το άλλο. Εάν δεν είναι επιλεγμένο ένα αντικείμενο, κάνοντας "
-"κλικ σε κάποιο αντικείμενο θα δημιουργήσει μια νέα επιλογή που περιέχει αυτό "
-"το αντικείμενο. Δείτε το <link xref=\"select\"/>."
+"Ο συνολικός αριθμός των τυπωμένων ετικετών ή καρτών είναι το γινόμενο του "
+"αριθμού εγγραφών στην πηγή συγχώνευσης και τον αριθμό των αντιγράφων που "
+"επιλέξατε. Εάν έχουν επιλεγεί πολλαπλά αντίγραφα, αυτά μπορεί να είναι είτε "
+"ταξινομημένα (αντίγραφα της ίδιας εγγραφής ομαδοποιούνται) ή μη-ταξινομημένα "
+"(ένα αντίγραφο κάθε εγγραφής έχει τυπωθεί πριν από το επόμενο αντίγραφο)."
 
-#: C/editprop.page:161(p)
+#. (itstool) path: section/p
+#: C/printfile.page:82
 msgid ""
-"A selected object can be resized by clicking one of its resize handle and "
-"dragging it to obtain the new size."
+"Printing can begin on any label on the first sheet. This can be selected "
+"with the <gui>Start on label</gui> spinbutton."
 msgstr ""
-"Ένα επιλεγμένο αντικείμενο μπορεί να μεταβληθεί κάνοντας κλικ σε μία από τις "
-"λαβές αλλαγής μεγέθους και σύροντας τα για να αποκτήσετε το νέο μέγεθος."
-
-#: C/editprop.page:167(title)
-msgid "Changing Stacking Order"
-msgstr "Αλλαγή σειράς στοίβαξης"
+"Η εκτύπωση μπορεί να αρχίσει από οποιαδήποτε ετικέτα στο πρώτο φύλλο. Αυτό "
+"μπορεί να επιλεγχθεί με το κουμπί <gui>Έναρξη στην ετικέτα</gui> spinbutton."
 
-#: C/editprop.page:169(p)
+#. (itstool) path: section/p
+#: C/printfile.page:86
 msgid ""
-"Stacking order refers to relative position in the z-axis of objects. That is "
-"when objects overlap, which object will appear on top of the other. By "
-"default, newer objects will appear above older objects. To change this "
-"order, select one or more objects and choose <guiseq><gui>Objects</"
-"gui><gui>Order</gui><gui>Bring to Front</gui></guiseq> to raise the "
-"selection to the top of the stacking order, or choose <guiseq><gui>Objects</"
-"gui><gui>Order</gui><gui>Send to Back</gui></guiseq> to lower the selection "
-"to the bottom of the stacking order. These menuitems are also available by "
-"right-clicking the display area when there is a non-empty selection."
+"The mini-preview can also be used to graphically select this first label, by "
+"clicking on the desired label in the mini-preview."
 msgstr ""
-"Η σειρά στοίβαξης αναφέρεται σε σχετική θέση του άξονα z των αντικειμένων. "
-"Αυτό γίνεται όταν τα αντικείμενα επικαλύπτονται, πιο αντικείμενο θα "
-"εμφανιστεί στην κορυφή του άλλου. Από προεπιλογή, τα νεότερα αντικείμενα θα "
-"εμφανίζονται πάνω από παλαιότερα αντικείμενα. Για να αλλάξετε αυτή τη σειρά, "
-"επιλέξτε ένα ή περισσότερα αντικείμενα και επιλέξτε "
-"<guiseq><gui>Αντικείμενα</gui><gui>Διάταξη</gui><gui>Σε πρώτο πλάνο</gui></"
-"guiseq> για να ανεβάσετε την επιλογή στην κορυφή της σειράς στοίβαξης, ή "
-"επιλέξτε <guiseq><gui>Αντικείμενα</gui><gui>Διάταξη</gui><gui>Μεταφορά στο "
-"φόντο</gui></guiseq> για να κατεβάσετε την επιλογή στο κάτω μέρος της σειράς "
-"στοίβαξης. Αυτά τα στοιχεία του μενού είναι επίσης διαθέσιμα κάνοντας δεξί "
-"κλικ στην περιοχή οθόνης που υπάρχει μια μη-κενή επιλογή."
+"Η μίνι-προεπισκόπηση μπορεί επίσης να χρησιμοποιηθεί για να επιλέξετε "
+"γραφικά της πρώτης ετικέτας, κάνοντας κλικ στην ετικέτα που θέλετε στη μίνι-"
+"προεπισκόπηση."
 
-#: C/editprop.page:187(title)
-msgid "Rotating and Flipping Objects"
-msgstr "Περιστροφή και αναστροφή αντικειμένων"
+#. (itstool) path: section/title
+#: C/printfile.page:93
+msgid "Options"
+msgstr "Επιλογές"
 
-#: C/editprop.page:189(p)
-msgid ""
-"Objects can be rotated 90 degrees in either direction, or flipped "
-"horizontally or vertically, by choosing the appropriate menuitem in the "
-"<guiseq><gui>Objects</gui><gui>Rotate/Flip</gui></guiseq> sub-menu. These "
-"menuitems are also available by right-clicking the display area when there "
-"is a non-empty selection."
-msgstr ""
-"Τα αντικείμενα μπορούν να περιστραφούν κατά 90 μοίρες προς οποιαδήποτε "
-"κατεύθυνση, είτε να αναστραφούν οριζόντια ή κάθετα, επιλέγοντας το κατάλληλο "
-"στοιχείο από το υπομενού "
-"<guiseq><gui>Αντικείμενα</gui><gui>Περιστροφή/Αναστροφή</gui></guiseq>. Αυτά "
-"τα στοιχεία είναι επίσης διαθέσιμα κάνοντας δεξί κλικ στην περιοχή οθόνης "
-"που υπάρχει μια μη-κενή επιλογή."
+#. (itstool) path: section/p
+#: C/printfile.page:94
+msgid "The following options can also be selected."
+msgstr "Οι ακόλουθες επιλογές μπορούν επίσης να επιλεγούν."
+
+#. (itstool) path: item/p
+#: C/printfile.page:97
+msgid "<gui>print outlines</gui>"
+msgstr "<gui>εκτύπωση περιγραμμάτων</gui>"
 
-#: C/editprop.page:197(p)
+#. (itstool) path: item/p
+#: C/printfile.page:98
 msgid ""
-"This feature could be useful when you are designing CD box inlays. For the "
-"spine caption, you need vertical aligned text. After you have created a "
-"basic text box, choose <guiseq><gui>Objects</gui><gui>Rotate/Flip</gui></"
-"guiseq> to rotate the text box according to your needs."
+"Print outlines of labels. This option is useful for dry-runs, to test "
+"printer alignment."
 msgstr ""
-"Αυτό το χαρακτηριστικό θα μπορούσε να είναι χρήσιμο όταν σχεδιάζετε ένθετα "
-"κουτιού CD. Για τη λεζάντα της κεντρικής στήλης, χρειάζεστε ένα κάθετα "
-"ευθυγραμμισμένο κείμενο. Αφού έχετε δημιουργήσει ένα βασικό πλαίσιο "
-"κειμένου, επιλέξτε <guiseq><gui>Αντικείμενα</gui><gui>Περιστροφή/Αναστροφή</"
-"gui></guiseq> για να περιστρέψετε το πλαίσιο κειμένου σύμφωνα με τις ανάγκες "
-"σας."
+"Εκτύπωση περιγραμμάτων των ετικετών. Αυτή η επιλογή είναι χρήσιμη για να "
+"ελέγξετε την ευθυγράμμιση του εκτυπωτή."
 
-#: C/editprop.page:208(title)
-msgid "Aligning Objects"
-msgstr "Στοίχιση αντικειμένων"
+#. (itstool) path: item/p
+#: C/printfile.page:102
+msgid "<gui>print in reverse</gui>"
+msgstr "<gui>εκτύπωση με αντιστροφή</gui>"
 
-#: C/editprop.page:210(p)
+#. (itstool) path: item/p
+#: C/printfile.page:103
 msgid ""
-"Objects can be aligned horizontally or vertically, relative to one another, "
-"or relative to the center line of the label, by choosing the appropriate "
-"menuitem from the <guiseq><gui>Objects</gui><gui>Align Horizontal</gui></"
-"guiseq> or <guiseq><gui>Objects</gui><gui>Align Vertical</gui></guiseq> sub-"
-"menus. These menuitems are also available by right-clicking the display area "
-"when there is a non-empty selection."
-msgstr ""
-"Τα αντικείμενα μπορούν να ευθυγραμμιστούν οριζόντια ή κάθετα, σχετικά μεταξύ "
-"τους, ή σε σχέση με την κεντρική γραμμή της ετικέτας, επιλέγοντας το "
-"κατάλληλο στοιχείο από το υπο-μενού <guiseq><gui>Αντικείμενα</"
-"gui><gui>Στοίχιση Οριζόντια</gui></guiseq> ή <guiseq><gui>Αντικείμενα</"
-"gui><gui>Στοίχιση Κατακόρυφα</gui></guiseq>. Αυτά τα στοιχεία είναι επίσης "
-"διαθέσιμα κάνοντας δεξί κλικ στην περιοχή οθόνης που υπάρχει μια μη-κενή "
-"επιλογή."
+"Prints the labels as mirror images. This option is useful for printing on "
+"clear labels that will be viewed from the reverse side (e.g. in a car "
+"window)."
+msgstr ""
+"Εκτυπώνει τις ετικέτες ως εικόνες καθρέφτη. Αυτή η επιλογή είναι χρήσιμη για "
+"την εκτύπωση σε διαφανείς ετικέτες που θα προβάλονται από την ανάποδη πλευρά "
+"(π.χ. σε ένα παράθυρο του αυτοκινήτου)."
 
-#: C/editprop.page:223(title)
-msgid "Using the Property Bar"
-msgstr "Χρήση της μπάρας ιδιοτήτων"
+#. (itstool) path: item/p
+#: C/printfile.page:108
+msgid "<gui>print crop marks</gui>"
+msgstr "<gui>εκτύπωση σημείων κοπής</gui>"
 
-#: C/editprop.page:225(p)
+#. (itstool) path: item/p
+#: C/printfile.page:109
 msgid ""
-"The property bar can be used to change some common properties of objects en-"
-"masse. These properties include font family, font size, font weight, text "
-"alignment, text color, fill color, line or outline color, and line width. "
-"The property bar also controls the defaults for these properties for any "
-"newly created objects."
+"Prints crop marks along the edge of the sheet. This option is useful for "
+"printing on blank stock, to be cut after printing. This option does not work "
+"well with all templates."
 msgstr ""
-"Η μπάρα ιδιοτήτων μπορεί να χρησιμοποιηθεί για να αλλάξετε κάποιες κοινές "
-"ιδιότητες των αντικειμένων μαζικά. Αυτές οι ιδιότητες περιλαμβάνουν τύπο "
-"γραμματοσειράς, μέγεθος γραμματοσειράς, βάρος γραμματοσειράς, στοίχιση του "
-"κειμένου, το χρώμα κειμένου, χρώμα γεμίσματος, γραμμής ή χρώμα "
-"περιγράμματος, και το πλάτος γραμμής. Η μπάρα ιδιοτήτων ελέγχει επίσης τις "
-"προεπιλογές για αυτές τις ιδιότητες σε κάθε νεοσύστατο αντικείμενο."
+"Εκτυπώνει σημάδια κοπής κατά μήκος της άκρης του φύλλου. Αυτή η επιλογή "
+"είναι χρήσιμη για την εκτύπωση σε λευκό υλικό, ώστε να κοπεί μετά από την "
+"εκτύπωση. Αυτή η επιλογή δεν λειτουργεί καλά με όλα τα πρότυπα."
 
-#: C/customtemplate.page:9(desc)
-msgid "Create your own templates for stationery products."
-msgstr "Δημιουργήστε τα δικά σας πρότυπα για προϊόντα γραφικής ύλης."
+#. (itstool) path: info/desc
+#: C/select.page:9
+msgid "How to select objects."
+msgstr "Πως να επιλέξετε αντικείμενα."
 
-#: C/customtemplate.page:25(title)
-msgid "To create a custom template"
-msgstr "Για να δημιουργήσετε ενα προσαρμοσμένο πρότυπο"
+#. (itstool) path: page/title
+#: C/select.page:25
+msgid "To select objects"
+msgstr "Για να επιλέξετε αντικείμενα"
 
-#: C/customtemplate.page:27(p)
+#. (itstool) path: page/p
+#: C/select.page:27
 msgid ""
-"To create a new custom template, choose <guiseq><gui>File</gui><gui>Template "
-"Designer ...</gui></guiseq> to display the <gui>Template Designer</gui> "
-"dialog. This dialog will assist you in creating a custom template for most "
-"types of label or card stationery that you may encounter."
+"A prerequisite for performing operations on objects is the selection of "
+"individual objects or groups of objects. The display area must be in the "
+"object selection mode to create new selections, as indicated by an arrow "
+"cursor. The object selection mode is selected by the <guiseq><gui>Objects</"
+"gui> <gui>Select Mode</gui></guiseq> menu item, or the corresponding command "
+"on the <gui>Drawing Toolbar</gui>."
 msgstr ""
-"Για να δημιουργήσετε ένα νέο προσαρμοσμένο πρότυπο, επιλέξτε "
-"<guiseq><gui>Αρχείο</gui><gui>Σχεδιαστής προτύπου ...</gui></guiseq> για να "
-"εμφανίσετε το παράθυρο <gui>Σχεδιαστής προτύπου</gui> . Αυτός ο διάλογος θα "
-"σας βοηθήσει να δημιουργείτε ένα προσαρμοσμένο πρότυπο για τα περισσότερα "
-"είδη της ετικέτας ή κάρτας που μπορεί να συναντήσετε."
+"Απαραίτητη προϋπόθεση της εκτέλεσης εργασιών για αντικείμενα είναι η επιλογή "
+"των επιμέρους αντικειμένων ή ομάδων αντικειμένων. Η περιοχή προβολής πρέπει "
+"να είναι σε κατάσταση επιλογής αντικειμένου για να δημιουργήσετε νέες "
+"επιλογές, όπως υποδεικνύεται από ένα βέλος δρομέα. Η κατάσταση επιλογής "
+"αντικειμένου μπορεί να επιλεγεί από το στοιχείο μενού "
+"<guiseq><gui>Αντικείμενα</gui><gui>Επιλογή κατάστασης</gui></guiseq>, ή την "
+"αντίστοιχη εντολή στην <gui>Εργαλειοθήκη σχεδίασης</gui>."
+
+#. (itstool) path: section/title
+#: C/select.page:38
+msgid "Selecting a single object"
+msgstr "Επιλέγοντας ένα μεμονωμένο αντικείμενο"
 
-#: C/customtemplate.page:34(p)
+#. (itstool) path: section/p
+#: C/select.page:39
 msgid ""
-"If you prefer, you can create your templates manually. For this option see "
-"<link xref=\"mancreate\"/>"
+"A single object can be selected simply by clicking on the desired object in "
+"the display area. Once selected the object will be highlighted with a set of "
+"resizing handles."
 msgstr ""
-"Αν προτιμάτε, μπορείτε να δημιουργήσετε τα πρότυπά σας χειροκίνητα. Για αυτή "
-"την επιλογή δείτε το <link xref=\"mancreate\"/>"
+"Ένα μεμονωμένο αντικείμενο μπορεί να επιλεγεί απλώς κάνοντας κλικ στο "
+"επιθυμητό αντικείμενο στην οθόνη. Μόλις επιλεγεί το αντικείμενο, θα "
+"επισημανθεί με μια σειρά από λαβές αλλαγής μεγέθους."
 
-#: C/customize.page:9(desc)
-msgid "Customize <app>gLabels</app> to match your needs."
-msgstr "Προσαρμογή του <app>gLabels</app> για να ταιριάξει με τις ανάγκες σας."
+#. (itstool) path: section/title
+#: C/select.page:46
+msgid "Aggregate object selections"
+msgstr "Συγκεντρωτικές επιλογές αντικειμένου"
 
-#. Use this section to describe how to customize the application.
-#: C/customize.page:25(title)
-msgid "Settings"
-msgstr "Ρυθμίσεις"
+#. (itstool) path: section/p
+#: C/select.page:47
+msgid ""
+"Multiple objects can be selected by first selecting the first object as "
+"above and then by holding the <key>Ctrl</key> key while selecting additional "
+"objects. Individual objects can be added to an existing selection at any "
+"time by holding the <key>Ctrl</key> key while selecting the desired objects. "
+"All objects can also be selected by using the <guiseq><gui>Edit</gui> "
+"<gui>Select All</gui></guiseq> menu item. All objects in an aggregate object "
+"selection will be highlighted."
+msgstr ""
+"Πολλαπλά αντικείμενα μπορούν να επιλεγούν επιλέγοντας πρώτα το πρώτο "
+"αντικείμενο όπως παραπάνω και στη συνέχεια κρατώντας πατημένο το πλήκτρο "
+"<key>Ctrl</key> για την επιλογή επιπλέον αντικειμένων. Μεμονωμένα "
+"αντικείμενα μπορούν να προστεθούν σε μια υπάρχουσα επιλογή οποτεδήποτε, "
+"κρατώντας πατημένο το <key>Ctrl</key> κατά την επιλογή των επιθυμητών "
+"αντικειμένων. Όλα τα αντικείμενα μπορούν επίσης να επιλεγούν με τη χρήση του "
+"στοιχείου μενού <guiseq><gui>Επεξεργασία</gui> <gui>Επιλογή όλων</gui></"
+"guiseq>. Όλα τα αντικείμενα στο σύνολο τους θα επισημανθούν."
+
+#. (itstool) path: section/title
+#: C/select.page:60
+msgid "Area selections"
+msgstr "Επιλογές περιοχής"
 
-#: C/customize.page:26(p)
+#. (itstool) path: section/p
+#: C/select.page:62
 msgid ""
-"To configure <app>gLabels</app>, choose <guiseq><gui>Settings</"
-"gui><gui>Preferences</gui></guiseq>. The <gui>Preferences</gui> dialog "
-"contains the following tabbed sections:"
+"Multiple objects can also be selected by clicking an empty area and dragging "
+"to form a rectangular area. When released, all objects contained in the area "
+"will form an aggregate selection. An area selection can be used to add to an "
+"existing selection by holding the <key>Ctrl</key> key while performing the "
+"selection."
 msgstr ""
-"Για να ρυθμίσετε το <app>gLabel </app>, επιλέξτε <guiseq><gui>Ρυθμίσεις</"
-"gui><gui>Προτιμήσεις</gui></guiseq>. Ο διάλογος <gui>Προτιμήσεις</gui> "
-"περιέχει τις ακόλουθες καρτέλες:"
+"Πολλαπλά αντικείμενα μπορούν επίσης να επιλεγούν κάνοντας κλικ σε μια κενή "
+"περιοχή και να σύρετε ώστε να σχηματίσετε μια ορθογώνια περιοχή. Όταν "
+"αφήσετε το κουμπί, όλα τα αντικείμενα που περιέχονται στην περιοχή θα "
+"αποτελέσουν μια συγκεντρωτική επιλογή. Μια επιλογή περιοχής, μπορεί να "
+"χρησιμοποιηθεί για να προσθέσετε σε μια υπάρχουσα επιλογή κρατώντας πατημένο "
+"το πλήκτρο <key>Ctrl</key> κατά την εκτέλεση της επιλογής."
 
-#: C/customize.page:35(title)
-msgid "Locale"
-msgstr "Τοπική προσαρμογή"
+#. (itstool) path: section/title
+#: C/select.page:72
+msgid "Unselecting objects"
+msgstr "Αποεπιλογή αντικειμένων"
 
-#: C/customize.page:37(title)
-msgid "Units"
-msgstr "Μονάδες"
+#. (itstool) path: section/p
+#: C/select.page:74
+msgid ""
+"Individual objects can be removed from an existing selection by holding the "
+"<key>Ctrl</key> key while clicking on a previously selected object. An "
+"entire selection can be dismissed by using the <guiseq> <gui>Edit</gui> "
+"<gui>Un-select All</gui> </guiseq> menu item or by simply clicking any empty "
+"space in the display area. Once an object is unselected its highlight is "
+"removed."
+msgstr ""
+"Μεμονωμένα αντικείμενα μπορούν να αφαιρεθούν από μια υπάρχουσα επιλογή "
+"κρατώντας πατημένο το πλήκτρο <key>Ctrl</key> ενώ επιλέγετε ένα ήδη "
+"επιλεγμένο αντικείμενο. Μια πολλαπλή επιλογή μπορεί να απορριφθεί "
+"χρησιμοποιώντας το στοιχείο μενού <guiseq><gui>Επεξεργασία</"
+"gui><gui>Αποεπιλογή όλων</gui></guiseq> ή πατώντας απλώς σε οποιοδήποτε κενό "
+"χώρο στην περιοχή της οθόνης. Όταν ένα αντικείμενο αποεπιλέγεται ο τονισμός "
+"του αφαιρείται."
+
+#. (itstool) path: section/title
+#: C/select.page:86
+msgid "Clipboard Commands"
+msgstr "Εντολές προχείρου"
 
-#: C/customize.page:38(p)
+#. (itstool) path: section/p
+#: C/select.page:88
 msgid ""
-"Use this radio button group to specify your preferred units. Select one of "
-"the following options:"
+"Object selections can be manipulated using the standard clipboard operations "
+"<gui>Cut</gui>, <gui>Copy</gui>, <gui>Paste</gui>, and <gui>Delete</gui>."
 msgstr ""
-"Χρησιμοποιείστε αυτήν την ομάδα κουμπιών επιλογής για να καθορίσετε τις "
-"προτιμώμενες μονάδες σας. Επιλέξτε μία από τις ακόλουθες επιλογές:"
+"Χειρισμός των επιλογών αντικειμένων γίνεται επίσης χρησιμοποιώντας τις "
+"τυπικές λειτουργίες του προχείρου <gui>Αποκοπή</gui>, <gui>Αντιγραφή</gui>, "
+"<gui>Επικόλληση</gui>, και <gui>Διαγραφή</gui>."
 
-#: C/customize.page:42(gui)
-msgid "Points"
-msgstr "Πόντοι"
+#. (itstool) path: section/title
+#: C/select.page:94
+msgid "<gui>Cut</gui> (<keyseq><key>Ctrl</key><key>X</key></keyseq>)"
+msgstr "<gui>Αποκοπή</gui> (<keyseq><key>Ctrl</key><key>X</key></keyseq>)"
 
-#: C/customize.page:43(p)
-msgid "Use points (1 point = 1/72 in = 0.352778 mm)."
-msgstr "Χρήση πόντων (1 πόντος pt = 1/72 ίντσας = 0.352778 mm)."
+#. (itstool) path: section/p
+#: C/select.page:96
+msgid ""
+"Moves selected objects to the clipboard. The objects are then available for "
+"pasting back into the current document or another document."
+msgstr ""
+"Μετακινεί τα επιλεγμένα αντικείμενα στο πρόχειρο. Τα αντικείμενα στη "
+"συνέχεια είναι διαθέσιμα για την επικόλληση στο τρέχον έγγραφο ή άλλο "
+"έγγραφο."
 
-#: C/customize.page:46(gui)
-msgid "Inches"
-msgstr "Ίντσες"
+#. (itstool) path: section/title
+#: C/select.page:103
+msgid "<gui>Copy</gui> (<keyseq><key>Ctrl</key><key>C</key></keyseq>)"
+msgstr "<gui>Αντιγραφή</gui> (<keyseq><key>Ctrl</key><key>C</key></keyseq>)"
 
-#: C/customize.page:47(p)
-msgid "Use Inches."
-msgstr "Χρήση Ίντσας."
+#. (itstool) path: section/p
+#: C/select.page:105
+msgid ""
+"Copies selected objects to the clipboard without deleting them. The objects "
+"are then available for pasting back into the current document or another "
+"document."
+msgstr ""
+"Αντιγράφει τα επιλεγμένα αντικείμενα στο πρόχειρο, χωρίς τη διαγραφή τους. "
+"Τα αντικείμενα στη συνέχεια είναι διαθέσιμα για την επικόλληση στο τρέχον "
+"έγγραφο ή άλλο έγγραφο."
 
-#: C/customize.page:50(gui)
-msgid "Millimeters"
-msgstr "Χιλιοστά"
+#. (itstool) path: section/title
+#: C/select.page:112
+msgid "<gui>Paste</gui> (<keyseq><key>Ctrl</key><key>V</key></keyseq>)"
+msgstr "<gui>Επικόλληση</gui> (<keyseq><key>Ctrl</key><key>V</key></keyseq>)"
 
-#: C/customize.page:51(p)
-msgid "Use Millimeters."
-msgstr "Χρήση Χιλιοστών."
+#. (itstool) path: section/p
+#: C/select.page:114
+msgid ""
+"Pastes objects from the clipboard into the current document. <app>gLabels</"
+"app> can only paste objects from another <app>gLabels</app> document."
+msgstr ""
+"Επικολλά αντικείμενα από το πρόχειρο στο τρέχον έγγραφο. Το <app>gLabels</"
+"app> μπορεί να επικολλήσει μόνο αντικείμενα από ένα άλλο <app>gLabels</app> "
+"έγγραφο."
 
-#: C/customize.page:54(p)
-msgid "Default: <gui>Inches</gui>."
-msgstr "Προεπιλεγμένο: <gui>Ίντσες</gui>."
+#. (itstool) path: section/title
+#: C/select.page:121
+msgid "<gui>Delete</gui> (<key>Del</key>)"
+msgstr "<gui>Διαγραφή</gui> (<key>Del</key>)"
 
-#: C/customize.page:58(title)
-msgid "Default page size"
-msgstr "Προκαθορισμένο μέγεθος σελίδας"
+#. (itstool) path: section/p
+#: C/select.page:123
+msgid "Deletes selected objects without placing them on the clipboard."
+msgstr ""
+"Διαγράφει τα επιλεγμένα αντικείμενα χωρίς να τα τοποθετεί στο πρόχειρο."
 
-#: C/customize.page:59(p)
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/skipfields.page:45
+msgctxt "_"
 msgid ""
-"Use this radio button group to specify your prefered page size. This will "
-"make it quicker for you to locate media types when creating a new label or "
-"card."
+"external ref='figures/skip-fields-screenshot.png' "
+"md5='eef4a81f48546bd7d3753656a3df9cb7'"
 msgstr ""
-"Χρησιμοποιήστε αυτή την ομάδα κουμπιών επιλογής για να καθορίσετε το μέγεθος "
-"της σελίδας της αρεσκείας σας. Αυτό θα καταστήσει πιο γρήγορο τον εντοπισμό "
-"των τύπων μέσων για εσάς όταν δημιουργείτε μια νέα ετικέτα ή κάρτα."
+"external ref='figures/skip-fields-screenshot.png' "
+"md5='eef4a81f48546bd7d3753656a3df9cb7'"
 
-#: C/customize.page:64(gui)
-msgid "US Letter"
-msgstr "US Letter"
-
-#: C/customize.page:65(p)
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/skipfields.page:53
+msgctxt "_"
 msgid ""
-"Most of your media will be of the US Letter page size (8.5 x 11 inches)."
+"external ref='figures/skip-fields-output.png' "
+"md5='b64d1a7fdf0d37e9a6d93f0bc2f9fa0d'"
 msgstr ""
-"Τα περισσότερα από τα μέσα σας θα είναι στο μέγεθος σελίδας US Letter (8.5 x "
-"11 ίντσες)."
+"external ref='figures/skip-fields-output.png' "
+"md5='b64d1a7fdf0d37e9a6d93f0bc2f9fa0d'"
 
-#: C/customize.page:68(gui)
-msgid "ISO A4"
-msgstr "ISO A4"
+#. (itstool) path: info/desc
+#: C/skipfields.page:9
+msgid "How to skip blank address lines when doing a document merge."
+msgstr ""
+"Πως να παρακάμψετε τις κενές γραμμές διευθύνσεων όταν κάνετε μια συγχώνευση "
+"εγγράφου."
 
-#: C/customize.page:69(p)
-msgid "Most of your media will be of the ISO A4 page size (210 x 297 mm)."
+#. (itstool) path: page/title
+#: C/skipfields.page:25
+msgid "Skipping blank address lines"
+msgstr "Παράκαμψη κενών γραμμών διευθύνσεων"
+
+#. (itstool) path: page/p
+#: C/skipfields.page:27
+msgid ""
+"This feature can be best described by a simple example. In the following CSV "
+"file, column 5 (ADDR2) contains the second address line for each record. "
+"This field is empty in records 1 and 2, but not in record 3. (For this "
+"feature to work, the field must be completely empty -- any text, including "
+"spaces will defeat this feature.)"
 msgstr ""
-"Τα περισσότερα από τα μέσα σας θα είναι ISO A4 page μέγεθος σελίδας (210 x "
-"297 mm)."
+"Αυτό το χαρακτηριστικό μπορεί να περιγραφεί καλύτερα από ένα απλό "
+"παράδειγμα. Στο παρακάτω αρχείο CSV, στήλη 5 (ADDR2) περιέχεται δεύτερη "
+"γραμμή διευθύνσεων για κάθε εγγραφή. Το πεδίο αυτό είναι κενό στα βιβλία 1 "
+"και 2, αλλά όχι στο αρχείο 3. (Για να λειτουργήσει αυτό το χαρακτηριστικό, "
+"το πεδίο πρέπει να είναι εντελώς άδειο - κάθε κείμενοσυμπεριλαμβανομένων των "
+"διαστημάτων θα απενεργοποιήσει αυτή τη δυνατότητα.)"
 
-#: C/customize.page:72(p)
-msgid "Default: <gui>US Letter</gui>."
-msgstr "Προεπιλεγμένο: <gui>US Letter</gui>."
+#. (itstool) path: page/code
+#: C/skipfields.page:33
+#, no-wrap
+msgid ""
+"\n"
+"  LAST,FIRST,MI,ADDR1,ADDR2,CITY,STATE,ZIP\n"
+"  Summers,Joyce,,\"1630 Revello Dr\",,Sunnydale,CA,95037\n"
+"  McGarret,Steve,O,\"404 Piikoi Street\",,Honolulu,HI,96813\n"
+"  Kramer,Cosmo,,\"Apt 5B\",\"129 W. 81 St.\",\"New York\",NY,10024-7207\n"
+"  "
+msgstr ""
+"\n"
+"  LAST,FIRST,MI,ADDR1,ADDR2,CITY,STATE,ZIP\n"
+"  Summers,Joyce,,\"1630 Revello Dr\",,Sunnydale,CA,95037\n"
+"  McGarret,Steve,O,\"404 Piikoi Street\",,Honolulu,HI,96813\n"
+"  Kramer,Cosmo,,\"Apt 5B\",\"129 W. 81 St.\",\"New York\",NY,10024-7207\n"
+"  "
 
-#: C/customize.page:77(title)
-msgid "Object Defaults"
-msgstr "Εξ'ορισμού ιδιότητες αντικειμένου"
+#. (itstool) path: page/p
+#: C/skipfields.page:40
+msgid ""
+"In the following screenshot, a single multiline text object has been created "
+"to format these addresses. Notice that ${ADDR2} representing the second "
+"address line is on a line by itself. (Any additional text on this line, "
+"including spaces would defeat this feature.)"
+msgstr ""
+"Στο παρακάτω στιγμιότυπο, ένα μόνο αντικείμενο κειμένου πολλών γραμμών έχει "
+"δημιουργηθεί για να διαμορφώσετε αυτές τις διευθύνσεις. Παρατηρήστε ότι το "
+"${ADDR2} που αντιπροσωπεύει τη δεύτερη γραμμή διεύθυνσης είναι σε μια γραμμή "
+"από μόνη της. (Κάθε πρόσθετο κείμενο σε αυτή τη γραμμή συμπεριλαμβανομένων "
+"των διαστημάτων θα απενεργοποιήσει αυτή τη δυνατότητα.)"
 
-#: C/customize.page:80(title) C/createnew.page:39(title)
-msgid "Text"
-msgstr "Κείμενο"
+#. (itstool) path: media/p
+#: C/skipfields.page:46
+msgid "Multi-line address"
+msgstr "Διεύθυνση πολλαπλών γραμμών"
 
-#: C/customize.page:81(p)
+#. (itstool) path: page/p
+#: C/skipfields.page:49
 msgid ""
-"Use these controls to set the default properties of new text objects. These "
-"properties are:"
+"Printing this label results in the following output. Notice that the line "
+"containing the ${ADDR2} field is completely skipped for the first two "
+"records, without printing a blank line."
 msgstr ""
-"Χρησιμοποιήστε αυτά τα στοιχεία ελέγχου για να ορίσετε τις προεπιλεγμένες "
-"ιδιότητες των νέων αντικειμένων κειμένου. Οι ιδιότητες αυτές είναι:"
+"Η εκτύπωση αυτής της ετικέτας έχει ως αποτέλεσμα την ακόλουθη έξοδο. "
+"Παρατηρήστε ότι η γραμμή που περιέχει το ${ADDR2} πεδίο παραλείπεται εντελώς "
+"για τα δύο πρώτα βιβλία, χωρίς να εκτυπώσετε μια κενή γραμμή."
 
-#: C/customize.page:85(gui)
-msgid "Font"
-msgstr "Γραμματοσειρά"
+#. (itstool) path: media/p
+#: C/skipfields.page:54
+msgid "Output"
+msgstr "Αποτέλεσμα"
 
-#: C/customize.page:86(p)
-msgid ""
-"These controls are used to select font family and font size, and whether the "
-"font should bold or in italics."
-msgstr ""
-"Οι έλεγχοι αυτοί χρησιμοποιούνται για την επιλογή οικογένειας γραμματοσειράς "
-"και του μεγέθους γραμματοσειράς, καθώς και αν η γραμματοσειρά θα έχει έντονη "
-"γραφή ή με πλάγιους χαρακτήρες."
+#~| msgid ""
+#~| "@@image: 'figures/glabels-template-rect-label.png'; "
+#~| "md5=9c7ae1c1a888e1c9eefd19655d093971"
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/glabels-template-rect-label.png' "
+#~ "md5='9c7ae1c1a888e1c9eefd19655d093971'"
+#~ msgstr ""
+#~ "external ref='figures/glabels-template-rect-label.png' "
+#~ "md5='9c7ae1c1a888e1c9eefd19655d093971'"
+
+#~| msgid ""
+#~| "@@image: 'figures/glabels-template-circle-label.png'; "
+#~| "md5=841e36a1f92aeed01e8fbaacc67758f1"
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/glabels-template-circle-label.png' "
+#~ "md5='841e36a1f92aeed01e8fbaacc67758f1'"
+#~ msgstr ""
+#~ "external ref='figures/glabels-template-circle-label.png' "
+#~ "md5='841e36a1f92aeed01e8fbaacc67758f1'"
+
+#~| msgid ""
+#~| "@@image: 'figures/glabels-template-cd-label.png'; "
+#~| "md5=c7952ac1b26ecbfa53facfbbf6486841"
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/glabels-template-cd-label.png' "
+#~ "md5='c7952ac1b26ecbfa53facfbbf6486841'"
+#~ msgstr ""
+#~ "external ref='figures/glabels-template-cd-label.png' "
+#~ "md5='c7952ac1b26ecbfa53facfbbf6486841'"
+
+#~| msgid ""
+#~| "@@image: 'figures/layouts-cdlabel.png'; "
+#~| "md5=0c41a95dc82b5a426e934751faf86872"
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/layouts-cdlabel.png' "
+#~ "md5='0c41a95dc82b5a426e934751faf86872'"
+#~ msgstr ""
+#~ "external ref='figures/layouts-cdlabel.png' "
+#~ "md5='0c41a95dc82b5a426e934751faf86872'"
+
+#~| msgid ""
+#~| "@@image: 'figures/glabels-template-layout.png'; "
+#~| "md5=fe1c9652d5448b2e0ece086777d3a287"
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/glabels-template-layout.png' "
+#~ "md5='fe1c9652d5448b2e0ece086777d3a287'"
+#~ msgstr ""
+#~ "external ref='figures/glabels-template-layout.png' "
+#~ "md5='fe1c9652d5448b2e0ece086777d3a287'"
+
+#~ msgid "evins@snaught.com"
+#~ msgstr "evins@snaught.com"
+
+#~ msgid "mariobl@gnome.org"
+#~ msgstr "mariobl@gnome.org"
+
+#~ msgid "glabels <placeholder-1/>"
+#~ msgstr "glabels <placeholder-1/>"
+
+#~ msgid "${prefix}/share/libglabels-3.0/templates"
+#~ msgstr "${prefix}/share/libglabels-3.0/templates"
+
+#~ msgid "${XDG_CONFIG_HOME}/libglabels/templates"
+#~ msgstr "${XDG_CONFIG_HOME}/libglabels/templates"
+
+#~ msgid "${HOME}/.glabels"
+#~ msgstr "${HOME}/.glabels"
+
+#~ msgid ""
+#~ "\n"
+#~ "&lt;?xml version=\"1.0\"?&gt;\n"
+#~ "&lt;Glabels-templates&gt;\n"
+#~ "\n"
+#~ "  &lt;Template brand=\"Avery\" part=\"8160\" size=\"US-Letter\" "
+#~ "description=\"Mailing Labels\"&gt;\n"
+#~ "    &lt;Meta category=\"label\"/&gt;\n"
+#~ "    &lt;Meta category=\"mail\"/&gt;\n"
+#~ "    &lt;Meta product_url=\"http://www.avery.com/avery/en_us/\"/&gt;\n"
+#~ "    &lt;Label-rectangle id=\"0\" width=\"189pt\" height=\"72pt\" round="
+#~ "\"5pt\"&gt;\n"
+#~ "      &lt;Markup-margin size=\"5pt\"/&gt;\n"
+#~ "      &lt;Layout nx=\"3\" ny=\"10\" x0=\"11.25pt\" y0=\"36pt\" dx=\"200pt"
+#~ "\" dy=\"72pt\"/&gt;\n"
+#~ "    &lt;/Label-rectangle&gt;\n"
+#~ "  &lt;/Template&gt;\n"
+#~ "\n"
+#~ "&lt;/Glabels-templates&gt;"
+#~ msgstr ""
+#~ "\n"
+#~ "&lt;?xml version=\"1.0\"?&gt;\n"
+#~ "&lt;Glabels-templates&gt;\n"
+#~ "\n"
+#~ "  &lt;Template brand=\"Avery\" part=\"8160\" size=\"US-Letter\" "
+#~ "description=\"Mailing Labels\"&gt;\n"
+#~ "    &lt;Meta category=\"label\"/&gt;\n"
+#~ "    &lt;Meta category=\"mail\"/&gt;\n"
+#~ "    &lt;Meta product_url=\"http://www.avery.com/avery/en_us/\"/&gt;\n"
+#~ "    &lt;Label-rectangle id=\"0\" width=\"189pt\" height=\"72pt\" round="
+#~ "\"5pt\"&gt;\n"
+#~ "      &lt;Markup-margin size=\"5pt\"/&gt;\n"
+#~ "      &lt;Layout nx=\"3\" ny=\"10\" x0=\"11.25pt\" y0=\"36pt\" dx=\"200pt"
+#~ "\" dy=\"72pt\"/&gt;\n"
+#~ "    &lt;/Label-rectangle&gt;\n"
+#~ "  &lt;/Template&gt;\n"
+#~ "\n"
+#~ "&lt;/Glabels-templates&gt;"
+
+#~ msgid "<span translate=\"no\">Template</span> Node"
+#~ msgstr "Κόμβος <span translate=\"no\">Template</span>"
+
+#~ msgid "brand"
+#~ msgstr "μάρκα"
+
+#~ msgid "part"
+#~ msgstr "είδος"
+
+#~ msgid "size"
+#~ msgstr "μέγεθος"
+
+#~ msgid "description"
+#~ msgstr "περιγραφή"
+
+#~ msgid "_description"
+#~ msgstr "_περιγραφή"
+
+#~ msgid "width"
+#~ msgstr "πλάτος"
 
-#: C/customize.page:90(gui) C/customize.page:110(gui)
-#: C/customize.page:122(gui)
-msgid "Color"
-msgstr "Χρώμα"
+#~ msgid "height"
+#~ msgstr "ύψος"
 
-#: C/customize.page:91(p)
-msgid "This control selects the default text color."
-msgstr "Ο έλεγχος αυτός επιλέγει τη προεπιλογή του χρώματος του κειμένου."
+#~ msgid "equiv"
+#~ msgstr "αντίστοιχο"
 
-#: C/customize.page:94(gui)
-msgid "Alignment"
-msgstr "Στοίχιση"
+#~ msgid "<span translate=\"no\">Meta</span> Node"
+#~ msgstr "Κόμβος <span translate=\"no\">Meta</span>"
 
-#: C/customize.page:95(p)
-msgid ""
-"These controls are used to select the default text alignment (left, center "
-"or right)."
-msgstr ""
-"Οι έλεγχοι αυτοί χρησιμοποιούνται για να επιλέξετε προεπιλογή της στοίχισης "
-"του κειμένου (αριστερά, κέντρο ή δεξιά)."
+#~ msgid "category"
+#~ msgstr "κατηγορία"
 
-#: C/customize.page:101(title) C/createnew.page:56(title)
-msgid "Line"
-msgstr "Γραμμή"
+#~ msgid "label"
+#~ msgstr "ετικέτα"
 
-#: C/customize.page:102(p)
-msgid ""
-"Use these controls to set the default properties of lines and outlines of "
-"new objects. These properties are:"
-msgstr ""
-"Χρησιμοποιήστε αυτά τα στοιχεία ελέγχου για να ορίσετε τις προεπιλεγμένες "
-"ιδιότητες γραμμών και περιγραμμάτων των νέων αντικειμένων. Οι ιδιότητες "
-"αυτές είναι:"
+#~ msgid "round-label"
+#~ msgstr "στρογγυλή-ετικέτα"
 
-#: C/customize.page:106(gui)
-msgid "Width"
-msgstr "Πλάτος"
+#~ msgid "elliptical-label"
+#~ msgstr "ελλειπτικη-ετικέτα"
 
-#: C/customize.page:107(p)
-msgid "This control selects the default line width."
-msgstr "Ο έλεγχος αυτός επιλέγει τη προεπιλογή του πλάτους της γραμμής."
+#~ msgid "square-label"
+#~ msgstr "τετράγωνη-ετικέτα"
 
-#: C/customize.page:111(p)
-msgid "This control selects the default line color."
-msgstr "Ο έλεγχος αυτός επιλέγει τη προεπιλογή του χρώματος της γραμμής."
+#~ msgid "rectangle-label"
+#~ msgstr "παραλληλόγραμμη-ετικέτα"
 
-#: C/customize.page:117(title)
-msgid "Fill"
-msgstr "Γέμισμα"
+#~ msgid "card"
+#~ msgstr "κάρτα"
 
-#: C/customize.page:118(p)
-msgid ""
-"Use this control to set the default fill property of new objects. This "
-"property is:"
-msgstr ""
-"Χρησιμοποιήστε αυτά τα στοιχεία ελέγχου για να ορίσετε τη προεπιλεγμένη "
-"ιδιότητα γεμίσματος των νέων αντικειμένων κειμένου. Η ιδιότητα αυτή είναι:"
+#~ msgid "business-card"
+#~ msgstr "επαγγελματική κάρτα"
 
-#: C/customize.page:123(p)
-msgid "This control selects the default fill color."
-msgstr "Ο έλεγχος αυτός επιλέγει τη προεπιλογή του χρώματος γεμίσματος."
+#~ msgid "media"
+#~ msgstr "μέσο"
 
-#: C/createnew.page:9(desc)
-msgid "Create new objects within your document."
-msgstr "Δημιουργήστε νέα αντικείμενα μέσα στο έγγραφό σας."
+#~ msgid "mail"
+#~ msgstr "αλληλογραφία"
 
-#: C/createnew.page:25(title)
-msgid "To create new objects"
-msgstr "Για να δημιουργήσετε νέα αντικείμενα"
+#~ msgid "foldable"
+#~ msgstr "αναδιπλούμενο"
 
-#: C/createnew.page:27(p)
-msgid ""
-"Objects are created by choosing the appropriate selection under the "
-"<guiseq><gui>Objects</gui><gui>Create Object</gui></guiseq> submenu or the "
-"<gui>Drawing Toolbar</gui>. This will place the display area into object "
-"creation mode as indicated by its cursor. To return to the default object "
-"selection mode without creating an object, choose <guiseq><gui>Objects</"
-"gui><gui>Select Mode</gui></guiseq>. This will return the display area's "
-"cursor to the default selection arrow."
-msgstr ""
-"Τα αντικείμενα δημιουργούνται επιλέγοντας την κατάλληλη επιλογή στο υπομενού "
-"<guiseq><gui>Αντικείμενα</gui><gui>Δημιουργία αντικειμένου</gui></guiseq> ή "
-"στο <gui>Εργαλεία Σχεδίασης</gui>. Αυτό θα θέσει την περιοχή της οθόνης σε "
-"λειτουργία δημιουργίας αντικειμένων, όπως υποδεικνύεται από το δρομέα του. "
-"Για να επιστρέψετε στην προεπιλεγμένη λειτουργία επιλογής αντικειμένου, "
-"χωρίς να δημιουργήσετε ένα αντικείμενο, επιλέξτε <guiseq><gui>Αντικείμενα</"
-"gui><gui>Λειτουργία Επιλογής</gui></guiseq>. Αυτό θα επιστρέψει τον κέρσορα "
-"της οθόνης στο βέλος προεπιλογής."
+#~ msgid "photo"
+#~ msgstr "φωτογραφία"
 
-#: C/createnew.page:35(p)
-msgid "The following describes the object creation mode for each object type:"
-msgstr ""
-"Το ακόλουθο περιγράφει τη λειτουργία δημιουργίας αντικειμένου για κάθε τύπο "
-"αντικειμένου:"
+#~ msgid "product_url"
+#~ msgstr "url_προϊόντος"
 
-#: C/createnew.page:40(p)
-msgid ""
-"Click the desired location of the upper left corner of the text object. New "
-"text objects are initialized with the string \"Text.\" To change this text, "
-"or other properties, see <link xref=\"editprop\"/>."
-msgstr ""
-"Κάντε κλικ στην επιθυμητή θέση της επάνω αριστερής γωνίας του αντικειμένου "
-"του κειμένου. Τα νέα αντικείμενα κειμένου αρχικοποιούνται με τη συμβολοσειρά "
-"\"Κείμενο.\" Για να αλλάξετε αυτό το κείμενο, ή άλλες ιδιότητες, δείτε το "
-"<link xref=\"editprop\"/>."
+#~ msgid "id"
+#~ msgstr "id"
 
-#: C/createnew.page:47(title)
-msgid "Box"
-msgstr "Πλαίσιο"
+#~ msgid "round"
+#~ msgstr "στρογγυλή"
 
-#: C/createnew.page:48(p)
-msgid ""
-"Click the desired location of the upper left corner of the box object and "
-"drag to the desired location of the lower right corner. If you simply click "
-"in a single location, a square box will be created. To change properties of "
-"the box object, see <link xref=\"editprop\"/>."
-msgstr ""
-"Κάντε κλικ στην επιθυμητή θέση της επάνω αριστερής γωνίας του αντικειμένου "
-"πλαίσιο και σύρετε στην επιθυμητή θέση της κάτω δεξιά γωνίας. Αν απλά κάνετε "
-"κλικ σε μία θέση, ένα τετράγωνο κουτί θα δημιουργηθεί. Για να αλλάξετε τις "
-"ιδιότητες του αντικειμένου κουτί, δείτε το <link xref=\"editprop\"/>."
+#~ msgid "x_waste"
+#~ msgstr "x_waste"
 
-#: C/createnew.page:57(p)
-msgid ""
-"Click the desired location of one end of the line object and drag to the "
-"desired location of the other end. If you simply click in a single location, "
-"a diagonal line will be created. To change properties of the line object, "
-"see <link xref=\"editprop\"/>."
-msgstr ""
-"Κάντε κλικ στην επιθυμητή θέση από το ένα άκρο της γραμμής του αντικειμένου "
-"και σύρετε στην επιθυμητή θέση του άλλου άκρου. Αν απλά κάνετε κλικ σε μία "
-"θέση, μια διαγώνια γραμμή θα δημιουργηθεί. Για να αλλάξετε τις ιδιότητες του "
-"αντικειμένου γραμμής, δείτε το <link xref=\"editprop\"/>."
+#~ msgid "y_waste"
+#~ msgstr "y_waste"
 
-#: C/createnew.page:65(title)
-msgid "Ellipse"
-msgstr "Έλλειψη"
+#~ msgid "waste"
+#~ msgstr "waste"
 
-#: C/createnew.page:66(p)
-msgid ""
-"Click the desired location of the upper left corner of the ellipse object "
-"and drag to the desired location of the lower right corner. If you simply "
-"click in a single location, a circle will be created. To change properties "
-"of the ellipse object, see <link xref=\"editprop\"/>."
-msgstr ""
-"Κάντε κλικ στην επιθυμητή θέση της επάνω αριστερής γωνίας του αντικειμένου "
-"έλλειψης και σύρετε στην επιθυμητή θέση της κάτω δεξιά γωνίας. Αν απλά "
-"κάνετε κλικ σε μία θέση, θα δημιουργηθεί ένας κύκλος. Για να αλλάξετε τις "
-"ιδιότητες του αντικειμένου έλλειψης, δείτε το <link xref=\"editprop\"/>."
+#~ msgid "radius"
+#~ msgstr "ακτίνα"
 
-#: C/createnew.page:74(title)
-msgid "Image"
-msgstr "Εικόνα"
+#~ msgid "<span translate=\"no\">Label-cd</span> Node"
+#~ msgstr "Κόμβος <span translate=\"no\">Label-cd</span>"
 
-#: C/createnew.page:75(p)
-msgid ""
-"Click the desired location of the upper left corner of the image object and "
-"drag to the desired location of the lower right corner. If you simply click "
-"in a single location, a square will be created. New image objects are "
-"initialized with a simple checkerboard image. To change this image, or other "
-"properties of the image object, see <link xref=\"editprop\"/>."
-msgstr ""
-"Κάντε κλικ στην επιθυμητή θέση της επάνω αριστερής γωνίας του αντικειμένου "
-"της εικόνας και σύρετε στην επιθυμητή θέση της κάτω δεξιά γωνίας. Αν απλά "
-"κάνετε κλικ σε μία θέση, ένα τετράγωνο θα δημιουργηθεί. Τα νέα αντικείμενα "
-"εικόνας αρχικοποιούνται με μια απλό εικόνα σκακιέρας. Για να αλλάξετε αυτή "
-"την εικόνα, ή άλλες ιδιότητες του αντικειμένου εικόνας, δείτε το <link xref="
-"\"editprop\"/>."
+#~ msgid "hole"
+#~ msgstr "τρύπα"
 
-#: C/createnew.page:85(title)
-msgid "Barcode"
-msgstr "Barcode γραμμικός κώδικας"
+#~ msgid "CD label parameters"
+#~ msgstr "Παράμετροι ετικέτας CD"
 
-#: C/createnew.page:86(p)
-msgid ""
-"Click the desired location of the upper left corner of the barcode object. "
-"New barcode objects are initialized to a POSTNET barcode with representative "
-"data. To change data and properties of the barcode object, see <link xref="
-"\"editprop\"/>."
-msgstr ""
-"Κάντε κλικ στην επιθυμητή θέση της επάνω αριστερής γωνίας του αντικειμένου "
-"barcode. Τα νέα αντικείμενα barcode αρχικοποιούνται σε POSTNET barcode με "
-"αντιπροσωπευτικά στοιχεία. Για να αλλάξετε τα δεδομένα και τις ιδιότητες του "
-"αντικειμένου barcode, δείτε το <link xref=\"editprop\"/>."
+#~ msgid "<span translate=\"no\">Markup</span> Nodes"
+#~ msgstr "Κόμβος <span translate=\"no\">Markup</span>"
 
-#: C/basicusage.page:9(desc)
-msgid "Handling files and quit the application."
-msgstr "Διαχείριση αρχείων και έξοδος της εφαρμογής."
+#~ msgid "x1"
+#~ msgstr "x1"
 
-#: C/basicusage.page:25(title)
-msgid "Basic usage"
-msgstr "Βασική χρήση"
+#~ msgid "y1"
+#~ msgstr "y1"
 
-#: C/basicusage.page:28(title)
-msgid "To open a file"
-msgstr "Για το άνοιγμα ενός αρχείου"
+#~ msgid "x2"
+#~ msgstr "x2"
 
-#: C/basicusage.page:30(p)
-msgid ""
-"To open a file, choose <guiseq><gui>File</gui><gui>Open</gui></guiseq> to "
-"display the <gui>Open File</gui> dialog. Select the file that you want to "
-"open, then click <gui>OK</gui>. The file is displayed in the display area of "
-"the <app>gLabels</app> window."
-msgstr ""
-"Για να ανοίξετε ένα αρχείο, επιλέξτε <guiseq><gui>Αρχείο</gui><gui>Άνοιγμα</"
-"gui></guiseq> για να εμφανίσετε το παράθυρο <gui>Άνοιγμα Αρχείου</gui>. "
-"Επιλέξτε το αρχείο που θέλετε να ανοίξετε, κάντε κλικ στο <gui>ΟΚ</gui> . Το "
-"αρχείο εμφανίζεται στην οθόνη του παράθυρο <app>gLabels</app>."
+#~ msgid "y2"
+#~ msgstr "y2"
 
-#: C/basicusage.page:37(p)
-msgid ""
-"You can also open multiple files in <app>gLabels</app>. The application "
-"creates a separate application window for each open file."
-msgstr ""
-"Μπορείτε επίσης να ανοίξετε πολλά αρχεία στο <app>gLabels</app>. Η εφαρμογή "
-"δημιουργεί ένα ξεχωριστό παράθυρο της εφαρμογής για κάθε ανοιχτό αρχείο."
+#~ msgid "x0"
+#~ msgstr "x0"
 
-#: C/basicusage.page:41(p)
-msgid ""
-"The application records the paths and filenames of the most recent files "
-"that you have edited and displays the files as menu items on the "
-"<guiseq><gui>File</gui><gui>Recent Files</gui></guiseq> menu."
-msgstr ""
-"Η εφαρμογή καταγράφει τις διαδρομές και τα ονόματα των πιο πρόσφατων αρχείων "
-"που έχετε επεξεργαστεί και εμφανίζει τα αρχεία και τα στοιχεία του μενού στο "
-"<guiseq><gui>Αρχείο</gui><gui>Πρόσφατα αρχεία</gui></guiseq> μενού."
+#~ msgid "y0"
+#~ msgstr "y0"
 
-#: C/basicusage.page:48(title)
-msgid "To close a file"
-msgstr "Για το κλείσιμο ενός αρχείου"
+#~ msgid "w"
+#~ msgstr "w"
 
-#: C/basicusage.page:50(p)
-msgid ""
-"To close the current document, choose <guiseq><gui>File</gui><gui>Close</"
-"gui></guiseq> to close the application window. If the current document is "
-"modified, a confirmation dialog will be presented, allowing you to save the "
-"document or cancel the command. If the window being closed is the only open "
-"window, <app>gLabels</app> will exit."
-msgstr ""
-"Για να κλείσετε το τρέχον έγγραφο, επιλέξτε <guiseq><gui>Αρχείο</"
-"gui><gui>Κλείσιμο</gui></guiseq> για να κλείσετε το παράθυρο της εφαρμογής. "
-"Εάν το τρέχον έγγραφο έχει τροποποιηθεί, ένα πλαίσιο διαλόγου επιβεβαίωσης "
-"θα παρουσιασθεί, επιτρέποντας σας να αποθηκεύσετε το έγγραφο ή να ακυρώσετε "
-"την εντολή. Αν το παράθυρο που κλείνει είναι το μόνο ανοικτό παράθυρο, Το "
-"<app>gLabels</app> θα κλείσει."
+#~ msgid "h"
+#~ msgstr "h"
 
-#: C/basicusage.page:60(title)
-msgid "To save a file"
-msgstr "Για την αποθήκευση ενός αρχείου"
+#~ msgid "r"
+#~ msgstr "r"
 
-#: C/basicusage.page:62(p)
-msgid "You can save files in the following ways:"
-msgstr "Μπορείτε να αποθηκεύετε αρχεία με τους εξής τρόπους:"
+#~ msgid "<span translate=\"no\">Layout</span> Node"
+#~ msgstr "Κόμβος <span translate=\"no\">Layout</span>"
 
-#: C/basicusage.page:66(p)
-msgid ""
-"To save changes to an existing file, choose <guiseq><gui>File</"
-"gui><gui>Save</gui></guiseq>."
-msgstr ""
-"Για να αποθηκεύσετε τις αλλαγές σε ένα υπάρχον αρχείο, επιλέξτε "
-"<guiseq><gui>Αρχείο</gui><gui>Αποθήκευση</gui></guiseq>."
+#~ msgid "nx"
+#~ msgstr "nx"
 
-#: C/basicusage.page:73(p)
-msgid ""
-"To save a new file or to save an existing file under a new filename, choose "
-"<guiseq><gui>File</gui><gui>Save As</gui></guiseq>. Enter a name for the "
-"file in the <gui>Save As</gui> dialog box, then click <gui>OK</gui>."
-msgstr ""
-"Για να αποθηκεύσετε ένα νέο αρχείο ή να αποθηκεύσετε ένα υπάρχον αρχείο υπό "
-"ένα νέο όνομα αρχείου, επιλέξτε <guiseq><gui>Αρχείο</gui><gui>Αποθήκευση ως</"
-"gui></guiseq>. Πληκτρολογήστε ένα όνομα για το αρχείο στο παράθυρο διαλόγου "
-"<gui>Αποθήκευση ως</gui>, στη συνέχεια κάντε κλικ στο <gui>ΟΚ</gui>."
+#~ msgid "ny"
+#~ msgstr "ny"
 
-#: C/basicusage.page:84(title)
-msgid "To quit <app>gLabels</app>"
-msgstr "Για την έξοδο από το <app>gLabels</app>"
+#~ msgid "dx"
+#~ msgstr "dx"
 
-#: C/basicusage.page:86(p)
-msgid ""
-"To quit <app>gLabels</app>, choose <guiseq><gui>File</gui><gui>Quit</gui></"
-"guiseq>. This is equivalent to closing all open windows. See <link xref="
-"\"basicusage#closefile\"/>."
-msgstr ""
-"Για την έξοδο από το <app>gLabels</app>, επιλέξετε <guiseq><gui>Αρχείο</"
-"gui><gui>Έξοδος</gui></guiseq>. Αυτό είναι ισοδύναμο με το κλείσιμο όλων των "
-"ανοιχτών παραθύρων. Δείτε το <link xref=\"basicusage#closefile\"/>."
+#~ msgid "dy"
+#~ msgstr "dy"
 
-#: C/about.page:9(desc)
-msgid "Information about <app>gLabels</app>."
-msgstr "Πληροφορίες για το <app>gLabels</app>."
+#~ msgid "<span translate=\"no\">Layout</span> Parameters"
+#~ msgstr "<span translate=\"no\">Layout</span> Παράμετροι"
 
-#: C/about.page:25(title)
-msgid "About <app>gLabels</app>"
-msgstr "Περί του <app>gLabels</app>"
+#~ msgid "Points"
+#~ msgstr "Πόντοι"
 
-#: C/about.page:27(p)
-msgid ""
-"<app>gLabels</app> was written by <link href=\"mailto:evins@snaught.com"
-"\">Jim Evins</link>. To find more information about <app>gLabels</app>, "
-"please visit the <link href=\"http://glabels.org\" type=\"http"
-"\"><app>gLabels</app> Web page</link>."
-msgstr ""
-"Το <app>gLabels</app> γράφτηκε από τον <link href=\"mailto:evins@snaught.com"
-"\">Jim Evins</link>. Για να βρείτε περισσότερες πληροφορίες σχετικά με το "
-"<app>gLabels</app>, παρακαλώ επισκεφθείτε την <link href=\"http://glabels.org"
-"\" type=\"http\">ιστοσελίδα του <app>gLabels</app></link>."
+#~ msgid "Inches"
+#~ msgstr "Ίντσες"
 
-#: C/about.page:31(p)
-msgid ""
-"To report a bug or make a suggestion regarding this application or this "
-"manual, follow the directions at the <link href=\"http://glabels.org/contact/"
-"\" type=\"http\"><app>gLabels</app> Contact Page</link>."
-msgstr ""
-"Για να αναφέρετε ένα σφάλμα ή να κάνετε μια πρόταση σχετικά με την εφαρμογή "
-"ή αυτό το εγχειρίδιο, ακολουθήστε τις οδηγίες στο <link href=\"http://"
-"glabels.org/contact/\" type=\"http\">Σελίδα Επικοινωνίας του <app>gLabels</"
-"app></link>."
+#~ msgid "US Letter"
+#~ msgstr "US Letter"
 
-#: C/about.page:37(p)
-msgid ""
-"This program is distributed under the terms of the GNU General Public "
-"license as published by the Free Software Foundation; either version 3 of "
-"the License, or (at your option) any later version. A copy of this license "
-"can be found at this <link href=\"ghelp:gpl\" type=\"help\">link</link>, or "
-"in the file COPYING included with the source code of this program."
-msgstr ""
-"Αυτό το πρόγραμμα διανέμεται υπό τους όρους της GNU General Public license "
-"όπως έχει δημοσιευτεί από το Ίδρυμα Ελεύθερου λογισμικού είτε τηn 3η έκδοση "
-"της άδειας, είτε (κατ επιλογή σας) οποιασδήποτε νεότερης έκδοσης. Μπορείτε "
-"να βρείτε αντίγραφο αυτής της άδειας στον ακόλουθο <link href=\"ghelp:gpl\" "
-"type=\"help\">link</link>, ή στο αρχείο COPYING που περιλαμβάνεται στον "
-"πηγαίο κώδικα αυτού του προγράμματος."
+#~ msgid "ISO A4"
+#~ msgstr "ISO A4"
 
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/index.page:0(None)
-msgid "translator-credits"
-msgstr ""
-"Ελληνική μεταφραστική ομάδα GNOME\n"
-" Δημήτρης Σπίγγος <dmtrs32@gmail.com>, 2013\n"
-" Κωνσταντίνος Χόρτης <cograss@yahoo.com>, 2012\n"
-"Για περισσότερα δείτε http://www.gnome.gr/."
+#~ msgid "Font"
+#~ msgstr "Γραμματοσειρά"
+
+#~ msgid "Color"
+#~ msgstr "Χρώμα"
+
+#~ msgid "Width"
+#~ msgstr "Πλάτος"
index 8a7c6476bb12f04d778278ea7bf16a79ceb2bf40..adac5f8df8fe4e8ada28e606fab97e5762c1c763 100644 (file)
@@ -2,8 +2,8 @@
 <page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" id="index" xml:lang="el">
 
   <info>
-    <title type="link">gLabels label and business card designer</title>
-    <title type="text">gLabels label and business card designer</title>
+    <title type="link">Σχεδιαστής ετικετών και επιχειρηματικών καρτών gLabels</title>
+    <title type="text">Σχεδιαστής ετικετών και επιχειρηματικών καρτών gLabels</title>
     <revision pkgversion="3.0" version="0.1" date="2010-05-04" status="incomplete"/>
     <credit type="author">
       <name>Jim Evins</name>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
   <title><media type="image" mime="image/png" src="figures/glabels-logo.png">λογότυπος του gLabels</media> Εγχειρίδιο του gLabels</title>
index d26772358000546eb6d3782e1b19dde10fedbbf0..0bf5452e76082045595cf65a32a851f912b8ff60 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
     <title>Για να αλλάξετε τις ιδιότητες ετικέτας</title>
 
-      <p>To change the media type and/or orientation of a label, choose
-        <guiseq><gui>File</gui>
-        <gui>Properties</gui></guiseq> to display the
-        <gui>Label properties</gui> dialog.  Select the
-        new media type and orientation for the document, then click
-        <gui>OK</gui>.</p>
+      <p>Για να αλλάξετε τον τύπο μέσων και/ή τον προσανατολισμό της ετικέτας, επιλέξτε <guiseq><gui>Αρχείο</gui><gui>Ιδιότητες</gui></guiseq> για να εμφανίσετε τον διάλογο <gui>Ιδιότητες ετικέτας</gui> . Επιλέξτε τον νέο τύπο μέσων και τον προσανατολισμό για το έγγραφο, έπειτα πατήστε στο <gui>Εντάξει</gui>.</p>
 
 </page>
index bf2a97eb80e74c389f0ed7f16496fd5e31525193..3cd90ba719615425088cfcc7aa4dc58c9780a6a6 100644 (file)
@@ -5,6 +5,18 @@
     <link type="seealso" xref="index"/>
     <revision pkgversion="2.30" version="0.1" date="2009-12-28" status="draft"/>
     <desc>Νομικές πληροφορίες.</desc>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
   <title>Άδεια χρήσης</title>
   <p>Μπορείτε ελεύθερα:</p>
   <terms>
     <item>
-      <title><em>To share</em></title>
+      <title><em>Για να μοιραστείτε</em></title>
       <p>Να αντιγράψετε, να διανείμετε και να μεταδόσετε το έργο.</p>
     </item>
     <item>
-      <title><em>To remix</em></title>
+      <title><em>Για να τροποποιήσετε</em></title>
       <p>Να προσαρμόσετε το έργο.</p> 
     </item>
   </terms>
   <p>Υπό τους εξής όρους:</p>
   <terms>
     <item>
-      <title><em>Attribution</em></title>
+      <title><em>Απόδοση</em></title>
       <p>Πρέπει να αναφέρετε την πηγή του έργου με τον τρόπο που καθορίζεται από το δημιουργό του ή αυτόν που παρέχει την άδεια (αλλά όχι με τρόπο που να εννοεί ότι εγκρίνουν εσάς ή τη δική σας χρήση του έργου).</p>
     </item>
     <item>
-      <title><em>Share Alike</em></title>
+      <title><em>Παρόμοια διανομή</em></title>
       <p>Αν μετατρέψετε, μετασχηματίσετε ή επεκτείνετε αυτό το έργο, μπορείτε να αναδιανείμετε το αποτέλεσμα υπό την ίδια, παρόμοια ή συμβατή άδεια χρήσης.</p>
     </item>
   </terms>
index 9043b2b141604d867ed6a548a3dc0343730d9f44..910f55d3e313aa1de3d6dd377834e92a987bf9d9 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
   <title>Χειροκίνητη δημιουργία νέων προτύπων</title>
       </tr>
       <tr>
         <td its:translate="no"><p><file>${XDG_CONFIG_HOME}/libglabels/templates</file></p></td>
-        <td><p>User defined templates created with the <app>gLabels</app> <gui>Template Designer</gui>.
-            <em>Do not put manually created templates in this directory.</em></p>
+        <td><p>Καθοριζόμενα από τον χρήστη πρότυπα με το <app>gLabels</app><gui>Σχεδιαστής προτύπου</gui>. <em>Μην βάζετε χειροκίνητα δημιουργηθέντα πρότυπα σε αυτόν τον κατάλογο.</em></p>
             <p>Εάν το <file>${XDG_CONFIG_HOME}</file> δεν έχει ορισθεί, είναι εξ ορισμού το <file>${HOME}/.config</file>.</p></td>
       </tr>
       <tr>
         <td its:translate="no"><p><file>${HOME}/.glabels</file></p></td>
-        <td><p>User defined templates that have been created manually should be placed in this
-            directory.
-            Older versions of the <app>gLabels</app> <gui>Template Designer</gui> (prior to 3.0)
-            would also put templates in this directory.</p></td>
+        <td><p>Καθοριζόμενα από το χρήστη πρότυπα που έχουν δημιουργηθεί χειροκίνητα θα πρέπει να τοποθετούνται σε αυτόν τον κατάλογο. Παλαιότερες εκδόσεις του <app>gLabels</app><gui>Σχεδιαστής προτύπου</gui> (πριν από 3.0) θα θέσουν επίσης να τοποθετούν τα πρότυπα σε αυτόν τον κατάλογο.</p></td>
       </tr>
     </table>
   </note>
         <p>Ένα φύλλο περιέχει μόνο ένα μέγεθος ετικέτας ή κάρτας (εάν ένα φύλλο περιέχει περισσότερα από ένα μεγέθη του στοιχείου, μπορεί να χωριστεί σε πολλά πρότυπα για την εκτύπωση πολλαπλών εκτυπώσεων)</p>
       </item>
       <item>
-        <p>Distances can be expressed in units of <code>pt</code>, <code>in</code>,
-         <code>mm</code>, <code>cm</code>, or <code>pc</code>.  For example:
-          "<code>1.0in</code>" or "<code>2.54cm</code>".  If no
-          units are specified, computer points (<code>pt</code>) will
-          be assumed (1 <em>pt</em> =
-          1/72 <em>in</em> = 0.352778 <em>mm</em>).
-          </p>
+        <p>Οι αποστάσεις μπορούν να εκφράζονται σε μονάδες <code>pt</code>, <code>in</code>, <code>mm</code>, <code>cm</code>, ή <code>pc</code>. Για παράδειγμα: "<code>1.0in</code>" ή "<code>2.54cm</code>". Αν δεν έχουν καθοριστεί μονάδες, θα χρησιμοποιηθούν οι στιγμές υπολογιστή (<code>pt</code>) (1 <em>pt</em> = 1/72 <em>in</em> = 0.352778 <em>mm</em>).</p>
       </item>
     </list>
   </section>
   <section id="template-file">
     <title>Αρχεία προτύπων</title>
 
-    <p>A template file contains a single <code>Glabels-templates</code> top-level
-    node.</p>
+    <p>Ένα αρχείο προτύπου περιέχει ένα μόνο κόμβο υψηλού επιπέδου<code>Glabels-templates</code>.</p>
 
     <code mime="text/xml">
 &lt;?xml version="1.0"?&gt;
 &lt;Glabels-templates&gt;
 
-   <var>...templates...</var>
+   <var its:translate="yes">...templates...</var>
 
 &lt;/Glabels-templates&gt;</code>
 
     <listing>
-      <title>Παράδειγμα Προτύπου</title>
-      <desc>Example <app>gLabels</app> template file containing a single
-            <code>Template</code> node.</desc>
+      <title>Παράδειγμα προτύπου</title>
+      <desc>Παράδειγμα ενός προτύπου <app>gLabels</app> που περιέχει ένα μόνο κόμβο <code>Template</code>.</desc>
       <code mime="text/xml" its:translate="no">
 &lt;?xml version="1.0"?&gt;
 &lt;Glabels-templates&gt;
   <!-- BEGIN Template Node  -->
   <!-- ******************** -->
   <section id="template-template-node">
-    <title><code>Template</code> Node</title>
+    <title>Κόμβος <code>Template</code></title>
 
-    <p>A <code>Template</code> node describes a single
-      stationery product.  It must contain one instance of any type of Label node
-      (<code>Label-rectangle</code>,
-      <code>Label-round</code>, or
-      <code>Label-cd</code>).</p>
+    <p>Ένας κόμβος <code>Template</code> περιγράφει ένα μόνο προϊόν γραφικής ύλης. Πρέπει να περιέχει ένα παράδειγμα για κάθε τύπο κόμβου ετικέτας (<code>Label-rectangle</code>, <code>Label-round</code>, ή <code>Label-cd</code>).</p>
 
     <table frame="all" rules="rows">
       <tr>
       </tr>
       <tr>
         <td its:translate="no"><p><code>size</code></p></td>
-        <td><p>Size of sheet.
-               E.g., "<code>US-Letter</code>", "<code>A4</code>", ...
-            </p></td>
+        <td><p>Το μέγεθος του φύλλου. Π.χ., "<code>US-Letter</code>", "<code>A4</code>", ...</p></td>
       </tr>
       <tr>
         <td its:translate="no"><p><code>description</code></p></td>
   <!-- BEGIN Meta Node      -->
   <!-- ******************** -->
   <section id="meta-template-node">
-    <title><code>Meta</code> Node</title>
+    <title>Κόμβος <code>Meta</code></title>
 
-    <p>A <code>Meta</code> node contains some additional
-         information about the template. A <code>Template</code>
-         node may contain zero or more <code>Meta</code> nodes.</p>
+    <p>Ένας κόμβος <code>Meta</code> περιέχει μερικές πρόσθετες πληροφορίες για το πρότυπο. Ένας κόμβος <code>Template</code> μπορεί να περιέχει μηδέν ή περισσότερους κόμβους <code>Meta</code>.</p>
 
     <table frame="all" rules="rows">
       <tr>
       </tr>
       <tr>
         <td its:translate="no"><p><code>category</code></p></td>
-        <td><p>A category for the template.
-            A template can belong to multiple categories by simply adding multiple
-            <code>Meta</code> nodes to the parent
-            <code>Template</code> node.
-            Template categories are used by the <app>gLabels</app> <gui>New Label
-            Dialog</gui> to filter the results of template searches.</p>
+        <td><p>Η κατηγορία του προτύπου. Ένα πρότυπο μπορεί να ανήκει σε πολλές κατηγορίες προσθέτοντας απλά πολλαπλούς κόμβους <code>Meta</code> στον μητρικό κόμβο <code>Template</code>. Οι κατηγορίες προτύπων χρησιμοποιούνται από το <app>gLabels</app><gui>Νέος διάλογος ετικέτας</gui> για να φιλτράρονται τα αποτελέσματα των αναζητήσεων προτύπου.</p>
 
             <p>Η τιμή αυτής της κατηγορίας πρέπει να ταιριάζει με ένα προκαθορισμένο αναγνωριστικό κατηγορίας που καθορίζεται στο αρχείο <file>${prefix}/libglabels-3.0/templates/categories.xml</file>. Επί του παρόντος τα καθορισμένα αναγνωριστικά κατηγοριών περιλαμβάνουν:</p>
             <list>
   <!-- BEGIN Label-rectangle Node -->
   <!-- ************************** -->
   <section id="template-label-rectangle-node">
-    <title><code>Label-rectangle</code> Node</title>
+    <title>Κόμβος <code>Label-rectangle</code></title>
 
-    <p>A <code>Label-rectangle</code> node describes the
-      dimensions of a single label or business card that is rectangular
-      in shape (may have rounded edges).</p>
+    <p>Ένας κόμβος <code>Label-rectangle</code> περιγράφει τις διαστάσεις μίας ετικέτας ή επιχειρηματικής κάρτας που είναι παραλληλόγραμμη στο σχήμα (μπορεί να έχει στρογγυλεμένες ακμές).</p>
 
     <table frame="all" rules="rows">
       <tr>
 
     <!-- ==== Figure ==== -->
     <figure>
-      <desc><code>Label-rectangle</code> parameters</desc>
+      <desc>Παράμετροι <code>Label-rectangle</code></desc>
       <media its:translate="no" type="image" src="figures/glabels-template-rect-label.png" mime="image/png" style="right">
         <p><code>Label-rectangle</code> parameters</p>
       </media>
   <!-- BEGIN Label-ellipse Node -->
   <!-- ************************ -->
   <section id="template-label-ellipse-node">
-    <title><code>Label-ellipse</code> Node</title>
+    <title>Κόμβος <code>Label-ellipse</code></title>
 
-    <p>A <code>Label-ellipse</code> node describes the
-      dimensions of a single label or business card that is elliptic
-      in shape.</p>
+    <p>Ένας κόμβος <code>Label-ellipse</code> περιγράφει τις διαστάσεις μίας ετικέτας ή επιχειρηματικής κάρτας που είναι ελλειπτική στο σχήμα.</p>
 
     <table frame="all" rules="rows">
       <tr>
 
     <!-- ==== Figure ==== -->
     <figure>
-      <desc><span>Label-ellipse</span> parameters</desc>
+      <desc>Παράμετροι <span>Label-ellipse</span></desc>
       <media type="image" src="figures/glabels-template-ellipse-label.png" mime="image/png" style="right">
-        <p><code>Label-ellipse</code> parameters</p>
+        <p>Παράμετροι <code>Label-ellipse</code></p>
       </media>
     </figure>
     <!-- ==== End of Figure ==== -->
   <!-- BEGIN Label-round Node -->
   <!-- ********************** -->
   <section id="template-label-round-node">
-    <title><code>Label-round</code> Node</title>
+    <title>Κόμβος <code>Label-round</code></title>
 
-    <p>A <code>Label-round</code> node describes the dimensions
-      of a simple round label (not a CD).</p>
+    <p>Ένας κόμβος <code>Label-round</code> περιγράφει τις διαστάσεις μιας απλής στρογγυλής ετικέτας (όχι ενός CD).</p>
 
     <table frame="all" rules="rows">
       <tr>
 
     <!-- ==== Figure ==== -->
     <figure>
-      <desc><code>Label-ellipse</code> parameters</desc>
+      <desc>Παράμετροι <code>Label-ellipse</code></desc>
       <media its:translate="no" type="image" src="figures/glabels-template-circle-label.png" mime="image/png" style="right">
         <p><code>Label-ellipse</code> parameters</p>
       </media>
   <!-- BEGIN Label-cd Node -->
   <!-- ******************* -->
   <section id="template-label-cd-node">
-    <title><code>Label-cd</code> Node</title>
+    <title>Κόμβος <code>Label-cd</code></title>
 
-    <p>A <code>Label-cd</code> node describes the dimensions
-      of a CD, DVD, or business card CD.</p>
+    <p>Ένας κόμβος <code>Label-cd</code> περιγράφει τις διαστάσεις ενός CD, DVD, CD επαγγελματικής κάρτας.</p>
 
     <table frame="all" rules="rows">
       <tr>
 
     <!-- ==== Figure ==== -->
     <figure>
-      <desc><code>Label-cd</code> parameters</desc>
+      <desc>Παράμετροι <code>Label-cd</code></desc>
       <media its:translate="no" type="image" src="figures/glabels-template-cd-label.png" mime="image/png" style="right">
         <p>CD label parameters</p>
       </media>
   <!-- BEGIN Markup Node -->
   <!-- ***************** -->
   <section id="template-markup">
-    <title><code>Markup</code> Nodes</title>
+    <title>Κόμβοι <code>Markup</code></title>
 
     <p>Τα πρότυπα μπορεί να περιέχουν προαιρετικά κόμβους σήμανσης. Αυτοί οι κόμβοι χρησιμοποιούνται για να περιγράψουν ένα απλό σύνολο των γραμμών σήμανσης που είναι ορατές στον καμβά σχεδίασης <app>glabels</app>, αλλά δεν είναι ορατές όταν εκτυπωθεί. Οι γραμμές αυτές μπορούν να αντιπροσωπεύουν περιθώρια, πτυχές, γραμμές κέντρου, ειδικές περιοχές, ή άλλες χρήσιμες υποδείξεις για τον χρήστη ενός προτύπου.</p>
 
     <!-- BEGIN Markup-margin Node -->
     <!-- ======================== -->
     <section id="template-markup-margin-node">
-      <title><code>Markup-margin</code> Node</title>
+      <title>Κόμβος <code>Markup-margin</code></title>
 
-      <p>A <code>Markup-margin</code> describes a margin along
-      all edges of a label.</p>
+      <p>Ένας <code>Markup-margin</code> περιγράφει ένα περιθώριο κατά μήκος όλων των άκρων μιας ετικέτας.</p>
 
       <table frame="all" rules="rows">
         <tr>
     <!-- BEGIN Markup-line Node -->
     <!-- ====================== -->
     <section id="template-markup-line-node">
-      <title><code>Markup-line</code> Node</title>
+      <title>Κόμβος <code>Markup-line</code></title>
 
-      <p>A <code>Markup-line</code> node describes a markup line.</p>
+      <p>Ένας κόμβος <code>Markup-line</code> περιγράφει μια γραμμή σήμανσης.</p>
 
       <table frame="all" rules="rows">
         <tr>
     <!-- BEGIN Markup-circle Node -->
     <!-- ======================== -->
     <section id="template-markup-circle-node">
-      <title><code>Markup-circle</code> Node</title>
+      <title>Κόμβος <code>Markup-circle</code></title>
 
-      <p>A <code>Markup-circle</code> describes a markup circle.</p>
+      <p>Ένα <code>Markup-circle</code> περιγράφει έναν κύκλο σήμανσης.</p>
 
       <table frame="all" rules="rows">
         <tr>
     <!-- BEGIN Markup-rect Node -->
     <!-- ====================== -->
     <section id="template-markup-rect-node">
-      <title><code>Markup-rect</code> Node</title>
+      <title>Κόμβος <code>Markup-rect</code></title>
 
-      <p>A <code>Markup-rect</code> describes a markup rectangle.</p>
+      <p>Ένα <code>Markup-rect</code> περιγράφει ένα παραλληλόγραμμο σήμανσης.</p>
 
       <table frame="all" rules="rows">
         <tr>
     <!-- BEGIN Markup-ellipse Node -->
     <!-- ========================= -->
     <section id="template-markup-ellipse-node">
-      <title><code>Markup-ellipse</code> Node</title>
+      <title>Κόμβος <code>Markup-ellipse</code></title>
 
-      <p>A <code>Markup-ellipse</code> describes a markup ellipse.</p>
+      <p>Ένα <code>Markup-ellipse</code> περιγράφει μία ελλειπτική σήμανση.</p>
 
       <table frame="all" rules="rows">
         <tr>
   <!-- BEGIN Layout Node -->
   <!-- ***************** -->
   <section id="template-layout-node">
-    <title><code>Layout</code> Node</title>
+    <title>Κόμβος <code>Layout</code></title>
 
-    <p>A label node may contain multiple <code>Layout</code>
-      children.  If labels are arranged in a simple grid pattern, only
-      one layout is needed.  However, if labels are arranged in multiple
-      grids, such as a running bond pattern, multiple
-      <code>Layout</code> tags can be used.</p>
+    <p>Ένας κόμβος ετικέτας μπορεί να περιέχει πολλαπλές θυγατρικές <code>Layout</code> παιδιά. Αν οι ετικέτες είναι τοποθετημένες σε ένα απλό σχέδιο πλέγματος, μόνο μία διάταξη είναι αναγκαία. Ωστόσο, αν οι υποδείγματος ομολόγων, πολλαπλές ετικέτες <code>Layout</code> μπορούν να χρησιμοποιηθούν.</p>
     <p>Ένα κοινό παράδειγμα για πολλαπλές διατάξεις είναι ένα φύλλο με τρεις ετικέτες CD:</p>
 
     <!-- ==== Figure ==== -->
 
     <!-- ==== Figure ==== -->
     <figure>
-      <desc><code>Layout</code> parameters</desc>
+      <desc>Παράμετροι <code>Layout</code></desc>
       <media its:translate="no" type="image" src="figures/glabels-template-layout.png" mime="image/png" style="right">
         <p><span>Layout</span> Parameters</p>
       </media>
index 06fa0fdf04f2990866c3a8b7575cdc9c8fe94e89..05f67e7f2da6573ee899f4577ea2a6d29736c4e1 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
     <title>Παράδειγμα 1: Ετικέτες Ονομάτων</title>
@@ -30,13 +42,7 @@ Name,Department,SN
 "Montgomery Scott",Engineering,SE-197-54T
       </code>
 
-      <p>In <app>gLabels</app> we have created a new <app>glabels</app>
-        document using the Avery 5395 "Name Badge Labels" template.  Next we use the
-        <guiseq> <gui>Objects</gui>
-        <gui>Merge Properties</gui> </guiseq> menu item to display
-        the <gui>merge properties</gui> dialog.  We use this dialog to
-        select the source type (in our case CSV with keys on line 1) and the merge
-       source (filename) as shown.</p>
+      <p>Στο <app>glabels</app> έχουμε δημιουργήσει ένα νέο έγγραφο <app>glabels</app> χρησιμοποιώντας το πρότυπο Avery 5395 "Ετικέτες ονόματος σημάτων" . Στη συνέχεια χρησιμοποιούμε το στοιχείο μενού <guiseq><gui>Αντικείμενα</gui><gui>Ιδιότητες συγχώνευσης</gui></guiseq> για να εμφανιστεί ο διάλογος <gui>ιδιότητες συγχώνευσης</gui> . Θα χρησιμοποιήσουμε αυτόν τον διάλογο για να επιλέξουμε τον τύπο της πηγής (στη περίπτωσή μας CSV με τα κλειδιά στη γραμμή 1) και την πηγή συγχώνευσης (όνομα αρχείου) όπως φαίνεται.</p>
 
       <!-- ==== Figure ==== -->
                <media type="image" src="figures/merge-ex1-1.png" mime="image/png" style="right">
@@ -56,10 +62,7 @@ Name,Department,SN
 
       <p>Σε αυτό το παράδειγμα έχουμε προσθέσει τρία αντικείμενα κειμένου και ένα αντικείμενο ραβδοκώδικα barcode. Το πρώτο αντικείμενο κειμένου περιέχει μόνο απλό κείμενο κατά γράμμα ("Hello, my name is"). Το δεύτερο αντικείμενο κειμένου περιέχει ένα πεδίο συγχώνευσης ("${Name}") που αντιστοιχεί στο πρώτο πεδίο μιας εγγραφής (πρώτη στήλη της γραμμής) , η οποία περιλαμβάνει το πλήρες όνομα του νέου μέλους του πληρώματος. Το τρίτο πεδίο κειμένου περιέχει τόσο κυριολεκτικό κείμενο ("Department: ") που ακολουθείται από ένα πεδίο συγχώνευσης ("${Department}") που αντιστοιχεί στο δεύτερο πεδίο ή τμήμα των μελών του πληρώματος. Το αντικείμενο barcode έχει ρυθμιστεί να χρησιμοποιεί τομέα (ή κλειδί) "SN" που περιέχει τον αριθμό σειράς Starfleet μέλους του πληρώματος μας.</p>
 
-      <p>Now we can print our name tags by selecting the
-        <guiseq> <gui>File</gui>
-        <gui>Print</gui> </guiseq> menu item.  This will display
-        print dialog as shown below.</p>
+      <p>Τώρα μπορούμε να τυπώσουμε τις ετικέτες ονομάτων μας επιλέγοντας το στοιχείο μενού <guiseq><gui>Αρχείο</gui><gui>Εκτύπωση</gui></guiseq>. Αυτό θα εμφανίσει το πλαίσιο διαλόγου εκτύπωσης όπως φαίνεται παρακάτω.</p>
 
       <!-- ==== Figure ==== -->
                <media type="image" src="figures/merge-ex1-3.png" mime="image/png" style="right">
index 886822f2fb278ce11830605e432f6a38348681f1..cc6c5d51c7bad3bb85e042a168832700748ff264 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
     <title>Παράδειγμα 2: Ετικέτες διευθύνσεων</title>
@@ -32,13 +44,7 @@ McGarret,Steve,O,"404 Piikoi Street",,Honolulu,HI,96813
 Kramer,Cosmo,,"Apt 5B","129 W. 81 St.","New York",NY,10024-7207
       </code>
 
-      <p>In <app>glabels</app> we have created a new <app>glabels</app>
-        document using the Avery 5512 "Address Labels" template.  Next we use the
-        <guiseq> <gui>Objects</gui>
-        <gui>Merge Properties</gui> </guiseq> menu item to display
-        the <gui>merge properties</gui> dialog.  We use this dialog to
-        select the source type (in our case CSV with keys on line 1) and the merge
-       source (filename) as shown.</p>
+      <p>Στο <app>glabels</app> έχουμε δημιουργήσει ένα νέο έγγραφο <app>glabels</app> χρησιμοποιώντας το πρότυπο Avery 5512 "Ετικέτες διευθύνσεων" . Στη συνέχεια χρησιμοποιούμε το στοιχείο μενού <guiseq><gui>Αντικείμενα</gui><gui>Ιδιότητες συγχώνευσης</gui></guiseq> για να εμφανιστεί ο διάλογος <gui>ιδιότητες συγχώνευσης</gui> . Θα χρησιμοποιήσουμε αυτόν τον διάλογο για να επιλέξουμε τον τύπο της πηγής (στη περίπτωσή μας CSV με τα κλειδιά στη γραμμή 1) και την πηγή συγχώνευσης (όνομα αρχείου) όπως φαίνεται.</p>
 
       <!-- ==== Figure ==== -->
                <media type="image" src="figures/merge-ex2-1.png" mime="image/png" style="right">
@@ -60,10 +66,7 @@ Kramer,Cosmo,,"Apt 5B","129 W. 81 St.","New York",NY,10024-7207
 
       <p>Σε αυτό το παράδειγμα έχουμε ένα μόνο αντικείμενο κειμένου. Αυτό το αντικείμενο κειμένου περιέχει όλα τα πεδία συγχώνευσης μας οργανωμένα σε πολλές γραμμές, ως μια ταχυδρομική διεύθυνση. Σημειώστε ότι τα πεδία ${ADDR1} και ${ADDR2} δεν έχει άλλο κείμενο μέσα στις δικές τους γραμμές. Όταν το <app>glabels</app> συναντά ένα πεδίο ως το μόνο κείμενο σε μια γραμμή, δεν θα επεκτείνει τη γραμμή αν το πεδίο είναι κενό.</p>
 
-      <p>Now we can print our address labels by selecting the
-        <guiseq> <gui>File</gui>
-        <gui>Print</gui> </guiseq> menu item.  This will display
-        print dialog as shown below.</p>
+      <p>Τώρα μπορούμε να τυπώσουμε τις ετικέτες διευθύνσεων μας επιλέγοντας το στοιχείο μενού <guiseq><gui>Αρχείο</gui><gui>Εκτύπωση</gui></guiseq>. Αυτό θα εμφανίσει τον διάλογο εκτύπωσης όπως φαίνεται παρακάτω.</p>
 
       <!-- ==== Figure ==== -->
                <media type="image" src="figures/merge-ex2-3.png" mime="image/png" style="right">
index 9e02397333a3051c09ecc842bd9952e2a3576287..7f5fbfb8a55010bc2fe7b95e0ccea733cb5ee1ab 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
     <title>Παράδειγμα 3: Ετικέτες διευθύνσεων από καταχωρήσεις του βιβλίου διευθύνσεων του <app>Evolution</app></title>
        <p>Εάν απο το πακέτο <app>gLabels</app> της διανομής σας λείπει αυτή η υποστήριξη, μπορεί να θελήσετε να επικοινωνήσετε με το συντηρητή πακέτου ή συντάξτε μια αναφορά σφάλματος για το πακέτο για να το ζητήσετε.</p>
       </note>
 
-      <p>In <app>glabels</app> we have created a new <app>gLabels</app>
-        document using the Avery 5512 "Address Labels" template. Next we use the
-        <guiseq> <gui>Objects</gui>
-        <gui>Merge Properties</gui></guiseq> menu item to display
-        the <gui>Merge properties</gui> dialog. We use this dialog to
-        select the source type (in our case <gui>Data from default Evolution
-       addressbook</gui>) as shown.</p>
+      <p>Στο <app>glabels</app> έχουμε δημιουργήσει ένα νέο έγγραφο <app>glabels</app> χρησιμοποιώντας το πρότυπο Avery 5512 "Ετικέτες διευθύνσεων". Στη συνέχεια χρησιμοποιούμε το στοιχείο μενού <guiseq><gui>Αντικείμενα</gui><gui>Ιδιότητες συγχώνευσης</gui></guiseq> για να εμφανίσουμε το διάλογο <gui>ιδιότητες συγχώνευσης</gui>. Χρησιμοποιούμε αυτόν τον διάλογο για να επιλέξουμε τον τύπο της πηγής (σε περίπτωση μας από <gui>Data from default Evolution addressbook</gui>) όπως φαίνεται.</p>
 
       <!-- ==== Figure ==== -->
                <media type="image" src="figures/merge-ex3-1.png" mime="image/png" style="right">
 
       <p>Σε αυτό το παράδειγμα έχουμε ένα μόνο αντικείμενο κειμένου πάλι. Αυτό το αντικείμενο κειμένου περιέχει όλα τα πεδία συγχώνευσης μας οργανωμένα σε πολλές γραμμές, ως διευθύνσεις αλληλογραφίας.</p>
 
-      <p>Now we can print our address labels by selecting the
-        <guiseq> <gui>File</gui>
-        <gui>Print</gui> </guiseq> menu item. This will display
-        the print dialog as shown below.</p>
+      <p>Τώρα μπορούμε να τυπώσουμε τις ετικέτες διευθύνσεων μας επιλέγοντας το στοιχείο μενού <guiseq><gui>Αρχείο</gui><gui>Εκτύπωση</gui></guiseq>. Αυτό θα εμφανίσει τον διάλογο εκτύπωσης όπως φαίνεται παρακάτω.</p>
 
       <!-- ==== Figure ==== -->
                <media type="image" src="figures/merge-ex3-3.png" mime="image/png" style="right">
index 27072afb2fbb0fd51151fec9370e0bfb2d2dff6d..0e8d5aaadc1342a7c73fc766c92e70c20fcff34b 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
     <title>Παράδειγμα 4: Ετικέτες διευθύνσεων χρησιμοποιώντας ένα αρχείο vCard</title>
index dfddb179feea393558422ff9723e3312429fffb9..7b63a7b3dc6dacc27fe65a805f1b2a24bc413755 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
     <title>Εκμάθηση συγχώνευσης εγγράφου</title>
index a1f14b9a9219b49dc6b3a695218ddec4b9ac33c7..37bb4f1a39384eb927c0df859aca268508d59da5 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
     <title>Εκτέλεση μιας συγχώνευσης εγγράφου</title>
       <p>Το πρώτο βήμα για την εκτέλεση της συγχώνευσης ενός εγγράφου είναι να προετοιμαστεί ένα πηγαίο έγγραφο που περιέχει τα δεδομένα συγχώνευσής σας. Αυτά τα δεδομένα μπορεί να είναι ταχυδρομικές διευθύνσεις ή οποιαδήποτε άλλα δεδομένα που θέλετε να δημιουργήσετε μοναδικές ετικέτες ή κάρτες. Προς το παρόν τα νωτιαία υπάρχουν μόνο για αρχεία κειμένου και του διακομιστή δεδομένων evolution -- έχουν προγραμματιστεί κι άλλα. Η παρούσα υποστήριξη μορφής κειμένου-αρχείου είναι πολύ απλή: κάθε γραμμή είναι μια εγγραφή· τα πεδία είναι οριοθετημένα με κόμματα (CSV​​), στηλοθέτες, ή διπλές τελείες και νέες γραμμές μπορούν να ενσωματωθούν σε πεδία, χρησιμοποιώντας την οντότητα "\n". Αυτό το αρχείο μπορεί να δημιουργηθεί χρησιμοποιώντας οποιοδήποτε πρόγραμμα επεξεργασίας κειμένου ή θα μπορούσε να δημιουργηθεί από κάποιο άλλο πρόγραμμα ή σενάριο. Ένας συνήθης τρόπος για τη δημιουργία αρχείων CSV είναι η εξαγωγή τους από ένα πρόγραμμα υπολογιστικών φύλλων ή από εφαρμογές βιβλίου διευθύνσεων.</p>
        
        <note style="advanced">
-         <p>
-         To export a CSV file from <app>kaddressbook</app>, first select the
-        contacts you wish to export. Click on the first contact, then press and
-        hold <key>Ctrl</key> and click on the other desired contacts to select them.
-        Then choose <guiseq><gui>File</gui><gui>Export</gui>
-        <gui>Export CSV File</gui></guiseq>.</p>
+         <p>Για εξαγωγή ενός αρχείου CSV από το <app>kaddressbook</app>, πρώτα επιλέξτε τις επαφές που επιθυμείτε να εξάγετε. Πατήστε στην πρώτη επαφή, έπειτα πατήστε και κρατήστε πατημένο το <key>Ctrl</key> και πατήστε στις άλλες επιθυμητές επαφές για να τις επιλέξετε. Έπειτα επιλέξτε <guiseq><gui>Αρχείο</gui><gui>Εξαγωγή</gui><gui>Εξαγωγή αρχείου CSV</gui></guiseq>.</p>
         
         <p>Στο παράθυρο <gui>Επιλογή επαφών</gui>, ενεργοποιήστε το κουμπί <gui>Επιλεγμένες επαφές</gui> (που πρέπει να ενεργοποιηθούν από προεπιλογή οπωσδήποτε). Έπειτα πατήστε στο <gui>Εντάξει</gui>. Στον διάλογο <gui>Αποθήκευση ως</gui>, επιλέξτε τον επιθυμητό φάκελο και ένα όνομα για το αρχείο και πατήστε στο <gui>Αποθήκευση</gui>.</p>
         </note>
        
        <note style="advanced">
-         <p>
-        To export a CSV file from <app>Thunderbird</app>, click on the
-        <gui>Address Book</gui> toolbar button or choose <guiseq><gui>Tools
-        </gui><gui>Address Book</gui></guiseq> from the menu.
-        Then select the contacts you wish to export. Click on the first contact,
-        then press and hold <key>Ctrl</key> and click on the other desired contacts
-        to select them. Then choose <guiseq><gui>Tools</gui><gui>Export</gui>
-        </guiseq>.</p>
+         <p>Για εξαγωγή ενός αρχείου CSV από το <app>Thunderbird</app>, πατήστε στο κουμπί εργαλειοθήκης <gui>Βιβλίο διευθύνσεων</gui> ή επιλέξτε <guiseq><gui>Εργαλεία</gui><gui>Βιβλίο διευθύνσεων</gui></guiseq> από το μενού. Έπειτα επιλέξτε τις επαφές που επιθυμείτε να εξάγετε. Πατήστε στην πρώτη επαφή, έπειτα πατήστε και κρατήστε πατημένο το <key>Ctrl</key> και πατήστε τις άλλες επιθυμητές επαφές για να τις επιλέξετε. Έπειτα επιλέξτε <guiseq><gui>Εργαλεία</gui><gui>Εξαγωγή</gui></guiseq>.</p>
         
         <p>Στο παράθυρο επιλογέα αρχείου, επιλέξτε τον επιθυμητό φάκελο και ένα όνομα για το αρχείο και αλλάξτε την τιμή του πτυσσόμενου κουμπιού στην κάτω δεξιά γωνία σε <gui>Διαχωριζόμενα με κόμμα</gui>. Τελικά, πατήστε στο <gui>Αποθήκευση</gui>.</p>
         </note>
 
-      <p>A label must then be configured to "point at" this data file.
-        To configure the merge properties of a document, choose
-        <guiseq><gui>Objects</gui>
-        <gui>Merge Properties</gui></guiseq> menu item
-        to display the <gui>merge properties</gui> dialog.  This
-        dialog is used to select the exact data file format and file
-        name (location) of the merge data.</p>
+      <p>Μια ετικέτα πρέπει στη συνέχεια να ρυθμιστεί ώστε να "δείχνει" το αρχείο δεδομένων. Για να ρυθμίσετε τις ιδιότητες συγχώνευσης ενός εγγράφου, επιλέξτε το στοιχείο μενού <guiseq><gui>Αντικείμενα</gui><gui>Ιδιότητες συγχώνευσης</gui></guiseq> για να εμφανίσετε τον διάλογο <gui>ιδιότητες συγχώνευσης</gui>. Αυτός ο διάλογος χρησιμοποιείται για να επιλέξετε την ακριβή μορφή αρχείου δεδομένων και το όνομα αρχείου (θέση) των δεδομένων συγχώνευσης.</p>
 
       <p>Τέλος, όταν η ετικέτα έχει ρυθμιστεί για ένα αρχείο δεδομένων, κλειδιά πεδίου μπορούν να εισαχθούν σε αντικείμενα κειμένου και να χρησιμοποιούνται ως πηγή ή δεδομένα για τα αντικείμενα barcode και ονόματα αρχείων εικόνα για τα αντικείμενα εικόνας. Δείτε το <link xref="editprop"/> για περισσότερες πληροφορίες σχετικά με τη χρήση δεδομένων συγχώνευσης για αυτούς τους τύπους αντικειμένων.</p>
 
index 2d41d75ceb22ce7462991ecf1e3140e5dda03b69..3ce209b5438d1e789670091680768ce6f62ffdd4 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
     <title>Για να ανοίξετε πολλά αρχεία ταυτόχρονα με χρήση της γραμμής εντολών</title>
 
       <p>Μπορείτε να εκτελέσετε το <app>gLabels</app> από τη γραμμή εντολών και να ανοίξετε ένα ή περισσότερα αρχεία. Για να ανοίξετε πολλά αρχεία από τη γραμμή εντολών, πληκτρολογήστε την ακόλουθη εντολή και πατήστε <key>Return</key>:</p>
 
-      <p><cmd>glabels
-      <var>file1.glabels file2.glabels file3.glabels</var>
-      </cmd></p>
+      <p><cmd>glabels <var>file1.glabels file2.glabels file3.glabels</var> </cmd></p>
 
       <p>Όταν ξεκινά η εφαρμογή, τα αρχεία που έχετε καθορίσει εμφανίζονται σε ξεχωριστά <app>gLabels</app> παράθυρα.</p>
 
index 4178d29886084e5778739e03e4517a48d65d4c25..d485a72c514e8eae1947809aababdd3ceaf24f5b 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
     <title>Για τη δημιουργία μιας νέας ετικέτας ή κάρτας</title>
index 149af340e372144fb7a30de734509c48a0787100..71ca282cff4e838825fec01a11c5202dd44060ea 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
     <title>Για να εκτυπώσετε τις ετικέτες και τις κάρτες σας</title>
 
-      <p>To print labels or cards, choose
-        <guiseq><gui>File</gui><gui>Print</gui>
-       </guiseq> to display the <gui>Print</gui> dialog.
-        Once print options have been selected, click <gui>Print</gui>
-        to print the labels or cards.  To simply preview the results,
-        click <gui>Print Preview</gui> instead.</p>
+      <p>Για να εκτυπώσετε ετικέτες ή κάρτες, επιλέξτε <guiseq><gui>Αρχείο</gui><gui>Εκτύπωση</gui></guiseq> για να εμφανίσετε τον διάλογο <gui>Εκτύπωση</gui>. Μόλις οι επιλογές εκτύπωσης έχουν επιλεγεί, πατήστε στην επιλογή <gui>Εκτύπωση</gui> για να εκτυπώσετε τις ετικέτες ή τις κάρτες. Για να κάνετε προεπισκόπηση των αποτελεσμάτων, πατήστε στην επιλογή <gui>Προεπισκόπηση εκτύπωσης</gui>.</p>
 
       <p>Ο διάλογος <gui>Εκτύπωση</gui> σας επιτρέπει να ορίσετε τις ακόλουθες επιλογές εκτύπωσης:</p>
 
              <p>Οι ακόλουθες επιλογές μπορούν επίσης να επιλεγούν.</p>
              <list>
                <item>
-                 <p><gui>print outlines</gui></p>
+                 <p><gui>εκτύπωση περιγραμμάτων</gui></p>
                  <p>Εκτύπωση περιγραμμάτων των ετικετών. Αυτή η επιλογή είναι χρήσιμη για να ελέγξετε την ευθυγράμμιση του εκτυπωτή.</p>
                </item>
                <item>
-                 <p><gui>print in reverse</gui></p>
+                 <p><gui>εκτύπωση με αντιστροφή</gui></p>
                  <p>Εκτυπώνει τις ετικέτες ως εικόνες καθρέφτη. Αυτή η επιλογή είναι χρήσιμη για την εκτύπωση σε διαφανείς ετικέτες που θα προβάλονται από την ανάποδη πλευρά (π.χ. σε ένα παράθυρο του αυτοκινήτου).</p>
                </item>
                <item>
-                 <p><gui>print crop marks</gui></p>
+                 <p><gui>εκτύπωση σημείων κοπής</gui></p>
                  <p>Εκτυπώνει σημάδια κοπής κατά μήκος της άκρης του φύλλου. Αυτή η επιλογή είναι χρήσιμη για την εκτύπωση σε λευκό υλικό, ώστε να κοπεί μετά από την εκτύπωση. Αυτή η επιλογή δεν λειτουργεί καλά με όλα τα πρότυπα.</p>
                </item>
              </list>
index 2bc90f1341d9ac06a95c0f964e11ba215bdd211c..8899dd4ac3be94be23b3e3c834ef0eba3267b52b 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
     <title>Για να επιλέξετε αντικείμενα</title>
 
-      <p>A prerequisite for performing operations on objects is the
-        selection of individual objects or groups of objects.  The
-        display area must be in the object selection mode to create new
-        selections, as indicated by an arrow cursor.  The object
-        selection mode is selected by the
-        <guiseq><gui>Objects</gui>
-        <gui>Select Mode</gui></guiseq> menu item,
-        or the corresponding command on the <gui>Drawing
-        Toolbar</gui>.</p>
+      <p>Απαραίτητη προϋπόθεση της εκτέλεσης εργασιών για αντικείμενα είναι η επιλογή των επιμέρους αντικειμένων ή ομάδων αντικειμένων. Η περιοχή προβολής πρέπει να είναι σε κατάσταση επιλογής αντικειμένου για να δημιουργήσετε νέες επιλογές, όπως υποδεικνύεται από ένα βέλος δρομέα. Η κατάσταση επιλογής αντικειμένου μπορεί να επιλεγεί από το στοιχείο μενού <guiseq><gui>Αντικείμενα</gui><gui>Επιλογή κατάστασης</gui></guiseq>, ή την αντίστοιχη εντολή στην <gui>Εργαλειοθήκη σχεδίασης</gui>.</p>
 
       <section>
          <title>Επιλέγοντας ένα μεμονωμένο αντικείμενο</title>
 
        <section>
          <title>Συγκεντρωτικές επιλογές αντικειμένου</title>
-           <p>Multiple objects can be selected by first selecting the first
-              object as above and then by holding the <key>Ctrl</key>
-              key while selecting additional objects.
-              Individual objects can be added to an existing selection
-              at any time by holding the <key>Ctrl</key> key while
-              selecting the desired objects.  All objects can also be
-              selected by using the <guiseq><gui>Edit</gui>
-              <gui>Select All</gui></guiseq>
-              menu item.  All objects in an aggregate object selection will be
-              highlighted.</p>
+           <p>Πολλαπλά αντικείμενα μπορούν να επιλεγούν επιλέγοντας πρώτα το πρώτο αντικείμενο όπως παραπάνω και στη συνέχεια κρατώντας πατημένο το πλήκτρο <key>Ctrl</key> για την επιλογή επιπλέον αντικειμένων. Μεμονωμένα αντικείμενα μπορούν να προστεθούν σε μια υπάρχουσα επιλογή οποτεδήποτε, κρατώντας πατημένο το <key>Ctrl</key> κατά την επιλογή των επιθυμητών αντικειμένων. Όλα τα αντικείμενα μπορούν επίσης να επιλεγούν με τη χρήση του στοιχείου μενού <guiseq><gui>Επεξεργασία</gui> <gui>Επιλογή όλων</gui></guiseq>. Όλα τα αντικείμενα στο σύνολο τους θα επισημανθούν.</p>
        </section>
 
        <section>
        <section>
          <title>Αποεπιλογή αντικειμένων</title>
          
-           <p>Individual objects can be removed from an existing
-              selection by holding the <key>Ctrl</key> key while
-              clicking on a previously selected object.  An entire selection
-              can be dismissed by using the <guiseq>
-             <gui>Edit</gui> <gui>Un-select All</gui>
-              </guiseq> menu item
-              or by simply clicking any empty space in the display area.
-              Once an object is unselected its highlight is removed.</p>
+           <p>Μεμονωμένα αντικείμενα μπορούν να αφαιρεθούν από μια υπάρχουσα επιλογή κρατώντας πατημένο το πλήκτρο <key>Ctrl</key> ενώ επιλέγετε ένα ήδη επιλεγμένο αντικείμενο. Μια πολλαπλή επιλογή μπορεί να απορριφθεί χρησιμοποιώντας το στοιχείο μενού <guiseq><gui>Επεξεργασία</gui><gui>Αποεπιλογή όλων</gui></guiseq> ή πατώντας απλώς σε οποιοδήποτε κενό χώρο στην περιοχή της οθόνης. Όταν ένα αντικείμενο αποεπιλέγεται ο τονισμός του αφαιρείται.</p>
          
        </section>
 
index 0c1d768002ed60d911dc21ac109bc43cdcbc0a25..99d9651179d263381a3fabc8001158f4fcda7fcd 100644 (file)
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
+      <mal:email>dmtrs32@gmail.com</mal:email>
+      <mal:years>2013, 2014</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name> Κωνσταντίνος Χόρτης</mal:name>
+      <mal:email>cograss@yahoo.com</mal:email>
+      <mal:years>2012</mal:years>
+    </mal:credit>
   </info>
 
   <title>Παράκαμψη κενών γραμμών διευθύνσεων</title>
index 9920b7f1122e11fbfd93ab86320aedf96d308d5f..76c41c9f4a911809ba7eac03876616299954027c 100644 (file)
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glabels.help.glabels_2_2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-13 11:18+0000\n"
-"PO-Revision-Date: 2013-10-15 16:29+0200\n"
+"POT-Creation-Date: 2013-12-18 19:25+0000\n"
+"PO-Revision-Date: 2013-12-19 11:15+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "Language: \n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Gtranslator 2.91.5\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -27,12 +27,16 @@ msgstr ""
 "Daniel Mustieles <daniel.mustieles@gmail.com>, 2010-2012\n"
 "Jorge González <jorgegonz@svn.gnome.org>, 2010"
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/index.page:24
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:24(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/glabels-logo.png' "
@@ -41,12 +45,16 @@ msgstr ""
 "external ref='figures/glabels-logo.png' "
 "md5='0c1e32afcbae0d2fc6976020c24a0a43'"
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/index.page:47
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:47(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/introduction-glabels-main-window.png' "
@@ -55,53 +63,56 @@ msgstr ""
 "external ref='figures/introduction-glabels-main-window.png' "
 "md5='9ee2b2cc026ee8cba3c881b370a14313'"
 
-#. (itstool) path: info/title
-#: C/index.page:7
+#: C/index.page:7(info/title)
 msgctxt "link"
 msgid "gLabels label and business card designer"
 msgstr "Diseñador de etiquetas y de tarjetas de visita gLabels"
 
-#. (itstool) path: info/title
-#: C/index.page:8
+#: C/index.page:8(info/title)
 msgctxt "text"
 msgid "gLabels label and business card designer"
 msgstr "Diseñador de etiquetas y de tarjetas de visita gLabels"
 
-#. (itstool) path: credit/name
-#: C/index.page:11 C/about.page:13 C/basicusage.page:13 C/createnew.page:13
-#: C/customize.page:11 C/customtemplate.page:13 C/editprop.page:13
-#: C/labelprop.page:13 C/mancreate.page:15 C/merge-ex1.page:13
-#: C/merge-ex2.page:13 C/merge-ex3.page:13 C/merge-ex4.page:13
-#: C/mergefeatures.page:13 C/merge.page:13 C/multifile.page:13
-#: C/newlabel.page:13 C/printfile.page:13 C/select.page:13
-#: C/skipfields.page:13
+#: C/index.page:11(credit/name) C/about.page:13(credit/name)
+#: C/basicusage.page:13(credit/name) C/createnew.page:13(credit/name)
+#: C/customize.page:11(credit/name) C/customtemplate.page:13(credit/name)
+#: C/editprop.page:13(credit/name) C/labelprop.page:13(credit/name)
+#: C/mancreate.page:15(credit/name) C/merge-ex1.page:13(credit/name)
+#: C/merge-ex2.page:13(credit/name) C/merge-ex3.page:13(credit/name)
+#: C/merge-ex4.page:13(credit/name) C/mergefeatures.page:13(credit/name)
+#: C/merge.page:13(credit/name) C/multifile.page:13(credit/name)
+#: C/newlabel.page:13(credit/name) C/printfile.page:13(credit/name)
+#: C/select.page:13(credit/name) C/skipfields.page:13(credit/name)
 msgid "Jim Evins"
 msgstr "Jim Evins"
 
-#. (itstool) path: credit/name
-#: C/index.page:15 C/about.page:17 C/basicusage.page:17 C/createnew.page:17
-#: C/customize.page:15 C/customtemplate.page:17 C/editprop.page:17
-#: C/labelprop.page:17 C/mancreate.page:19 C/merge-ex1.page:17
-#: C/merge-ex2.page:17 C/merge-ex3.page:17 C/merge-ex4.page:17
-#: C/mergefeatures.page:17 C/merge.page:17 C/multifile.page:17
-#: C/newlabel.page:17 C/printfile.page:17 C/select.page:17
-#: C/skipfields.page:17
+#: C/index.page:15(credit/name) C/about.page:17(credit/name)
+#: C/basicusage.page:17(credit/name) C/createnew.page:17(credit/name)
+#: C/customize.page:15(credit/name) C/customtemplate.page:17(credit/name)
+#: C/editprop.page:17(credit/name) C/labelprop.page:17(credit/name)
+#: C/mancreate.page:19(credit/name) C/merge-ex1.page:17(credit/name)
+#: C/merge-ex2.page:17(credit/name) C/merge-ex3.page:17(credit/name)
+#: C/merge-ex4.page:17(credit/name) C/mergefeatures.page:17(credit/name)
+#: C/merge.page:17(credit/name) C/multifile.page:17(credit/name)
+#: C/newlabel.page:17(credit/name) C/printfile.page:17(credit/name)
+#: C/select.page:17(credit/name) C/skipfields.page:17(credit/name)
 msgid "Mario Blättermann"
 msgstr "Mario Blättermann"
 
-#. (itstool) path: license/p
-#: C/index.page:19 C/about.page:21 C/basicusage.page:21 C/createnew.page:21
-#: C/customize.page:19 C/customtemplate.page:21 C/editprop.page:21
-#: C/labelprop.page:21 C/mancreate.page:23 C/merge-ex1.page:21
-#: C/merge-ex2.page:21 C/merge-ex3.page:21 C/merge-ex4.page:21
-#: C/mergefeatures.page:21 C/merge.page:21 C/multifile.page:21
-#: C/newlabel.page:21 C/printfile.page:21 C/select.page:21
-#: C/skipfields.page:21
+#: C/index.page:19(license/p) C/about.page:21(license/p)
+#: C/basicusage.page:21(license/p) C/createnew.page:21(license/p)
+#: C/customize.page:19(license/p) C/customtemplate.page:21(license/p)
+#: C/editprop.page:21(license/p) C/labelprop.page:21(license/p)
+#: C/mancreate.page:23(license/p) C/merge-ex1.page:21(license/p)
+#: C/merge-ex2.page:21(license/p) C/merge-ex3.page:21(license/p)
+#: C/merge-ex4.page:21(license/p) C/mergefeatures.page:21(license/p)
+#: C/merge.page:21(license/p) C/multifile.page:21(license/p)
+#: C/newlabel.page:21(license/p) C/printfile.page:21(license/p)
+#: C/select.page:21(license/p) C/skipfields.page:21(license/p)
 msgid "Creative Commons Share Alike 3.0"
 msgstr "Creative Commons Compartir Igual 3.0"
 
-#. (itstool) path: page/title
-#: C/index.page:23
+#: C/index.page:23(page/title)
 msgid ""
 "<media type=\"image\" mime=\"image/png\" src=\"figures/glabels-logo.png"
 "\">gLabels logo</media> gLabels Manual"
@@ -109,8 +120,7 @@ msgstr ""
 "<media type=\"image\" mime=\"image/png\" src=\"figures/glabels-logo.png"
 "\">logo de gLabels</media> Manual de gLabels"
 
-#. (itstool) path: page/p
-#: C/index.page:28
+#: C/index.page:28(page/p)
 msgid ""
 "The <app>gLabels</app> application is a lightweight program for creating "
 "labels and business cards for the GNOME desktop environment. It is designed "
@@ -122,8 +132,7 @@ msgstr ""
 "trabajar con varias hojas de etiquetas láser/chorro de tinta que encontrará "
 "en la mayoría de las tiendas de suministros de oficina."
 
-#. (itstool) path: page/p
-#: C/index.page:35
+#: C/index.page:35(page/p)
 msgid ""
 "<app>gLabels</app> can be used to design address labels, name tags, price "
 "tags, cd/dvd labels, or just about anything else that is organized in a "
@@ -142,44 +151,35 @@ msgstr ""
 "externa, tal como un archivo CSV o una libreta de direcciones de "
 "<app>Evolution</app>."
 
-#. (itstool) path: figure/title
-#. (itstool) path: figure/desc
-#: C/index.page:45 C/index.page:46
+#: C/index.page:45(figure/title) C/index.page:46(figure/desc)
 msgid "<app>gLabels</app> main window"
 msgstr "Ventana principal de <app>gLabels</app>"
 
-#. (itstool) path: media/p
-#: C/index.page:48
+#: C/index.page:48(media/p)
 msgid "<app>gLabels</app> main window."
 msgstr "Ventana principal de <app>gLabels</app>."
 
-#. (itstool) path: section/title
-#: C/index.page:53
+#: C/index.page:53(section/title)
 msgid "Usage"
 msgstr "Uso"
 
-#. (itstool) path: section/title
-#: C/index.page:57
+#: C/index.page:57(section/title)
 msgid "Document Merging"
 msgstr "Fusión de documentos"
 
-#. (itstool) path: section/title
-#: C/index.page:61
+#: C/index.page:61(section/title)
 msgid "Advanced usage"
 msgstr "Uso avanzado"
 
-#. (itstool) path: info/desc
-#: C/about.page:9
+#: C/about.page:9(info/desc)
 msgid "Information about <app>gLabels</app>."
 msgstr "Información acerca de <app>gLabels</app>."
 
-#. (itstool) path: page/title
-#: C/about.page:25
+#: C/about.page:25(page/title)
 msgid "About <app>gLabels</app>"
 msgstr "Acerca de <app>gLabels</app>"
 
-#. (itstool) path: page/p
-#: C/about.page:27
+#: C/about.page:27(page/p)
 msgid ""
 "<app>gLabels</app> was written by <link href=\"mailto:evins@snaught.com"
 "\">Jim Evins</link>. To find more information about <app>gLabels</app>, "
@@ -191,8 +191,7 @@ msgstr ""
 "app>, visite la <link href=\"http://glabels.org\" type=\"http\">página web "
 "de<app>gLabels</app></link>."
 
-#. (itstool) path: page/p
-#: C/about.page:31
+#: C/about.page:31(page/p)
 msgid ""
 "To report a bug or make a suggestion regarding this application or this "
 "manual, follow the directions at the <link href=\"http://glabels.org/contact/"
@@ -202,8 +201,7 @@ msgstr ""
 "este manual, siga las indicaciones en la <link href=\"http://glabels.org/"
 "contact/\" type=\"http\">página de contacto de <app>gLabels</app></link>."
 
-#. (itstool) path: page/p
-#: C/about.page:37
+#: C/about.page:37(page/p)
 msgid ""
 "This program is distributed under the terms of the GNU General Public "
 "license as published by the Free Software Foundation; either version 3 of "
@@ -218,23 +216,19 @@ msgstr ""
 "\"help\">enlace</link>, o en el archivo COPYING incluido con el código "
 "fuente de este programa."
 
-#. (itstool) path: info/desc
-#: C/basicusage.page:9
+#: C/basicusage.page:9(info/desc)
 msgid "Handling files and quit the application."
 msgstr "Manejar archivos y salir de la aplicación."
 
-#. (itstool) path: page/title
-#: C/basicusage.page:25
+#: C/basicusage.page:25(page/title)
 msgid "Basic usage"
 msgstr "Uso básico"
 
-#. (itstool) path: section/title
-#: C/basicusage.page:28
+#: C/basicusage.page:28(section/title)
 msgid "To open a file"
 msgstr "Abrir un archivo"
 
-#. (itstool) path: section/p
-#: C/basicusage.page:30
+#: C/basicusage.page:30(section/p)
 msgid ""
 "To open a file, choose <guiseq><gui>File</gui><gui>Open</gui> </guiseq> to "
 "display the <gui>Open File</gui> dialog. Select the file that you want to "
@@ -246,8 +240,7 @@ msgstr ""
 "archivo que quiere abrir y pulse <gui>Aceptar</gui>. El archivo se muestra "
 "en el área de visualización de la ventana de <app>gLabels</app>."
 
-#. (itstool) path: section/p
-#: C/basicusage.page:37
+#: C/basicusage.page:37(section/p)
 msgid ""
 "You can also open multiple files in <app>gLabels</app>. The application "
 "creates a separate application window for each open file."
@@ -255,8 +248,7 @@ msgstr ""
 "Puede abrir múltiples archivos en <app>gLabels</app>. La aplicación crea una "
 "ventana de aplicación separada para cada archivo abierto."
 
-#. (itstool) path: section/p
-#: C/basicusage.page:41
+#: C/basicusage.page:41(section/p)
 msgid ""
 "The application records the paths and filenames of the most recent files "
 "that you have edited and displays the files as menu items on the "
@@ -266,13 +258,11 @@ msgstr ""
 "recientes que haya editado, y muestra los archivos como elementos del menú "
 "<guiseq><gui>Archivo</gui><gui>Archivos recientes</gui></guiseq>."
 
-#. (itstool) path: section/title
-#: C/basicusage.page:48
+#: C/basicusage.page:48(section/title)
 msgid "To close a file"
 msgstr "Cerrar un archivo"
 
-#. (itstool) path: section/p
-#: C/basicusage.page:50
+#: C/basicusage.page:50(section/p)
 msgid ""
 "To close the current document, choose <guiseq><gui>File</gui> <gui>Close</"
 "gui></guiseq> to close the application window. If the current document is "
@@ -287,18 +277,15 @@ msgstr ""
 "la ventana que va a cerrar es la única que está abierta, <app>gLabels</app> "
 "se cerrará."
 
-#. (itstool) path: section/title
-#: C/basicusage.page:60
+#: C/basicusage.page:60(section/title)
 msgid "To save a file"
 msgstr "Guardar un archivo"
 
-#. (itstool) path: section/p
-#: C/basicusage.page:62
+#: C/basicusage.page:62(section/p)
 msgid "You can save files in the following ways:"
 msgstr "Puede guardar archivos de cualquiera de estas maneras:"
 
-#. (itstool) path: item/p
-#: C/basicusage.page:66
+#: C/basicusage.page:66(item/p)
 msgid ""
 "To save changes to an existing file, choose <guiseq><gui>File</gui> "
 "<gui>Save</gui></guiseq>."
@@ -306,8 +293,7 @@ msgstr ""
 "Para guardar los cambios a un archivo existente, elija <guiseq><gui>Archivo</"
 "gui><gui>Guardar</gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/basicusage.page:73
+#: C/basicusage.page:73(item/p)
 msgid ""
 "To save a new file or to save an existing file under a new filename, choose "
 "<guiseq><gui>File</gui> <gui>Save As</gui></guiseq>. Enter a name for the "
@@ -318,13 +304,11 @@ msgstr ""
 "gui></guiseq>. Introduzca un nombre para el archivo en el cuadro de diálogo "
 "<gui>Guardar como</gui> y pulse <gui>Aceptar</gui>."
 
-#. (itstool) path: section/title
-#: C/basicusage.page:84
+#: C/basicusage.page:84(section/title)
 msgid "To quit <app>gLabels</app>"
 msgstr "Salir de <application>gLabels</application>"
 
-#. (itstool) path: section/p
-#: C/basicusage.page:86
+#: C/basicusage.page:86(section/p)
 msgid ""
 "To quit <app>gLabels</app>, choose <guiseq><gui>File</gui> <gui>Quit</gui></"
 "guiseq>. This is equivalent to closing all open windows. See <link xref="
@@ -334,18 +318,15 @@ msgstr ""
 "gui><gui>Quitar</gui></guiseq>. Esto es equivalente a cerrar todas las "
 "ventanas abiertas. Consulte la <link xref=\"basicusage#closefile\"/>."
 
-#. (itstool) path: info/desc
-#: C/createnew.page:9
+#: C/createnew.page:9(info/desc)
 msgid "Create new objects within your document."
 msgstr "Crear objetos nuevos dentro de su documento."
 
-#. (itstool) path: page/title
-#: C/createnew.page:25
+#: C/createnew.page:25(page/title)
 msgid "To create new objects"
 msgstr "Crear objetos nuevos"
 
-#. (itstool) path: page/p
-#: C/createnew.page:27
+#: C/createnew.page:27(page/p)
 msgid ""
 "Objects are created by choosing the appropriate selection under the "
 "<guiseq><gui>Objects</gui><gui>Create Object</gui></guiseq> submenu or the "
@@ -364,20 +345,17 @@ msgstr ""
 "Esto devolverá el cursor del área de visualización a la flecha de selección "
 "predeterminada."
 
-#. (itstool) path: page/p
-#: C/createnew.page:35
+#: C/createnew.page:35(page/p)
 msgid "The following describes the object creation mode for each object type:"
 msgstr ""
 "A continuación se describe el modo de creación de un objeto para cada tipo "
 "de objeto:"
 
-#. (itstool) path: section/title
-#: C/createnew.page:39 C/customize.page:80
+#: C/createnew.page:39(section/title) C/customize.page:80(section/title)
 msgid "Text"
 msgstr "Texto"
 
-#. (itstool) path: section/p
-#: C/createnew.page:40
+#: C/createnew.page:40(section/p)
 msgid ""
 "Click the desired location of the upper left corner of the text object. New "
 "text objects are initialized with the string \"Text.\" To change this text, "
@@ -388,13 +366,11 @@ msgstr ""
 "cadena «Texto». Para cambiar este texto u otras propiedades, consulte la "
 "<link xref=\"editprop\"/>."
 
-#. (itstool) path: section/title
-#: C/createnew.page:47
+#: C/createnew.page:47(section/title)
 msgid "Box"
 msgstr "Caja"
 
-#. (itstool) path: section/p
-#: C/createnew.page:48
+#: C/createnew.page:48(section/p)
 msgid ""
 "Click the desired location of the upper left corner of the box object and "
 "drag to the desired location of the lower right corner. If you simply click "
@@ -407,13 +383,11 @@ msgstr ""
 "cuadrada. Para cambiar las propiedades del objeto de caja, consulte la <link "
 "xref=\"editprop\"/>."
 
-#. (itstool) path: section/title
-#: C/createnew.page:56 C/customize.page:101
+#: C/createnew.page:56(section/title) C/customize.page:101(section/title)
 msgid "Line"
 msgstr "Línea"
 
-#. (itstool) path: section/p
-#: C/createnew.page:57
+#: C/createnew.page:57(section/p)
 msgid ""
 "Click the desired location of one end of the line object and drag to the "
 "desired location of the other end. If you simply click in a single location, "
@@ -425,13 +399,11 @@ msgstr ""
 "pulsa en una única ubicación, se creará una línea. Para cambiar las "
 "propiedades del objeto de línea, consulte la <link xref=\"editprop\"/>."
 
-#. (itstool) path: section/title
-#: C/createnew.page:65
+#: C/createnew.page:65(section/title)
 msgid "Ellipse"
 msgstr "Elipse"
 
-#. (itstool) path: section/p
-#: C/createnew.page:66
+#: C/createnew.page:66(section/p)
 msgid ""
 "Click the desired location of the upper left corner of the ellipse object "
 "and drag to the desired location of the lower right corner. If you simply "
@@ -444,13 +416,11 @@ msgstr ""
 "Para cambiar las propiedades del objeto de elipse, consulte la <link xref="
 "\"editprop\"/>."
 
-#. (itstool) path: section/title
-#: C/createnew.page:74
+#: C/createnew.page:74(section/title)
 msgid "Image"
 msgstr "Imagen"
 
-#. (itstool) path: section/p
-#: C/createnew.page:75
+#: C/createnew.page:75(section/p)
 msgid ""
 "Click the desired location of the upper left corner of the image object and "
 "drag to the desired location of the lower right corner. If you simply click "
@@ -465,13 +435,11 @@ msgstr ""
 "Para cambiar esta imagen, u otras propiedades del objeto de imagen, consulte "
 "la <link xref=\"editprop\"/>."
 
-#. (itstool) path: section/title
-#: C/createnew.page:85
+#: C/createnew.page:85(section/title)
 msgid "Barcode"
 msgstr "Código de barras"
 
-#. (itstool) path: section/p
-#: C/createnew.page:86
+#: C/createnew.page:86(section/p)
 msgid ""
 "Click the desired location of the upper left corner of the barcode object. "
 "New barcode objects are initialized to a POSTNET barcode with representative "
@@ -484,18 +452,15 @@ msgstr ""
 "datos y las propiedades del objeto de código de barras, consulte la <link "
 "xref=\"editprop\"/>."
 
-#. (itstool) path: info/desc
-#: C/customize.page:9
+#: C/customize.page:9(info/desc)
 msgid "Customize <app>gLabels</app> to match your needs."
 msgstr "Personalizar <app>gLabels</app> para ajustarlo a sus necesidades."
 
-#. (itstool) path: page/title
-#: C/customize.page:25
+#: C/customize.page:25(page/title)
 msgid "Settings"
 msgstr "Configuración"
 
-#. (itstool) path: page/p
-#: C/customize.page:26
+#: C/customize.page:26(page/p)
 msgid ""
 "To configure <app>gLabels</app>, choose <guiseq> <gui>Settings</gui> "
 "<gui>Preferences</gui> </guiseq>. The <gui>Preferences</gui> dialog contains "
@@ -505,18 +470,15 @@ msgstr ""
 "gui><gui>Preferencias</gui></guiseq>. El diálogo <gui>Preferencias</gui> "
 "contiene las siguientes secciones en pestañas:"
 
-#. (itstool) path: section/title
-#: C/customize.page:35
+#: C/customize.page:35(section/title)
 msgid "Locale"
 msgstr "Región"
 
-#. (itstool) path: section/title
-#: C/customize.page:37
+#: C/customize.page:37(section/title)
 msgid "Units"
 msgstr "Unidades"
 
-#. (itstool) path: section/p
-#: C/customize.page:38
+#: C/customize.page:38(section/p)
 msgid ""
 "Use this radio button group to specify your preferred units. Select one of "
 "the following options:"
@@ -524,48 +486,39 @@ msgstr ""
 "Use este grupo de botones de radio para especificar sus unidades favoritas. "
 "Seleccione una de las siguientes opciones:"
 
-#. (itstool) path: item/p
-#: C/customize.page:42
+#: C/customize.page:42(item/p)
 msgid "<gui>Points</gui>"
 msgstr "<gui>Puntos</gui>"
 
-#. (itstool) path: item/p
-#: C/customize.page:43
+#: C/customize.page:43(item/p)
 msgid "Use points (1 point = 1/72 in = 0.352778 mm)."
 msgstr "Usar puntos (1 punto = 1/72 pulgadas = 0.352778 mm)."
 
-#. (itstool) path: item/p
-#: C/customize.page:46
+#: C/customize.page:46(item/p)
 msgid "<gui>Inches</gui>"
 msgstr "<gui>Pulgadas</gui>"
 
-#. (itstool) path: item/p
-#: C/customize.page:47
+#: C/customize.page:47(item/p)
 msgid "Use Inches."
 msgstr "Usar pulgadas."
 
-#. (itstool) path: item/p
-#: C/customize.page:50
+#: C/customize.page:50(item/p)
 msgid "<gui>Millimeters</gui>"
 msgstr "<gui>Milímetros</gui>"
 
-#. (itstool) path: item/p
-#: C/customize.page:51
+#: C/customize.page:51(item/p)
 msgid "Use Millimeters."
 msgstr "Usar milímetros."
 
-#. (itstool) path: section/p
-#: C/customize.page:54
+#: C/customize.page:54(section/p)
 msgid "Default: <gui>Inches</gui>."
 msgstr "Predeterminado: <gui>pulgadas</gui>."
 
-#. (itstool) path: section/title
-#: C/customize.page:58
+#: C/customize.page:58(section/title)
 msgid "Default page size"
 msgstr "Tamaño de página predeterminado"
 
-#. (itstool) path: section/p
-#: C/customize.page:59
+#: C/customize.page:59(section/p)
 msgid ""
 "Use this radio button group to specify your prefered page size. This will "
 "make it quicker for you to locate media types when creating a new label or "
@@ -575,42 +528,35 @@ msgstr ""
 "favorito. Esto hará que localice más rápidamente los tipos de medios cuando "
 "crea una etiqueta o una tarjeta nuevas."
 
-#. (itstool) path: item/p
-#: C/customize.page:64
+#: C/customize.page:64(item/p)
 msgid "<gui>US Letter</gui>"
 msgstr "<gui>Carta</gui>"
 
-#. (itstool) path: item/p
-#: C/customize.page:65
+#: C/customize.page:65(item/p)
 msgid ""
 "Most of your media will be of the US Letter page size (8.5 x 11 inches)."
 msgstr ""
 "La mayoría de sus medios serán tendrán un tamaño de página «Carta» (8.5 x 11 "
 "pulgadas)."
 
-#. (itstool) path: item/p
-#: C/customize.page:68
+#: C/customize.page:68(item/p)
 msgid "<gui>ISO A4</gui>"
 msgstr "<gui>ISO A4</gui>"
 
-#. (itstool) path: item/p
-#: C/customize.page:69
+#: C/customize.page:69(item/p)
 msgid "Most of your media will be of the ISO A4 page size (210 x 297 mm)."
 msgstr ""
 "La mayoría de sus medios serán del tamaño de página ISO A4 (210 x 297 mm)."
 
-#. (itstool) path: section/p
-#: C/customize.page:72
+#: C/customize.page:72(section/p)
 msgid "Default: <gui>US Letter</gui>."
 msgstr "Predeterminado: <gui>Carta</gui>."
 
-#. (itstool) path: section/title
-#: C/customize.page:77
+#: C/customize.page:77(section/title)
 msgid "Object Defaults"
 msgstr "Opciones predeterminadas para el objeto"
 
-#. (itstool) path: section/p
-#: C/customize.page:81
+#: C/customize.page:81(section/p)
 msgid ""
 "Use these controls to set the default properties of new text objects. These "
 "properties are:"
@@ -618,13 +564,11 @@ msgstr ""
 "Use estos controles para configurar las propiedades predeterminadas de los "
 "objetos de texto nuevos. Estas propiedades son:"
 
-#. (itstool) path: item/p
-#: C/customize.page:85
+#: C/customize.page:85(item/p)
 msgid "<gui>Font</gui>"
 msgstr "<gui>Tipografía</gui>"
 
-#. (itstool) path: item/p
-#: C/customize.page:86
+#: C/customize.page:86(item/p)
 msgid ""
 "These controls are used to select font family and font size, and whether the "
 "font should bold or in italics."
@@ -632,23 +576,20 @@ msgstr ""
 "Estos controles se usan para seleccionar la familia tipográfica y su tamaño, "
 "y si la tipografía debe ser negrita o cursiva."
 
-#. (itstool) path: item/p
-#: C/customize.page:90 C/customize.page:110 C/customize.page:122
+#: C/customize.page:90(item/p) C/customize.page:110(item/p)
+#: C/customize.page:122(item/p)
 msgid "<gui>Color</gui>"
 msgstr "<gui>Color</gui>"
 
-#. (itstool) path: item/p
-#: C/customize.page:91
+#: C/customize.page:91(item/p)
 msgid "This control selects the default text color."
 msgstr "Este control selecciona el color predeterminado del texto."
 
-#. (itstool) path: item/p
-#: C/customize.page:94
+#: C/customize.page:94(item/p)
 msgid "<gui>Alignment</gui>"
 msgstr "<gui>Alineación</gui>"
 
-#. (itstool) path: item/p
-#: C/customize.page:95
+#: C/customize.page:95(item/p)
 msgid ""
 "These controls are used to select the default text alignment (left, center "
 "or right)."
@@ -656,8 +597,7 @@ msgstr ""
 "Estos controles se usan para seleccionar la alineación predeterminada del "
 "texto (izquierda, centrado o derecha)."
 
-#. (itstool) path: section/p
-#: C/customize.page:102
+#: C/customize.page:102(section/p)
 msgid ""
 "Use these controls to set the default properties of lines and outlines of "
 "new objects. These properties are:"
@@ -665,28 +605,23 @@ msgstr ""
 "Use estos controles para establecer las propiedades predeterminadas de las "
 "líneas y los márgenes de los objetos nuevos. Estas propiedades son:"
 
-#. (itstool) path: item/p
-#: C/customize.page:106
+#: C/customize.page:106(item/p)
 msgid "<gui>Width</gui>"
 msgstr "<gui>Anchura</gui>"
 
-#. (itstool) path: item/p
-#: C/customize.page:107
+#: C/customize.page:107(item/p)
 msgid "This control selects the default line width."
 msgstr "Este control selecciona la anchura predeterminada de la línea."
 
-#. (itstool) path: item/p
-#: C/customize.page:111
+#: C/customize.page:111(item/p)
 msgid "This control selects the default line color."
 msgstr "Este control selecciona el color predeterminado de la línea."
 
-#. (itstool) path: section/title
-#: C/customize.page:117
+#: C/customize.page:117(section/title)
 msgid "Fill"
 msgstr "Relleno"
 
-#. (itstool) path: section/p
-#: C/customize.page:118
+#: C/customize.page:118(section/p)
 msgid ""
 "Use this control to set the default fill property of new objects. This "
 "property is:"
@@ -694,23 +629,19 @@ msgstr ""
 "Use este control para establecer la propiedad predeterminada de relleno de "
 "los objetos nuevos. Esta propiedad es:"
 
-#. (itstool) path: item/p
-#: C/customize.page:123
+#: C/customize.page:123(item/p)
 msgid "This control selects the default fill color."
 msgstr "Este control selecciona el color predeterminado de relleno."
 
-#. (itstool) path: info/desc
-#: C/customtemplate.page:9
+#: C/customtemplate.page:9(info/desc)
 msgid "Create your own templates for stationery products."
 msgstr "Crear sus propias plantillas para productos de papelería."
 
-#. (itstool) path: page/title
-#: C/customtemplate.page:25
+#: C/customtemplate.page:25(page/title)
 msgid "To create a custom template"
 msgstr "Crear una plantilla personalizada"
 
-#. (itstool) path: page/p
-#: C/customtemplate.page:27
+#: C/customtemplate.page:27(page/p)
 msgid ""
 "To create a new custom template, choose <guiseq><gui>File</gui> "
 "<gui>Template Designer ...</gui></guiseq> to display the <gui>Template "
@@ -723,8 +654,7 @@ msgstr ""
 "de una plantilla personalizada para la mayoría de tipos de etiquetas o "
 "tarjetas de papelería que pueda encontrar."
 
-#. (itstool) path: page/p
-#: C/customtemplate.page:34
+#: C/customtemplate.page:34(page/p)
 msgid ""
 "If you prefer, you can create your templates manually. For this option see "
 "<link xref=\"mancreate\"/>"
@@ -732,12 +662,11 @@ msgstr ""
 "Si lo prefiere, puede crear sus plantillas manualmente. Para esta opción "
 "consulte la <link xref=\"mancreate\"/>"
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/editprop.page:35
+#: C/editprop.page:35(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/object-editor-sidebar.png' "
@@ -746,18 +675,15 @@ msgstr ""
 "external ref='figures/object-editor-sidebar.png' "
 "md5='68be18416cc17964992fe0c7e311e0ef'"
 
-#. (itstool) path: info/desc
-#: C/editprop.page:9
+#: C/editprop.page:9(info/desc)
 msgid "Change the properties of objects."
 msgstr "Cambiar las propiedades de objetos."
 
-#. (itstool) path: page/title
-#: C/editprop.page:25
+#: C/editprop.page:25(page/title)
 msgid "To edit object properties"
 msgstr "Editar las propiedades del objeto"
 
-#. (itstool) path: section/p
-#: C/editprop.page:29
+#: C/editprop.page:29(section/p)
 msgid ""
 "Most object properties can be modified through the object editor sidebar, "
 "illustrated below. To use the object editor, a single object must first be "
@@ -767,13 +693,11 @@ msgstr ""
 "la barra lateral del editor de objetos. Para usar el editor de objetos, se "
 "debe seleccionar primero un objeto. Consulte la <link xref=\"select\"/>."
 
-#. (itstool) path: media/p
-#: C/editprop.page:36 C/printfile.page:48
+#: C/editprop.page:36(media/p) C/printfile.page:48(media/p)
 msgid "Print Copy Controls"
 msgstr "Controles de impresión de copia"
 
-#. (itstool) path: section/p
-#: C/editprop.page:40
+#: C/editprop.page:40(section/p)
 msgid ""
 "The object editor will contain a subset of the following tabbed sections, "
 "depending on object type:"
@@ -781,13 +705,11 @@ msgstr ""
 "El editor de objetos contendrá un subconjunto de las siguientes secciones en "
 "pestañas, dependiendo del tipo de objeto:"
 
-#. (itstool) path: section/title
-#: C/editprop.page:44
+#: C/editprop.page:44(section/title)
 msgid "Text Tabbed Section (Text objects)"
 msgstr "Sección de texto en pestañas (objetos de texto)"
 
-#. (itstool) path: section/p
-#: C/editprop.page:46
+#: C/editprop.page:46(section/p)
 msgid ""
 "This section contains a small editor for changing the content of a text "
 "object. It also contains a dropdown menu of available document merge keys, "
@@ -797,13 +719,11 @@ msgstr ""
 "objeto de texto. También contiene un menú desplegable con las claves "
 "combinadas del documento disponibles, que se pueden insertar en el texto."
 
-#. (itstool) path: section/title
-#: C/editprop.page:53
+#: C/editprop.page:53(section/title)
 msgid "Image Tabbed Section (Image objects)"
 msgstr "Sección de imagen en pestañas (objetos de imagen)"
 
-#. (itstool) path: section/p
-#: C/editprop.page:55
+#: C/editprop.page:55(section/p)
 msgid ""
 "This section contains a file entry with preview to select image files. The "
 "browse button can be used to easily locate image files. Alternatively, a "
@@ -815,13 +735,11 @@ msgstr ""
 "usar la clave de combinación de un documento para proporcionar un nombre de "
 "archivo a la hora de imprimir."
 
-#. (itstool) path: section/title
-#: C/editprop.page:63
+#: C/editprop.page:63(section/title)
 msgid "Data Tabbed Section (Barcode objects)"
 msgstr "Sección de datos en pestañas (objetos de código de barras)"
 
-#. (itstool) path: section/p
-#: C/editprop.page:65
+#: C/editprop.page:65(section/p)
 msgid ""
 "This section contains a text entry to enter literal barcode data. "
 "Alternatively, a document merge key can be used to provide this data at "
@@ -832,13 +750,11 @@ msgstr ""
 "combinación de un documento para proporcionar este dato a la hora de "
 "imprimir."
 
-#. (itstool) path: section/title
-#: C/editprop.page:72
+#: C/editprop.page:72(section/title)
 msgid "Style Tabbed Section (Text objects)"
 msgstr "Sección de estilo en pestañas (objetos de texto)"
 
-#. (itstool) path: section/p
-#: C/editprop.page:74
+#: C/editprop.page:74(section/p)
 msgid ""
 "This section contains controls to select text properties, including font "
 "family, font size, font weight, color, and text justification."
@@ -847,13 +763,11 @@ msgstr ""
 "incluyendo la familia tipográfica, tamaño, peso, color y justificación del "
 "texto."
 
-#. (itstool) path: section/title
-#: C/editprop.page:81
+#: C/editprop.page:81(section/title)
 msgid "Style Tabbed Section (Barcode objects)"
 msgstr "Sección de estilo en pestañas (objetos de código de barras)"
 
-#. (itstool) path: section/p
-#: C/editprop.page:83
+#: C/editprop.page:83(section/p)
 msgid ""
 "This section contains controls to select barcode properties, including "
 "barcode style, color, whether to print text, and whether to include a "
@@ -863,13 +777,11 @@ msgstr ""
 "de barras, incluyendo su estilo, color, si se debe imprimir texto y si se "
 "debe incluir un dígito de control."
 
-#. (itstool) path: section/title
-#: C/editprop.page:90
+#: C/editprop.page:90(section/title)
 msgid "Line Tabbed Section"
 msgstr "Sección de línea en pestañas"
 
-#. (itstool) path: section/p
-#: C/editprop.page:92
+#: C/editprop.page:92(section/p)
 msgid ""
 "This section contains controls to select properties of lines and outlines. "
 "These properties include line width and color."
@@ -878,13 +790,11 @@ msgstr ""
 "líneas y de los márgenes. Estas propiedades incluyen el ancho de línea y el "
 "color."
 
-#. (itstool) path: section/title
-#: C/editprop.page:98
+#: C/editprop.page:98(section/title)
 msgid "Fill Tabbed Section"
 msgstr "Sección de relleno en pestañas"
 
-#. (itstool) path: section/p
-#: C/editprop.page:100
+#: C/editprop.page:100(section/p)
 msgid ""
 "This section contains controls to select fill properties of box and ellipse "
 "objects. Currently the only fill property is fill color."
@@ -893,13 +803,11 @@ msgstr ""
 "de objetos de caja y de elipse. Actualmente, la única propiedad del relleno "
 "es el color."
 
-#. (itstool) path: section/title
-#: C/editprop.page:107
+#: C/editprop.page:107(section/title)
 msgid "Size Tabbed Section (All except line objects)"
 msgstr "Sección de tamaño en pestañas (todos excepto los objetos de línea)"
 
-#. (itstool) path: section/p
-#: C/editprop.page:109
+#: C/editprop.page:109(section/p)
 msgid ""
 "This section contains controls to select the width and height of an object. "
 "A checkbox is provided, so that the current aspect ratio can be locked while "
@@ -912,13 +820,11 @@ msgstr ""
 "altura. Los objetos de imagen también proporcionan un botón para reiniciar "
 "el tamaño al original de la imagen (se asumen 72DPI)"
 
-#. (itstool) path: section/title
-#: C/editprop.page:118
+#: C/editprop.page:118(section/title)
 msgid "Size Tabbed Section (Line objects)"
 msgstr "Sección de tamaño en pestañas (objetos de línea)"
 
-#. (itstool) path: section/p
-#: C/editprop.page:120
+#: C/editprop.page:120(section/p)
 msgid ""
 "This section contains controls to select the length and angle of a line "
 "object."
@@ -926,44 +832,36 @@ msgstr ""
 "Esta sección contiene controles para seleccionar la longitud y el ángulo de "
 "un objeto de línea."
 
-#. (itstool) path: section/title
-#: C/editprop.page:126
+#: C/editprop.page:126(section/title)
 msgid "Position Tabbed Section"
 msgstr "Sección de posición en pestañas"
 
-#. (itstool) path: section/p
-#: C/editprop.page:128
+#: C/editprop.page:128(section/p)
 msgid "This section contains controls to change the position of an object."
 msgstr "Esta sección contiene controles para cambiar la posición de un objeto."
 
-#. (itstool) path: section/title
-#: C/editprop.page:135
+#: C/editprop.page:135(section/title)
 msgid "Shadow Tabbed Section (All except barcode objects)"
 msgstr ""
 "Sección de sombra en pestañas (todos excepto los objetos de código de barras)"
 
-#. (itstool) path: section/p
-#: C/editprop.page:137
+#: C/editprop.page:137(section/p)
 msgid "This section contains controls to add a shadow to an object."
 msgstr "Esta sección contiene controles para añadir sombre a un objeto."
 
-#. (itstool) path: section/title
-#: C/editprop.page:146
+#: C/editprop.page:146(section/title)
 msgid "Other Manipulations of Objects"
 msgstr "Otras manipulaciones de objetos"
 
-#. (itstool) path: section/p
-#: C/editprop.page:148
+#: C/editprop.page:148(section/p)
 msgid "Objects can also be manipulated in the following ways."
 msgstr "Los objetos se pueden manipular de las siguientes maneras."
 
-#. (itstool) path: section/title
-#: C/editprop.page:151
+#: C/editprop.page:151(section/title)
 msgid "Moving and Resizing Objects"
 msgstr "Mover y redimensionar objetos"
 
-#. (itstool) path: section/p
-#: C/editprop.page:153
+#: C/editprop.page:153(section/p)
 msgid ""
 "Objects can be moved by simply clicking on a selected object and dragging "
 "the object to its new location. If the object is part of an aggregate "
@@ -980,8 +878,7 @@ msgstr ""
 "creará una selección nueva que contenga a ese objeto. Consulte la <link xref="
 "\"select\"/>."
 
-#. (itstool) path: section/p
-#: C/editprop.page:161
+#: C/editprop.page:161(section/p)
 msgid ""
 "A selected object can be resized by clicking one of its resize handle and "
 "dragging it to obtain the new size."
@@ -989,13 +886,11 @@ msgstr ""
 "Un objeto seleccionado se puede redimensionar pulsando una vez sobre su "
 "controlador de tamaño y arrastrándolo para obtener el nuevo tamaño."
 
-#. (itstool) path: section/title
-#: C/editprop.page:167
+#: C/editprop.page:167(section/title)
 msgid "Changing Stacking Order"
 msgstr "Cambiar el orden de apilamiento"
 
-#. (itstool) path: section/p
-#: C/editprop.page:169
+#: C/editprop.page:169(section/p)
 msgid ""
 "Stacking order refers to relative position in the z-axis of objects. That is "
 "when objects overlap, which object will appear on top of the other. By "
@@ -1019,13 +914,11 @@ msgstr ""
 "están disponibles pulsando con el botón derecho en el área de visualización "
 "cuando no hay una selección vacía."
 
-#. (itstool) path: section/title
-#: C/editprop.page:187
+#: C/editprop.page:187(section/title)
 msgid "Rotating and Flipping Objects"
 msgstr "Rotar y voltear objetos"
 
-#. (itstool) path: section/p
-#: C/editprop.page:189
+#: C/editprop.page:189(section/p)
 msgid ""
 "Objects can be rotated 90 degrees in either direction, or flipped "
 "horizontally or vertically, by choosing the appropriate menuitem in the "
@@ -1039,8 +932,7 @@ msgstr ""
 "elementos de menú también están disponibles pulsando con el botón derecho en "
 "el área de visualización cuando no hay una selección vacía."
 
-#. (itstool) path: note/p
-#: C/editprop.page:197
+#: C/editprop.page:197(note/p)
 msgid ""
 "This feature could be useful when you are designing CD box inlays. For the "
 "spine caption, you need vertical aligned text. After you have created a "
@@ -1053,13 +945,11 @@ msgstr ""
 "gui><gui>Rotar/Voltear</gui></guiseq> para rotar la caja de texto de acuerdo "
 "a sus necesidades."
 
-#. (itstool) path: section/title
-#: C/editprop.page:208
+#: C/editprop.page:208(section/title)
 msgid "Aligning Objects"
 msgstr "Alinear objetos"
 
-#. (itstool) path: section/p
-#: C/editprop.page:210
+#: C/editprop.page:210(section/p)
 msgid ""
 "Objects can be aligned horizontally or vertically, relative to one another, "
 "or relative to the center line of the label, by choosing the appropriate "
@@ -1076,13 +966,11 @@ msgstr ""
 "pulsando con el botón derecho en el área de visualización cuando no hay una "
 "selección vacía."
 
-#. (itstool) path: section/title
-#: C/editprop.page:223
+#: C/editprop.page:223(section/title)
 msgid "Using the Property Bar"
 msgstr "Usar la barra de propiedades"
 
-#. (itstool) path: section/p
-#: C/editprop.page:225
+#: C/editprop.page:225(section/p)
 msgid ""
 "The property bar can be used to change some common properties of objects en-"
 "masse. These properties include font family, font size, font weight, text "
@@ -1097,19 +985,16 @@ msgstr ""
 "barra de propiedades también controla los valores predeterminados de estas "
 "propiedades para cualquier objeto nuevo creado."
 
-#. (itstool) path: info/desc
-#: C/labelprop.page:9
+#: C/labelprop.page:9(info/desc)
 msgid "How to change the properties of a label or business card."
 msgstr ""
 "Cómo cambiar las propiedades de una etiqueta o de una tarjeta de visita."
 
-#. (itstool) path: page/title
-#: C/labelprop.page:25
+#: C/labelprop.page:25(page/title)
 msgid "To change label properties"
 msgstr "Cambiar las propiedades de la etiqueta"
 
-#. (itstool) path: page/p
-#: C/labelprop.page:27
+#: C/labelprop.page:27(page/p)
 msgid ""
 "To change the media type and/or orientation of a label, choose "
 "<guiseq><gui>File</gui> <gui>Properties</gui></guiseq> to display the "
@@ -1121,18 +1006,15 @@ msgstr ""
 "diálogo <gui>Propiedades de la etiqueta</gui>. Seleccione el tipo de medio y "
 "la orientación nuevas y pulse <gui>Aceptar</gui>."
 
-#. (itstool) path: info/desc
-#: C/license.page:8
+#: C/license.page:8(info/desc)
 msgid "Legal information."
 msgstr "Información legal."
 
-#. (itstool) path: page/title
-#: C/license.page:11
+#: C/license.page:11(page/title)
 msgid "License"
 msgstr "Licencia"
 
-#. (itstool) path: page/p
-#: C/license.page:12
+#: C/license.page:12(page/p)
 msgid ""
 "This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
 "Unported license."
@@ -1140,43 +1022,35 @@ msgstr ""
 "Este trabajo está distribuido bajo una licencia sin soporte CreativeCommons "
 "Compartir-Igual 3.0."
 
-#. (itstool) path: page/p
-#: C/license.page:20
+#: C/license.page:20(page/p)
 msgid "You are free:"
 msgstr "Es libre de:"
 
-#. (itstool) path: item/title
-#: C/license.page:25
+#: C/license.page:25(item/title)
 msgid "<em>To share</em>"
 msgstr "<em>Compartir</em>"
 
-#. (itstool) path: item/p
-#: C/license.page:26
+#: C/license.page:26(item/p)
 msgid "To copy, distribute and transmit the work."
 msgstr "Copiar, distribuir y transmitir el trabajo."
 
-#. (itstool) path: item/title
-#: C/license.page:29
+#: C/license.page:29(item/title)
 msgid "<em>To remix</em>"
 msgstr "<em>Hacer obras derivadas</em>"
 
-#. (itstool) path: item/p
-#: C/license.page:30
+#: C/license.page:30(item/p)
 msgid "To adapt the work."
 msgstr "Adaptar el trabajo."
 
-#. (itstool) path: page/p
-#: C/license.page:33
+#: C/license.page:33(page/p)
 msgid "Under the following conditions:"
 msgstr "Bajo las siguientes condiciones:"
 
-#. (itstool) path: item/title
-#: C/license.page:38
+#: C/license.page:38(item/title)
 msgid "<em>Attribution</em>"
 msgstr "<em>Atribución</em>"
 
-#. (itstool) path: item/p
-#: C/license.page:39
+#: C/license.page:39(item/p)
 msgid ""
 "You must attribute the work in the manner specified by the author or "
 "licensor (but not in any way that suggests that they endorse you or your use "
@@ -1186,13 +1060,11 @@ msgstr ""
 "autor o el licenciador (pero no de una manera que sugiera que tiene su apoyo "
 "o apoyan el uso que hace de su obra)."
 
-#. (itstool) path: item/title
-#: C/license.page:46
+#: C/license.page:46(item/title)
 msgid "<em>Share Alike</em>"
 msgstr "<em>Compartir igual</em>"
 
-#. (itstool) path: item/p
-#: C/license.page:47
+#: C/license.page:47(item/p)
 msgid ""
 "If you alter, transform, or build upon this work, you may distribute the "
 "resulting work only under the same, similar or a compatible license."
@@ -1201,8 +1073,7 @@ msgstr ""
 "puede distribuir la obra resultante bajo la misma licencia, una similar o "
 "una compatible."
 
-#. (itstool) path: page/p
-#: C/license.page:53
+#: C/license.page:53(page/p)
 msgid ""
 "For the full text of the license, see the <link href=\"http://"
 "creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</"
@@ -1214,12 +1085,27 @@ msgstr ""
 "Commons</link> o lea el<link href=\"http://creativecommons.org/licenses/by-"
 "sa/3.0/\">Escrito de Commons</link>."
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/mancreate.page:392
+#: C/mancreate.page:340(media)
+#| msgid ""
+#| "@@image: 'figures/glabels-template-rect-label.png'; "
+#| "md5=9c7ae1c1a888e1c9eefd19655d093971"
+msgctxt "_"
+msgid ""
+"external ref='figures/glabels-template-rect-label.png' "
+"md5='9c7ae1c1a888e1c9eefd19655d093971'"
+msgstr ""
+"external ref='figures/glabels-template-rect-label.png' "
+"md5='9c7ae1c1a888e1c9eefd19655d093971'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mancreate.page:392(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/glabels-template-ellipse-label.png' "
@@ -1228,18 +1114,79 @@ msgstr ""
 "external ref='figures/glabels-template-ellipse-label.png' "
 "md5='ba612c86b5fb8fcd2b5384ecc1c331d2'"
 
-#. (itstool) path: info/desc
-#: C/mancreate.page:11
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mancreate.page:439(media)
+#| msgid ""
+#| "@@image: 'figures/glabels-template-circle-label.png'; "
+#| "md5=841e36a1f92aeed01e8fbaacc67758f1"
+msgctxt "_"
+msgid ""
+"external ref='figures/glabels-template-circle-label.png' "
+"md5='841e36a1f92aeed01e8fbaacc67758f1'"
+msgstr ""
+"external ref='figures/glabels-template-circle-label.png' "
+"md5='841e36a1f92aeed01e8fbaacc67758f1'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mancreate.page:500(media)
+#| msgid ""
+#| "@@image: 'figures/glabels-template-cd-label.png'; "
+#| "md5=c7952ac1b26ecbfa53facfbbf6486841"
+msgctxt "_"
+msgid ""
+"external ref='figures/glabels-template-cd-label.png' "
+"md5='c7952ac1b26ecbfa53facfbbf6486841'"
+msgstr ""
+"external ref='figures/glabels-template-cd-label.png' "
+"md5='c7952ac1b26ecbfa53facfbbf6486841'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mancreate.page:726(media)
+#| msgid ""
+#| "@@image: 'figures/layouts-cdlabel.png'; "
+#| "md5=0c41a95dc82b5a426e934751faf86872"
+msgctxt "_"
+msgid ""
+"external ref='figures/layouts-cdlabel.png' "
+"md5='0c41a95dc82b5a426e934751faf86872'"
+msgstr ""
+"external ref='figures/layouts-cdlabel.png' "
+"md5='0c41a95dc82b5a426e934751faf86872'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mancreate.page:789(media)
+#| msgid ""
+#| "@@image: 'figures/glabels-template-layout.png'; "
+#| "md5=fe1c9652d5448b2e0ece086777d3a287"
+msgctxt "_"
+msgid ""
+"external ref='figures/glabels-template-layout.png' "
+"md5='fe1c9652d5448b2e0ece086777d3a287'"
+msgstr ""
+"external ref='figures/glabels-template-layout.png' "
+"md5='fe1c9652d5448b2e0ece086777d3a287'"
+
+#: C/mancreate.page:11(info/desc)
 msgid "Create your templates manually."
 msgstr "Crear sus plantillas manualmente."
 
-#. (itstool) path: page/title
-#: C/mancreate.page:27
+#: C/mancreate.page:27(page/title)
 msgid "Manually creating new templates"
 msgstr "Crear plantillas nuevas manualmente"
 
-#. (itstool) path: page/p
-#: C/mancreate.page:34
+#: C/mancreate.page:34(page/p)
 msgid ""
 "This page is a reference guide to manually creating <app>gLabels</app> "
 "templates. <app>gLabels</app> templates are defined in simple XML files as "
@@ -1253,8 +1200,7 @@ msgstr ""
 "xmlns/2.3/glabels-2.3.dtd.txt\">glabels-2.3.dtd</link> (Este DTD también "
 "describe otros formatos XML usados por <app>glabels</app>)."
 
-#. (itstool) path: page/p
-#: C/mancreate.page:39
+#: C/mancreate.page:39(page/p)
 msgid ""
 "Manually created template files should be placed in the <file>${HOME}/."
 "glabels</file> and be named with a <file>.template</file> extension."
@@ -1262,8 +1208,7 @@ msgstr ""
 "Las plantillas creadas manualmente se guardarán en <file>${HOME}/.glabels</"
 "file> y se nombrarán con extensión <file>.template</file>."
 
-#. (itstool) path: note/p
-#: C/mancreate.page:43
+#: C/mancreate.page:43(note/p)
 msgid ""
 "<app>gLabels</app> searches for templates in several other locations as "
 "defined here:"
@@ -1271,27 +1216,25 @@ msgstr ""
 "<app>gLabels</app> busca plantillas en varias ubicaciones, como se define "
 "aquí:"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:46
+#: C/mancreate.page:46(td/p)
 msgid "Location"
 msgstr "Ubicación"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:47 C/mancreate.page:173 C/mancreate.page:237
-#: C/mancreate.page:301 C/mancreate.page:364 C/mancreate.page:415
-#: C/mancreate.page:462 C/mancreate.page:535 C/mancreate.page:562
-#: C/mancreate.page:600 C/mancreate.page:634 C/mancreate.page:676
-#: C/mancreate.page:753
+#: C/mancreate.page:47(td/p) C/mancreate.page:173(td/p)
+#: C/mancreate.page:237(td/p) C/mancreate.page:301(td/p)
+#: C/mancreate.page:364(td/p) C/mancreate.page:415(td/p)
+#: C/mancreate.page:462(td/p) C/mancreate.page:535(td/p)
+#: C/mancreate.page:562(td/p) C/mancreate.page:600(td/p)
+#: C/mancreate.page:634(td/p) C/mancreate.page:676(td/p)
+#: C/mancreate.page:753(td/p)
 msgid "Description"
 msgstr "Descripción"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:55
+#: C/mancreate.page:55(td/p)
 msgid "Predefined templates distributed with <app>gLabels</app>."
 msgstr "Plantillas predefinidas distribuidas con <app>gLabels</app>."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:56
+#: C/mancreate.page:56(td/p)
 msgid ""
 "<file>${prefix}</file> is usually <file>/usr</file> or <file>/usr/local</"
 "file>, depending on where <app>gLabels</app> was installed."
@@ -1299,8 +1242,7 @@ msgstr ""
 "<file>${prefix}</file> normalmente es <file>/usr</file> o <file>/usr/local</"
 "file>, dependiendo de dónde se haya instalado <app>gLabels</app>."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:61
+#: C/mancreate.page:61(td/p)
 msgid ""
 "User defined templates created with the <app>gLabels</app> <gui>Template "
 "Designer</gui>. <em>Do not put manually created templates in this directory."
@@ -1310,8 +1252,7 @@ msgstr ""
 "plantillas</gui> de <app>gLabels</app>. <em>No ponga plantillas creadas "
 "manualmente en esta carpeta</em>."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:63
+#: C/mancreate.page:63(td/p)
 msgid ""
 "If <file>${XDG_CONFIG_HOME}</file> is not defined, it defaults to <file>"
 "${HOME}/.config</file>."
@@ -1319,8 +1260,7 @@ msgstr ""
 "Si <file>${XDG_CONFIG_HOME}</file> no está definido, su valor predeterminado "
 "es <file>${HOME}/.config</file>."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:68
+#: C/mancreate.page:68(td/p)
 msgid ""
 "User defined templates that have been created manually should be placed in "
 "this directory. Older versions of the <app>gLabels</app> <gui>Template "
@@ -1331,8 +1271,7 @@ msgstr ""
 "<app>gLabels</app> (anteriores a 3.0) también pondrían plantillas en esta "
 "carpeta."
 
-#. (itstool) path: note/p
-#: C/mancreate.page:76
+#: C/mancreate.page:76(note/p)
 msgid ""
 "Completed template files can be sent to the <app>gLabels</app> template "
 "<link href=\"mailto:glabels-templates@lists.sourceforge.net\">mailing list</"
@@ -1343,13 +1282,11 @@ msgstr ""
 "plantillas de <app>gLabels</app>, para incluirlas posiblemente en versiones "
 "futuras de <app>gLabels</app>."
 
-#. (itstool) path: section/title
-#: C/mancreate.page:90
+#: C/mancreate.page:90(section/title)
 msgid "Assumptions/caveats"
 msgstr "Supuestos/advertencias"
 
-#. (itstool) path: item/p
-#: C/mancreate.page:93
+#: C/mancreate.page:93(item/p)
 msgid ""
 "A sheet contains only one size of label or card (if a sheet contains more "
 "than one size of item, it can be split into multiple templates for multiple "
@@ -1359,8 +1296,7 @@ msgstr ""
 "contiene más de un tamaño por elemento, se puede dividir el varias "
 "plantillas para imprimir en múltiples pasadas)"
 
-#. (itstool) path: item/p
-#: C/mancreate.page:98
+#: C/mancreate.page:98(item/p)
 msgid ""
 "Distances can be expressed in units of <code>pt</code>, <code>in</code>, "
 "<code>mm</code>, <code>cm</code>, or <code>pc</code>. For example: "
@@ -1374,13 +1310,11 @@ msgstr ""
 "unidades, se asumirá que son puntos informáticos (<code>pt</code>), donde 1 "
 "<em>pt</em> = 1/72 <em>in</em> = 0.352778 <em>mm</em>."
 
-#. (itstool) path: section/title
-#: C/mancreate.page:118
+#: C/mancreate.page:118(section/title)
 msgid "Template Files"
 msgstr "Archivos de plantillas"
 
-#. (itstool) path: section/p
-#: C/mancreate.page:120
+#: C/mancreate.page:120(section/p)
 msgid ""
 "A template file contains a single <code>Glabels-templates</code> top-level "
 "node."
@@ -1388,8 +1322,7 @@ msgstr ""
 "Un archivo de plantilla contiene un único nodo <code>Glabels-templates</"
 "code> de nivel superior."
 
-#. (itstool) path: section/code
-#: C/mancreate.page:123
+#: C/mancreate.page:123(section/code)
 #, no-wrap
 msgid ""
 "\n"
@@ -1408,13 +1341,11 @@ msgstr ""
 "\n"
 "&lt;/Glabels-templates&gt;"
 
-#. (itstool) path: listing/title
-#: C/mancreate.page:132
+#: C/mancreate.page:132(listing/title)
 msgid "Example Template"
 msgstr "Plantilla de ejemplo"
 
-#. (itstool) path: listing/desc
-#: C/mancreate.page:133
+#: C/mancreate.page:133(listing/desc)
 msgid ""
 "Example <app>gLabels</app> template file containing a single <code>Template</"
 "code> node."
@@ -1422,13 +1353,11 @@ msgstr ""
 "Ejemplo de archivo de plantilla de <app>gLabels</app> con un nodo "
 "<code>Template</code>."
 
-#. (itstool) path: section/title
-#: C/mancreate.page:163
+#: C/mancreate.page:163(section/title)
 msgid "<code>Template</code> Node"
 msgstr "Nodo <code>Plantilla</code>"
 
-#. (itstool) path: section/p
-#: C/mancreate.page:165
+#: C/mancreate.page:165(section/p)
 msgid ""
 "A <code>Template</code> node describes a single stationery product. It must "
 "contain one instance of any type of Label node (<code>Label-rectangle</"
@@ -1438,59 +1367,52 @@ msgstr ""
 "contener una instancia de cada tipo de nodo «Etiqueta» (<code>Label-"
 "rectangle</code>, <code>Label-round</code>, o <code>Label-cd</code>)."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:173 C/mancreate.page:301 C/mancreate.page:364
-#: C/mancreate.page:415 C/mancreate.page:462 C/mancreate.page:535
-#: C/mancreate.page:562 C/mancreate.page:600 C/mancreate.page:634
-#: C/mancreate.page:676 C/mancreate.page:753
+#: C/mancreate.page:173(td/p) C/mancreate.page:301(td/p)
+#: C/mancreate.page:364(td/p) C/mancreate.page:415(td/p)
+#: C/mancreate.page:462(td/p) C/mancreate.page:535(td/p)
+#: C/mancreate.page:562(td/p) C/mancreate.page:600(td/p)
+#: C/mancreate.page:634(td/p) C/mancreate.page:676(td/p)
+#: C/mancreate.page:753(td/p)
 msgid "Property"
 msgstr "Propiedad"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:180
+#: C/mancreate.page:180(td/p)
 msgid "Brand or manufacturer of stationery product. E.g. \"Avery\""
 msgstr "Marca o fabricante de productos de papelería. Por ejemplo «Avery»."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:184
+#: C/mancreate.page:184(td/p)
 msgid "Part number or name of stationery product. E.g. \"8160\""
 msgstr "Número de pieza o nombre de un producto de papelería. Ej «8160»"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:188
+#: C/mancreate.page:188(td/p)
 msgid ""
 "Size of sheet. E.g., \"<code>US-Letter</code>\", \"<code>A4</code>\", ..."
 msgstr ""
 "Tamaño de la hoja. Ej. \"<code>Carta</code>\", \"<code>A4</code>\", ...."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:194
+#: C/mancreate.page:194(td/p)
 msgid "Description of stationery product. E.g, \"Mailing Labels.\""
 msgstr ""
 "Descripción de un producto de papelería. Por ejemplo, «Etiquetas de "
 "dirección»."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:198
+#: C/mancreate.page:198(td/p)
 msgid ""
 "Translatable description of stationery product. E.g, \"Mailing Labels."
 "\" (Only useful for predefined templates)"
 msgstr ""
-"Descripción traducible para un producto de papelería. Por ejemplo, «Etiquetas "
-"de correo». (Útil sólo para plantillas predefinidas.)"
+"Descripción traducible para un producto de papelería. Por ejemplo, "
+"«Etiquetas de correo». (Útil sólo para plantillas predefinidas.)"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:203
+#: C/mancreate.page:203(td/p)
 msgid "Page width. Only valid if size=\"Other\""
 msgstr "Ancho de la página. Sólo es válido si tamaño=«Otro»"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:207
+#: C/mancreate.page:207(td/p)
 msgid "Page height. Only valid if size=\"Other\""
 msgstr "Altura de la página. Sólo es válido si tamaño=«Otro»"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:211
+#: C/mancreate.page:211(td/p)
 msgid ""
 "Equivalent part number. If this property is present, the template is a clone "
 "of another template of the same brand. The template will inherit all "
@@ -1504,13 +1426,11 @@ msgstr ""
 "propiedad debe referirse a una plantilla definida anteriormente: actualmente "
 "<app>gLabels</app> no soporta hacia adelante."
 
-#. (itstool) path: section/title
-#: C/mancreate.page:229
+#: C/mancreate.page:229(section/title)
 msgid "<code>Meta</code> Node"
 msgstr "Nodo <code>Meta</code>"
 
-#. (itstool) path: section/p
-#: C/mancreate.page:231
+#: C/mancreate.page:231(section/p)
 msgid ""
 "A <code>Meta</code> node contains some additional information about the "
 "template. A <code>Template</code> node may contain zero or more <code>Meta</"
@@ -1520,13 +1440,11 @@ msgstr ""
 "Un nodo <code>Template</code> puede contener cero o más nodos <code>Meta</"
 "code>."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:237
+#: C/mancreate.page:237(td/p)
 msgid "Subnode"
 msgstr "Subnodo"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:244
+#: C/mancreate.page:244(td/p)
 msgid ""
 "A category for the template. A template can belong to multiple categories by "
 "simply adding multiple <code>Meta</code> nodes to the parent <code>Template</"
@@ -1539,8 +1457,7 @@ msgstr ""
 "<app>gLabels</app> usa las categorías de las plantillas para filtrar los "
 "resultados de búsquedas de plantillas."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:251
+#: C/mancreate.page:251(td/p)
 msgid ""
 "The value of this category must match a predefined category ID defined in "
 "the file <file>${prefix}/libglabels-3.0/templates/categories.xml</file>. "
@@ -1550,8 +1467,7 @@ msgstr ""
 "en el archivo <file>${prefix}/libglabels-3.0/templates/categories.xml</"
 "file>. Los ID de categoría definidos actualmente incluyen:"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:273
+#: C/mancreate.page:273(td/p)
 msgid ""
 "A URL pointing to the vendor's webpage for the specific product, if "
 "available."
@@ -1559,8 +1475,7 @@ msgstr ""
 "Un URL que apunta a la página web del fabricante para un producto "
 "determinado, si está disponible."
 
-#. (itstool) path: note/p
-#: C/mancreate.page:277
+#: C/mancreate.page:277(note/p)
 msgid ""
 "Suggestions for additional categories can be sent to the <app>gLabels</app> "
 "developer's <link href=\"mailto:glabels-devel@lists.sourceforge.net"
@@ -1570,20 +1485,17 @@ msgstr ""
 "\"mailto:glabels-devel@lists.sourceforge.net\">lista de correo</link> de los "
 "desarrolladores de <app>gLabels</app>."
 
-#. (itstool) path: note/p
-#: C/mancreate.page:280
+#: C/mancreate.page:280(note/p)
 msgid "Product URLs may be of limited use, because they may not be permanent."
 msgstr ""
 "Los URL de productos deben ser de uso limitado, ya que pueden no ser "
 "permanentes."
 
-#. (itstool) path: section/title
-#: C/mancreate.page:293
+#: C/mancreate.page:293(section/title)
 msgid "<code>Label-rectangle</code> Node"
 msgstr "Nodo <code>Label-rectangle</code>"
 
-#. (itstool) path: section/p
-#: C/mancreate.page:295
+#: C/mancreate.page:295(section/p)
 msgid ""
 "A <code>Label-rectangle</code> node describes the dimensions of a single "
 "label or business card that is rectangular in shape (may have rounded edges)."
@@ -1592,24 +1504,20 @@ msgstr ""
 "etiqueta o tarjeta de visita de forma rectangular (Puede tener los bordes "
 "redondeados)."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:308 C/mancreate.page:371 C/mancreate.page:422
-#: C/mancreate.page:469
+#: C/mancreate.page:308(td/p) C/mancreate.page:371(td/p)
+#: C/mancreate.page:422(td/p) C/mancreate.page:469(td/p)
 msgid "Reserved for future use. Should always be 0."
 msgstr "Reservado para el futuro. Debería ser siempre 0."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:312
+#: C/mancreate.page:312(td/p)
 msgid "Width of label/card"
 msgstr "Ancho de la etiqueta/tarjeta"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:316
+#: C/mancreate.page:316(td/p)
 msgid "Heigth of label/card"
 msgstr "Altura de la etiqueta/tarjeta"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:320
+#: C/mancreate.page:320(td/p)
 msgid ""
 "Radius of corners. For items with square edges (business cards), the radius "
 "should be 0."
@@ -1617,8 +1525,7 @@ msgstr ""
 "Radio de la esquina. Para elementos con bordes cuadrados (tarjetas de "
 "visita), el radio debe ser 0."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:325
+#: C/mancreate.page:325(td/p)
 msgid ""
 "Amount of horizontal waste (over-print) to allow. This is useful for "
 "minimizing alignment problems when using non-white backgrounds (e.g. images)."
@@ -1627,8 +1534,7 @@ msgstr ""
 "útil para minimizar problemas de alineación al usar fondos no blancos (ej. "
 "imágenes)."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:331
+#: C/mancreate.page:331(td/p)
 msgid ""
 "Amount of vertical waste (over-print) to allow. This is useful for "
 "minimizing alignment problems when using non-white backgrounds (e.g. images)."
@@ -1637,18 +1543,15 @@ msgstr ""
 "para minimizar problemas de alineación al usar fondos no blancos (ej. "
 "imágenes)."
 
-#. (itstool) path: figure/desc
-#: C/mancreate.page:339
+#: C/mancreate.page:339(figure/desc)
 msgid "<code>Label-rectangle</code> parameters"
 msgstr "Parámetros de <code>Label-rectangle</code>"
 
-#. (itstool) path: section/title
-#: C/mancreate.page:356
+#: C/mancreate.page:356(section/title)
 msgid "<code>Label-ellipse</code> Node"
 msgstr "Nodo <code>Label-ellipse</code>"
 
-#. (itstool) path: section/p
-#: C/mancreate.page:358
+#: C/mancreate.page:358(section/p)
 msgid ""
 "A <code>Label-ellipse</code> node describes the dimensions of a single label "
 "or business card that is elliptic in shape."
@@ -1656,18 +1559,16 @@ msgstr ""
 "Un nodo <code>Label-ellipse</code> describe las dimensiones de una única "
 "etiqueta o tarjeta de visita de forma elíptica."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:375
+#: C/mancreate.page:375(td/p)
 msgid "Width of the ellipse"
 msgstr "Anchura de la elipse"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:379
+#: C/mancreate.page:379(td/p)
 msgid "Heigth of the ellipse"
 msgstr "Altura de la elipse"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:383 C/mancreate.page:430 C/mancreate.page:491
+#: C/mancreate.page:383(td/p) C/mancreate.page:430(td/p)
+#: C/mancreate.page:491(td/p)
 msgid ""
 "Amount of waste (over-print) to allow. This is useful for minimizing "
 "alignment problems when using non-white backgrounds (e.g. images)."
@@ -1675,24 +1576,19 @@ msgstr ""
 "Cantidad de residuos (sobreimpresión) que permitir. Esto es útil para "
 "minimizar problemas de alineación al usar fondos no blancos (ej. imágenes)."
 
-#. (itstool) path: figure/desc
-#: C/mancreate.page:391
+#: C/mancreate.page:391(figure/desc)
 msgid "<span>Label-ellipse</span> parameters"
 msgstr "Parámetros de <span>Label-ellipse</span>"
 
-#. (itstool) path: media/p
-#. (itstool) path: figure/desc
-#: C/mancreate.page:393 C/mancreate.page:438
+#: C/mancreate.page:393(media/p) C/mancreate.page:438(figure/desc)
 msgid "<code>Label-ellipse</code> parameters"
 msgstr "Parámetros de <code>Label-ellipse</code>"
 
-#. (itstool) path: section/title
-#: C/mancreate.page:408
+#: C/mancreate.page:408(section/title)
 msgid "<code>Label-round</code> Node"
 msgstr "Nodo <code>Label-round</code>"
 
-#. (itstool) path: section/p
-#: C/mancreate.page:410
+#: C/mancreate.page:410(section/p)
 msgid ""
 "A <code>Label-round</code> node describes the dimensions of a simple round "
 "label (not a CD)."
@@ -1700,18 +1596,15 @@ msgstr ""
 "Un nodo <code>Label-round</code> describe las dimensiones de una sola "
 "etiqueta circular (no un CD)."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:426
+#: C/mancreate.page:426(td/p)
 msgid "Radius (1/2 diameter) of label"
 msgstr "Radio (1/2 del diámetro) de la etiqueta"
 
-#. (itstool) path: section/title
-#: C/mancreate.page:455
+#: C/mancreate.page:455(section/title)
 msgid "<code>Label-cd</code> Node"
 msgstr "Nodo <code>Label-cd</code>"
 
-#. (itstool) path: section/p
-#: C/mancreate.page:457
+#: C/mancreate.page:457(section/p)
 msgid ""
 "A <code>Label-cd</code> node describes the dimensions of a CD, DVD, or "
 "business card CD."
@@ -1719,18 +1612,15 @@ msgstr ""
 "Un nodo <code>Label-cd</code> describe las dimensiones de un CD, DVD o un CD "
 "de tarjeta de visita."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:473
+#: C/mancreate.page:473(td/p)
 msgid "Outer radius of label"
 msgstr "Radio exterior de la etiqueta"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:477
+#: C/mancreate.page:477(td/p)
 msgid "Radius of concentric hole"
 msgstr "Radio del agujero concéntrico"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:481
+#: C/mancreate.page:481(td/p)
 msgid ""
 "If present, the label is clipped to the given width. (Useful for \"business "
 "card CDs\")."
@@ -1738,8 +1628,7 @@ msgstr ""
 "Si está presente, la etiqueta se recorta a la anchura dada. (Útil para "
 "«tarjetas de visita en CD»)."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:486
+#: C/mancreate.page:486(td/p)
 msgid ""
 "If present, the label is clipped to the given height. (Useful for \"business "
 "card CDs\")."
@@ -1747,18 +1636,15 @@ msgstr ""
 "Si está presente, la etiqueta se recorta a la altura dada. (Útil para "
 "«tarjetas de visita en CD»)."
 
-#. (itstool) path: figure/desc
-#: C/mancreate.page:499
+#: C/mancreate.page:499(figure/desc)
 msgid "<code>Label-cd</code> parameters"
 msgstr "Parámetros de <code>Label-cd</code>"
 
-#. (itstool) path: section/title
-#: C/mancreate.page:516
+#: C/mancreate.page:516(section/title)
 msgid "<code>Markup</code> Nodes"
 msgstr "Nodos <code>Markup</code>"
 
-#. (itstool) path: section/p
-#: C/mancreate.page:518
+#: C/mancreate.page:518(section/p)
 msgid ""
 "Templates may contain optional markup nodes. These nodes are used to "
 "describe a simple set of markup lines that are visible in the <app>glabels</"
@@ -1773,21 +1659,18 @@ msgstr ""
 "centrado, áreas especiales u otros indicios útiles para el usuario de una "
 "plantilla."
 
-#. (itstool) path: section/title
-#: C/mancreate.page:528
+#: C/mancreate.page:528(section/title)
 msgid "<code>Markup-margin</code> Node"
 msgstr "Nodo <code>Markup-margin</code>"
 
-#. (itstool) path: section/p
-#: C/mancreate.page:530
+#: C/mancreate.page:530(section/p)
 msgid ""
 "A <code>Markup-margin</code> describes a margin along all edges of a label."
 msgstr ""
 "Un <code>Markup-margin</code> describe un margen a lo largo de los bordes de "
 "una etiqueta."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:542
+#: C/mancreate.page:542(td/p)
 msgid ""
 "Size of the margin. I.e. the distance of the margin line from the edge of "
 "the card/label."
@@ -1795,133 +1678,107 @@ msgstr ""
 "Tamaño del margen. Ej. la distancia de la línea del margen desde el borde de "
 "la tarjeta/etiqueta."
 
-#. (itstool) path: section/title
-#: C/mancreate.page:556
+#: C/mancreate.page:556(section/title)
 msgid "<code>Markup-line</code> Node"
 msgstr "Nodo <code>Markup-line</code>"
 
-#. (itstool) path: section/p
-#: C/mancreate.page:558
+#: C/mancreate.page:558(section/p)
 msgid "A <code>Markup-line</code> node describes a markup line."
 msgstr "Un nodo <code >Markup-line</code> describe una línea de marcado."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:569
+#: C/mancreate.page:569(td/p)
 msgid "x coordinate of 1st endpoint of the line segment."
 msgstr "coordenada X del primero punto final del segmento de línea."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:573
+#: C/mancreate.page:573(td/p)
 msgid "y coordinate of 1st endpoint of the line segment."
 msgstr "coordenada Y del primero punto final del segmento de línea."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:577
+#: C/mancreate.page:577(td/p)
 msgid "x coordinate of 2st endpoint of the line segment."
 msgstr "coordenada X del segundo punto final del segmento de línea."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:581
+#: C/mancreate.page:581(td/p)
 msgid "y coordinate of 2st endpoint of the line segment."
 msgstr "coordenada Y del segundo punto final del segmento de línea."
 
-#. (itstool) path: section/title
-#: C/mancreate.page:594
+#: C/mancreate.page:594(section/title)
 msgid "<code>Markup-circle</code> Node"
 msgstr "Nodo <code>Markup-circle</code>"
 
-#. (itstool) path: section/p
-#: C/mancreate.page:596
+#: C/mancreate.page:596(section/p)
 msgid "A <code>Markup-circle</code> describes a markup circle."
 msgstr "Un <code>Markup-circle</code> describe un círculo de marcado."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:607
+#: C/mancreate.page:607(td/p)
 msgid "x coordinate of circle origin (center)."
 msgstr "coordenada X del círculo origen (centro)."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:611
+#: C/mancreate.page:611(td/p)
 msgid "y coordinate of circle origin (center)."
 msgstr "coordenada Y del círculo origen (centro)."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:615
+#: C/mancreate.page:615(td/p)
 msgid "Radius of circle."
 msgstr "Radio del círculo."
 
-#. (itstool) path: section/title
-#: C/mancreate.page:628
+#: C/mancreate.page:628(section/title)
 msgid "<code>Markup-rect</code> Node"
 msgstr "Nodo <code>Markup-rect</code>"
 
-#. (itstool) path: section/p
-#: C/mancreate.page:630
+#: C/mancreate.page:630(section/p)
 msgid "A <code>Markup-rect</code> describes a markup rectangle."
 msgstr "Un <code>Markup-rect</code> describe un rectángulo de marcado."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:641
+#: C/mancreate.page:641(td/p)
 msgid "x coordinate of upper left corner of rectangle."
 msgstr "coordenada X de la esquina superior izquierda del rectángulo"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:645
+#: C/mancreate.page:645(td/p)
 msgid "y coordinate of upper left corner of rectangle."
 msgstr "coordenada Y de la esquina superior izquierda del rectángulo"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:649
+#: C/mancreate.page:649(td/p)
 msgid "Width of rectangle."
 msgstr "Anchura del rectángulo."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:653
+#: C/mancreate.page:653(td/p)
 msgid "Height of rectangle."
 msgstr "Altura del rectángulo."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:657
+#: C/mancreate.page:657(td/p)
 msgid "Radius of rounded corners of rectangle."
 msgstr "Radio de las esquinas redondeadas del rectángulo."
 
-#. (itstool) path: section/title
-#: C/mancreate.page:670
+#: C/mancreate.page:670(section/title)
 msgid "<code>Markup-ellipse</code> Node"
 msgstr "Nodo <code>Markup-ellipse</code>"
 
-#. (itstool) path: section/p
-#: C/mancreate.page:672
+#: C/mancreate.page:672(section/p)
 msgid "A <code>Markup-ellipse</code> describes a markup ellipse."
 msgstr "Un <code>Markup-ellipse</code> describe una elipse de marcado."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:683
+#: C/mancreate.page:683(td/p)
 msgid "x coordinate of upper left corner of ellipse."
 msgstr "coordenada «x» de la esquina superior izquierda de la elipse."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:687
+#: C/mancreate.page:687(td/p)
 msgid "y coordinate of upper left corner of ellipse."
 msgstr "coordenada «y» de la esquina superior izquierda de la elipse."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:691
+#: C/mancreate.page:691(td/p)
 msgid "Width of ellipse."
 msgstr "Anchura de la elipse."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:695
+#: C/mancreate.page:695(td/p)
 msgid "Height of ellipse."
 msgstr "Altura de la elipse."
 
-#. (itstool) path: section/title
-#: C/mancreate.page:713
+#: C/mancreate.page:713(section/title)
 msgid "<code>Layout</code> Node"
 msgstr "Nodo <code>Layout</code>"
 
-#. (itstool) path: section/p
-#: C/mancreate.page:715
+#: C/mancreate.page:715(section/p)
 msgid ""
 "A label node may contain multiple <code>Layout</code> children. If labels "
 "are arranged in a simple grid pattern, only one layout is needed. However, "
@@ -1933,18 +1790,15 @@ msgstr ""
 "sin embargo, si las etiquetas se colocan en varias rejillas, como un patrón "
 "de unión, se pueden usar múltiples etiquetas <code>Layout</code>."
 
-#. (itstool) path: section/p
-#: C/mancreate.page:720
+#: C/mancreate.page:720(section/p)
 msgid "A common example for multiple layouts is a sheet with three CD labels:"
 msgstr "Un ejemplo común de varios diseños es una hoja con etiquetas para CD:"
 
-#. (itstool) path: figure/desc
-#: C/mancreate.page:725
+#: C/mancreate.page:725(figure/desc)
 msgid "CD label sheet"
 msgstr "Hoja de etiquetas de CD"
 
-#. (itstool) path: section/p
-#: C/mancreate.page:732
+#: C/mancreate.page:732(section/p)
 msgid ""
 "The two labels on the left edge can be assigned to a grid, assuming we can "
 "define the coordinates for the top left label and the distance to the second "
@@ -1961,8 +1815,7 @@ msgstr ""
 "definir un segundo diseño, con coordenadas únicas para la esquina superior "
 "izquierda de esa etiqueta."
 
-#. (itstool) path: note/p
-#: C/mancreate.page:740
+#: C/mancreate.page:740(note/p)
 msgid ""
 "You can define multiple layouts only if the labels on the sheet have the "
 "same shape. If your sheet contains different shapes, you have to define each "
@@ -1976,23 +1829,19 @@ msgstr ""
 "probablemente podrán concatenar estas hojas con diferentes formas en una "
 "única plantilla."
 
-#. (itstool) path: note/p
-#: C/mancreate.page:748
+#: C/mancreate.page:748(note/p)
 msgid "A single label can always be treated as a grid of one."
 msgstr "Una única etiqueta se puede tratar con una rejilla de una."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:760
+#: C/mancreate.page:760(td/p)
 msgid "Number of labels/cards across in the grid (horizontal)"
 msgstr "Número de etiquetas/tarjetas en la rejilla (horizontal)"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:764
+#: C/mancreate.page:764(td/p)
 msgid "Number of labels/cards across in the grid (vertical)"
 msgstr "Número de etiquetas/tarjetas en la rejilla (vertical)"
 
-#. (itstool) path: td/p
-#: C/mancreate.page:768
+#: C/mancreate.page:768(td/p)
 msgid ""
 "Distance from left edge of sheet to the left edge of the left column of "
 "cards/labels in the layout."
@@ -2000,8 +1849,7 @@ msgstr ""
 "Distancia desde el borde izquierdo de la hoja hasta el borde izquierdo de la "
 "columna de la izquierda de las tarjetas/etiquetas en la disposición."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:773
+#: C/mancreate.page:773(td/p)
 msgid ""
 "Distance from the top edge of sheet to the top edge of the top row of labels/"
 "cards in the layout."
@@ -2009,81 +1857,71 @@ msgstr ""
 "Distancia desde el borde superior de la hoja hasta el borde superior de la "
 "fila de arriba de las tarjetas/etiquetas en la disposición."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:778
+#: C/mancreate.page:778(td/p)
 msgid "Horizontal pitch of grid."
 msgstr "Inclinación horizontal de la rejilla."
 
-#. (itstool) path: td/p
-#: C/mancreate.page:782
+#: C/mancreate.page:782(td/p)
 msgid "Vertical pitch of grid."
 msgstr "Inclinación vertical de la rejilla."
 
-#. (itstool) path: figure/desc
-#: C/mancreate.page:788
+#: C/mancreate.page:788(figure/desc)
 msgid "<code>Layout</code> parameters"
 msgstr "Parámetros de <code>Layout</code>"
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/merge-ex1.page:50
+#: C/merge-ex1.page:50(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/merge-ex1-1.png' md5='c1fe7f5f05a81d9c04f9d03bb7071798'"
 msgstr ""
 "external ref='figures/merge-ex1-1.png' md5='c1fe7f5f05a81d9c04f9d03bb7071798'"
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/merge-ex1.page:63
+#: C/merge-ex1.page:63(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/merge-ex1-2.png' md5='45c30ca8de2478387404c7c5f45cf3d0'"
 msgstr ""
 "external ref='figures/merge-ex1-2.png' md5='45c30ca8de2478387404c7c5f45cf3d0'"
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/merge-ex1.page:84
+#: C/merge-ex1.page:84(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/merge-ex1-3.png' md5='1c23af6c90e5185cdc9e14d19baeb9f6'"
 msgstr ""
 "external ref='figures/merge-ex1-3.png' md5='1c23af6c90e5185cdc9e14d19baeb9f6'"
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/merge-ex1.page:95
+#: C/merge-ex1.page:95(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/merge-ex1-4.png' md5='1cc9f9adcb5a6e98ff5068531e6933f0'"
 msgstr ""
 "external ref='figures/merge-ex1-4.png' md5='1cc9f9adcb5a6e98ff5068531e6933f0'"
 
-#. (itstool) path: info/desc
-#: C/merge-ex1.page:9
+#: C/merge-ex1.page:9(info/desc)
 msgid "Create name tags from a CSV file."
 msgstr "Crear etiquetas de nombre desde un archivo CSV."
 
-#. (itstool) path: page/title
-#: C/merge-ex1.page:25
+#: C/merge-ex1.page:25(page/title)
 msgid "Example 1: Name Tags"
 msgstr "Ejemplo 1: etiquetas de nombre"
 
-#. (itstool) path: page/p
-#: C/merge-ex1.page:27
+#: C/merge-ex1.page:27(page/p)
 msgid ""
 "In this example we are organizing an orientation party for the new crew "
 "members of our ship. We have a list of freshman crew members that we created "
@@ -2096,8 +1934,7 @@ msgstr ""
 "siguiente archivo CSV. Se podría haber creado este archivo utilizando un "
 "editor de texto, pero diablos, es el siglo XXIII."
 
-#. (itstool) path: page/code
-#: C/merge-ex1.page:33
+#: C/merge-ex1.page:33(page/code)
 #, no-wrap
 msgid ""
 "\n"
@@ -2116,8 +1953,7 @@ msgstr ""
 "\"Montgomery Scott\",Engineering,SE-197-54T\n"
 "      "
 
-#. (itstool) path: page/p
-#: C/merge-ex1.page:41
+#: C/merge-ex1.page:41(page/p)
 msgid ""
 "In <app>gLabels</app> we have created a new <app>glabels</app> document "
 "using the Avery 5395 \"Name Badge Labels\" template. Next we use the "
@@ -2134,13 +1970,12 @@ msgstr ""
 "caso, CSV con claves en la línea 1) y la fuente de combinación (nombre de "
 "archivo) como se muestra."
 
-#. (itstool) path: media/p
-#: C/merge-ex1.page:51 C/merge-ex2.page:53 C/merge-ex3.page:54
+#: C/merge-ex1.page:51(media/p) C/merge-ex2.page:53(media/p)
+#: C/merge-ex3.page:54(media/p)
 msgid "Merge properties dialog"
 msgstr "Diálogo de propiedades de fusión"
 
-#. (itstool) path: page/p
-#: C/merge-ex1.page:55 C/merge-ex2.page:62
+#: C/merge-ex1.page:55(page/p) C/merge-ex2.page:62(page/p)
 msgid ""
 "We can also view each record in more detail by clicking on the appropriate "
 "expander (the little triangles) as shown. Once we are satisfied with the "
@@ -2151,21 +1986,20 @@ msgstr ""
 "las selecciones, pulse <gui>Aceptar</gui> en este diálogo para aceptar los "
 "cambios."
 
-#. (itstool) path: page/p
-#: C/merge-ex1.page:60 C/merge-ex2.page:67 C/merge-ex3.page:71
+#: C/merge-ex1.page:60(page/p) C/merge-ex2.page:67(page/p)
+#: C/merge-ex3.page:71(page/p)
 msgid ""
 "Now we start adding objects to our <app>glabels</app> document as shown."
 msgstr ""
 "Ahora puede añadir a añadir objetos al documento de<application>gLabels</"
 "application> como se muestra."
 
-#. (itstool) path: media/p
-#: C/merge-ex1.page:64 C/merge-ex2.page:71 C/merge-ex3.page:75
+#: C/merge-ex1.page:64(media/p) C/merge-ex2.page:71(media/p)
+#: C/merge-ex3.page:75(media/p)
 msgid "Adding objects"
 msgstr "Añadir objetos"
 
-#. (itstool) path: page/p
-#: C/merge-ex1.page:68
+#: C/merge-ex1.page:68(page/p)
 msgid ""
 "In this example we have added three text objects and a barcode object. The "
 "first text object contains only simple literal text (\"Hello, my name is\"). "
@@ -2189,8 +2023,7 @@ msgstr ""
 "campo (o la clave) «SN», que contiene los números de serie de la flota "
 "estelar de los miembros de la tripulación."
 
-#. (itstool) path: page/p
-#: C/merge-ex1.page:78
+#: C/merge-ex1.page:78(page/p)
 msgid ""
 "Now we can print our name tags by selecting the <guiseq> <gui>File</gui> "
 "<gui>Print</gui> </guiseq> menu item. This will display print dialog as "
@@ -2200,13 +2033,12 @@ msgstr ""
 "de menú <guiseq><gui>Archivo</gui><gui>Imprimir</gui></guiseq>. Esto "
 "mostrará el diálogo de impresión como se muestra a continuación."
 
-#. (itstool) path: media/p
-#: C/merge-ex1.page:85
+#: C/merge-ex1.page:85(media/p)
 msgid "Printing name tags"
 msgstr "Imprimir etiquetas de nombre"
 
-#. (itstool) path: page/p
-#: C/merge-ex1.page:89 C/merge-ex2.page:93 C/merge-ex3.page:93
+#: C/merge-ex1.page:89(page/p) C/merge-ex2.page:93(page/p)
+#: C/merge-ex3.page:93(page/p)
 msgid ""
 "Just to make sure our labels are going to look okay, we select the "
 "<gui>Print outlines</gui> option and click <gui>Print Preview</gui>. This "
@@ -2217,13 +2049,11 @@ msgstr ""
 "impresión</gui>. Esto mostrará un diálogo de vista previa, como se muestra a "
 "continuación."
 
-#. (itstool) path: media/p
-#: C/merge-ex1.page:96
+#: C/merge-ex1.page:96(media/p)
 msgid "Name tags preview"
 msgstr "Vista previa de las etiquetas de nombre"
 
-#. (itstool) path: page/p
-#: C/merge-ex1.page:100
+#: C/merge-ex1.page:100(page/p)
 msgid ""
 "Everything looks good, so we can now load up our printer with the "
 "appropriate label stock, print our name tags and start beaming our guests "
@@ -2233,66 +2063,59 @@ msgstr ""
 "etiquetas apropiadas, imprimir sus etiquetas de nombre e invitar a sus "
 "invitados a bordo."
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/merge-ex2.page:52
+#: C/merge-ex2.page:52(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/merge-ex2-1.png' md5='817abd0c8deb8a0b95acb7881d8ddb85'"
 msgstr ""
 "external ref='figures/merge-ex2-1.png' md5='817abd0c8deb8a0b95acb7881d8ddb85'"
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/merge-ex2.page:70
+#: C/merge-ex2.page:70(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/merge-ex2-2.png' md5='2012870be14752300e0cde420471714a'"
 msgstr ""
 "external ref='figures/merge-ex2-2.png' md5='2012870be14752300e0cde420471714a'"
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/merge-ex2.page:88
+#: C/merge-ex2.page:88(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/merge-ex2-3.png' md5='c347460091d8eef9f4ec89557fa9f1e2'"
 msgstr ""
 "external ref='figures/merge-ex2-3.png' md5='c347460091d8eef9f4ec89557fa9f1e2'"
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/merge-ex2.page:99
+#: C/merge-ex2.page:99(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/merge-ex2-4.png' md5='30d12e946a79e27211b835e38742671c'"
 msgstr ""
 "external ref='figures/merge-ex2-4.png' md5='30d12e946a79e27211b835e38742671c'"
 
-#. (itstool) path: info/desc
-#: C/merge-ex2.page:9
+#: C/merge-ex2.page:9(info/desc)
 msgid "Create address labels from a CSV file."
 msgstr "Crear etiquetas de dirección desde un archivo CSV."
 
-#. (itstool) path: page/title
-#: C/merge-ex2.page:25
+#: C/merge-ex2.page:25(page/title)
 msgid "Example 2: Address labels"
 msgstr "Ejemplo 2: etiquetas de dirección"
 
-#. (itstool) path: page/p
-#: C/merge-ex2.page:27
+#: C/merge-ex2.page:27(page/p)
 msgid ""
 "In this example we are going to throw a party and need to print mailing "
 "address labels for our invitations. We have a list of our closest friends "
@@ -2306,8 +2129,7 @@ msgstr ""
 "exportado como el siguiente archivo CSV. Debe tener en cuenta que no todo el "
 "mundo tiene una inicial intermedia o una dirección de dos líneas."
 
-#. (itstool) path: page/code
-#: C/merge-ex2.page:33
+#: C/merge-ex2.page:33(page/code)
 #, no-wrap
 msgid ""
 "\n"
@@ -2330,8 +2152,7 @@ msgstr ""
 "Kramer,Cosmo,,\"Apt 5B\",\"129 W. 81 St.\",\"New York\",NY,10024-7207\n"
 "      "
 
-#. (itstool) path: page/p
-#: C/merge-ex2.page:43
+#: C/merge-ex2.page:43(page/p)
 msgid ""
 "In <app>glabels</app> we have created a new <app>glabels</app> document "
 "using the Avery 5512 \"Address Labels\" template. Next we use the <guiseq> "
@@ -2348,8 +2169,7 @@ msgstr ""
 "CSV con claves en la línea 1) y la fuente de combinación (nombre de archivo) "
 "como se muestra."
 
-#. (itstool) path: page/p
-#: C/merge-ex2.page:57
+#: C/merge-ex2.page:57(page/p)
 msgid ""
 "Before applying the merge source, we uncheck the first record since it only "
 "contains empty fields. It is an artifact of our original <app>gnumeric</app> "
@@ -2362,8 +2182,7 @@ msgstr ""
 "nuestra primera etiqueta. También se pueden deseleccionar cualquier otro "
 "registro para el que no se quiera imprimir una etiqueta."
 
-#. (itstool) path: page/p
-#: C/merge-ex2.page:75
+#: C/merge-ex2.page:75(page/p)
 msgid ""
 "In this example we have a single text object. This text object contains all "
 "of our merge fields organized on multiple lines as a mailing address. Notice "
@@ -2378,8 +2197,7 @@ msgstr ""
 "app> encuentra un campo como el único texto de una línea, no expandirá la "
 "línea si el campo está vacío."
 
-#. (itstool) path: page/p
-#: C/merge-ex2.page:82
+#: C/merge-ex2.page:82(page/p)
 msgid ""
 "Now we can print our address labels by selecting the <guiseq> <gui>File</"
 "gui> <gui>Print</gui> </guiseq> menu item. This will display print dialog as "
@@ -2389,18 +2207,15 @@ msgstr ""
 "elemento de menú <guiseq><gui>Archivo</gui><gui>Imprimir</gui></guiseq>. "
 "Esto mostrará el diálogo de impresión como se muestra a continuación."
 
-#. (itstool) path: media/p
-#: C/merge-ex2.page:89 C/merge-ex3.page:89
+#: C/merge-ex2.page:89(media/p) C/merge-ex3.page:89(media/p)
 msgid "Printing address labels"
 msgstr "Imprimir etiquetas de dirección"
 
-#. (itstool) path: media/p
-#: C/merge-ex2.page:100
+#: C/merge-ex2.page:100(media/p)
 msgid "Address labels preview"
 msgstr "Vista previa de las etiquetas de dirección"
 
-#. (itstool) path: page/p
-#: C/merge-ex2.page:104 C/merge-ex3.page:104
+#: C/merge-ex2.page:104(page/p) C/merge-ex3.page:104(page/p)
 msgid ""
 "Everything looks good, so we can now load up our printer with the "
 "appropriate label stock, print our address labels and start mailing our "
@@ -2410,71 +2225,64 @@ msgstr ""
 "etiquetas apropiadas, imprimir nuestras etiquetas de dirección y enviar por "
 "correo nuestras invitaciones a la fiesta."
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/merge-ex3.page:53
+#: C/merge-ex3.page:53(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/merge-ex3-1.png' md5='fb5bf719857fb0a49517ecb50124384d'"
 msgstr ""
 "external ref='figures/merge-ex3-1.png' md5='fb5bf719857fb0a49517ecb50124384d'"
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/merge-ex3.page:74
+#: C/merge-ex3.page:74(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/merge-ex3-2.png' md5='51fe322868241d083ec83ae824d927d7'"
 msgstr ""
 "external ref='figures/merge-ex3-2.png' md5='51fe322868241d083ec83ae824d927d7'"
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/merge-ex3.page:88
+#: C/merge-ex3.page:88(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/merge-ex3-3.png' md5='f731f35b38ddd51499e636733bacc7a6'"
 msgstr ""
 "external ref='figures/merge-ex3-3.png' md5='f731f35b38ddd51499e636733bacc7a6'"
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/merge-ex3.page:99
+#: C/merge-ex3.page:99(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/merge-ex3-4.png' md5='4415be9d5b59fb57093077bcaece014a'"
 msgstr ""
 "external ref='figures/merge-ex3-4.png' md5='4415be9d5b59fb57093077bcaece014a'"
 
-#. (itstool) path: info/desc
-#: C/merge-ex3.page:9
+#: C/merge-ex3.page:9(info/desc)
 msgid ""
 "Create address labels from the <app>Evolution</app> address book entries."
 msgstr ""
 "Crear etiquetas de direcciones desde las entradas de la libreta de "
 "direcciones de <app>Evolution</app>."
 
-#. (itstool) path: page/title
-#: C/merge-ex3.page:25
+#: C/merge-ex3.page:25(page/title)
 msgid "Example 3: Address Labels Using the <app>Evolution</app> Addressbook"
 msgstr ""
 "Ejemplo 3: Etiquetas de dirección usando la libreta de direcciones de "
 "<app>Evolution</app>"
 
-#. (itstool) path: page/p
-#: C/merge-ex3.page:27
+#: C/merge-ex3.page:27(page/p)
 msgid ""
 "Our last party was a great success, and now we need to print mailing address "
 "labels for the invitations to a new one. To simplify this, we can use the "
@@ -2486,8 +2294,7 @@ msgstr ""
 "puede usar la libreta de direcciones de <app>Evolution</app>, ya que las "
 "direcciones de sus amigos están guardadas ahí."
 
-#. (itstool) path: note/p
-#: C/merge-ex3.page:33
+#: C/merge-ex3.page:33(note/p)
 msgid ""
 "Depending on how your copy of <app>gLabels</app> was packaged, this option "
 "could be unavailable. Support for the <app>Evolution</app> addressbook will "
@@ -2502,8 +2309,7 @@ msgstr ""
 "compiló <app>gLabels</app>. Tenga esto en cuenta si construye <app>gLabels</"
 "app> directamente desde las fuentes."
 
-#. (itstool) path: note/p
-#: C/merge-ex3.page:39
+#: C/merge-ex3.page:39(note/p)
 msgid ""
 "If the <app>gLabels</app> package from your distribution lacks this support, "
 "you may wish to contact the package maintainer or file a bug against the "
@@ -2513,8 +2319,7 @@ msgstr ""
 "puede contactar con el mantenedor del paquete o informar de un error en este "
 "paquete para solicitarlo."
 
-#. (itstool) path: page/p
-#: C/merge-ex3.page:44
+#: C/merge-ex3.page:44(page/p)
 msgid ""
 "In <app>glabels</app> we have created a new <app>gLabels</app> document "
 "using the Avery 5512 \"Address Labels\" template. Next we use the <guiseq> "
@@ -2530,8 +2335,7 @@ msgstr ""
 "diálogo para seleccionar el tipo de origen (en este caso, <gui>Datos de la "
 "libreta de direcciones predeterminada de Evolution</gui>) como se muestra."
 
-#. (itstool) path: page/p
-#: C/merge-ex3.page:58
+#: C/merge-ex3.page:58(page/p)
 msgid ""
 "Once we have chosen <gui>Data from default Evolution addressbook </gui> as "
 "our merge source, we will get a full list of its content. Initially, all "
@@ -2551,8 +2355,7 @@ msgstr ""
 "todo</gui> para activar o desactivar todas las entradas en la libreta de "
 "direcciones."
 
-#. (itstool) path: page/p
-#: C/merge-ex3.page:66
+#: C/merge-ex3.page:66(page/p)
 msgid ""
 "We can also view each entry in more detail by clicking on the appropriate "
 "expander (the little triangles) as shown. Once we are satisfied with the "
@@ -2564,8 +2367,7 @@ msgstr ""
 "las selecciones en este diálogo, pulse el botón <gui>Aceptar</gui> para "
 "aceptar los cambios."
 
-#. (itstool) path: page/p
-#: C/merge-ex3.page:79
+#: C/merge-ex3.page:79(page/p)
 msgid ""
 "In this example we have a single text object again. This text object "
 "contains all of our merge fields organized on multiple lines as a mailing "
@@ -2575,8 +2377,7 @@ msgstr ""
 "texto contiene todos los campos mezclados organizados en varias líneas como "
 "direcciones de correo."
 
-#. (itstool) path: page/p
-#: C/merge-ex3.page:82
+#: C/merge-ex3.page:82(page/p)
 msgid ""
 "Now we can print our address labels by selecting the <guiseq> <gui>File</"
 "gui> <gui>Print</gui> </guiseq> menu item. This will display the print "
@@ -2586,33 +2387,27 @@ msgstr ""
 "elemento de menú <guiseq><gui>Archivo</gui><gui>Imprimir</gui></guiseq>. "
 "Esto mostrará el diálogo de impresión como se muestra a continuación."
 
-#. (itstool) path: media/p
-#: C/merge-ex3.page:100
+#: C/merge-ex3.page:100(media/p)
 msgid "Addess labels preview"
 msgstr "Vista previa de las etiquetas de dirección"
 
-#. (itstool) path: info/desc
-#: C/merge-ex4.page:9
+#: C/merge-ex4.page:9(info/desc)
 msgid "Create address labels from a vCard file."
 msgstr "Crear etiquetas de dirección desde un archivo vCard."
 
-#. (itstool) path: page/title
-#: C/merge-ex4.page:25
+#: C/merge-ex4.page:25(page/title)
 msgid "Example 4: Address Labels Using a vCard file"
 msgstr "Ejemplo 4: etiquetas de dirección usando un archivo vCard"
 
-#. (itstool) path: info/desc
-#: C/mergefeatures.page:9
+#: C/mergefeatures.page:9(info/desc)
 msgid "What you may expect from a document merge."
 msgstr "Que puede esperar de la fusión de un documento."
 
-#. (itstool) path: page/title
-#: C/mergefeatures.page:25
+#: C/mergefeatures.page:25(page/title)
 msgid "Performing a document merge"
 msgstr "Fusionar un documento"
 
-#. (itstool) path: page/p
-#: C/mergefeatures.page:27
+#: C/mergefeatures.page:27(page/p)
 msgid ""
 "Document Merge (sometimes called \"Mail Merge\") is a powerful feature that "
 "allows a unique label or card to be printed for each record in an external "
@@ -2622,19 +2417,7 @@ msgstr ""
 "es una potente característica que permite que una única tarjeta o etiqueta "
 "se impriman por cada registro de una fuente de datos externa."
 
-#. (itstool) path: page/p
-#: C/mergefeatures.page:31
-#| msgid ""
-#| "The first step to performing a document merge is to prepare a source "
-#| "document that contains your merge data. This data could be mailing "
-#| "addresses or any other data that you wish to create unique labels or "
-#| "cards for. Currently back-ends only exist for text files and the "
-#| "evolution data server -- others are planned. The currently supported text-"
-#| "file format is very simple: each line is a record; fields are delimited "
-#| "by commas (CSV), tabs, or colons; and newlines can be embedded into "
-#| "fields by using the \"\\n\" entity. This file could be created using any "
-#| "text editor or could be created by another program or script. A common "
-#| "way of creating CSV files is to export them from a spreadsheet program."
+#: C/mergefeatures.page:31(page/p)
 msgid ""
 "The first step to performing a document merge is to prepare a source "
 "document that contains your merge data. This data could be mailing addresses "
@@ -2659,8 +2442,7 @@ msgstr ""
 "habitual de crear archivos CSV es exportarlos desde un programa de hojas de "
 "cálculo."
 
-#. (itstool) path: note/p
-#: C/mergefeatures.page:45
+#: C/mergefeatures.page:45(note/p)
 msgid ""
 "To export a CSV file from <app>kaddressbook</app>, first select the contacts "
 "you wish to export. Click on the first contact, then press and hold "
@@ -2674,8 +2456,7 @@ msgstr ""
 "contactos para seleccionarlos. Luego elija <guiseq><gui>Archivo</"
 "gui><gui>Exportar</gui> <gui>Exportar archivo CSV</gui></guiseq>."
 
-#. (itstool) path: note/p
-#: C/mergefeatures.page:52
+#: C/mergefeatures.page:52(note/p)
 msgid ""
 "In the <gui>Select Contacts</gui> window, enable the button <gui>Selected "
 "contacts</gui> (which should be enabled by default anyway). Then click on "
@@ -2688,8 +2469,7 @@ msgstr ""
 "diálogo <gui>Guardar como</gui> elija la carpeta que quiere y un nombre para "
 "el archivo y pulse en <gui>Guardar</gui>."
 
-#. (itstool) path: note/p
-#: C/mergefeatures.page:62
+#: C/mergefeatures.page:62(note/p)
 msgid ""
 "To export a CSV file from <app>Thunderbird</app>, click on the <gui>Address "
 "Book</gui> toolbar button or choose <guiseq><gui>Tools </gui><gui>Address "
@@ -2706,8 +2486,7 @@ msgstr ""
 "sobre el resto de contactos para seleccionarlos. Cuando termine, elija "
 "<guiseq><gui>Herramientas</gui><gui>Exportar</gui> </guiseq>."
 
-#. (itstool) path: note/p
-#: C/mergefeatures.page:71
+#: C/mergefeatures.page:71(note/p)
 msgid ""
 "In the file chooser window, choose the desired folder and a name for the "
 "file and change the value of the drop-down button in the right bottom corner "
@@ -2718,8 +2497,7 @@ msgstr ""
 "esquina inferior derecha a <gui>Separado por comas</gui>. Para terminar, "
 "pulse en <gui>Guardar</gui>."
 
-#. (itstool) path: page/p
-#: C/mergefeatures.page:79
+#: C/mergefeatures.page:79(page/p)
 msgid ""
 "A label must then be configured to \"point at\" this data file. To configure "
 "the merge properties of a document, choose <guiseq><gui>Objects</gui> "
@@ -2734,8 +2512,7 @@ msgstr ""
 "gui>. Este diálogo se utiliza para seleccionar el formato de datos exacto "
 "del archivo y nombre de archivo (ubicación) de la combinación de datos."
 
-#. (itstool) path: page/p
-#: C/mergefeatures.page:87
+#: C/mergefeatures.page:87(page/p)
 msgid ""
 "Finally, once the label has been configured for a data file, field keys can "
 "be inserted into text objects and used as source or data for barcode objects "
@@ -2748,8 +2525,7 @@ msgstr ""
 "imágenes para objetos de imagen. Consulte la <link xref=\"editprop\"/> para "
 "obtener más información sobre cómo combinar datos para este tipo de objetos."
 
-#. (itstool) path: page/p
-#: C/mergefeatures.page:93
+#: C/mergefeatures.page:93(page/p)
 msgid ""
 "Now that your label is configured, <app>gLabels</app> will print a unique "
 "label for each record in your source document -- substituting fields from "
@@ -2760,8 +2536,7 @@ msgstr ""
 "campos de cada registro por los campos clave en todo el texto, código de "
 "barras y objetos de imagen."
 
-#. (itstool) path: page/p
-#: C/mergefeatures.page:98
+#: C/mergefeatures.page:98(page/p)
 msgid ""
 "See <link xref=\"merge\"/> for a detailed tutorial on the document merge "
 "feature."
@@ -2769,18 +2544,15 @@ msgstr ""
 "Consulte en <link xref=\"merge\"/> un tutorial detallado sobre la "
 "característica de fusión de documentos."
 
-#. (itstool) path: info/desc
-#: C/merge.page:9
+#: C/merge.page:9(info/desc)
 msgid "Merge a data source to create multiple documents."
 msgstr "Combinar un origen de datos para crear múltiples documentos."
 
-#. (itstool) path: page/title
-#: C/merge.page:25
+#: C/merge.page:25(page/title)
 msgid "Document merge tutorial"
 msgstr "Tutorial para fusionar documentos"
 
-#. (itstool) path: page/p
-#: C/merge.page:27
+#: C/merge.page:27(page/p)
 msgid ""
 "Document Merge (sometimes called \"Mail Merge\") is a powerful feature that "
 "allows a unique label or card to be printed for each record in an external "
@@ -2795,18 +2567,15 @@ msgstr ""
 "siguientes ejemplos le guiarán paso a paso a través de un par de de tareas "
 "comunes usando la característica de combinación de documentos."
 
-#. (itstool) path: info/desc
-#: C/multifile.page:9
+#: C/multifile.page:9(info/desc)
 msgid "How to open multiple files at once by using the command line."
 msgstr "Cómo abrir varios archivos a la vez usando la línea de comandos."
 
-#. (itstool) path: page/title
-#: C/multifile.page:25
+#: C/multifile.page:25(page/title)
 msgid "To open multiple files from the command line"
 msgstr "Abrir varios archivos desde la línea de comandos"
 
-#. (itstool) path: page/p
-#: C/multifile.page:27
+#: C/multifile.page:27(page/p)
 msgid ""
 "You can run <app>gLabels</app> from a command line and open a single file or "
 "multiple files. To open multiple files from a command line, type the "
@@ -2816,16 +2585,14 @@ msgstr ""
 "varios archivos. Para abrir varios archivos desde una línea de comandos, "
 "escriba el siguiente comando y pulse <key>Intro</key>:"
 
-#. (itstool) path: page/p
-#: C/multifile.page:32
+#: C/multifile.page:32(page/p)
 msgid ""
 "<cmd>glabels <var>file1.glabels file2.glabels file3.glabels</var> </cmd>"
 msgstr ""
 "<cmd>glabels <var>archivo1.glabels archivo2.glabels archivo3.glabels</var> </"
 "cmd>"
 
-#. (itstool) path: page/p
-#: C/multifile.page:36
+#: C/multifile.page:36(page/p)
 msgid ""
 "When the application starts, the files that you specify are displayed in "
 "separate <app>gLabels</app> windows."
@@ -2833,18 +2600,15 @@ msgstr ""
 "Cuando se inicia la aplicación, se muestran los archivos que especifique en "
 "ventanas de <app>gLabels</app> separadas."
 
-#. (itstool) path: info/desc
-#: C/newlabel.page:9
+#: C/newlabel.page:9(info/desc)
 msgid "Create a new label or card in <app>gLabels</app>."
 msgstr "Crear una etiqueta o tarjeta nuevas en <app>gLabels</app>."
 
-#. (itstool) path: page/title
-#: C/newlabel.page:25
+#: C/newlabel.page:25(page/title)
 msgid "To create a new label or card"
 msgstr "Crear una etiqueta nueva o una tarjeta"
 
-#. (itstool) path: page/p
-#: C/newlabel.page:27
+#: C/newlabel.page:27(page/p)
 msgid ""
 "To create a new label or business card, choose <guiseq><gui>File</"
 "gui><gui>New</gui></guiseq> to display the <gui>New Label or Card</gui> "
@@ -2859,12 +2623,11 @@ msgstr ""
 "mostrará un documento nuevo en el área de visualización de la ventana "
 "ventana de <app>gLabels</app>."
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/printfile.page:47
+#: C/printfile.page:47(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/print-copies.png' "
@@ -2873,30 +2636,26 @@ msgstr ""
 "external ref='figures/print-copies.png' "
 "md5='ee473352947fe25c7adaa9f9a052c3e9'"
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/printfile.page:70
+#: C/printfile.page:70(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/print-merge.png' md5='ee70bd2150a6cd46e96ce5c0531eb47b'"
 msgstr ""
 "external ref='figures/print-merge.png' md5='ee70bd2150a6cd46e96ce5c0531eb47b'"
 
-#. (itstool) path: info/desc
-#: C/printfile.page:9
+#: C/printfile.page:9(info/desc)
 msgid "How to print your labels and cards."
 msgstr "Cómo imprimir sus etiquetas y sus tarjetas."
 
-#. (itstool) path: page/title
-#: C/printfile.page:25
+#: C/printfile.page:25(page/title)
 msgid "To print labels and cards"
 msgstr "Imprimir etiquetas y tarjetas"
 
-#. (itstool) path: page/p
-#: C/printfile.page:27
+#: C/printfile.page:27(page/p)
 msgid ""
 "To print labels or cards, choose <guiseq><gui>File</gui><gui>Print</gui> </"
 "guiseq> to display the <gui>Print</gui> dialog. Once print options have been "
@@ -2910,8 +2669,7 @@ msgstr ""
 "previsualizar el resultado, pulse en <gui>Previsualizar la impresión</gui> "
 "en su lugar."
 
-#. (itstool) path: page/p
-#: C/printfile.page:34
+#: C/printfile.page:34(page/p)
 msgid ""
 "The <gui>Print</gui> dialog allows you to specify the following print "
 "options:"
@@ -2919,18 +2677,15 @@ msgstr ""
 "El diálogo <gui>Imprimir</gui> le permite especificar las siguientes "
 "opciones de impresión:"
 
-#. (itstool) path: section/title
-#: C/printfile.page:38
+#: C/printfile.page:38(section/title)
 msgid "The Labels Tab of the Print Dialog"
 msgstr "La pestaña «etiquetas» del diálogo de impresión"
 
-#. (itstool) path: section/title
-#: C/printfile.page:41
+#: C/printfile.page:41(section/title)
 msgid "Print control (Simple)"
 msgstr "Control de impresión (simple)"
 
-#. (itstool) path: section/p
-#: C/printfile.page:43
+#: C/printfile.page:43(section/p)
 msgid ""
 "For simple labels or cards (no document merge), the job tabbed section "
 "contains the following copy controls."
@@ -2938,8 +2693,7 @@ msgstr ""
 "Para etiquetas o tarjetas simples (no para documentos combinados) la sección "
 "de trabajos en pestañas contiene los siguientes controles de copia."
 
-#. (itstool) path: section/p
-#: C/printfile.page:52
+#: C/printfile.page:52(section/p)
 msgid ""
 "The number of copies of the label can be selected by choosing the number of "
 "full sheets to print, or a specific subset of labels on a single sheet."
@@ -2948,8 +2702,7 @@ msgstr ""
 "de hojas completas que imprimir, o un subconjunto específico de etiquetas de "
 "una sola hoja."
 
-#. (itstool) path: section/p
-#: C/printfile.page:56
+#: C/printfile.page:56(section/p)
 msgid ""
 "The mini-preview can also be used to graphically select the subset of labels "
 "by clicking the first label on the mini-preview and dragging to the last "
@@ -2959,30 +2712,26 @@ msgstr ""
 "subconjunto de etiquetas, pulsando en la primera etiqueta de la mini vista "
 "previa y arrastrando hasta la última etiqueta."
 
-#. (itstool) path: section/title
-#: C/printfile.page:63
+#: C/printfile.page:63(section/title)
 msgid "Print control (Merge)"
 msgstr "Control de impresión (fusión)"
 
-#. (itstool) path: section/p
-#: C/printfile.page:65
+#: C/printfile.page:65(section/p)
 msgid ""
 "For labels or cards using the document merge (also known as \"mail merge\") "
 "capability, the job tabbed section contains the following merge controls "
 "instead of copy controls."
 msgstr ""
 "Para etiquetas o tarjetas que usan la capacidad de combinación de documentos "
-"(también llamada «combinación de correo»), la sección de trabajos en pestañas "
-"contiene los siguientes controles de combinación en vez de los controles de "
-"copia."
+"(también llamada «combinación de correo»), la sección de trabajos en "
+"pestañas contiene los siguientes controles de combinación en vez de los "
+"controles de copia."
 
-#. (itstool) path: media/p
-#: C/printfile.page:71
+#: C/printfile.page:71(media/p)
 msgid "Print Document Merge Controls"
 msgstr "Controles de impresión de fusión de documentos"
 
-#. (itstool) path: section/p
-#: C/printfile.page:75
+#: C/printfile.page:75(section/p)
 msgid ""
 "The total number of labels or cards printed is the product of the number of "
 "records in the merge source and the number of copies selected. If multiple "
@@ -2996,8 +2745,7 @@ msgstr ""
 "(copias de un mismo registro agrupados) o sin cotejar (una copia de cada "
 "registro se imprime antes del siguiente copia)."
 
-#. (itstool) path: section/p
-#: C/printfile.page:82
+#: C/printfile.page:82(section/p)
 msgid ""
 "Printing can begin on any label on the first sheet. This can be selected "
 "with the <gui>Start on label</gui> spinbutton."
@@ -3006,8 +2754,7 @@ msgstr ""
 "puede seleccionar con el botón incremental <gui>Comenzar con la etiqueta</"
 "gui>."
 
-#. (itstool) path: section/p
-#: C/printfile.page:86
+#: C/printfile.page:86(section/p)
 msgid ""
 "The mini-preview can also be used to graphically select this first label, by "
 "clicking on the desired label in the mini-preview."
@@ -3015,23 +2762,19 @@ msgstr ""
 "La mini vista previa también se puede usar para seleccionar gráficamente la "
 "primera etiqueta, pulsando en la etiqueta que quiere en la mini vista previa."
 
-#. (itstool) path: section/title
-#: C/printfile.page:93
+#: C/printfile.page:93(section/title)
 msgid "Options"
 msgstr "Opciones"
 
-#. (itstool) path: section/p
-#: C/printfile.page:94
+#: C/printfile.page:94(section/p)
 msgid "The following options can also be selected."
 msgstr "Se pueden seleccionar las siguientes opciones."
 
-#. (itstool) path: item/p
-#: C/printfile.page:97
+#: C/printfile.page:97(item/p)
 msgid "<gui>print outlines</gui>"
 msgstr "<gui>imprimir márgenes</gui>"
 
-#. (itstool) path: item/p
-#: C/printfile.page:98
+#: C/printfile.page:98(item/p)
 msgid ""
 "Print outlines of labels. This option is useful for dry-runs, to test "
 "printer alignment."
@@ -3039,13 +2782,11 @@ msgstr ""
 "Imprimir los contornos de las etiquetas. Esta opción es útil para "
 "ejecuciones en seco, para verificar la alineación de la impresora."
 
-#. (itstool) path: item/p
-#: C/printfile.page:102
+#: C/printfile.page:102(item/p)
 msgid "<gui>print in reverse</gui>"
 msgstr "<gui>imprimir en el reverso</gui>"
 
-#. (itstool) path: item/p
-#: C/printfile.page:103
+#: C/printfile.page:103(item/p)
 msgid ""
 "Prints the labels as mirror images. This option is useful for printing on "
 "clear labels that will be viewed from the reverse side (e.g. in a car "
@@ -3055,13 +2796,11 @@ msgstr ""
 "imprimir en etiquetas que se verán por el reverso (ej. en la ventanilla de "
 "un coche)."
 
-#. (itstool) path: item/p
-#: C/printfile.page:108
+#: C/printfile.page:108(item/p)
 msgid "<gui>print crop marks</gui>"
 msgstr "<gui>imprimir marcas de corte</gui>"
 
-#. (itstool) path: item/p
-#: C/printfile.page:109
+#: C/printfile.page:109(item/p)
 msgid ""
 "Prints crop marks along the edge of the sheet. This option is useful for "
 "printing on blank stock, to be cut after printing. This option does not work "
@@ -3071,18 +2810,15 @@ msgstr ""
 "para imprimir en páginas en blanco, y recortarlas después de imprimir. Esta "
 "opción no funciona bien con todas las plantillas."
 
-#. (itstool) path: info/desc
-#: C/select.page:9
+#: C/select.page:9(info/desc)
 msgid "How to select objects."
 msgstr "Cómo seleccionar objetos."
 
-#. (itstool) path: page/title
-#: C/select.page:25
+#: C/select.page:25(page/title)
 msgid "To select objects"
 msgstr "Seleccionar objetos"
 
-#. (itstool) path: page/p
-#: C/select.page:27
+#: C/select.page:27(page/p)
 msgid ""
 "A prerequisite for performing operations on objects is the selection of "
 "individual objects or groups of objects. The display area must be in the "
@@ -3098,13 +2834,11 @@ msgstr ""
 "de menú <guiseq><gui>Objetos</gui><gui>Seleccionar modo</gui></guiseq>, o "
 "con el comando correspondiente de la <gui>Barra de dibujo</gui>."
 
-#. (itstool) path: section/title
-#: C/select.page:38
+#: C/select.page:38(section/title)
 msgid "Selecting a single object"
 msgstr "Seleccionar un sólo objeto"
 
-#. (itstool) path: section/p
-#: C/select.page:39
+#: C/select.page:39(section/p)
 msgid ""
 "A single object can be selected simply by clicking on the desired object in "
 "the display area. Once selected the object will be highlighted with a set of "
@@ -3114,13 +2848,11 @@ msgstr ""
 "objeto que quiere en el área de visualización. Una vez seleccionado, el "
 "objeto se resaltará con un conjunto de manejadores para redimensionarlo."
 
-#. (itstool) path: section/title
-#: C/select.page:46
+#: C/select.page:46(section/title)
 msgid "Aggregate object selections"
 msgstr "Agregar selecciones de objetos"
 
-#. (itstool) path: section/p
-#: C/select.page:47
+#: C/select.page:47(section/p)
 msgid ""
 "Multiple objects can be selected by first selecting the first object as "
 "above and then by holding the <key>Ctrl</key> key while selecting additional "
@@ -3139,13 +2871,11 @@ msgstr ""
 "todo</gui></guiseq>. Todos los objetos de una selección agregada de objetos "
 "se resaltarán."
 
-#. (itstool) path: section/title
-#: C/select.page:60
+#: C/select.page:60(section/title)
 msgid "Area selections"
 msgstr "Selecciones de área"
 
-#. (itstool) path: section/p
-#: C/select.page:62
+#: C/select.page:62(section/p)
 msgid ""
 "Multiple objects can also be selected by clicking an empty area and dragging "
 "to form a rectangular area. When released, all objects contained in the area "
@@ -3159,13 +2889,11 @@ msgstr ""
 "se puede usar para añadirla a una selección existente manteniendo pulsada la "
 "tecla <key>Ctrl</key> mientras se hace la selección."
 
-#. (itstool) path: section/title
-#: C/select.page:72
+#: C/select.page:72(section/title)
 msgid "Unselecting objects"
 msgstr "Deseleccionar objetos"
 
-#. (itstool) path: section/p
-#: C/select.page:74
+#: C/select.page:74(section/p)
 msgid ""
 "Individual objects can be removed from an existing selection by holding the "
 "<key>Ctrl</key> key while clicking on a previously selected object. An "
@@ -3181,13 +2909,11 @@ msgstr ""
 "simplemente pulsando en un espacio vacío en el área de visualización. Una "
 "vez que un objeto no está seleccionado, se quita el resaltado."
 
-#. (itstool) path: section/title
-#: C/select.page:86
+#: C/select.page:86(section/title)
 msgid "Clipboard Commands"
 msgstr "Comandos del portapapeles"
 
-#. (itstool) path: section/p
-#: C/select.page:88
+#: C/select.page:88(section/p)
 msgid ""
 "Object selections can be manipulated using the standard clipboard operations "
 "<gui>Cut</gui>, <gui>Copy</gui>, <gui>Paste</gui>, and <gui>Delete</gui>."
@@ -3196,13 +2922,11 @@ msgstr ""
 "portapapeles <gui>Cortar</gui>, <gui>Copiar</gui>, <gui>Pegar</gui>, y "
 "<gui>Eliminar</gui>."
 
-#. (itstool) path: section/title
-#: C/select.page:94
+#: C/select.page:94(section/title)
 msgid "<gui>Cut</gui> (<keyseq><key>Ctrl</key><key>X</key></keyseq>)"
 msgstr "<gui>Cortar</gui> (<keyseq><key>Ctrl</key><key>X</key></keyseq>)"
 
-#. (itstool) path: section/p
-#: C/select.page:96
+#: C/select.page:96(section/p)
 msgid ""
 "Moves selected objects to the clipboard. The objects are then available for "
 "pasting back into the current document or another document."
@@ -3210,13 +2934,11 @@ msgstr ""
 "Mueve objetos al portapapeles. Los objetos están disponibles para pegarlos "
 "de nuevo en el documento actual o en otro documento."
 
-#. (itstool) path: section/title
-#: C/select.page:103
+#: C/select.page:103(section/title)
 msgid "<gui>Copy</gui> (<keyseq><key>Ctrl</key><key>C</key></keyseq>)"
 msgstr "<gui>Copiar</gui> (<keyseq><key>Ctrl</key><key>C</key></keyseq>)"
 
-#. (itstool) path: section/p
-#: C/select.page:105
+#: C/select.page:105(section/p)
 msgid ""
 "Copies selected objects to the clipboard without deleting them. The objects "
 "are then available for pasting back into the current document or another "
@@ -3225,13 +2947,11 @@ msgstr ""
 "Copia los objetos seleccionados al portapapeles sin borrarlos. Los objetos "
 "están disponibles para pegarlos en el documento actual o en otro documento."
 
-#. (itstool) path: section/title
-#: C/select.page:112
+#: C/select.page:112(section/title)
 msgid "<gui>Paste</gui> (<keyseq><key>Ctrl</key><key>V</key></keyseq>)"
 msgstr "<gui>Pegar</gui> (<keyseq><key>Ctrl</key><key>V</key></keyseq>)"
 
-#. (itstool) path: section/p
-#: C/select.page:114
+#: C/select.page:114(section/p)
 msgid ""
 "Pastes objects from the clipboard into the current document. <app>gLabels</"
 "app> can only paste objects from another <app>gLabels</app> document."
@@ -3239,22 +2959,19 @@ msgstr ""
 "Pega objetos del portapapeles en el documento actual. <app>gLabels</app> "
 "sólo puede pegar objetos de otro documento de <app>gLabels</app>."
 
-#. (itstool) path: section/title
-#: C/select.page:121
+#: C/select.page:121(section/title)
 msgid "<gui>Delete</gui> (<key>Del</key>)"
 msgstr "<gui>Eliminar</gui> (<key>Supr</key>)"
 
-#. (itstool) path: section/p
-#: C/select.page:123
+#: C/select.page:123(section/p)
 msgid "Deletes selected objects without placing them on the clipboard."
 msgstr "Elimina los objetos seleccionados sin ponerlos en el portapapeles."
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/skipfields.page:45
+#: C/skipfields.page:45(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/skip-fields-screenshot.png' "
@@ -3263,12 +2980,11 @@ msgstr ""
 "external ref='figures/skip-fields-screenshot.png' "
 "md5='eef4a81f48546bd7d3753656a3df9cb7'"
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/skipfields.page:53
+#: C/skipfields.page:53(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/skip-fields-output.png' "
@@ -3277,18 +2993,15 @@ msgstr ""
 "external ref='figures/skip-fields-output.png' "
 "md5='b64d1a7fdf0d37e9a6d93f0bc2f9fa0d'"
 
-#. (itstool) path: info/desc
-#: C/skipfields.page:9
+#: C/skipfields.page:9(info/desc)
 msgid "How to skip blank address lines when doing a document merge."
 msgstr "Cómo omitir líneas de dirección en blanco al fusionar un documento."
 
-#. (itstool) path: page/title
-#: C/skipfields.page:25
+#: C/skipfields.page:25(page/title)
 msgid "Skipping blank address lines"
 msgstr "Omitir líneas de dirección vacías"
 
-#. (itstool) path: page/p
-#: C/skipfields.page:27
+#: C/skipfields.page:27(page/p)
 msgid ""
 "This feature can be best described by a simple example. In the following CSV "
 "file, column 5 (ADDR2) contains the second address line for each record. "
@@ -3302,8 +3015,7 @@ msgstr ""
 "el 3. (Para que esta característica funcione, el campo no debe contener "
 "ningún texto, ni siquiera espacios.)"
 
-#. (itstool) path: page/code
-#: C/skipfields.page:33
+#: C/skipfields.page:33(page/code)
 #, no-wrap
 msgid ""
 "\n"
@@ -3320,8 +3032,7 @@ msgstr ""
 "  Kramer,Cosmo,,\"Apt 5B\",\"129 W. 81 St.\",\"New York\",NY,10024-7207\n"
 "  "
 
-#. (itstool) path: page/p
-#: C/skipfields.page:40
+#: C/skipfields.page:40(page/p)
 msgid ""
 "In the following screenshot, a single multiline text object has been created "
 "to format these addresses. Notice that ${ADDR2} representing the second "
@@ -3334,13 +3045,11 @@ msgstr ""
 "adicional en esta línea, incluyendo los espacios, anularía esta "
 "característica.)"
 
-#. (itstool) path: media/p
-#: C/skipfields.page:46
+#: C/skipfields.page:46(media/p)
 msgid "Multi-line address"
 msgstr "Dirección multilínea"
 
-#. (itstool) path: page/p
-#: C/skipfields.page:49
+#: C/skipfields.page:49(page/p)
 msgid ""
 "Printing this label results in the following output. Notice that the line "
 "containing the ${ADDR2} field is completely skipped for the first two "
@@ -3350,8 +3059,7 @@ msgstr ""
 "que la línea que contiene el campo  ${ADDR2} se omite completamente para los "
 "dos primeros registros, sin imprimir una línea en blanco."
 
-#. (itstool) path: media/p
-#: C/skipfields.page:54
+#: C/skipfields.page:54(media/p)
 msgid "Output"
 msgstr "Salida"
 
@@ -3364,41 +3072,6 @@ msgstr "Salida"
 #~ msgid "glabels <placeholder-1/>"
 #~ msgstr "glabels <placeholder-1/>"
 
-#~ msgid ""
-#~ "@@image: 'figures/glabels-template-rect-label.png'; "
-#~ "md5=9c7ae1c1a888e1c9eefd19655d093971"
-#~ msgstr ""
-#~ "@@image: 'figures/glabels-template-rect-label.png'; "
-#~ "md5=9c7ae1c1a888e1c9eefd19655d093971"
-
-#~ msgid ""
-#~ "@@image: 'figures/glabels-template-circle-label.png'; "
-#~ "md5=841e36a1f92aeed01e8fbaacc67758f1"
-#~ msgstr ""
-#~ "@@image: 'figures/glabels-template-circle-label.png'; "
-#~ "md5=841e36a1f92aeed01e8fbaacc67758f1"
-
-#~ msgid ""
-#~ "@@image: 'figures/glabels-template-cd-label.png'; "
-#~ "md5=c7952ac1b26ecbfa53facfbbf6486841"
-#~ msgstr ""
-#~ "@@image: 'figures/glabels-template-cd-label.png'; "
-#~ "md5=c7952ac1b26ecbfa53facfbbf6486841"
-
-#~ msgid ""
-#~ "@@image: 'figures/layouts-cdlabel.png'; "
-#~ "md5=0c41a95dc82b5a426e934751faf86872"
-#~ msgstr ""
-#~ "@@image: 'figures/layouts-cdlabel.png'; "
-#~ "md5=0c41a95dc82b5a426e934751faf86872"
-
-#~ msgid ""
-#~ "@@image: 'figures/glabels-template-layout.png'; "
-#~ "md5=fe1c9652d5448b2e0ece086777d3a287"
-#~ msgstr ""
-#~ "@@image: 'figures/glabels-template-layout.png'; "
-#~ "md5=fe1c9652d5448b2e0ece086777d3a287"
-
 #~ msgid "${prefix}/share/libglabels-3.0/templates"
 #~ msgstr "${prefix}/share/libglabels-3.0/templates"
 
index 0b34b34f72b6d1c3ded9c05e7aab00eb1312bdf3..631f23fb8e36f08c6ec8c292a84c8d6ce81f0f6f 100644 (file)
@@ -3077,7 +3077,7 @@ msgstr ""
 #. (itstool) path: item/p
 #: C/printfile.page:108
 msgid "<gui>print crop marks</gui>"
-msgstr "<gui>imprimer les guides de coupe<gui>"
+msgstr "<gui>imprimer les guides de coupe</gui>"
 
 #. (itstool) path: item/p
 #: C/printfile.page:109
index ce5421140755168d903ba0b34bcb64131c7e0cc6..3099b5e0fbdb1126c1ff3400514b17a5a97f0005 100644 (file)
                  <p>Imprime les étiquettes en miroir. Cette option est utile pour imprimer sur des supports transparents destinés à être vus de l'extérieur (par ex. sur une vitre de voiture).</p>
                </item>
                <item>
-                 <p><gui>print crop marks</gui></p>
+                 <p><gui>imprimer les guides de coupe</gui></p>
                  <p>Imprime les repères de massicot sur les bords de la feuille. Cette option est utile pour une impression sur feuilles blanches destinées à être découpées après impression. Elle ne fonctionne pas bien avec tous les modèles d'étiquette.</p>
                </item>
              </list>
index a9244eb0786534553fdd9eb0050bb4b172bad0a3..377bb8687ffe16bfc79ea25c8667cabf72aaf2c2 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-01-19.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@ scriptversion=2011-01-19.21; # UTC
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,7 +156,7 @@ while test $# -ne 0; do
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
-       # Protect names problematic for `test' and other utilities.
+       # Protect names problematic for 'test' and other utilities.
        case $dst_arg in
          -* | [=\(\)!]) dst_arg=./$dst_arg;;
        esac
@@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
-    # Protect names problematic for `test' and other utilities.
+    # Protect names problematic for 'test' and other utilities.
     case $dst_arg in
       -* | [=\(\)!]) dst_arg=./$dst_arg;;
     esac
@@ -202,7 +202,7 @@ if test $# -eq 0; then
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
@@ -240,7 +240,7 @@ fi
 
 for src
 do
-  # Protect names problematic for `test' and other utilities.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
     -* | [=\(\)!]) src=./$src;;
   esac
@@ -354,7 +354,7 @@ do
              if test -z "$dir_arg" || {
                   # Check for POSIX incompatibilities with -m.
                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-                  # other-writeable bit of parent directory when it shouldn't.
+                  # other-writable bit of parent directory when it shouldn't.
                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
                   case $ls_ld_tmpdir in
index 07745dc1d392aea93f58de2166a2b231a6830c52..6860493d46158ba9a1d7042c760e963e94d76586 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -54,10 +81,10 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = libglabels
-DIST_COMMON = $(libglabels_3_0include_HEADERS) \
-       $(libglabels_3_0subinclude_HEADERS) \
-       $(srcdir)/${LIBGLABELS_BRANCH}.pc.in $(srcdir)/Makefile.am \
-       $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+       $(srcdir)/${LIBGLABELS_BRANCH}.pc.in $(top_srcdir)/depcomp \
+       $(libglabels_3_0include_HEADERS) \
+       $(libglabels_3_0subinclude_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -106,10 +133,23 @@ libglabels_3_0_la_OBJECTS = $(am_libglabels_3_0_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libglabels_3_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(libglabels_3_0_la_LDFLAGS) $(LDFLAGS) \
        -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -122,20 +162,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libglabels_3_0_la_SOURCES)
 DIST_SOURCES = $(libglabels_3_0_la_SOURCES)
 am__can_run_installinfo = \
@@ -146,6 +182,23 @@ am__can_run_installinfo = \
 DATA = $(pkgconfig_DATA)
 HEADERS = $(libglabels_3_0include_HEADERS) \
        $(libglabels_3_0subinclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -193,6 +246,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -442,6 +496,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 ${LIBGLABELS_BRANCH}.pc: $(top_builddir)/config.status $(srcdir)/${LIBGLABELS_BRANCH}.pc.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -468,12 +523,15 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-         test "$$dir" != "$$p" || dir=.; \
-         echo "rm -f \"$${dir}/so_locations\""; \
-         rm -f "$${dir}/so_locations"; \
-       done
+       @list='$(lib_LTLIBRARIES)'; \
+       locs=`for p in $$list; do echo $$p; done | \
+             sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+             sort -u`; \
+       test -z "$$locs" || { \
+         echo rm -f $${locs}; \
+         rm -f $${locs}; \
+       }
+
 libglabels-3.0.la: $(libglabels_3_0_la_OBJECTS) $(libglabels_3_0_la_DEPENDENCIES) $(EXTRA_libglabels_3_0_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(libglabels_3_0_la_LINK) -rpath $(libdir) $(libglabels_3_0_la_OBJECTS) $(libglabels_3_0_la_LIBADD) $(LIBS)
 
@@ -501,14 +559,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -586,26 +644,15 @@ uninstall-libglabels_3_0subincludeHEADERS:
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(libglabels_3_0subincludedir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+       $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
        set x; \
        here=`pwd`; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       $(am__define_uniq_tagged_files); \
        shift; \
        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
          test -n "$$unique" || unique=$$empty_fix; \
@@ -617,15 +664,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
              $$unique; \
          fi; \
        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+       $(am__define_uniq_tagged_files); \
        test -z "$(CTAGS_ARGS)$$unique" \
          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
             $$unique
@@ -634,6 +677,21 @@ GTAGS:
        here=`$(am__cd) $(top_builddir) && pwd` \
          && $(am__cd) $(top_srcdir) \
          && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+       list='$(am__tagged_files)'; \
+       case "$(srcdir)" in \
+         [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+         *) sdir=$(subdir)/$(srcdir) ;; \
+       esac; \
+       for i in $$list; do \
+         if test -f "$$i"; then \
+           echo "$(subdir)/$$i"; \
+         else \
+           echo "$$sdir/$$i"; \
+         fi; \
+       done >> $(top_builddir)/cscope.files
 
 distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -782,20 +840,21 @@ uninstall-am: uninstall-libLTLIBRARIES \
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-       clean-libLTLIBRARIES clean-libtool ctags distclean \
-       distclean-compile distclean-generic distclean-libtool \
-       distclean-tags distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am \
-       install-libLTLIBRARIES install-libglabels_3_0includeHEADERS \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+       clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+       ctags-am distclean distclean-compile distclean-generic \
+       distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+       install-data-am install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-libLTLIBRARIES \
+       install-libglabels_3_0includeHEADERS \
        install-libglabels_3_0subincludeHEADERS install-man \
        install-pdf install-pdf-am install-pkgconfigDATA install-ps \
        install-ps-am install-strip installcheck installcheck-am \
        installdirs maintainer-clean maintainer-clean-generic \
        mostlyclean mostlyclean-compile mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
        uninstall-am uninstall-libLTLIBRARIES \
        uninstall-libglabels_3_0includeHEADERS \
        uninstall-libglabels_3_0subincludeHEADERS \
index 9cae2d8a22a5ef9f5d4b2e9c7842e4b06b45401b..2cbe3046b93b19810a08da6855e6c361fa2dc380 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -54,10 +81,10 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = libglbarcode
-DIST_COMMON = $(libglbarcode_3_0include_HEADERS) \
-       $(libglbarcode_3_0subinclude_HEADERS) \
-       $(srcdir)/${LIBGLBARCODE_BRANCH}.pc.in $(srcdir)/Makefile.am \
-       $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+       $(srcdir)/${LIBGLBARCODE_BRANCH}.pc.in $(top_srcdir)/depcomp \
+       $(libglbarcode_3_0include_HEADERS) \
+       $(libglbarcode_3_0subinclude_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -105,10 +132,23 @@ libglbarcode_3_0_la_OBJECTS = $(am_libglbarcode_3_0_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libglbarcode_3_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(libglbarcode_3_0_la_LDFLAGS) \
        $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -121,20 +161,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libglbarcode_3_0_la_SOURCES)
 DIST_SOURCES = $(libglbarcode_3_0_la_SOURCES)
 am__can_run_installinfo = \
@@ -145,6 +181,23 @@ am__can_run_installinfo = \
 DATA = $(pkgconfig_DATA)
 HEADERS = $(libglbarcode_3_0include_HEADERS) \
        $(libglbarcode_3_0subinclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -192,6 +245,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -426,6 +480,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 ${LIBGLBARCODE_BRANCH}.pc: $(top_builddir)/config.status $(srcdir)/${LIBGLBARCODE_BRANCH}.pc.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -452,12 +507,15 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
        -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-         test "$$dir" != "$$p" || dir=.; \
-         echo "rm -f \"$${dir}/so_locations\""; \
-         rm -f "$${dir}/so_locations"; \
-       done
+       @list='$(lib_LTLIBRARIES)'; \
+       locs=`for p in $$list; do echo $$p; done | \
+             sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+             sort -u`; \
+       test -z "$$locs" || { \
+         echo rm -f $${locs}; \
+         rm -f $${locs}; \
+       }
+
 libglbarcode-3.0.la: $(libglbarcode_3_0_la_OBJECTS) $(libglbarcode_3_0_la_DEPENDENCIES) $(EXTRA_libglbarcode_3_0_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(libglbarcode_3_0_la_LINK) -rpath $(libdir) $(libglbarcode_3_0_la_OBJECTS) $(libglbarcode_3_0_la_LIBADD) $(LIBS)
 
@@ -479,14 +537,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -564,26 +622,15 @@ uninstall-libglbarcode_3_0subincludeHEADERS:
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(libglbarcode_3_0subincludedir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+       $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
        set x; \
        here=`pwd`; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       $(am__define_uniq_tagged_files); \
        shift; \
        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
          test -n "$$unique" || unique=$$empty_fix; \
@@ -595,15 +642,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
              $$unique; \
          fi; \
        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+       $(am__define_uniq_tagged_files); \
        test -z "$(CTAGS_ARGS)$$unique" \
          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
             $$unique
@@ -612,6 +655,21 @@ GTAGS:
        here=`$(am__cd) $(top_builddir) && pwd` \
          && $(am__cd) $(top_srcdir) \
          && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+       list='$(am__tagged_files)'; \
+       case "$(srcdir)" in \
+         [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+         *) sdir=$(subdir)/$(srcdir) ;; \
+       esac; \
+       for i in $$list; do \
+         if test -f "$$i"; then \
+           echo "$(subdir)/$$i"; \
+         else \
+           echo "$$sdir/$$i"; \
+         fi; \
+       done >> $(top_builddir)/cscope.files
 
 distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -761,20 +819,21 @@ uninstall-am: uninstall-libLTLIBRARIES \
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-       clean-libLTLIBRARIES clean-libtool ctags distclean \
-       distclean-compile distclean-generic distclean-libtool \
-       distclean-tags distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am \
-       install-libLTLIBRARIES install-libglbarcode_3_0includeHEADERS \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+       clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+       ctags-am distclean distclean-compile distclean-generic \
+       distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+       install-data-am install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-libLTLIBRARIES \
+       install-libglbarcode_3_0includeHEADERS \
        install-libglbarcode_3_0subincludeHEADERS install-man \
        install-pdf install-pdf-am install-pkgconfigDATA install-ps \
        install-ps-am install-strip installcheck installcheck-am \
        installdirs maintainer-clean maintainer-clean-generic \
        mostlyclean mostlyclean-compile mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
        uninstall-am uninstall-libLTLIBRARIES \
        uninstall-libglbarcode_3_0includeHEADERS \
        uninstall-libglbarcode_3_0subincludeHEADERS \
index b9205eeb4f8876a2a765b18f825a34ff2a7edc08..a356acafa4548959e97355d1e8044b7201661754 100644 (file)
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -70,7 +70,7 @@
 #         compiler:            $LTCC
 #         compiler flags:              $LTCFLAGS
 #         linker:              $LD (gnu? $with_gnu_ld)
-#         $progname:   (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1
+#         $progname:   (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
 #         automake:    $automake_version
 #         autoconf:    $autoconf_version
 #
@@ -80,7 +80,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.2ubuntu1"
+VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
 TIMESTAMP=""
 package_revision=1.3337
 
diff --git a/missing b/missing
index 86a8fc31e3c2aa268688a5be47d161c586772e78..db98974ff5d59295d7e0edfec2eb2069dc78ef1a 100755 (executable)
--- a/missing
+++ b/missing
@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,68 +25,40 @@ scriptversion=2012-01-06.13; # UTC
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
 
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -99,228 +70,141 @@ Send bug reports to <bug-automake@gnu.org>."
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-                                      sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-          sed 's/\.am$/.in/' |
-          while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-       touch $file
-    else
-       test -z "$file" || exec >$file
-       echo "#! /bin/sh"
-       echo "# Created by GNU Automake missing as a replacement of"
-       echo "#  $ $@"
-       echo "exit 0"
-       chmod +x $file
-       exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-       case $LASTARG in
-       *.y)
-           SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-           if test -f "$SRCFILE"; then
-                cp "$SRCFILE" y.tab.c
-           fi
-           SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-           if test -f "$SRCFILE"; then
-                cp "$SRCFILE" y.tab.h
-           fi
-         ;;
-       esac
-    fi
-    if test ! -f y.tab.h; then
-       echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-       echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-       case $LASTARG in
-       *.l)
-           SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-           if test -f "$SRCFILE"; then
-                cp "$SRCFILE" lex.yy.c
-           fi
-         ;;
-       esac
-    fi
-    if test ! -f lex.yy.c; then
-       echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-        you modified a dependency of a manual page.  You may need the
-        \`Help2man' package in order for those modifications to take
-        effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-       touch $file
-    else
-       test -z "$file" || exec >$file
-       echo ".ab help2man is required to generate this page"
-       exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-       /^@setfilename/{
-         s/.* \([^ ]*\) *$/\1/
-         p
-         q
-       }' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
 
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
     ;;
-esac
-
-exit 0
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
index bb512f88c38e4c9d194158a24fc9008f9d6951c2..dacb259ebdce06c1e29a96ebabdfbd223ec8317f 100644 (file)
@@ -22,7 +22,6 @@ ko
 lv
 nb
 nl
-pl
 pt
 pt_BR
 ru
index 4ad041699308eaceec99fd1bbe33e2adc45e03d1..9e01404d6696f9876985aaa26c5d791d4fb40887 100644 (file)
@@ -231,6 +231,7 @@ data/schemas/org.gnome.glabels-3.gschema.xml.in.in
 [type: gettext/xml]templates/avery-iso-templates.xml
 [type: gettext/xml]templates/avery-other-templates.xml
 [type: gettext/xml]templates/brother-other-templates.xml
+[type: gettext/xml]templates/canon-other-templates.xml
 [type: gettext/xml]templates/databecker-iso-templates.xml
 [type: gettext/xml]templates/dataline-iso-templates.xml
 [type: gettext/xml]templates/decadry-iso-templates.xml
index de3a7eb845d15ace4671dd7c51498f7565d588e9..bcda3de4d24467a8cfb3e08cb54dc7bb02eec5a1 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glabels glabels-3.2\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n"
-"POT-Creation-Date: 2013-10-13 11:17+0000\n"
-"PO-Revision-Date: 2013-10-13 16:04+0200\n"
+"POT-Creation-Date: 2014-02-13 18:50+0000\n"
+"PO-Revision-Date: 2014-02-13 21:36+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -3143,6 +3143,11 @@ msgstr "Víceúčelové etikety 17 × 54 mm"
 msgid "Standard Address Labels 38mm x 90mm"
 msgstr "Standardní adresní etikety 38 × 90 mm"
 
+#. ===================================================================
+#: ../templates/canon-other-templates.xml.h:2
+msgid "CD/DVD Tray"
+msgstr "Držák CD/DVD"
+
 #. ===================================================================
 #: ../templates/databecker-iso-templates.xml.h:4
 msgid "CD/DVD Labels Standard Format (face only)"
index 661228649a0932187c867d9f4ff24f5431036744..a462a326bb5a1522550515189ddb03162ccc8529 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2001-2011 Jim Evins <evins@snaught.com>
 # Marcus Bauer <m@7n7.de>, 2001.
 # Christian Neumair <christian-neumair@web.de>, 2002.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2008-2013.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2008-2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels glabels-3_2\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n"
-"POT-Creation-Date: 2013-10-11 18:32+0000\n"
-"PO-Revision-Date: 2013-10-12 18:35+0100\n"
+"POT-Creation-Date: 2014-04-15 12:22+0000\n"
+"PO-Revision-Date: 2014-04-15 21:29+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "Language: de\n"
@@ -567,7 +567,8 @@ msgstr "Auswahl des Dateinamens ist leer"
 
 #: ../src/file.c:322 ../src/file.c:338
 msgid "Please select a file or supply a valid file name"
-msgstr "Bitte wählen Sie eine Datei oder geben Sie einen gültigen Dateinamen an"
+msgstr ""
+"Bitte wählen Sie eine Datei oder geben Sie einen gültigen Dateinamen an"
 
 #: ../src/file.c:335
 msgid "File does not exist"
@@ -616,7 +617,8 @@ msgstr "Änderungen am Dokument »%s« vor dem Schließen speichern?"
 
 #: ../src/file.c:748
 msgid "Your changes will be lost if you don't save them."
-msgstr "Nicht gespeicherte Änderungen gehen verloren, wenn Sie nicht speichern."
+msgstr ""
+"Nicht gespeicherte Änderungen gehen verloren, wenn Sie nicht speichern."
 
 #: ../src/file.c:751
 msgid "Close without saving"
@@ -1027,7 +1029,8 @@ msgstr "Text: Durch Tabulatoren getrennte Werte (TSV)"
 
 #: ../src/merge-init.c:79
 msgid "Text: Tab Separated Values (TSV) with keys on line 1"
-msgstr "Text: Durch Tabulatoren getrennte Werte (TSV) mit Schlüsseln in Zeile 1"
+msgstr ""
+"Text: Durch Tabulatoren getrennte Werte (TSV) mit Schlüsseln in Zeile 1"
 
 #: ../src/merge-init.c:87
 msgid "Text: Colon separated values"
@@ -1594,7 +1597,8 @@ msgstr "Eigenschaften-Werkzeugleiste"
 #: ../src/ui.c:450
 msgid "Change the visibility of the property toolbar in the current window"
 msgstr ""
-"Die Sichtbarkeit der Werkzeugleiste im aktuellen Fenster ein- oder ausschalten"
+"Die Sichtbarkeit der Werkzeugleiste im aktuellen Fenster ein- oder "
+"ausschalten"
 
 #: ../src/ui.c:456
 msgid "Grid"
@@ -1602,7 +1606,8 @@ msgstr "Raster"
 
 #: ../src/ui.c:458
 msgid "Change the visibility of the grid in the current window"
-msgstr "Die Sichtbarkeit des Rasters im aktuellen Fenster ein- oder ausschalten"
+msgstr ""
+"Die Sichtbarkeit des Rasters im aktuellen Fenster ein- oder ausschalten"
 
 #: ../src/ui.c:464
 msgid "Markup"
@@ -2216,7 +2221,8 @@ msgstr "3. Ränder"
 
 #: ../data/ui/template-designer.ui.h:30
 msgid ""
-"Please enter the following size parameters of a single label in your template."
+"Please enter the following size parameters of a single label in your "
+"template."
 msgstr ""
 "Bitte geben Sie die folgenden Größenwerte des einzelnen Etiketts in Ihrer "
 "Vorlage an."
@@ -2404,27 +2410,27 @@ msgid ""
 msgstr ""
 "gLabels ist ein Programm zum Entwerfen von Etiketten und Visitenkarten. Es "
 "wurde für die verschiedensten mit Laser- oder Tintenstrahldruckern "
-"bedruckbaren selbstklebenden) Etiketten sowie Visitenkarten entworfen, so wie "
-"Sie sie bei den meisten Anbietern für Bürozubehör finden."
+"bedruckbaren selbstklebenden) Etiketten sowie Visitenkarten entworfen, so "
+"wie Sie sie bei den meisten Anbietern für Bürozubehör finden."
 
 #: ../data/appdata/glabels-3.appdata.xml.in.h:2
 msgid ""
 "gLabels can be used to design address labels, name tags, price tags, cd/dvd "
-"labels, or just about anything else that is organized in a regular pattern on "
-"a sheet of paper. Labels (or cards) can contain text, images, lines, shapes, "
-"and barcodes. gLabels also includes a document-merge feature which lets you "
-"print a unique label for each record from an external data source, such as a "
-"CSV file or an Evolution address book."
+"labels, or just about anything else that is organized in a regular pattern "
+"on a sheet of paper. Labels (or cards) can contain text, images, lines, "
+"shapes, and barcodes. gLabels also includes a document-merge feature which "
+"lets you print a unique label for each record from an external data source, "
+"such as a CSV file or an Evolution address book."
 msgstr ""
 "gLabels kann zum Enwerfen von Adressaufklebern, Namens- und Preisschildern, "
 "Etiketten CDs und DVDs oder für alles Andere verwendet werden, was mit dem "
 "Bedrucken von Papieren zu tun hat, die Etiketten oder Karten in einer "
-"regulären Anordnung enthalten. Die Etiketten oder Karten können Text, Bilder, "
-"Linien, Formen oder Strichcodes enthalten. gLabels verfügt auch über ein "
-"Funktionsmerkmal zur Dokumentmischung. Das bedeutet, dass Sie eine externe "
-"Datenquelle dazu verwenden können, ein Etikett für jeden Datensatz zu "
-"drucken. Als Datenquelle kann dabei beispielsweise eine CSV-Datei oder das "
-"Adressbuch von Evolution genutzt werden."
+"regulären Anordnung enthalten. Die Etiketten oder Karten können Text, "
+"Bilder, Linien, Formen oder Strichcodes enthalten. gLabels verfügt auch über "
+"ein Funktionsmerkmal zur Dokumentmischung. Das bedeutet, dass Sie eine "
+"externe Datenquelle dazu verwenden können, ein Etikett für jeden Datensatz "
+"zu drucken. Als Datenquelle kann dabei beispielsweise eine CSV-Datei oder "
+"das Adressbuch von Evolution genutzt werden."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:1
 msgid "Show/hide main toolbar."
@@ -3154,6 +3160,11 @@ msgstr "Mehrzwecketiketten 17mm x 54mm"
 msgid "Standard Address Labels 38mm x 90mm"
 msgstr "Standard-Adressaufkleber 38mm x 90mm"
 
+#. ===================================================================
+#: ../templates/canon-other-templates.xml.h:2
+msgid "CD/DVD Tray"
+msgstr "CD/DVD-Hülle"
+
 #. ===================================================================
 #: ../templates/databecker-iso-templates.xml.h:4
 msgid "CD/DVD Labels Standard Format (face only)"
index 7a3228b4717f5b70eb89cd906fe4ecfc5286805f..98832caede01f167849e0d23e25eabb91d4b5951 100644 (file)
--- a/po/el.po
+++ b/po/el.po
@@ -2,15 +2,15 @@
 # Copyright (C) 2011 glabels's COPYRIGHT HOLDER
 # This file is distributed under the same license as the glabels package.
 # Efstathios Iosifidis <diamond_gr@freemail.gr>, 2011, 2012.
-# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2012.
+# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2012, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels glabels-3_0\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n"
-"POT-Creation-Date: 2012-07-12 12:18+0000\n"
-"PO-Revision-Date: 2012-10-30 11:33+0300\n"
+"POT-Creation-Date: 2013-12-27 05:21+0000\n"
+"PO-Revision-Date: 2014-01-05 11:46+0300\n"
 "Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
-"Language-Team: team@gnome.gr\n"
+"Language-Team: www.gnome.gr\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -548,7 +548,7 @@ msgstr "Κρίσμο σφάλμα gLabels!"
 msgid "New Label or Card"
 msgstr "Νέα Ετικέτα ή Κάρτα"
 
-#: ../src/file.c:175 ../src/label.c:601 ../src/label.c:645
+#: ../src/file.c:175 ../src/label.c:602 ../src/label.c:646
 msgid "Label properties"
 msgstr "Ιδιότητες ετικέτας"
 
@@ -774,93 +774,93 @@ msgid "Create box object"
 msgstr "Δημιουργία αντικειμένου πλαισίου"
 
 #: ../src/label-box.c:230 ../src/label-ellipse.c:232
-#: ../data/ui/property-bar.ui.h:9
+#: ../data/ui/property-bar.ui.h:12
 msgid "Fill color"
 msgstr "Χρώμα γεμίσματος"
 
 #: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
-#: ../data/ui/property-bar.ui.h:10
+#: ../data/ui/property-bar.ui.h:13
 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:11
+#: ../data/ui/property-bar.ui.h:14
 msgid "Line width"
 msgstr "Πλάτος γραμμής"
 
-#: ../src/label.c:405
+#: ../src/label.c:406
 msgid "Untitled"
 msgstr "Χωρίς Τίτλο"
 
-#: ../src/label.c:719 ../src/ui.c:420
+#: ../src/label.c:720 ../src/ui.c:420
 msgid "Merge properties"
 msgstr "Ιδιότητες συγχώνευσης"
 
-#: ../src/label.c:1215 ../src/ui.c:213
+#: ../src/label.c:1216 ../src/ui.c:213
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: ../src/label.c:1248 ../src/ui.c:322
+#: ../src/label.c:1251 ../src/ui.c:322
 msgid "Bring to front"
 msgstr "Μεταφορά εμπρός"
 
-#: ../src/label.c:1284 ../src/ui.c:329
+#: ../src/label.c:1287 ../src/ui.c:329
 msgid "Send to back"
 msgstr "Μετάφορά πίσω"
 
-#: ../src/label.c:1325
+#: ../src/label.c:1328
 msgid "Rotate"
 msgstr "Περιστροφή"
 
-#: ../src/label.c:1360 ../src/ui.c:336
+#: ../src/label.c:1363 ../src/ui.c:336
 msgid "Rotate left"
 msgstr "Περιστροφή αριστερά"
 
-#: ../src/label.c:1393 ../src/ui.c:343
+#: ../src/label.c:1396 ../src/ui.c:343
 msgid "Rotate right"
 msgstr "Περιστροφή δεξιά"
 
-#: ../src/label.c:1428 ../src/ui.c:350
+#: ../src/label.c:1431 ../src/ui.c:350
 msgid "Flip horizontally"
 msgstr "Αναστροφή οριζόντια"
 
-#: ../src/label.c:1463 ../src/ui.c:357
+#: ../src/label.c:1466 ../src/ui.c:357
 msgid "Flip vertically"
 msgstr "Αναστροφή κατακόρυφα"
 
-#: ../src/label.c:1503 ../src/ui.c:364
+#: ../src/label.c:1506 ../src/ui.c:364
 msgid "Align left"
 msgstr "Στοίχιση αριστερά"
 
-#: ../src/label.c:1560 ../src/ui.c:378
+#: ../src/label.c:1563 ../src/ui.c:378
 msgid "Align right"
 msgstr "Στοίχιση δεξιά"
 
-#: ../src/label.c:1621
+#: ../src/label.c:1624
 msgid "Align horizontal center"
 msgstr "Στοίχιση οριζόντια στο κέντρο"
 
-#: ../src/label.c:1697
+#: ../src/label.c:1700
 msgid "Align tops"
 msgstr "Στοίχιση επάνω"
 
-#: ../src/label.c:1754
+#: ../src/label.c:1757
 msgid "Align bottoms"
 msgstr "Στοίχιση κάτω"
 
-#: ../src/label.c:1815
+#: ../src/label.c:1818
 msgid "Align vertical center"
 msgstr "Στοίχιση κατακόρυφα στο κέντρο"
 
-#: ../src/label.c:1893 ../src/ui.c:406
+#: ../src/label.c:1896 ../src/ui.c:406
 msgid "Center horizontally"
 msgstr "Οριζόντιο κεντράρισμα"
 
-#: ../src/label.c:1940 ../src/ui.c:413
+#: ../src/label.c:1943 ../src/ui.c:413
 msgid "Center vertically"
 msgstr "Κατακόρυφο κεντράρισμα"
 
-#: ../src/label.c:2628 ../src/label.c:2670 ../src/label.c:2696 ../src/ui.c:206
+#: ../src/label.c:2664 ../src/label.c:2706 ../src/label.c:2732 ../src/ui.c:206
 msgid "Paste"
 msgstr "Επικόλληση"
 
@@ -868,11 +868,11 @@ msgstr "Επικόλληση"
 msgid "Create ellipse object"
 msgstr "Δημιουργία αντικειμένου έλλειψης"
 
-#: ../src/label-image.c:200 ../src/ui.c:310
+#: ../src/label-image.c:199 ../src/ui.c:310
 msgid "Create image object"
 msgstr "Δημιουργία αντικειμένου εικόνας"
 
-#: ../src/label-image.c:333 ../src/label-image.c:474
+#: ../src/label-image.c:332 ../src/label-image.c:473
 msgid "Set image"
 msgstr "Ορισμός εικόνας"
 
@@ -880,67 +880,71 @@ msgstr "Ορισμός εικόνας"
 msgid "Create line object"
 msgstr "Δημιουργία αντικειμένου γραμμής"
 
-#: ../src/label-object.c:394 ../src/label-object.c:428
+#: ../src/label-object.c:392 ../src/label-object.c:423
 msgid "Move"
 msgstr "Μετακίνηση"
 
-#: ../src/label-object.c:479
+#: ../src/label-object.c:474
 msgid "Resize"
 msgstr "Αλλαγή μεγέθους"
 
-#: ../src/label-object.c:1217
+#: ../src/label-object.c:1258
 msgid "Shadow state"
 msgstr "Κατάσταση σκιάς"
 
-#: ../src/label-object.c:1260
+#: ../src/label-object.c:1301
 msgid "Shadow offset"
 msgstr "Αντιστάθμιση σκιάς"
 
-#: ../src/label-object.c:1308
+#: ../src/label-object.c:1349
 msgid "Shadow color"
 msgstr "Χρώμα σκιάς"
 
-#: ../src/label-object.c:1351
+#: ../src/label-object.c:1392
 msgid "Shadow opacity"
 msgstr "Αδιαφάνεια σκιάς"
 
-#: ../src/label-text.c:281 ../src/ui.c:282
+#: ../src/label-text.c:293 ../src/ui.c:282
 msgid "Create text object"
 msgstr "Δημιουργία αντικειμένου κειμένου"
 
-#: ../src/label-text.c:453
+#: ../src/label-text.c:467
 msgid "Typing"
 msgstr "Πληκτρολόγηση"
 
-#: ../src/label-text.c:586 ../data/ui/property-bar.ui.h:1
+#: ../src/label-text.c:601 ../data/ui/property-bar.ui.h:1
 msgid "Font family"
 msgstr "Οικογένεια γραμματοσειράς"
 
-#: ../src/label-text.c:624 ../data/ui/property-bar.ui.h:2
+#: ../src/label-text.c:639 ../data/ui/property-bar.ui.h:2
 msgid "Font size"
 msgstr "Μέγεθος γραμματοσειράς"
 
-#: ../src/label-text.c:657
+#: ../src/label-text.c:672
 msgid "Font weight"
 msgstr "Μέγεθος γραμματοσειράς"
 
-#: ../src/label-text.c:690 ../data/ui/property-bar.ui.h:4
+#: ../src/label-text.c:705 ../data/ui/property-bar.ui.h:4
 msgid "Italic"
 msgstr "Πλάγια"
 
-#: ../src/label-text.c:723
+#: ../src/label-text.c:738
 msgid "Align text"
 msgstr "Στοίχιση κειμένου"
 
-#: ../src/label-text.c:756
+#: ../src/label-text.c:771
+msgid "Vertically align text"
+msgstr "Κάθετη στοίχιση κειμένου"
+
+#: ../src/label-text.c:804
 msgid "Line spacing"
 msgstr "Διάστοιχο γραμμών"
 
-#: ../src/label-text.c:789 ../data/ui/property-bar.ui.h:8
+#: ../src/label-text.c:837 ../data/ui/property-bar.ui.h:11
 msgid "Text color"
 msgstr "Χρώμα κειμένου"
 
-#: ../src/label-text.c:933
+#: ../src/label-text.c:997
 msgid "Auto shrink"
 msgstr "Αυτόματη σμίκρυνση"
 
@@ -1066,7 +1070,7 @@ msgstr "Επιλέξτε"
 msgid "Record/Field"
 msgstr "Καταγραφή/Πεδίο"
 
-#: ../src/merge-properties-dialog.c:356 ../data/ui/object-editor.ui.h:23
+#: ../src/merge-properties-dialog.c:356 ../data/ui/object-editor.ui.h:24
 msgid "Data"
 msgstr "Δεδομένα"
 
@@ -1079,25 +1083,25 @@ msgid "Fixed"
 msgstr "Σταθερό"
 
 #. Translators: "Up" refers to the direction towards the top of a label.
-#: ../src/mini-preview.c:1054
+#: ../src/mini-preview.c:1051
 msgid "Up"
 msgstr "Επάνω"
 
-#: ../src/new-label-dialog.c:203
+#: ../src/new-label-dialog.c:212 ../data/ui/new-label-dialog.ui.h:1
 msgid "Select Product"
 msgstr "Επιλογή προϊόντος"
 
-#: ../src/new-label-dialog.c:215
+#: ../src/new-label-dialog.c:225 ../data/ui/new-label-dialog.ui.h:3
 msgid "Choose Orientation"
 msgstr "Επιλογή προσανατολισμού"
 
-#: ../src/new-label-dialog.c:229
+#: ../src/new-label-dialog.c:240
 msgid "Review"
 msgstr "Αναθεώρηση"
 
 #: ../src/object-editor-bc-page.c:97 ../src/object-editor-shadow-page.c:93
-#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:335
-#: ../src/ui-property-bar.c:277
+#: ../src/object-editor-text-page.c:102 ../src/prefs-dialog.c:335
+#: ../src/ui-property-bar.c:289
 msgid "Default"
 msgstr "Προεπιλογή"
 
@@ -1134,7 +1138,7 @@ msgid "Insert merge field"
 msgstr "Εισαγωγή πεδίου συγχώνευσης"
 
 #: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:341
-#: ../src/ui-property-bar.c:287
+#: ../src/ui-property-bar.c:299
 msgid "No Fill"
 msgstr "Χωρίς γέμισμα"
 
@@ -1152,7 +1156,7 @@ msgid "%s (*.%s)"
 msgstr "%s (*.%s)"
 
 #: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:338
-#: ../src/ui-property-bar.c:297
+#: ../src/ui-property-bar.c:309
 msgid "No Line"
 msgstr "Χωρίς γραμμή"
 
@@ -1466,7 +1470,7 @@ msgstr "Πλαίσιο"
 msgid "Create box/rectangle object"
 msgstr "Δημιουργία αντικειμένου πλαισίου/ορθογωνίου"
 
-#: ../src/ui.c:294 ../data/ui/object-editor.ui.h:16
+#: ../src/ui.c:294 ../data/ui/object-editor.ui.h:17
 #: ../data/ui/prefs-dialog.ui.h:20
 msgid "Line"
 msgstr "Γραμμή"
@@ -1479,7 +1483,7 @@ msgstr "Έλλειψη"
 msgid "Create ellipse/circle object"
 msgstr "Δημιουργία αντικειμένου έλλειψη/κύκλος"
 
-#: ../src/ui.c:308 ../data/ui/object-editor.ui.h:19
+#: ../src/ui.c:308 ../data/ui/object-editor.ui.h:20
 msgid "Image"
 msgstr "Εικόνα"
 
@@ -1639,7 +1643,7 @@ msgstr "Ένα πρόγραμμα δημιουργίας ετικετών και
 msgid "translator-credits"
 msgstr ""
 "Ελληνική μεταφραστική ομάδα GNOME\n"
-"Σπίγγος Δημήτρης <dmtrs32@gmail.com>, 2012\n"
+"Σπίγγος Δημήτρης <dmtrs32@gmail.com>, 2012, 2014\n"
 "Ευστάθιος Ιωσηφίδης <diamond_gr@freemail.gr>, 2012\n"
 "Για περισσότερα δείτε http://www.gnome.gr/."
 
@@ -1744,13 +1748,13 @@ msgstr "διάμετρος"
 #. the CSS2 Specification (Section 4.3.2)
 #. This table must be sorted exactly as the enumerations in lglUnits
 #. [LGL_UNITS_POINT]
-#: ../libglabels/lgl-units.c:65 ../data/ui/object-editor.ui.h:14
+#: ../libglabels/lgl-units.c:65 ../data/ui/object-editor.ui.h:15
 #: ../data/ui/prefs-dialog.ui.h:19
 msgid "points"
 msgstr "σημεία"
 
 #. [LGL_UNITS_INCH]
-#: ../libglabels/lgl-units.c:66 ../data/ui/object-editor.ui.h:27
+#: ../libglabels/lgl-units.c:66 ../data/ui/object-editor.ui.h:28
 #: ../data/ui/template-designer.ui.h:15
 msgid "inches"
 msgstr "ίντσες"
@@ -1810,7 +1814,7 @@ msgstr "Πρόσφατο"
 msgid "Brand:"
 msgstr "Μάρκα:"
 
-#: ../data/ui/media-select.ui.h:3 ../data/ui/new-label-dialog.ui.h:7
+#: ../data/ui/media-select.ui.h:3 ../data/ui/new-label-dialog.ui.h:10
 #: ../data/ui/template-designer.ui.h:12
 msgid "Page size:"
 msgstr "Μέγεθος Σελίδας:"
@@ -1827,7 +1831,7 @@ msgstr "Επιλογή όλων"
 msgid "Custom"
 msgstr "Προσαρμοσμένο"
 
-#: ../data/ui/new-label-dialog.ui.h:1
+#: ../data/ui/new-label-dialog.ui.h:2
 msgid ""
 "Choose label or card product from hundreds of predefined templates or define "
 "your own."
@@ -1835,43 +1839,47 @@ msgstr ""
 "Επιλέξτε ετικέτα ή κάρτα από χιλιάδες προκαθορισμένα πρότυπα ή ορίστε ένα "
 "δικό σας."
 
-#: ../data/ui/new-label-dialog.ui.h:2
+#: ../data/ui/new-label-dialog.ui.h:4
 msgid "Select orientation of label content."
 msgstr "Επιλογή προσανατολισμού περιεχομένου ετικέτας."
 
-#: ../data/ui/new-label-dialog.ui.h:3
+#: ../data/ui/new-label-dialog.ui.h:5
 msgid "Normal"
 msgstr "Κανονικό"
 
-#: ../data/ui/new-label-dialog.ui.h:4
+#: ../data/ui/new-label-dialog.ui.h:6
 msgid "Rotated"
 msgstr "Περιστροφή"
 
-#: ../data/ui/new-label-dialog.ui.h:5
+#: ../data/ui/new-label-dialog.ui.h:7
+msgid "Review Selection"
+msgstr "Επιθεώρηση επιλογής"
+
+#: ../data/ui/new-label-dialog.ui.h:8
 msgid "Please review and confirm your selection."
 msgstr "Παρακαλώ επιθεωρήστε και επιβεβαιώστε την επιλογή σας."
 
-#: ../data/ui/new-label-dialog.ui.h:6 ../data/ui/template-designer.ui.h:9
+#: ../data/ui/new-label-dialog.ui.h:9 ../data/ui/template-designer.ui.h:9
 msgid "Description:"
 msgstr "Περιγραφή:"
 
-#: ../data/ui/new-label-dialog.ui.h:8
+#: ../data/ui/new-label-dialog.ui.h:11
 msgid "Label size:"
 msgstr "Μέγεθος ετικέτας:"
 
-#: ../data/ui/new-label-dialog.ui.h:9
+#: ../data/ui/new-label-dialog.ui.h:12
 msgid "Layout:"
 msgstr "Διάταξη:"
 
-#: ../data/ui/new-label-dialog.ui.h:10
+#: ../data/ui/new-label-dialog.ui.h:13
 msgid "Similar products:"
 msgstr "Παρόμοια προϊόντα:"
 
-#: ../data/ui/new-label-dialog.ui.h:11 ../data/ui/template-designer.ui.h:6
+#: ../data/ui/new-label-dialog.ui.h:14 ../data/ui/template-designer.ui.h:6
 msgid "Part #:"
 msgstr "Είδος #:"
 
-#: ../data/ui/new-label-dialog.ui.h:12
+#: ../data/ui/new-label-dialog.ui.h:15
 msgid "Vendor:"
 msgstr "Πωλητής:"
 
@@ -1907,113 +1915,117 @@ msgstr "πλήκτρο:"
 msgid "Alignment:"
 msgstr "Στοίχιση:"
 
-#: ../data/ui/object-editor.ui.h:10 ../data/ui/prefs-dialog.ui.h:16
+#: ../data/ui/object-editor.ui.h:10
+msgid "Vertical alignment:"
+msgstr "Κάθετη στοίχιση:"
+
+#: ../data/ui/object-editor.ui.h:11 ../data/ui/prefs-dialog.ui.h:16
 msgid "Line Spacing:"
 msgstr "Απόσταση γραμμών:"
 
-#: ../data/ui/object-editor.ui.h:11
+#: ../data/ui/object-editor.ui.h:12
 msgid "Allow merge to automatically shrink text"
 msgstr "Να επιτρέπεται η συγχώνευση για αυτόματη συρρίκνωση του κειμένου"
 
-#: ../data/ui/object-editor.ui.h:12
+#: ../data/ui/object-editor.ui.h:13
 msgid "Style"
 msgstr "Τεχνοτοπία"
 
-#: ../data/ui/object-editor.ui.h:13 ../data/ui/prefs-dialog.ui.h:18
+#: ../data/ui/object-editor.ui.h:14 ../data/ui/prefs-dialog.ui.h:18
 #: ../data/ui/template-designer.ui.h:13
 msgid "Width:"
 msgstr "Πλάτος:"
 
-#: ../data/ui/object-editor.ui.h:15
+#: ../data/ui/object-editor.ui.h:16
 msgid "Key:"
 msgstr "Πλήκτρο:"
 
-#: ../data/ui/object-editor.ui.h:17 ../data/ui/prefs-dialog.ui.h:21
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:21
 msgid "Fill"
 msgstr "Γέμισμα"
 
-#: ../data/ui/object-editor.ui.h:18
+#: ../data/ui/object-editor.ui.h:19
 msgid "File:"
 msgstr "Αρχείο:"
 
-#: ../data/ui/object-editor.ui.h:20
+#: ../data/ui/object-editor.ui.h:21
 msgid "Literal:"
 msgstr "Κυριολεκτικό:"
 
-#: ../data/ui/object-editor.ui.h:21
+#: ../data/ui/object-editor.ui.h:22
 msgid "format:"
 msgstr "μορφή:"
 
-#: ../data/ui/object-editor.ui.h:22
+#: ../data/ui/object-editor.ui.h:23
 msgid "digits:"
 msgstr "ψηφία:"
 
-#: ../data/ui/object-editor.ui.h:24
+#: ../data/ui/object-editor.ui.h:25
 msgid "Backend:"
 msgstr "Σύστημα υποστήριξης:"
 
-#: ../data/ui/object-editor.ui.h:25
+#: ../data/ui/object-editor.ui.h:26
 msgid "Checksum"
 msgstr "άθροισμα ελέγχου"
 
-#: ../data/ui/object-editor.ui.h:26 ../data/ui/template-designer.ui.h:14
+#: ../data/ui/object-editor.ui.h:27 ../data/ui/template-designer.ui.h:14
 msgid "Height:"
 msgstr "Ύψος:"
 
-#: ../data/ui/object-editor.ui.h:28
+#: ../data/ui/object-editor.ui.h:29
 msgid "Reset image size"
 msgstr "Επαναφορά μεγέθους εικόνας"
 
-#: ../data/ui/object-editor.ui.h:29
+#: ../data/ui/object-editor.ui.h:30
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: ../data/ui/object-editor.ui.h:30
+#: ../data/ui/object-editor.ui.h:31
 msgid "Length:"
 msgstr "Μήκος:"
 
-#: ../data/ui/object-editor.ui.h:31
+#: ../data/ui/object-editor.ui.h:32
 msgid "Angle:"
 msgstr "Γωνία:"
 
-#: ../data/ui/object-editor.ui.h:32
+#: ../data/ui/object-editor.ui.h:33
 msgid "degrees"
 msgstr "μοίρες"
 
-#: ../data/ui/object-editor.ui.h:33
+#: ../data/ui/object-editor.ui.h:34
 msgid "X:"
 msgstr "X:"
 
-#: ../data/ui/object-editor.ui.h:34
+#: ../data/ui/object-editor.ui.h:35
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/ui/object-editor.ui.h:35
+#: ../data/ui/object-editor.ui.h:36
 msgid "Position"
 msgstr "Θέση"
 
-#: ../data/ui/object-editor.ui.h:36
+#: ../data/ui/object-editor.ui.h:37
 msgid "Enable shadow"
 msgstr "Ενεργοποίηση σκίασης"
 
-#: ../data/ui/object-editor.ui.h:37
+#: ../data/ui/object-editor.ui.h:38
 msgid "X Offset:"
 msgstr "Αντιστάθμιση X:"
 
-#: ../data/ui/object-editor.ui.h:38
+#: ../data/ui/object-editor.ui.h:39
 msgid "Y Offset:"
 msgstr "Αντιστάθμιση Υ:"
 
-#: ../data/ui/object-editor.ui.h:39
+#: ../data/ui/object-editor.ui.h:40
 msgid "Opacity:"
 msgstr "Διαφάνεια:"
 
-#: ../data/ui/object-editor.ui.h:41
+#: ../data/ui/object-editor.ui.h:42
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: ../data/ui/object-editor.ui.h:42
+#: ../data/ui/object-editor.ui.h:43
 msgid "Shadow"
 msgstr "Σκιά"
 
@@ -2085,6 +2097,18 @@ msgstr "Κεντρική στοίχιση"
 msgid "Right align"
 msgstr "Δεξιά στοίχιση"
 
+#: ../data/ui/property-bar.ui.h:8
+msgid "Top vertical align"
+msgstr "Κάθετη στοίχιση πάνω"
+
+#: ../data/ui/property-bar.ui.h:9
+msgid "Center vertical align"
+msgstr "Κάθετη στοίχιση στο κέντρο"
+
+#: ../data/ui/property-bar.ui.h:10
+msgid "Bottom vertical align"
+msgstr "Κάθετη στοίχιση κάτω"
+
 #: ../data/ui/template-designer.ui.h:1
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
@@ -2367,6 +2391,35 @@ msgstr "Έλεγχος συγχώνευσης"
 msgid "Options"
 msgstr "Επιλογές"
 
+#: ../data/appdata/glabels-3.appdata.xml.in.h:1
+msgid ""
+"gLabels is a program for creating labels and business cards. It is designed "
+"to work with various laser/ink-jet peel-off label and business card sheets "
+"that you'll find at most office supply stores."
+msgstr ""
+"Το gLabels είναι ένα πρόγραμμα για δημιουργία ετικετών και επαγγελματικών "
+"καρτών. Σχεδιάστηκε για να δουλεύει με ποικίλες αυτοκόλλητες ετικέτες λέιζερ/"
+"ψεκασμού και φύλλα επαγγελματικών καρτών που θα βρείτε στα περισσότερα "
+"καταστήματα ειδών γραφείου."
+
+#: ../data/appdata/glabels-3.appdata.xml.in.h:2
+msgid ""
+"gLabels can be used to design address labels, name tags, price tags, cd/dvd "
+"labels, or just about anything else that is organized in a regular pattern "
+"on a sheet of paper. Labels (or cards) can contain text, images, lines, "
+"shapes, and barcodes. gLabels also includes a document-merge feature which "
+"lets you print a unique label for each record from an external data source, "
+"such as a CSV file or an Evolution address book."
+msgstr ""
+"Η εφαρμογή gLabels μπορεί να χρησιμοποιηθεί για την σχεδίαση ετικετών "
+"διευθύνσεων, ετικετών ονομάτων, ετικετών τιμών, ετικετών cd/dvd, ή οτιδήποτε "
+"άλλου που διοργανώνεται σε ένα κανονικό υπόδειγμα ενός φύλλου χαρτιού. Οι "
+"ετικέτες (ή κάρτες) μπορεί να περιέχουν κείμενο, εικόνες, γραμμές, σχήματα, "
+"και ραβδωτούς κώδικες. Το gLabels περιλαμβάνει επίσης το χαρακτηριστικό "
+"συγχώνευσης εγγράφου το οποίο σας επιτρέπει να εκτυπώσετε μια μοναδική "
+"ετικέτα για κάθε εγγραφή από μια εξωτερική πηγή δεδομένων, όπως ένα αρχείο "
+"CSV ή ένα βιβλίο διευθύνσεων του Evolution."
+
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:1
 msgid "Show/hide main toolbar."
 msgstr "Προβολή/απόκρυψη κύριας εργαλειοθήκης."
@@ -2437,7 +2490,8 @@ msgstr "Προεπιλεγμένη οικογένεια γραμματοσειρ
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:18
 msgid "The default font family for new text objects."
-msgstr "Η προεπιλεγμένη οικογένεια γραμματοσειράς για νέα αντικείμενα κειμένου."
+msgstr ""
+"Η προεπιλεγμένη οικογένεια γραμματοσειράς για νέα αντικείμενα κειμένου."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:19
 msgid "Default font size."
@@ -2743,12 +2797,14 @@ msgstr "Τετράγωνες ετικέτες"
 #. ====================================================================
 #. ===================================================================
 #. ********************************************************************
+#. ===================================================================
 #: ../templates/categories.xml.h:5 ../templates/ascom-iso-templates.xml.h:4
 #: ../templates/endisch-templates.xml.h:3
 #: ../templates/hama-iso-templates.xml.h:27
 #: ../templates/herma-iso-templates.xml.h:20
 #: ../templates/igepa-templates.xml.h:1 ../templates/jac-iso-templates.xml.h:4
 #: ../templates/rayfilm-templates.xml.h:1
+#: ../templates/sheetlabels-us-templates.xml.h:2
 msgid "Rectangular labels"
 msgstr "Ορθογώνιες ετικέτες"
 
@@ -2843,7 +2899,7 @@ msgstr "Ετικέτες φακέλου αρχείου"
 #: ../templates/avery-us-templates.xml.h:10
 #: ../templates/dataline-iso-templates.xml.h:10
 #: ../templates/meritline-us-templates.xml.h:6
-#: ../templates/sheetlabels-us-templates.xml.h:4
+#: ../templates/sheetlabels-us-templates.xml.h:6
 #: ../templates/uline-us-templates.xml.h:2
 #: ../templates/worldlabel-us-templates.xml.h:4
 msgid "Shipping Labels"
@@ -2860,7 +2916,7 @@ msgstr "Ετικέτες αποστολής"
 #: ../templates/maco-us-templates.xml.h:2
 #: ../templates/meritline-us-templates.xml.h:4
 #: ../templates/pearl-iso-templates.xml.h:2
-#: ../templates/sheetlabels-us-templates.xml.h:2
+#: ../templates/sheetlabels-us-templates.xml.h:4
 #: ../templates/worldlabel-us-templates.xml.h:3
 #: ../templates/zweckform-iso-templates.xml.h:4
 msgid "Address Labels"
@@ -2871,7 +2927,7 @@ msgstr "Ετικέτες διευθύνσεων"
 #: ../templates/avery-us-templates.xml.h:14
 #: ../templates/dymo-other-templates.xml.h:6
 #: ../templates/meritline-us-templates.xml.h:8
-#: ../templates/sheetlabels-us-templates.xml.h:6
+#: ../templates/sheetlabels-us-templates.xml.h:8
 #: ../templates/worldlabel-us-templates.xml.h:2
 msgid "Return Address Labels"
 msgstr "Ετικέτες διευθύνσεων επιστροφής"
@@ -2881,7 +2937,7 @@ msgstr "Ετικέτες διευθύνσεων επιστροφής"
 #: ../templates/maco-us-templates.xml.h:3
 #: ../templates/meritline-us-templates.xml.h:12
 #: ../templates/misc-us-templates.xml.h:23
-#: ../templates/sheetlabels-us-templates.xml.h:8
+#: ../templates/sheetlabels-us-templates.xml.h:10
 #: ../templates/worldlabel-us-templates.xml.h:9
 msgid "Round Labels"
 msgstr "Στρογγυλές ετικέτες"
@@ -2890,7 +2946,7 @@ msgstr "Στρογγυλές ετικέτες"
 #: ../templates/avery-us-templates.xml.h:18
 #: ../templates/avery-iso-templates.xml.h:20
 #: ../templates/meritline-us-templates.xml.h:14
-#: ../templates/sheetlabels-us-templates.xml.h:14
+#: ../templates/sheetlabels-us-templates.xml.h:16
 #: ../templates/worldlabel-us-templates.xml.h:8
 msgid "Diskette Labels"
 msgstr "Ετικέτες δισκετών"
@@ -2902,7 +2958,7 @@ msgstr "Κάρτες στηρίγματος"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:22
-#: ../templates/sheetlabels-us-templates.xml.h:10
+#: ../templates/sheetlabels-us-templates.xml.h:12
 #: ../templates/worldlabel-us-templates.xml.h:7
 msgid "Filing Labels"
 msgstr "Ετικέτες αρχειοθέτησης"
@@ -2954,7 +3010,7 @@ msgstr "Ετικέτες ονόματος σήματος"
 #: ../templates/misc-other-templates.xml.h:2
 #: ../templates/pearl-iso-templates.xml.h:64
 #: ../templates/rayfilm-templates.xml.h:10
-#: ../templates/sheetlabels-us-templates.xml.h:12
+#: ../templates/sheetlabels-us-templates.xml.h:14
 #: ../templates/worldlabel-us-templates.xml.h:12
 #: ../templates/zweckform-iso-templates.xml.h:8
 msgid "CD/DVD Labels"
@@ -2962,7 +3018,7 @@ msgstr "Ετικέτες CD/DVD"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:34
-#: ../templates/sheetlabels-us-templates.xml.h:16
+#: ../templates/sheetlabels-us-templates.xml.h:18
 msgid "CD/DVD Labels (Disc Labels)"
 msgstr "Ετικέτες CD/DVD (ετικέτες δίσκων)"
 
@@ -2975,7 +3031,7 @@ msgstr "Ετικέτες CD/DVD (ετικέτες ράχης)"
 #: ../templates/avery-us-templates.xml.h:38
 #: ../templates/geha-iso-templates.xml.h:17
 #: ../templates/meritline-us-templates.xml.h:16
-#: ../templates/sheetlabels-us-templates.xml.h:18
+#: ../templates/sheetlabels-us-templates.xml.h:20
 #: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Video Tape Face Labels"
 msgstr "Ετικέτες όψης κασέτας βίντεο"
index fceaab80b6737387f0ac299ad941c563dcf4d8f2..f54500e1f22105d8cae8fedd8f00164c79cdc3ba 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -1,14 +1,14 @@
 # Spanish translation of glabels.
 # sergio rivadero <sergiorivadero@argentina.com>, 2005.
 # Jorge González <jorgegonz@svn.gnome.org>, 2010.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012, 2013.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012, 2013, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels 2.1.0\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n"
-"POT-Creation-Date: 2013-10-13 11:17+0000\n"
-"PO-Revision-Date: 2013-10-15 14:34+0200\n"
+"POT-Creation-Date: 2014-04-15 06:15+0000\n"
+"PO-Revision-Date: 2014-02-14 10:35+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "Language: \n"
@@ -16,6 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Gtranslator 2.91.5\n"
 
 #: ../src/bc-backends.c:81
 msgid "Built-in"
@@ -601,7 +602,7 @@ msgstr "Debe proporcionar un nombre de archivo válido"
 #: ../src/file.c:644
 #, c-format
 msgid "Overwrite file \"%s\"?"
-msgstr "¿Sobreescribir el archivo «%s»?"
+msgstr "¿Sobrescribir el archivo «%s»?"
 
 #: ../src/file.c:648
 msgid "File already exists."
@@ -1850,7 +1851,6 @@ msgid "Rotated"
 msgstr "Rotada"
 
 #: ../data/ui/new-label-dialog.ui.h:7
-#| msgid "Remove all selections"
 msgid "Review Selection"
 msgstr "Revisar la selección"
 
@@ -3150,6 +3150,11 @@ msgstr "Etiquetas multipropósito de 17mm x 54mm"
 msgid "Standard Address Labels 38mm x 90mm"
 msgstr "Etiquetas de dirección estándar de 38mm x 90mm"
 
+#. ===================================================================
+#: ../templates/canon-other-templates.xml.h:2
+msgid "CD/DVD Tray"
+msgstr "Bandeja de CD/DVD"
+
 #. ===================================================================
 #: ../templates/databecker-iso-templates.xml.h:4
 msgid "CD/DVD Labels Standard Format (face only)"
index 2bfbe737f8afd032ea26ee6f51463d0f936881da..4eb02fd72c36eb19fe34e8ab3f5bbba4830e74a4 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,13 +1,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Jiri Grönroos <jiri.gronroos+l10n@iki.fi>, 2012, 2013.
+#
+# Lasse Liehu <lasse.liehu@gmail.com>, 2014.
+# Jiri Grönroos <jiri.gronroos+l10n@iki.fi>, 2012, 2013, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n"
-"POT-Creation-Date: 2013-08-04 07:53+0000\n"
-"PO-Revision-Date: 2013-09-18 19:50+0300\n"
+"POT-Creation-Date: 2014-09-15 08:04+0000\n"
+"PO-Revision-Date: 2014-09-15 14:56+0300\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <gnome-fi-laatu@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -547,7 +549,7 @@ msgstr "gLabelsin vakava virhe!"
 msgid "New Label or Card"
 msgstr "Uusi etiketti tai kortti"
 
-#: ../src/file.c:175 ../src/label.c:601 ../src/label.c:645
+#: ../src/file.c:175 ../src/label.c:602 ../src/label.c:646
 msgid "Label properties"
 msgstr "Etiketin ominaisuudet"
 
@@ -622,19 +624,19 @@ msgstr "Sulje tallentamatta"
 
 #: ../src/font-combo-menu.c:137
 msgid "Recent fonts"
-msgstr "Viimeisimmät kirjasimet"
+msgstr "Viimeisimmät fontit"
 
 #: ../src/font-combo-menu.c:152
 msgid "Proportional fonts"
-msgstr "Tasasuhtaiset kirjasimet"
+msgstr "Tasasuhtaiset fontit"
 
 #: ../src/font-combo-menu.c:160
 msgid "Fixed-width fonts"
-msgstr "Tasalevyiset kirjasimet"
+msgstr "Tasalevyiset fontit"
 
 #: ../src/font-combo-menu.c:168
 msgid "All fonts"
-msgstr "Kaikki kirjasimet"
+msgstr "Kaikki fontit"
 
 #.
 #. * Allow text samples to be localized.
@@ -701,15 +703,15 @@ msgstr ""
 
 #: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print outlines (to test printer alignment)"
-msgstr ""
+msgstr "tulosta ääriviivat (testataksesi tulostimen kohdistusta)"
 
 #: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
-msgstr ""
+msgstr "tulosta käänteisesti (esim. peilikuvat)"
 
 #: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print crop marks"
-msgstr ""
+msgstr "tulosta leikkausviivat"
 
 #: ../src/glabels-batch.c:67
 msgid "input file for merging"
@@ -729,6 +731,9 @@ msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
+"%s\n"
+"Suorita '%s --help' nähdäksesi kaikki käytettävissä olevat "
+"komentorivivalinnat.\n"
 
 #: ../src/glabels-batch.c:151
 #, c-format
@@ -769,93 +774,93 @@ msgid "Create box object"
 msgstr "Luo laatikko-objekti"
 
 #: ../src/label-box.c:230 ../src/label-ellipse.c:232
-#: ../data/ui/property-bar.ui.h:9
+#: ../data/ui/property-bar.ui.h:12
 msgid "Fill color"
 msgstr "Täyttöväri"
 
 #: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
-#: ../data/ui/property-bar.ui.h:10
+#: ../data/ui/property-bar.ui.h:13
 msgid "Line color"
 msgstr "Viivan väri"
 
 #: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
-#: ../data/ui/property-bar.ui.h:11
+#: ../data/ui/property-bar.ui.h:14
 msgid "Line width"
 msgstr "Viivan leveys"
 
-#: ../src/label.c:405
+#: ../src/label.c:406
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: ../src/label.c:719 ../src/ui.c:420
+#: ../src/label.c:720 ../src/ui.c:420
 msgid "Merge properties"
 msgstr "Yhdistä ominaisuudet"
 
-#: ../src/label.c:1215 ../src/ui.c:213
+#: ../src/label.c:1216 ../src/ui.c:213
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/label.c:1248 ../src/ui.c:322
+#: ../src/label.c:1251 ../src/ui.c:322
 msgid "Bring to front"
 msgstr "Tuo muiden eteen"
 
-#: ../src/label.c:1284 ../src/ui.c:329
+#: ../src/label.c:1287 ../src/ui.c:329
 msgid "Send to back"
 msgstr "Vie muiden taakse"
 
-#: ../src/label.c:1325
+#: ../src/label.c:1328
 msgid "Rotate"
 msgstr "Käännä"
 
-#: ../src/label.c:1360 ../src/ui.c:336
+#: ../src/label.c:1363 ../src/ui.c:336
 msgid "Rotate left"
 msgstr "Käännä vasemmalle"
 
-#: ../src/label.c:1393 ../src/ui.c:343
+#: ../src/label.c:1396 ../src/ui.c:343
 msgid "Rotate right"
 msgstr "Käännä oikealle"
 
-#: ../src/label.c:1428 ../src/ui.c:350
+#: ../src/label.c:1431 ../src/ui.c:350
 msgid "Flip horizontally"
 msgstr "Käännä vaakasuunnassa"
 
-#: ../src/label.c:1463 ../src/ui.c:357
+#: ../src/label.c:1466 ../src/ui.c:357
 msgid "Flip vertically"
 msgstr "Käännä pystysuunnassa"
 
-#: ../src/label.c:1503 ../src/ui.c:364
+#: ../src/label.c:1506 ../src/ui.c:364
 msgid "Align left"
 msgstr "Tasaa vasemmalle"
 
-#: ../src/label.c:1560 ../src/ui.c:378
+#: ../src/label.c:1563 ../src/ui.c:378
 msgid "Align right"
 msgstr "Tasaa oikealle"
 
-#: ../src/label.c:1621
+#: ../src/label.c:1624
 msgid "Align horizontal center"
 msgstr ""
 
-#: ../src/label.c:1697
+#: ../src/label.c:1700
 msgid "Align tops"
 msgstr ""
 
-#: ../src/label.c:1754
+#: ../src/label.c:1757
 msgid "Align bottoms"
 msgstr ""
 
-#: ../src/label.c:1815
+#: ../src/label.c:1818
 msgid "Align vertical center"
 msgstr ""
 
-#: ../src/label.c:1893 ../src/ui.c:406
+#: ../src/label.c:1896 ../src/ui.c:406
 msgid "Center horizontally"
 msgstr "Keskitä vaakasuunnassa"
 
-#: ../src/label.c:1940 ../src/ui.c:413
+#: ../src/label.c:1943 ../src/ui.c:413
 msgid "Center vertically"
 msgstr "Keskitä pystysuunnassa"
 
-#: ../src/label.c:2628 ../src/label.c:2670 ../src/label.c:2696 ../src/ui.c:206
+#: ../src/label.c:2664 ../src/label.c:2706 ../src/label.c:2732 ../src/ui.c:206
 msgid "Paste"
 msgstr "Liitä"
 
@@ -863,11 +868,11 @@ msgstr "Liitä"
 msgid "Create ellipse object"
 msgstr "Luo ellipsiobjekti"
 
-#: ../src/label-image.c:200 ../src/ui.c:310
+#: ../src/label-image.c:199 ../src/ui.c:310
 msgid "Create image object"
 msgstr "Luo kuvaobjekti"
 
-#: ../src/label-image.c:333 ../src/label-image.c:474
+#: ../src/label-image.c:332 ../src/label-image.c:473
 msgid "Set image"
 msgstr "Aseta kuva"
 
@@ -875,69 +880,73 @@ msgstr "Aseta kuva"
 msgid "Create line object"
 msgstr "Luo viivaobjekti"
 
-#: ../src/label-object.c:394 ../src/label-object.c:428
+#: ../src/label-object.c:392 ../src/label-object.c:423
 msgid "Move"
 msgstr "Siirrä"
 
-#: ../src/label-object.c:479
+#: ../src/label-object.c:474
 msgid "Resize"
 msgstr "Muuta kokoa"
 
-#: ../src/label-object.c:1217
+#: ../src/label-object.c:1258
 msgid "Shadow state"
 msgstr ""
 
-#: ../src/label-object.c:1260
+#: ../src/label-object.c:1301
 msgid "Shadow offset"
 msgstr "Varjon siirtymä"
 
-#: ../src/label-object.c:1308
+#: ../src/label-object.c:1349
 msgid "Shadow color"
 msgstr "Varjon väri"
 
-#: ../src/label-object.c:1351
+#: ../src/label-object.c:1392
 msgid "Shadow opacity"
 msgstr "Varjon läpinäkyvyys"
 
-#: ../src/label-text.c:281 ../src/ui.c:282
+#: ../src/label-text.c:293 ../src/ui.c:282
 msgid "Create text object"
 msgstr "Luo tekstiobjekti"
 
-#: ../src/label-text.c:453
+#: ../src/label-text.c:467
 msgid "Typing"
 msgstr "Kirjoitus"
 
-#: ../src/label-text.c:587 ../data/ui/property-bar.ui.h:1
+#: ../src/label-text.c:601 ../data/ui/property-bar.ui.h:1
 msgid "Font family"
-msgstr "Kirjasinperhe"
+msgstr "Fonttiperhe"
 
-#: ../src/label-text.c:625 ../data/ui/property-bar.ui.h:2
+#: ../src/label-text.c:639 ../data/ui/property-bar.ui.h:2
 msgid "Font size"
-msgstr "Kirjasimen koko"
+msgstr "Fontin koko"
 
-#: ../src/label-text.c:658
+#: ../src/label-text.c:672
 msgid "Font weight"
-msgstr "Kirjasimen painotus"
+msgstr "Fontin lihavuus"
 
-#: ../src/label-text.c:691 ../data/ui/property-bar.ui.h:4
+#: ../src/label-text.c:705 ../data/ui/property-bar.ui.h:4
 msgid "Italic"
 msgstr "Kursivoitu"
 
-#: ../src/label-text.c:724
+#: ../src/label-text.c:738
 msgid "Align text"
 msgstr "Tasaa teksti"
 
-#: ../src/label-text.c:757
+#: ../src/label-text.c:771
+msgid "Vertically align text"
+msgstr "Tasaa teksti pystysuunnassa"
+
+#: ../src/label-text.c:804
 msgid "Line spacing"
 msgstr "Riviväli"
 
-#: ../src/label-text.c:790 ../data/ui/property-bar.ui.h:8
+#: ../src/label-text.c:837 ../data/ui/property-bar.ui.h:11
 msgid "Text color"
 msgstr "Tekstin väri"
 
-#: ../src/label-text.c:934
+#: ../src/label-text.c:997
 msgid "Auto shrink"
-msgstr ""
+msgstr "Kutista automaattisesti"
 
 #: ../src/media-select.c:358 ../src/media-select.c:361
 #: ../src/media-select.c:506 ../src/media-select.c:723
@@ -971,7 +980,7 @@ msgstr "Viimeisimpiä malleja ei löytynyt."
 
 #: ../src/media-select.c:992
 msgid "Try selecting a template in the \"Search all\" tab."
-msgstr ""
+msgstr "Valitse jokin malli \"Etsi kaikista\"-välilehdeltä."
 
 #. Translators: "No match" means that for the given template search criteria, there
 #. * were no matches found.
@@ -985,13 +994,15 @@ msgstr "Valitse muu malli, sivukoko tai luokka."
 
 #: ../src/media-select.c:1179
 msgid "No custom templates found."
-msgstr ""
+msgstr "Mukautettuja malleja ei löytynyt."
 
 #: ../src/media-select.c:1181
 msgid ""
 "You may create new templates or try searching for pre-defined templates in "
 "the \"Search all\" tab."
 msgstr ""
+"Voit luoda uusia mallipohjia tai etsiä valmiista malleista \"Etsi kaikista\"-"
+"välilehdeltä."
 
 #. Translators: "None" here means that no document-merge source or
 #. * method has been selected.
@@ -1057,9 +1068,9 @@ msgstr "Valitse"
 
 #: ../src/merge-properties-dialog.c:348
 msgid "Record/Field"
-msgstr ""
+msgstr "Merkintä/kenttä"
 
-#: ../src/merge-properties-dialog.c:356 ../data/ui/object-editor.ui.h:23
+#: ../src/merge-properties-dialog.c:356 ../data/ui/object-editor.ui.h:24
 msgid "Data"
 msgstr ""
 
@@ -1072,25 +1083,25 @@ msgid "Fixed"
 msgstr ""
 
 #. Translators: "Up" refers to the direction towards the top of a label.
-#: ../src/mini-preview.c:1054
+#: ../src/mini-preview.c:1051
 msgid "Up"
 msgstr ""
 
-#: ../src/new-label-dialog.c:203
+#: ../src/new-label-dialog.c:212 ../data/ui/new-label-dialog.ui.h:1
 msgid "Select Product"
 msgstr "Valitse tuote"
 
-#: ../src/new-label-dialog.c:215
+#: ../src/new-label-dialog.c:225 ../data/ui/new-label-dialog.ui.h:3
 msgid "Choose Orientation"
 msgstr "Valitse suuntaus"
 
-#: ../src/new-label-dialog.c:229
+#: ../src/new-label-dialog.c:240
 msgid "Review"
 msgstr "Esikatsele"
 
 #: ../src/object-editor-bc-page.c:97 ../src/object-editor-shadow-page.c:93
-#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:335
-#: ../src/ui-property-bar.c:277
+#: ../src/object-editor-text-page.c:102 ../src/prefs-dialog.c:335
+#: ../src/ui-property-bar.c:289
 msgid "Default"
 msgstr "Oletus"
 
@@ -1124,10 +1135,10 @@ msgstr "Viivakoodiobjektin ominaisuudet"
 
 #: ../src/object-editor-edit-page.c:76
 msgid "Insert merge field"
-msgstr ""
+msgstr "Syötä yhdistämiskenttä"
 
 #: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:341
-#: ../src/ui-property-bar.c:287
+#: ../src/ui-property-bar.c:299
 msgid "No Fill"
 msgstr "Ei täyttöä"
 
@@ -1145,13 +1156,13 @@ msgid "%s (*.%s)"
 msgstr "%s (*.%s)"
 
 #: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:338
-#: ../src/ui-property-bar.c:297
+#: ../src/ui-property-bar.c:309
 msgid "No Line"
 msgstr ""
 
 #: ../src/object-editor-size-page.c:89
 msgid "Lock aspect ratio."
-msgstr ""
+msgstr "Lukitse kuvasuhde."
 
 #: ../src/prefs-dialog.c:168 ../data/ui/prefs-dialog.ui.h:1
 msgid "gLabels Preferences"
@@ -1276,7 +1287,7 @@ msgstr "_Ohje"
 #. Popup entries.
 #: ../src/ui.c:107 ../src/ui.c:108
 msgid "Context Menu"
-msgstr ""
+msgstr "Asiayhteysvalikko"
 
 #: ../src/ui.c:113
 msgid "_New"
@@ -1459,7 +1470,7 @@ msgstr "Laatikko"
 msgid "Create box/rectangle object"
 msgstr "Luo laatikon/suorakulmion muotoinen objekti"
 
-#: ../src/ui.c:294 ../data/ui/object-editor.ui.h:16
+#: ../src/ui.c:294 ../data/ui/object-editor.ui.h:17
 #: ../data/ui/prefs-dialog.ui.h:20
 msgid "Line"
 msgstr "Viiva"
@@ -1472,7 +1483,7 @@ msgstr "Ellipsi"
 msgid "Create ellipse/circle object"
 msgstr "Luo ellipsin/ympyrän muotoinen objekti"
 
-#: ../src/ui.c:308 ../data/ui/object-editor.ui.h:19
+#: ../src/ui.c:308 ../data/ui/object-editor.ui.h:20
 msgid "Image"
 msgstr "Kuva"
 
@@ -1578,7 +1589,7 @@ msgstr "Ominaisuuspalkki"
 
 #: ../src/ui.c:450
 msgid "Change the visibility of the property toolbar in the current window"
-msgstr ""
+msgstr "Aseta nykyisen ikkunan ominaisuuspalkki päälle/pois"
 
 #: ../src/ui.c:456
 msgid "Grid"
@@ -1586,7 +1597,7 @@ msgstr "Ruudukko"
 
 #: ../src/ui.c:458
 msgid "Change the visibility of the grid in the current window"
-msgstr ""
+msgstr "Aseta nykyisen ikkunan ruudkko päälle/pois"
 
 #: ../src/ui.c:464
 msgid "Markup"
@@ -1594,7 +1605,7 @@ msgstr "Marginaali"
 
 #: ../src/ui.c:466
 msgid "Change the visibility of markup lines in the current window"
-msgstr ""
+msgstr "Aseta nykyisen ikkunan marginaaliviivat päälle/pois"
 
 #: ../src/ui.c:477
 msgid "Main toolbar"
@@ -1602,7 +1613,7 @@ msgstr "Työkalupalkki"
 
 #: ../src/ui.c:479
 msgid "Change the visibility of the main toolbar in the current window"
-msgstr ""
+msgstr "Aseta nykyisen ikkunan ensisijainen työkalupalkki päälle/pois"
 
 #: ../src/ui.c:485
 msgid "Drawing toolbar"
@@ -1610,19 +1621,19 @@ msgstr "Piirtopalkki"
 
 #: ../src/ui.c:487
 msgid "Change the visibility of the drawing toolbar in the current window"
-msgstr ""
+msgstr "Aseta nykyisen ikkunan piirtopalkki päälle/pois"
 
 #: ../src/ui-commands.c:1135
 msgid "Glabels includes contributions from:"
-msgstr ""
+msgstr "Glabels on saanut apua seuraavilta tahoilta:"
 
 #: ../src/ui-commands.c:1144
 msgid "See the file AUTHORS for additional credits,"
-msgstr ""
+msgstr "Lue AUTHORS-tiedosto nähdäksesi lisää avustajia"
 
 #: ../src/ui-commands.c:1145
 msgid "or visit http://glabels.org/"
-msgstr "tai käy osoitteessa http://glabels.org/"
+msgstr "tai käy verkkosivustolla http://glabels.org/"
 
 #: ../src/ui-commands.c:1162
 msgid "A label and business card creation program.\n"
@@ -1722,13 +1733,13 @@ msgstr ""
 #. the CSS2 Specification (Section 4.3.2)
 #. This table must be sorted exactly as the enumerations in lglUnits
 #. [LGL_UNITS_POINT]
-#: ../libglabels/lgl-units.c:65 ../data/ui/object-editor.ui.h:14
+#: ../libglabels/lgl-units.c:65 ../data/ui/object-editor.ui.h:15
 #: ../data/ui/prefs-dialog.ui.h:19
 msgid "points"
 msgstr "pistettä"
 
 #. [LGL_UNITS_INCH]
-#: ../libglabels/lgl-units.c:66 ../data/ui/object-editor.ui.h:27
+#: ../libglabels/lgl-units.c:66 ../data/ui/object-editor.ui.h:28
 #: ../data/ui/template-designer.ui.h:15
 msgid "inches"
 msgstr "tuumaa"
@@ -1778,7 +1789,7 @@ msgstr "Poista kaikki valinnat"
 
 #: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Record selection/preview"
-msgstr ""
+msgstr "Merkinnän valinta/esikatselu"
 
 #: ../data/ui/media-select.ui.h:1
 msgid "Recent"
@@ -1788,7 +1799,7 @@ msgstr "Viimeisimmät"
 msgid "Brand:"
 msgstr "Malli:"
 
-#: ../data/ui/media-select.ui.h:3 ../data/ui/new-label-dialog.ui.h:7
+#: ../data/ui/media-select.ui.h:3 ../data/ui/new-label-dialog.ui.h:10
 #: ../data/ui/template-designer.ui.h:12
 msgid "Page size:"
 msgstr "Sivun koko:"
@@ -1805,7 +1816,7 @@ msgstr "Etsi kaikista"
 msgid "Custom"
 msgstr "Mukautettu"
 
-#: ../data/ui/new-label-dialog.ui.h:1
+#: ../data/ui/new-label-dialog.ui.h:2
 msgid ""
 "Choose label or card product from hundreds of predefined templates or define "
 "your own."
@@ -1813,43 +1824,49 @@ msgstr ""
 "Valitse etiketti- tai korttituote sadoista määritetyistä malleista tai luo "
 "oma malli."
 
-#: ../data/ui/new-label-dialog.ui.h:2
+#: ../data/ui/new-label-dialog.ui.h:4
 msgid "Select orientation of label content."
 msgstr "Valitse etiketin sisällön suuntaus."
 
-#: ../data/ui/new-label-dialog.ui.h:3
+#: ../data/ui/new-label-dialog.ui.h:5
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: ../data/ui/new-label-dialog.ui.h:4
+#: ../data/ui/new-label-dialog.ui.h:6
 msgid "Rotated"
 msgstr "Käännetty"
 
-#: ../data/ui/new-label-dialog.ui.h:5
+#: ../data/ui/new-label-dialog.ui.h:7
+#, fuzzy
+#| msgid "Remove all selections"
+msgid "Review Selection"
+msgstr "Poista kaikki valinnat"
+
+#: ../data/ui/new-label-dialog.ui.h:8
 msgid "Please review and confirm your selection."
 msgstr "Esikatsele ja vahvista valintasi."
 
-#: ../data/ui/new-label-dialog.ui.h:6 ../data/ui/template-designer.ui.h:9
+#: ../data/ui/new-label-dialog.ui.h:9 ../data/ui/template-designer.ui.h:9
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../data/ui/new-label-dialog.ui.h:8
+#: ../data/ui/new-label-dialog.ui.h:11
 msgid "Label size:"
 msgstr "Etiketin koko:"
 
-#: ../data/ui/new-label-dialog.ui.h:9
+#: ../data/ui/new-label-dialog.ui.h:12
 msgid "Layout:"
 msgstr "Asettelu:"
 
-#: ../data/ui/new-label-dialog.ui.h:10
+#: ../data/ui/new-label-dialog.ui.h:13
 msgid "Similar products:"
 msgstr "Vastaavanlaisia tuotteita:"
 
-#: ../data/ui/new-label-dialog.ui.h:11 ../data/ui/template-designer.ui.h:6
+#: ../data/ui/new-label-dialog.ui.h:14 ../data/ui/template-designer.ui.h:6
 msgid "Part #:"
 msgstr "Osa #:"
 
-#: ../data/ui/new-label-dialog.ui.h:12
+#: ../data/ui/new-label-dialog.ui.h:15
 msgid "Vendor:"
 msgstr "Toimittaja:"
 
@@ -1885,113 +1902,118 @@ msgstr "avain:"
 msgid "Alignment:"
 msgstr "Tasaus:"
 
-#: ../data/ui/object-editor.ui.h:10 ../data/ui/prefs-dialog.ui.h:16
+#: ../data/ui/object-editor.ui.h:10
+#| msgid "Alignment:"
+msgid "Vertical alignment:"
+msgstr "Pystysuunnan tasaus:"
+
+#: ../data/ui/object-editor.ui.h:11 ../data/ui/prefs-dialog.ui.h:16
 msgid "Line Spacing:"
 msgstr "Riviväli:"
 
-#: ../data/ui/object-editor.ui.h:11
+#: ../data/ui/object-editor.ui.h:12
 msgid "Allow merge to automatically shrink text"
 msgstr "Salli yhdistämisen pienentää tekstiä automaattisesti"
 
-#: ../data/ui/object-editor.ui.h:12
+#: ../data/ui/object-editor.ui.h:13
 msgid "Style"
 msgstr "Tyyli"
 
-#: ../data/ui/object-editor.ui.h:13 ../data/ui/prefs-dialog.ui.h:18
+#: ../data/ui/object-editor.ui.h:14 ../data/ui/prefs-dialog.ui.h:18
 #: ../data/ui/template-designer.ui.h:13
 msgid "Width:"
 msgstr "Leveys:"
 
-#: ../data/ui/object-editor.ui.h:15
+#: ../data/ui/object-editor.ui.h:16
 msgid "Key:"
 msgstr "Avain:"
 
-#: ../data/ui/object-editor.ui.h:17 ../data/ui/prefs-dialog.ui.h:21
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:21
 msgid "Fill"
 msgstr "Täyttö"
 
-#: ../data/ui/object-editor.ui.h:18
+#: ../data/ui/object-editor.ui.h:19
 msgid "File:"
 msgstr "Tiedosto:"
 
-#: ../data/ui/object-editor.ui.h:20
+#: ../data/ui/object-editor.ui.h:21
 msgid "Literal:"
 msgstr ""
 
-#: ../data/ui/object-editor.ui.h:21
+#: ../data/ui/object-editor.ui.h:22
 msgid "format:"
 msgstr "muoto:"
 
-#: ../data/ui/object-editor.ui.h:22
+#: ../data/ui/object-editor.ui.h:23
 msgid "digits:"
 msgstr "numeroita:"
 
-#: ../data/ui/object-editor.ui.h:24
+#: ../data/ui/object-editor.ui.h:25
 msgid "Backend:"
 msgstr "Taustaosa:"
 
-#: ../data/ui/object-editor.ui.h:25
+#: ../data/ui/object-editor.ui.h:26
 msgid "Checksum"
 msgstr "Tarkistussumma"
 
-#: ../data/ui/object-editor.ui.h:26 ../data/ui/template-designer.ui.h:14
+#: ../data/ui/object-editor.ui.h:27 ../data/ui/template-designer.ui.h:14
 msgid "Height:"
 msgstr "Korkeus:"
 
-#: ../data/ui/object-editor.ui.h:28
+#: ../data/ui/object-editor.ui.h:29
 msgid "Reset image size"
 msgstr "Palauta kuvan alkuperäiskoko"
 
-#: ../data/ui/object-editor.ui.h:29
+#: ../data/ui/object-editor.ui.h:30
 msgid "Size"
 msgstr "Koko"
 
-#: ../data/ui/object-editor.ui.h:30
+#: ../data/ui/object-editor.ui.h:31
 msgid "Length:"
-msgstr ""
+msgstr "Pituus:"
 
-#: ../data/ui/object-editor.ui.h:31
+#: ../data/ui/object-editor.ui.h:32
 msgid "Angle:"
 msgstr "Kulma:"
 
-#: ../data/ui/object-editor.ui.h:32
+#: ../data/ui/object-editor.ui.h:33
 msgid "degrees"
 msgstr "astetta"
 
-#: ../data/ui/object-editor.ui.h:33
+#: ../data/ui/object-editor.ui.h:34
 msgid "X:"
 msgstr "X:"
 
-#: ../data/ui/object-editor.ui.h:34
+#: ../data/ui/object-editor.ui.h:35
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/ui/object-editor.ui.h:35
+#: ../data/ui/object-editor.ui.h:36
 msgid "Position"
 msgstr "Sijainti"
 
-#: ../data/ui/object-editor.ui.h:36
+#: ../data/ui/object-editor.ui.h:37
 msgid "Enable shadow"
 msgstr "Käytä varjostusta"
 
-#: ../data/ui/object-editor.ui.h:37
+#: ../data/ui/object-editor.ui.h:38
 msgid "X Offset:"
 msgstr "X-siirtymä:"
 
-#: ../data/ui/object-editor.ui.h:38
+#: ../data/ui/object-editor.ui.h:39
 msgid "Y Offset:"
 msgstr "Y-siirtymä:"
 
-#: ../data/ui/object-editor.ui.h:39
+#: ../data/ui/object-editor.ui.h:40
 msgid "Opacity:"
 msgstr "Läpinäkyvyys:"
 
-#: ../data/ui/object-editor.ui.h:41
+#: ../data/ui/object-editor.ui.h:42
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: ../data/ui/object-editor.ui.h:42
+#: ../data/ui/object-editor.ui.h:43
 msgid "Shadow"
 msgstr "Varjo"
 
@@ -2041,7 +2063,7 @@ msgstr "Valitse uusien objektien oletusominaisuudet."
 
 #: ../data/ui/prefs-dialog.ui.h:13
 msgid "Font:"
-msgstr "Kirjasin:"
+msgstr "Fontti:"
 
 #: ../data/ui/prefs-dialog.ui.h:22
 msgid "Object defaults"
@@ -2063,6 +2085,20 @@ msgstr "Tasaus keskelle"
 msgid "Right align"
 msgstr "Tasaus oikealle"
 
+#: ../data/ui/property-bar.ui.h:8
+#| msgid "Flip vertically"
+msgid "Top vertical align"
+msgstr "Tasaa ylös pystysuunnassa"
+
+#: ../data/ui/property-bar.ui.h:9
+#| msgid "Center vertically"
+msgid "Center vertical align"
+msgstr "Tasaa keskelle pystysuunnassa"
+
+#: ../data/ui/property-bar.ui.h:10
+msgid "Bottom vertical align"
+msgstr "Tasaa alas pystysuunnassa"
+
 #: ../data/ui/template-designer.ui.h:1
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
@@ -2117,7 +2153,7 @@ msgstr "Soikea"
 
 #: ../data/ui/template-designer.ui.h:20
 msgid "CD/DVD (including credit card CDs)"
-msgstr ""
+msgstr "CD/DVD (mukaan lukien pienet \"luottokortti-CD:t\")"
 
 #: ../data/ui/template-designer.ui.h:21
 msgid ""
@@ -2177,19 +2213,19 @@ msgstr "3. Reunus"
 
 #: ../data/ui/template-designer.ui.h:34
 msgid "1. Outer radius:"
-msgstr ""
+msgstr "1. Ulkoinen säde:"
 
 #: ../data/ui/template-designer.ui.h:35
 msgid "2. Inner radius:"
-msgstr ""
+msgstr "2. Sisäinen säde:"
 
 #: ../data/ui/template-designer.ui.h:36
 msgid "3. Clipping width:"
-msgstr ""
+msgstr "3. Leikkausleveys:"
 
 #: ../data/ui/template-designer.ui.h:37
 msgid "4. Clipping height:"
-msgstr ""
+msgstr "4. Leikkauskorkeus:"
 
 #: ../data/ui/template-designer.ui.h:38
 msgid "5. Waste (overprint allowed):"
@@ -2337,6 +2373,33 @@ msgstr ""
 msgid "Options"
 msgstr "Valinnat"
 
+#: ../data/appdata/glabels-3.appdata.xml.in.h:1
+msgid ""
+"gLabels is a program for creating labels and business cards. It is designed "
+"to work with various laser/ink-jet peel-off label and business card sheets "
+"that you'll find at most office supply stores."
+msgstr ""
+"gLabelsilla on mahdollista luoda käyntikortteja, etikettejä ja muita "
+"lappuja. Se on suunniteltu toimimaan useimpiin tulostimiin soveltuvien "
+"tulostetuotteiden, kuten tarralappujen ja käyntikorttipohjien kanssa."
+
+#: ../data/appdata/glabels-3.appdata.xml.in.h:2
+msgid ""
+"gLabels can be used to design address labels, name tags, price tags, cd/dvd "
+"labels, or just about anything else that is organized in a regular pattern "
+"on a sheet of paper. Labels (or cards) can contain text, images, lines, "
+"shapes, and barcodes. gLabels also includes a document-merge feature which "
+"lets you print a unique label for each record from an external data source, "
+"such as a CSV file or an Evolution address book."
+msgstr ""
+"gLabelsin avulla voit suunnitella osoite-, nimi- ja hintalappuja, CD-/DVD-"
+"tulosteita sekä paljon paljon muita tulosteita. Etiketit (eli laput, kortit "
+"yms.) voivat sisältää tekstiä, kuvia, viivoja, erilaisia muotoja ja "
+"viivakoodeja. gLabels mahdollistaa myös asiakirjojen yhdistämistoiminnon, "
+"jonka avulla voit asettaa tulosteisiin yksilöllisiä arvoja ulkoisista "
+"tietolähteistä, kuten esimerkiksi nimiä ja osoitteita CSV-tiedostosta tai "
+"Evolutionin osoitekirjasta."
+
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:1
 msgid "Show/hide main toolbar."
 msgstr "Näytä/piilota työkalupalkki."
@@ -2403,7 +2466,7 @@ msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:17
 msgid "Default font family."
-msgstr "Kirjasimen oletusperhe."
+msgstr "Fontin oletusperhe."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:18
 msgid "The default font family for new text objects."
@@ -2411,11 +2474,11 @@ msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:19
 msgid "Default font size."
-msgstr "Kirjasimen oletuskoko."
+msgstr "Fontin oletuskoko."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:20
 msgid "The default font size for new text objects."
-msgstr "Uusien tekstiobjektien kirjasimen oletuskoko."
+msgstr "Uusien tekstiobjektien fontin oletuskoko."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:21
 msgid "Default font weight."
@@ -2471,7 +2534,7 @@ msgstr "Viivan oletusväri"
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:34
 msgid "The default line color new objects (0xRRGGBBAA)."
-msgstr ""
+msgstr "Uusien objektien oletusviivaväri (0xRRGGBBAA)."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:35
 msgid "Default fill color."
@@ -2479,7 +2542,7 @@ msgstr "Täytön oletusväri."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:36
 msgid "The default fill color new objects (0xRRGGBBAA)."
-msgstr ""
+msgstr "Uusien objektin oletustäyttöväri (0xRRGGBBAA)."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:37
 msgid "Recent templates."
@@ -2491,11 +2554,11 @@ msgstr "Viimeksi käytetyt mallit."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:39
 msgid "Recent fonts."
-msgstr "Viimeisimmät kirjasimet."
+msgstr "Viimeisimmät fontit."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:40
 msgid "Recently used font families."
-msgstr "Viimeksi käytetyt kirjasinperheet."
+msgstr "Viimeksi käytetyt fonttiperheet."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:41
 msgid "Recent colors."
@@ -2681,7 +2744,7 @@ msgstr "SRA4"
 
 #: ../templates/categories.xml.h:1
 msgid "Any label"
-msgstr ""
+msgstr "Mikä tahansa lappu"
 
 #. ====================================================================
 #. ===================================================================
@@ -2690,21 +2753,21 @@ msgstr ""
 #: ../templates/pearl-iso-templates.xml.h:4
 #: ../templates/rayfilm-templates.xml.h:8
 msgid "Round labels"
-msgstr ""
+msgstr "Pyöreät laput"
 
 #. ===================================================================
 #: ../templates/categories.xml.h:3 ../templates/endisch-templates.xml.h:2
 #: ../templates/pearl-iso-templates.xml.h:58
 #: ../templates/rayfilm-templates.xml.h:9
 msgid "Elliptical labels"
-msgstr ""
+msgstr "Soikeat laput"
 
 #. ====================================================================
 #: ../templates/categories.xml.h:4 ../templates/endisch-templates.xml.h:4
 #: ../templates/hama-iso-templates.xml.h:41
 #: ../templates/rayfilm-templates.xml.h:2
 msgid "Square labels"
-msgstr ""
+msgstr "Neliömäiset laput"
 
 #. ===================================================================
 #. ====================================================================
@@ -2719,7 +2782,7 @@ msgstr ""
 #: ../templates/rayfilm-templates.xml.h:1
 #: ../templates/sheetlabels-us-templates.xml.h:2
 msgid "Rectangular labels"
-msgstr ""
+msgstr "Suorakulmiomaiset laput"
 
 #: ../templates/categories.xml.h:6
 msgid "Any card"
@@ -2741,15 +2804,15 @@ msgstr "CD/DVD tai muu media"
 
 #: ../templates/categories.xml.h:9
 msgid "Mailing/shipping products"
-msgstr ""
+msgstr "Postitus- ja lähetystuotteet"
 
 #: ../templates/categories.xml.h:10
 msgid "Foldable cards"
-msgstr ""
+msgstr "Taitettavat kortit"
 
 #: ../templates/categories.xml.h:11
 msgid "Photo products"
-msgstr ""
+msgstr "Kuvatuotteet"
 
 #. TODO: Is this the real part #?
 #. ============================================================
@@ -2766,7 +2829,7 @@ msgstr ""
 #: ../templates/misc-iso-templates.xml.h:2
 #: ../templates/zweckform-iso-templates.xml.h:6
 msgid "Rectangular Labels"
-msgstr ""
+msgstr "Suorakulmiomaiset laput"
 
 #. ===================================================================
 #: ../templates/ascom-iso-templates.xml.h:6
@@ -2788,17 +2851,17 @@ msgstr ""
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:2
 msgid "Square Labels"
-msgstr ""
+msgstr "Neliömäiset etiketit"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:4
 msgid "Small Round Labels"
-msgstr ""
+msgstr "Pienet pyöreät etiketit"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:6
 msgid "Large Round Labels"
-msgstr ""
+msgstr "Suuret pyöreät etiketit"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:8
@@ -2833,7 +2896,7 @@ msgstr ""
 #: ../templates/worldlabel-us-templates.xml.h:3
 #: ../templates/zweckform-iso-templates.xml.h:4
 msgid "Address Labels"
-msgstr ""
+msgstr "Osoitelaput"
 
 #. ===================================================================
 #. ********************************************************************
@@ -2843,7 +2906,7 @@ msgstr ""
 #: ../templates/sheetlabels-us-templates.xml.h:8
 #: ../templates/worldlabel-us-templates.xml.h:2
 msgid "Return Address Labels"
-msgstr ""
+msgstr "Palautusosoitelaput"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:16
@@ -2906,7 +2969,7 @@ msgstr "Postikortit"
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:30
 msgid "Name Badge Labels"
-msgstr ""
+msgstr "Nimikyltit"
 
 #. ===================================================================
 #. ===============================================================
@@ -2985,18 +3048,18 @@ msgstr ""
 #: ../templates/avery-iso-templates.xml.h:10
 #: ../templates/decadry-iso-templates.xml.h:2
 msgid "Mailing labels"
-msgstr ""
+msgstr "Postituslaput"
 
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:12
 #: ../templates/misc-iso-templates.xml.h:12
 msgid "Address labels"
-msgstr ""
+msgstr "Osoitelaput"
 
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:16
 msgid "Shipping labels"
-msgstr ""
+msgstr "Lähetyslaput"
 
 #. ===============================================================
 #. ===================================================================
@@ -3018,12 +3081,12 @@ msgstr ""
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:28
 msgid "Mini Address Labels"
-msgstr ""
+msgstr "Pienet osoitetarrat"
 
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:30
 msgid "Identification Labels"
-msgstr ""
+msgstr "Tunnistelaput"
 
 #. ===================================================================
 #. ====================================================================
@@ -3065,6 +3128,11 @@ msgstr ""
 msgid "Standard Address Labels 38mm x 90mm"
 msgstr ""
 
+#. ===================================================================
+#: ../templates/canon-other-templates.xml.h:2
+msgid "CD/DVD Tray"
+msgstr ""
+
 #. ===================================================================
 #: ../templates/databecker-iso-templates.xml.h:4
 msgid "CD/DVD Labels Standard Format (face only)"
@@ -3092,7 +3160,7 @@ msgstr ""
 #: ../templates/dataline-iso-templates.xml.h:8
 #: ../templates/pearl-iso-templates.xml.h:60
 msgid "Membership cards"
-msgstr ""
+msgstr "Jäsenyyskortit"
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:2
@@ -3507,12 +3575,12 @@ msgstr ""
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:56
 msgid "Foldable business cards"
-msgstr ""
+msgstr "Taitettavat käyntikortit"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:62
 msgid "Membership cards, both sides printable"
-msgstr ""
+msgstr "Jäsenyyskortit, molemmat puolet tulostettavissa"
 
 #: ../templates/rayfilm-templates.xml.h:11
 msgid "Business card CD Labels"
@@ -3520,7 +3588,7 @@ msgstr ""
 
 #: ../templates/rayfilm-templates.xml.h:12
 msgid "Mini CD Labels"
-msgstr ""
+msgstr "Pienoiskokoisen CD:n tulosteet"
 
 #: ../templates/rayfilm-templates.xml.h:13
 msgid "Triangular labels"
index c0300a66b3839b5d0f05a6f6bba2c000ecdfb724..ca98ae7aaa9ef7a2049c746c2329da91457088af 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -1,22 +1,22 @@
 # Indonesian translation for glabels.
 # Copyright (C) 2012 glabels's COPYRIGHT HOLDER
 # This file is distributed under the same license as the glabels package.
-# Andika Triwidada <andika@gmail.com>, 2012.
+# Andika Triwidada <andika@gmail.com>, 2012, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: glabels glabels-3_0\n"
+"Project-Id-Version: glabels glabels-3_2\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n"
-"POT-Creation-Date: 2012-07-22 21:53+0000\n"
-"PO-Revision-Date: 2012-07-23 16:34+0700\n"
+"POT-Creation-Date: 2014-02-11 12:42+0000\n"
+"PO-Revision-Date: 2014-09-15 15:03+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Poedit-Language: Indonesian\n"
-"X-Poedit-Country: INDONESIA\n"
+"X-Generator: Poedit 1.6.9\n"
 
 #: ../src/bc-backends.c:81
 msgid "Built-in"
@@ -46,14 +46,11 @@ msgstr "CEPNET"
 msgid "One Code"
 msgstr "One Code"
 
-#: ../src/bc-backends.c:119
-#: ../src/bc-backends.c:175
-#: ../src/bc-backends.c:248
+#: ../src/bc-backends.c:119 ../src/bc-backends.c:175 ../src/bc-backends.c:248
 msgid "Code 39"
 msgstr "Code 39"
 
-#: ../src/bc-backends.c:122
-#: ../src/bc-backends.c:251
+#: ../src/bc-backends.c:122 ../src/bc-backends.c:251
 msgid "Code 39 Extended"
 msgstr "Code 39 Extended"
 
@@ -89,8 +86,7 @@ msgstr "EAN-13 +5"
 msgid "UPC (UPC-A or UPC-E)"
 msgstr "UPC (UPC-A atau UPC-E)"
 
-#: ../src/bc-backends.c:151
-#: ../src/bc-backends.c:395
+#: ../src/bc-backends.c:151 ../src/bc-backends.c:395
 msgid "UPC-A"
 msgstr "UPC-A"
 
@@ -102,8 +98,7 @@ msgstr "UPC-A +2"
 msgid "UPC-A +5"
 msgstr "UPC-A +5"
 
-#: ../src/bc-backends.c:160
-#: ../src/bc-backends.c:398
+#: ../src/bc-backends.c:160 ../src/bc-backends.c:398
 msgid "UPC-E"
 msgstr "UPC-E"
 
@@ -115,8 +110,7 @@ msgstr "UPC-E +2"
 msgid "UPC-E +5"
 msgstr "UPC-E +5"
 
-#: ../src/bc-backends.c:169
-#: ../src/bc-backends.c:332
+#: ../src/bc-backends.c:169 ../src/bc-backends.c:332
 msgid "ISBN"
 msgstr "ISBN"
 
@@ -124,8 +118,7 @@ msgstr "ISBN"
 msgid "ISBN +5"
 msgstr "ISBN +5"
 
-#: ../src/bc-backends.c:178
-#: ../src/bc-backends.c:260
+#: ../src/bc-backends.c:178 ../src/bc-backends.c:260
 msgid "Code 128"
 msgstr "Code 128"
 
@@ -137,13 +130,11 @@ msgstr "Code 128C"
 msgid "Code 128B"
 msgstr "Code 128B"
 
-#: ../src/bc-backends.c:187
-#: ../src/bc-backends.c:329
+#: ../src/bc-backends.c:187 ../src/bc-backends.c:329
 msgid "Interleaved 2 of 5"
 msgstr ""
 
-#: ../src/bc-backends.c:190
-#: ../src/bc-backends.c:224
+#: ../src/bc-backends.c:190 ../src/bc-backends.c:224
 msgid "Codabar"
 msgstr "Codabar"
 
@@ -155,8 +146,7 @@ msgstr "MSI"
 msgid "Plessey"
 msgstr "Plessey"
 
-#: ../src/bc-backends.c:199
-#: ../src/bc-backends.c:257
+#: ../src/bc-backends.c:199 ../src/bc-backends.c:257
 msgid "Code 93"
 msgstr "Code 93"
 
@@ -392,8 +382,7 @@ msgstr "IEC16022 (DataMatrix)"
 msgid "IEC18004 (QRCode)"
 msgstr "IEC18004 (QRCode)"
 
-#: ../src/color-combo-button.c:198
-#: ../src/color-combo.c:178
+#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
 msgid "Default Color"
 msgstr "Warna Baku"
 
@@ -406,8 +395,9 @@ msgid "Brown"
 msgstr "Coklat"
 
 #: ../src/color-combo-menu.c:85
+#, fuzzy
 msgid "Dark Goldenrod"
-msgstr ""
+msgstr "goldenrod gelap"
 
 #: ../src/color-combo-menu.c:86
 msgid "Dark Green"
@@ -442,8 +432,9 @@ msgid "Medium green"
 msgstr "Hijau Sedang"
 
 #: ../src/color-combo-menu.c:95
+#, fuzzy
 msgid "Turquoise"
-msgstr ""
+msgstr "turquoise"
 
 #: ../src/color-combo-menu.c:96
 msgid "Blue"
@@ -542,120 +533,107 @@ msgstr "Kelabu 60%"
 msgid "Black"
 msgstr "Hitam"
 
-#: ../src/color-combo-menu.c:254
-#: ../src/color-combo-menu.c:373
-#, fuzzy
+#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
 msgid "Custom Color"
-msgstr "Pilih warna:"
+msgstr ""
 
 #: ../src/color-combo-menu.c:319
-#, fuzzy, c-format
+#, c-format
 msgid "Custom Color #%u"
-msgstr "Pilih warna:"
+msgstr ""
 
 #: ../src/critical-error-handler.c:70
 msgid "gLabels Fatal Error!"
-msgstr ""
+msgstr "Galat Fatal gLabels!"
 
 #: ../src/file.c:84
 msgid "New Label or Card"
-msgstr ""
+msgstr "Label atau Kartu Baru"
 
-#: ../src/file.c:175
-#: ../src/label.c:601
-#: ../src/label.c:645
+#: ../src/file.c:175 ../src/label.c:602 ../src/label.c:646
 msgid "Label properties"
 msgstr "Properti label"
 
-#: ../src/file.c:267
-#: ../src/file.c:557
+#: ../src/file.c:267 ../src/file.c:557
 msgid "All files"
 msgstr "Semua berkas"
 
-#: ../src/file.c:272
-#: ../src/file.c:562
+#: ../src/file.c:272 ../src/file.c:562
 msgid "gLabels documents"
 msgstr "Dokumen gLabels"
 
-#: ../src/file.c:319
-#: ../src/file.c:620
+#: ../src/file.c:319 ../src/file.c:620
 msgid "Empty file name selection"
-msgstr ""
+msgstr "Pilihan nama berkas kosong"
 
-#: ../src/file.c:322
-#: ../src/file.c:338
+#: ../src/file.c:322 ../src/file.c:338
 msgid "Please select a file or supply a valid file name"
-msgstr ""
+msgstr "Silakan pilih sebuah berkas atau berikan nama berkas yang valid"
 
 #: ../src/file.c:335
 msgid "File does not exist"
-msgstr ""
+msgstr "Berkas tak ada"
 
 #: ../src/file.c:410
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open file \"%s\""
-msgstr "Tidak bisa membuka berkas: %s: %s"
+msgstr "Tak bisa membuka berkas \"%s\""
 
 #: ../src/file.c:413
 msgid "Not a supported file format"
-msgstr ""
+msgstr "Buka format berkas yang didukung"
 
-#: ../src/file.c:491
-#: ../src/file.c:670
-#, fuzzy, c-format
+#: ../src/file.c:491 ../src/file.c:670
+#, c-format
 msgid "Could not save file \"%s\""
-msgstr "Tak bisa menyimpan berkas %s"
+msgstr "Tak dapat menyimpan berkas \"%s\""
 
-#: ../src/file.c:495
-#: ../src/file.c:674
+#: ../src/file.c:495 ../src/file.c:674
 msgid "Error encountered during save.  The file is still not saved."
 msgstr ""
 
 #: ../src/file.c:535
-#, fuzzy, c-format
+#, c-format
 msgid "Save \"%s\" as"
-msgstr "Simpan sebagai..."
+msgstr "Simpan \"%s\" sebagai"
 
 #: ../src/file.c:623
 msgid "Please supply a valid file name"
-msgstr ""
+msgstr "Harap berikan nama berkas yang valid"
 
 #: ../src/file.c:644
 #, c-format
 msgid "Overwrite file \"%s\"?"
-msgstr ""
+msgstr "Timpa berkas \"%s\"?"
 
 #: ../src/file.c:648
-#, fuzzy
 msgid "File already exists."
-msgstr "Berkas {0} telah ada"
+msgstr "Berkas sudah ada."
 
 #: ../src/file.c:744
-#, fuzzy, c-format
+#, c-format
 msgid "Save changes to document \"%s\" before closing?"
 msgstr "Simpan perubahan ke dokumen \"%s\" sebelum menutup?"
 
 #: ../src/file.c:748
-#, fuzzy
 msgid "Your changes will be lost if you don't save them."
 msgstr "Perubahan yang Anda buat akan hilang bila tidak Anda simpan."
 
 #: ../src/file.c:751
-#, fuzzy
 msgid "Close without saving"
-msgstr "Tutup _tanpa Menyimpan"
+msgstr "Tutup tanpa menyimpan"
 
 #: ../src/font-combo-menu.c:137
 msgid "Recent fonts"
-msgstr ""
+msgstr "Fonta baru-baru ini"
 
 #: ../src/font-combo-menu.c:152
 msgid "Proportional fonts"
-msgstr ""
+msgstr "Fonta proporsional"
 
 #: ../src/font-combo-menu.c:160
 msgid "Fixed-width fonts"
-msgstr ""
+msgstr "Fonta lebar tetap"
 
 #: ../src/font-combo-menu.c:168
 msgid "All fonts"
@@ -696,76 +674,68 @@ msgstr "Contoh teks"
 msgid "set output filename (default=\"output.pdf\")"
 msgstr ""
 
-#: ../src/glabels-batch.c:53
-#: ../src/glabels-batch.c:67
-#, fuzzy
+#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
 msgid "filename"
-msgstr "Nama berkas"
+msgstr "namaberkas"
 
 #: ../src/glabels-batch.c:55
 msgid "number of sheets (default=1)"
-msgstr ""
+msgstr "banyaknya lembaran (baku=1)"
 
 #: ../src/glabels-batch.c:55
 msgid "sheets"
-msgstr ""
+msgstr "lembaran"
 
 #: ../src/glabels-batch.c:57
 msgid "number of copies (default=1)"
-msgstr ""
+msgstr "banyaknya salinan (baku=1)"
 
 #: ../src/glabels-batch.c:57
-#, fuzzy
 msgid "copies"
-msgstr "Copies"
+msgstr "salinan"
 
 #: ../src/glabels-batch.c:59
 msgid "first label on first sheet (default=1)"
 msgstr ""
 
 #: ../src/glabels-batch.c:59
-#, fuzzy
 msgid "first"
 msgstr "pertama"
 
-#: ../src/glabels-batch.c:61
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:11
+#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:11
+#, fuzzy
 msgid "print outlines (to test printer alignment)"
-msgstr ""
+msgstr "Cetak untuk Menguji Pencetak"
 
-#: ../src/glabels-batch.c:63
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:12
+#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
 msgstr ""
 
-#: ../src/glabels-batch.c:65
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:13
+#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print crop marks"
-msgstr ""
+msgstr "cetak tanda potong"
 
 #: ../src/glabels-batch.c:67
 msgid "input file for merging"
-msgstr ""
+msgstr "berkas masukan untuk penggabungan"
 
-#: ../src/glabels-batch.c:69
-#: ../src/glabels.c:63
-#, fuzzy
+#: ../src/glabels-batch.c:69 ../src/glabels.c:63
 msgid "[FILE...]"
-msgstr "[FILE...]"
+msgstr "[BERKAS...]"
 
 #: ../src/glabels-batch.c:99
 msgid "Print files created with gLabels."
-msgstr ""
+msgstr "Cetak berkas yang dibuat dengan gLabels."
 
-#: ../src/glabels-batch.c:107
-#: ../src/glabels.c:87
-#, fuzzy, c-format
+#: ../src/glabels-batch.c:107 ../src/glabels.c:87
+#, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "%s\n"
-"Jalankan '%s --help' untuk melihat daftar lengkap dari opsi baris perintah yang tersedia.\n"
+"Jalankan '%s --help' untuk melihat daftar lengkap dari opsi baris perintah "
+"yang tersedia.\n"
 
 #: ../src/glabels-batch.c:151
 #, c-format
@@ -775,292 +745,241 @@ msgstr ""
 #: ../src/glabels-batch.c:186
 #, c-format
 msgid "cannot open glabels file %s\n"
-msgstr ""
+msgstr "tak bisa membuka berkas glabels %s\n"
 
 #: ../src/glabels.c:79
 msgid "Launch gLabels label and business card designer."
 msgstr ""
 
-#: ../src/label-barcode.c:183
-#: ../src/ui.c:317
+#: ../src/label-barcode.c:183 ../src/ui.c:317
 msgid "Create barcode object"
-msgstr ""
+msgstr "Buat objek barcode"
 
-#: ../src/label-barcode.c:259
-#: ../src/label-barcode.c:461
+#: ../src/label-barcode.c:259 ../src/label-barcode.c:461
 msgid "Barcode data"
-msgstr ""
+msgstr "Data barcode"
 
 #: ../src/label-barcode.c:290
 msgid "Barcode property"
-msgstr ""
+msgstr "Properti barcode"
 
 #: ../src/label-barcode.c:684
 msgid "Barcode data empty"
-msgstr ""
+msgstr "Data barcode kosong"
 
 #: ../src/label-barcode.c:688
 msgid "Invalid barcode data"
-msgstr ""
+msgstr "Data barcode tak valid"
 
 #: ../src/label-box.c:156
 msgid "Create box object"
-msgstr ""
+msgstr "Buat objek kotak"
 
-#: ../src/label-box.c:230
-#: ../src/label-ellipse.c:232
-#: ../data/ui/property-bar.ui.h:9
+#: ../src/label-box.c:230 ../src/label-ellipse.c:232
+#: ../data/ui/property-bar.ui.h:12
 msgid "Fill color"
-msgstr ""
+msgstr "Warna isian"
 
-#: ../src/label-box.c:261
-#: ../src/label-ellipse.c:261
-#: ../src/label-line.c:212
-#: ../data/ui/property-bar.ui.h:10
-#, fuzzy
+#: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
+#: ../data/ui/property-bar.ui.h:13
 msgid "Line color"
-msgstr "Warna Garis:\n"
+msgstr "Warna garis"
 
-#: ../src/label-box.c:289
-#: ../src/label-ellipse.c:290
-#: ../src/label-line.c:241
-#: ../data/ui/property-bar.ui.h:11
-#, fuzzy
+#: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
+#: ../data/ui/property-bar.ui.h:14
 msgid "Line width"
-msgstr "Lebar Garis:"
+msgstr "Lebar garis"
 
-#: ../src/label.c:405
-#, fuzzy
+#: ../src/label.c:406
 msgid "Untitled"
-msgstr "Tak ada judul"
+msgstr "Tanpa judul"
 
-#: ../src/label.c:719
-#: ../src/ui.c:420
+#: ../src/label.c:720 ../src/ui.c:420
 msgid "Merge properties"
-msgstr ""
+msgstr "Gabungkan properti"
 
-#: ../src/label.c:1215
-#: ../src/ui.c:213
-#, fuzzy
+#: ../src/label.c:1216 ../src/ui.c:213
 msgid "Delete"
 msgstr "Hapus"
 
-#: ../src/label.c:1248
-#: ../src/ui.c:322
+#: ../src/label.c:1251 ../src/ui.c:322
 msgid "Bring to front"
-msgstr ""
+msgstr "Bawa ke depan"
 
-#: ../src/label.c:1284
-#: ../src/ui.c:329
+#: ../src/label.c:1287 ../src/ui.c:329
 msgid "Send to back"
-msgstr ""
+msgstr "Kirim ke belakang"
 
-#: ../src/label.c:1325
-#, fuzzy
+#: ../src/label.c:1328
 msgid "Rotate"
-msgstr "Puta_r:"
+msgstr "Putar"
 
-#: ../src/label.c:1360
-#: ../src/ui.c:336
-#, fuzzy
+#: ../src/label.c:1363 ../src/ui.c:336
 msgid "Rotate left"
-msgstr "Putar _Kiri"
+msgstr "Putar kiri"
 
-#: ../src/label.c:1393
-#: ../src/ui.c:343
-#, fuzzy
+#: ../src/label.c:1396 ../src/ui.c:343
 msgid "Rotate right"
-msgstr "_Putar Kanan"
+msgstr "Putar kanan"
 
-#: ../src/label.c:1428
-#: ../src/ui.c:350
-#, fuzzy
+#: ../src/label.c:1431 ../src/ui.c:350
 msgid "Flip horizontally"
-msgstr "Balikkan Secara _Horisontal"
+msgstr "Balik horisontal"
 
-#: ../src/label.c:1463
-#: ../src/ui.c:357
+#: ../src/label.c:1466 ../src/ui.c:357
 msgid "Flip vertically"
-msgstr ""
+msgstr "Balik vertikal"
 
-#: ../src/label.c:1503
-#: ../src/ui.c:364
-#, fuzzy
+#: ../src/label.c:1506 ../src/ui.c:364
 msgid "Align left"
 msgstr "Rata kiri"
 
-#: ../src/label.c:1560
-#: ../src/ui.c:378
-#, fuzzy
+#: ../src/label.c:1563 ../src/ui.c:378
 msgid "Align right"
 msgstr "Rata kanan"
 
-#: ../src/label.c:1621
+#: ../src/label.c:1624
 msgid "Align horizontal center"
-msgstr ""
+msgstr "Rata horisontal tengah"
 
-#: ../src/label.c:1697
+#: ../src/label.c:1700
 msgid "Align tops"
-msgstr ""
+msgstr "Rata atas"
 
-#: ../src/label.c:1754
+#: ../src/label.c:1757
 msgid "Align bottoms"
-msgstr ""
+msgstr "Rata bawah"
 
-#: ../src/label.c:1815
+#: ../src/label.c:1818
 msgid "Align vertical center"
-msgstr ""
+msgstr "Rata vertikal tengah"
 
-#: ../src/label.c:1893
-#: ../src/ui.c:406
+#: ../src/label.c:1896 ../src/ui.c:406
 msgid "Center horizontally"
-msgstr ""
+msgstr "Pusatkan arah mendatar"
 
-#: ../src/label.c:1940
-#: ../src/ui.c:413
+#: ../src/label.c:1943 ../src/ui.c:413
 msgid "Center vertically"
-msgstr ""
+msgstr "Pusatkan arah tegak"
 
-#: ../src/label.c:2628
-#: ../src/label.c:2670
-#: ../src/label.c:2696
-#: ../src/ui.c:206
-#, fuzzy
+#: ../src/label.c:2664 ../src/label.c:2706 ../src/label.c:2732 ../src/ui.c:206
 msgid "Paste"
 msgstr "Tempel"
 
 #: ../src/label-ellipse.c:160
 msgid "Create ellipse object"
-msgstr ""
+msgstr "Buat objek elips"
 
-#: ../src/label-image.c:200
-#: ../src/ui.c:310
+#: ../src/label-image.c:199 ../src/ui.c:310
 msgid "Create image object"
-msgstr ""
+msgstr "Buat objek citra"
 
-#: ../src/label-image.c:333
-#: ../src/label-image.c:474
-#, fuzzy
+#: ../src/label-image.c:332 ../src/label-image.c:473
 msgid "Set image"
-msgstr "Tetapkan Ukuran Gambar"
+msgstr "Tata citra"
 
-#: ../src/label-line.c:147
-#: ../src/ui.c:296
+#: ../src/label-line.c:147 ../src/ui.c:296
 msgid "Create line object"
-msgstr ""
+msgstr "Buat objek garis"
 
-#: ../src/label-object.c:394
-#: ../src/label-object.c:428
-#, fuzzy
+#: ../src/label-object.c:392 ../src/label-object.c:423
 msgid "Move"
-msgstr "_Pindahkan"
+msgstr "Pindah"
 
-#: ../src/label-object.c:479
-#, fuzzy
+#: ../src/label-object.c:474
 msgid "Resize"
-msgstr "Ubah Uku_ran"
+msgstr "Ubah ukuran"
 
-#: ../src/label-object.c:1217
+#: ../src/label-object.c:1258
 msgid "Shadow state"
-msgstr ""
+msgstr "Keadaan bayangan"
 
-#: ../src/label-object.c:1260
+#: ../src/label-object.c:1301
 msgid "Shadow offset"
-msgstr ""
+msgstr "Ofset bayangan"
 
-#: ../src/label-object.c:1308
+#: ../src/label-object.c:1349
 msgid "Shadow color"
-msgstr ""
+msgstr "Warna bayangan"
 
-#: ../src/label-object.c:1351
+#: ../src/label-object.c:1392
 msgid "Shadow opacity"
-msgstr ""
+msgstr "Kelegapan bayangan"
 
-#: ../src/label-text.c:281
-#: ../src/ui.c:282
+#: ../src/label-text.c:293 ../src/ui.c:282
 msgid "Create text object"
-msgstr ""
+msgstr "Buat objek teks"
 
-#: ../src/label-text.c:453
+#: ../src/label-text.c:467
 msgid "Typing"
-msgstr ""
+msgstr "Mengetik"
 
-#: ../src/label-text.c:587
-#: ../data/ui/property-bar.ui.h:1
-#, fuzzy
+#: ../src/label-text.c:601 ../data/ui/property-bar.ui.h:1
 msgid "Font family"
-msgstr "Keluarga _Fonta"
+msgstr "Keluarga fonta"
 
-#: ../src/label-text.c:625
-#: ../data/ui/property-bar.ui.h:2
-#, fuzzy
+#: ../src/label-text.c:639 ../data/ui/property-bar.ui.h:2
 msgid "Font size"
-msgstr "Reset ukuran fonta"
+msgstr "Ukuran fonta"
 
-#: ../src/label-text.c:658
+#: ../src/label-text.c:672
 msgid "Font weight"
-msgstr ""
+msgstr "Bobot fonta"
 
-#: ../src/label-text.c:691
-#: ../data/ui/property-bar.ui.h:4
+#: ../src/label-text.c:705 ../data/ui/property-bar.ui.h:4
 msgid "Italic"
 msgstr "Miring"
 
-#: ../src/label-text.c:724
+#: ../src/label-text.c:738
 msgid "Align text"
-msgstr ""
+msgstr "Ratakan teks"
 
-#: ../src/label-text.c:757
-#, fuzzy
+#: ../src/label-text.c:771
+msgid "Vertically align text"
+msgstr "Ratakan teks secara vertikal"
+
+#: ../src/label-text.c:804
 msgid "Line spacing"
-msgstr "Jarak baris:"
+msgstr "Jarak baris"
 
-#: ../src/label-text.c:790
-#: ../data/ui/property-bar.ui.h:8
-#, fuzzy
+#: ../src/label-text.c:837 ../data/ui/property-bar.ui.h:11
 msgid "Text color"
 msgstr "Warna teks"
 
-#: ../src/label-text.c:934
+#: ../src/label-text.c:997
+#, fuzzy
 msgid "Auto shrink"
-msgstr ""
+msgstr "Dikecilkan"
 
-#: ../src/media-select.c:358
-#: ../src/media-select.c:361
-#: ../src/media-select.c:506
-#: ../src/media-select.c:723
-#, fuzzy
+#: ../src/media-select.c:358 ../src/media-select.c:361
+#: ../src/media-select.c:506 ../src/media-select.c:723
 msgctxt "Brand"
 msgid "Any"
-msgstr "Sebarang Kolom"
+msgstr "Apapun"
 
-#: ../src/media-select.c:365
-#: ../src/media-select.c:893
-#, fuzzy
+#: ../src/media-select.c:365 ../src/media-select.c:893
 msgctxt "Page size"
 msgid "Any"
-msgstr "Sebarang Kolom"
+msgstr "Apapun"
 
-#: ../src/media-select.c:372
-#: ../src/media-select.c:375
+#: ../src/media-select.c:372 ../src/media-select.c:375
 #: ../src/media-select.c:902
-#, fuzzy
 msgctxt "Category"
 msgid "Any"
-msgstr "Sebarang Kolom"
+msgstr "Apapun"
 
 #: ../src/media-select.c:648
-#, fuzzy, c-format
+#, c-format
 msgid "Delete template \"%s\"?"
-msgstr "_Hapus Templat..."
+msgstr "Hapus templat \"%s\"?"
 
 #: ../src/media-select.c:650
 msgid "This action will permanently delete this template."
-msgstr ""
+msgstr "Aksi ini akan menghapus secara permanen templat ini."
 
 #: ../src/media-select.c:990
 msgid "No recent templates found."
-msgstr ""
+msgstr "Tak ditemukan templat baru-baru ini."
 
 #: ../src/media-select.c:992
 msgid "Try selecting a template in the \"Search all\" tab."
@@ -1070,7 +989,7 @@ msgstr ""
 #. * were no matches found.
 #: ../src/media-select.c:1083
 msgid "No match."
-msgstr ""
+msgstr "Tak ada yang cocok."
 
 #: ../src/media-select.c:1085
 msgid "Try selecting a different brand, page size or category."
@@ -1078,25 +997,23 @@ msgstr ""
 
 #: ../src/media-select.c:1179
 msgid "No custom templates found."
-msgstr ""
+msgstr "Tak ada templat ubahan yang ditemukan."
 
 #: ../src/media-select.c:1181
-msgid "You may create new templates or try searching for pre-defined templates in the \"Search all\" tab."
+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
-#, fuzzy
+#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
 msgid "None"
-msgstr "Tak ada"
+msgstr "Nihil"
 
 #: ../src/merge-init.c:57
 msgid "Text: Comma Separated Values (CSV)"
-msgstr ""
+msgstr "Teks: Nilai Dipisah Koma (CSV)"
 
 #: ../src/merge-init.c:64
 msgid "Text: Comma Separated Values (CSV) with keys on line 1"
@@ -1112,7 +1029,7 @@ msgstr ""
 
 #: ../src/merge-init.c:87
 msgid "Text: Colon separated values"
-msgstr ""
+msgstr "Teks: Nilai-nilai yang dipisah titik dua"
 
 #: ../src/merge-init.c:94
 msgid "Text: Colon separated values with keys on line 1"
@@ -1120,7 +1037,7 @@ msgstr ""
 
 #: ../src/merge-init.c:102
 msgid "Text: Semicolon separated values"
-msgstr ""
+msgstr "Teks: Nilai-nilai yang dipisah titik koma"
 
 #: ../src/merge-init.c:109
 msgid "Text: Semicolon separated values with keys on line 1"
@@ -1128,29 +1045,28 @@ msgstr ""
 
 #: ../src/merge-init.c:119
 msgid "Evolution Addressbook"
-msgstr ""
+msgstr "Buku Alamat Evolution"
 
 #: ../src/merge-init.c:125
-#, fuzzy
 msgid "VCards"
-msgstr "vCard Ganda"
+msgstr "VCard"
 
 #: ../src/merge-properties-dialog.c:280
 msgid "Merge Properties"
-msgstr ""
+msgstr "Gabungkan Properti"
 
-#: ../src/merge-properties-dialog.c:304
-#: ../src/merge-properties-dialog.c:420
+#: ../src/merge-properties-dialog.c:304 ../src/merge-properties-dialog.c:420
 msgid "Select merge-database source"
-msgstr ""
+msgstr "Pilih sumber gabung basis data"
 
-#: ../src/merge-properties-dialog.c:315
-#: ../src/merge-properties-dialog.c:446
+# Tidak Tersedia
+# atau
+# Tidak Ada (?)
+#: ../src/merge-properties-dialog.c:315 ../src/merge-properties-dialog.c:446
 msgid "N/A"
-msgstr ""
+msgstr "T/T"
 
 #: ../src/merge-properties-dialog.c:341
-#, fuzzy
 msgid "Select"
 msgstr "Pilih"
 
@@ -1158,9 +1074,7 @@ msgstr "Pilih"
 msgid "Record/Field"
 msgstr ""
 
-#: ../src/merge-properties-dialog.c:356
-#: ../data/ui/object-editor.ui.h:23
-#, fuzzy
+#: ../src/merge-properties-dialog.c:356 ../data/ui/object-editor.ui.h:24
 msgid "Data"
 msgstr "Data"
 
@@ -1169,76 +1083,68 @@ msgstr "Data"
 #. * evolution-data-server, there are no further choices -- the source is "Fixed."
 #.
 #: ../src/merge-properties-dialog.c:439
-#, fuzzy
 msgid "Fixed"
 msgstr "Tetap"
 
 #. Translators: "Up" refers to the direction towards the top of a label.
-#: ../src/mini-preview.c:1054
-#, fuzzy
+#: ../src/mini-preview.c:1051
 msgid "Up"
 msgstr "Naik"
 
-#: ../src/new-label-dialog.c:203
+#: ../src/new-label-dialog.c:212 ../data/ui/new-label-dialog.ui.h:1
 msgid "Select Product"
-msgstr ""
+msgstr "Pilih Produk"
 
-#: ../src/new-label-dialog.c:215
+#: ../src/new-label-dialog.c:225 ../data/ui/new-label-dialog.ui.h:3
 msgid "Choose Orientation"
-msgstr ""
+msgstr "Pilih Orientasi"
 
-#: ../src/new-label-dialog.c:229
-#, fuzzy
+#: ../src/new-label-dialog.c:240
 msgid "Review"
 msgstr "Tinjau"
 
-#: ../src/object-editor-bc-page.c:97
-#: ../src/object-editor-shadow-page.c:93
-#: ../src/object-editor-text-page.c:97
-#: ../src/prefs-dialog.c:335
-#: ../src/ui-property-bar.c:277
-#, fuzzy
+#: ../src/object-editor-bc-page.c:97 ../src/object-editor-shadow-page.c:93
+#: ../src/object-editor-text-page.c:102 ../src/prefs-dialog.c:335
+#: ../src/ui-property-bar.c:289
 msgid "Default"
-msgstr "Default"
+msgstr "Baku"
 
-#: ../src/object-editor.c:161
-#: ../src/object-editor.c:470
+#: ../src/object-editor.c:161 ../src/object-editor.c:470
 msgid "Object properties"
-msgstr ""
+msgstr "Properti objek"
 
 #: ../src/object-editor.c:314
 msgid "Box object properties"
-msgstr ""
+msgstr "Properti objek kotak"
 
 #: ../src/object-editor.c:333
 msgid "Ellipse object properties"
-msgstr ""
+msgstr "Properti objek elips"
 
 #: ../src/object-editor.c:352
 msgid "Line object properties"
-msgstr ""
+msgstr "Properti objek garis"
 
 #: ../src/object-editor.c:369
 msgid "Image object properties"
-msgstr ""
+msgstr "Properti objek citra"
 
 #: ../src/object-editor.c:386
 msgid "Text object properties"
-msgstr ""
+msgstr "Properti objek teks"
 
 #: ../src/object-editor.c:408
 msgid "Barcode object properties"
-msgstr ""
+msgstr "Properti objek barcode"
 
 #: ../src/object-editor-edit-page.c:76
 msgid "Insert merge field"
-msgstr ""
+msgstr "Sisipkan ruas gabung"
 
-#: ../src/object-editor-fill-page.c:79
-#: ../src/prefs-dialog.c:341
-#: ../src/ui-property-bar.c:287
+#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:341
+#: ../src/ui-property-bar.c:299
 msgid "No Fill"
-msgstr ""
+msgstr "Tanpa Isi"
 
 #: ../src/object-editor-image-page.c:302
 msgid "All Files"
@@ -1246,31 +1152,28 @@ msgstr "Semua Berkas"
 
 #: ../src/object-editor-image-page.c:307
 msgid "All Images"
-msgstr ""
+msgstr "Semua Citra"
 
 #: ../src/object-editor-image-page.c:323
 #, c-format
 msgid "%s (*.%s)"
 msgstr "%s (*.%s)"
 
-#: ../src/object-editor-line-page.c:79
-#: ../src/prefs-dialog.c:338
-#: ../src/ui-property-bar.c:297
+#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:338
+#: ../src/ui-property-bar.c:309
 msgid "No Line"
-msgstr ""
+msgstr "Tanpa Garis"
 
 #: ../src/object-editor-size-page.c:89
 msgid "Lock aspect ratio."
-msgstr ""
+msgstr "Kunci rasio aspek."
 
-#: ../src/prefs-dialog.c:168
-#: ../data/ui/prefs-dialog.ui.h:1
+#: ../src/prefs-dialog.c:168 ../data/ui/prefs-dialog.ui.h:1
 msgid "gLabels Preferences"
-msgstr ""
+msgstr "Preferensi gLabels"
 
 #. TODO: Is this the actual part #?
-#: ../src/print-op.c:205
-#: ../src/print-op-dialog.c:215
+#: ../src/print-op.c:205 ../src/print-op-dialog.c:215
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:2
 #: ../templates/misc-iso-templates.xml.h:26
 msgid "Labels"
@@ -1278,10 +1181,9 @@ msgstr "Label"
 
 #: ../src/template-designer.c:429
 msgid "New gLabels Template"
-msgstr ""
+msgstr "Template baru gLabels"
 
 #: ../src/template-designer.c:487
-#, fuzzy
 msgid "Welcome"
 msgstr "Selamat Datang"
 
@@ -1291,41 +1193,39 @@ msgstr ""
 
 #: ../src/template-designer.c:575
 msgid "Page Size"
-msgstr ""
+msgstr "Ukuran Halaman"
 
 #: ../src/template-designer.c:642
 msgid "Label or Card Shape"
-msgstr ""
+msgstr "Bentuk Label atau Kartu"
 
-#: ../src/template-designer.c:689
-#: ../src/template-designer.c:790
+#: ../src/template-designer.c:689 ../src/template-designer.c:790
 msgid "Label or Card Size"
-msgstr ""
+msgstr "Ukuran Label atau Kartu"
 
 #: ../src/template-designer.c:873
 msgid "Label Size (round)"
-msgstr ""
+msgstr "Ukuran Label (bulat)"
 
 #: ../src/template-designer.c:954
 msgid "Label Size (CD/DVD)"
-msgstr ""
+msgstr "Ukuran Label (CD/DVD)"
 
 #: ../src/template-designer.c:1045
 msgid "Number of Layouts"
-msgstr ""
+msgstr "Banyaknya Tata Letak"
 
 #: ../src/template-designer.c:1113
-#, fuzzy
 msgid "Layout(s)"
-msgstr "Tata Letak"
+msgstr "Tata letak"
 
 #: ../src/template-designer.c:1218
 msgid "Design Completed"
-msgstr ""
+msgstr "Rancangan Selesai"
 
 #: ../src/template-designer.c:1246
 msgid "Edit gLabels Template"
-msgstr ""
+msgstr "Sunting Templat gLabels"
 
 #: ../src/template-designer.c:1549
 msgid "Brand and part# match an existing template!"
@@ -1337,48 +1237,44 @@ msgid "_File"
 msgstr "_Berkas"
 
 #: ../src/ui.c:92
-#, fuzzy
 msgid "Open Recent _Files"
-msgstr "Buka berkas-berkas yang baru-baru ini dipakai"
+msgstr "Buka _Berkas-berkas Terkini"
 
 #: ../src/ui.c:93
 msgid "_Edit"
 msgstr "_Sunting"
 
 #: ../src/ui.c:94
-#, fuzzy
 msgid "_View"
-msgstr "_Tampilan"
+msgstr "_Tilik"
 
 #: ../src/ui.c:95
 msgid "Customize Main Toolbar"
-msgstr ""
+msgstr "Gubah Bilah Alat Utama"
 
 #: ../src/ui.c:96
 msgid "Customize Drawing Toolbar"
-msgstr ""
+msgstr "Gubah Bilah Alat Menggambar"
 
 #: ../src/ui.c:97
 msgid "Customize Properties Toolbar"
-msgstr ""
+msgstr "Gubah Bilah Alat Properti"
 
 #: ../src/ui.c:98
-#, fuzzy
 msgid "_Objects"
-msgstr "Objek"
+msgstr "_Objek"
 
 #: ../src/ui.c:99
-#, fuzzy
 msgid "_Create"
-msgstr "Buat %s"
+msgstr "_Buat"
 
 #: ../src/ui.c:100
 msgid "_Order"
-msgstr ""
+msgstr "_Urutan"
 
 #: ../src/ui.c:101
 msgid "_Rotate/Flip"
-msgstr ""
+msgstr "Puta_r/Jungkir"
 
 #: ../src/ui.c:102
 msgid "_Alignment"
@@ -1393,10 +1289,9 @@ msgid "_Help"
 msgstr "Ba_ntuan"
 
 #. Popup entries.
-#: ../src/ui.c:107
-#: ../src/ui.c:108
+#: ../src/ui.c:107 ../src/ui.c:108
 msgid "Context Menu"
-msgstr ""
+msgstr "Menu Konteks"
 
 #: ../src/ui.c:113
 msgid "_New"
@@ -1404,7 +1299,7 @@ msgstr "Bar_u"
 
 #: ../src/ui.c:115
 msgid "Create a new file"
-msgstr ""
+msgstr "Buat berkas baru"
 
 #: ../src/ui.c:120
 msgid "_Open..."
@@ -1428,7 +1323,7 @@ msgstr "Simpan Seb_agai..."
 
 #: ../src/ui.c:136
 msgid "Save the current file to a different name"
-msgstr ""
+msgstr "Simpan berkas kini dengan nama lain"
 
 #: ../src/ui.c:141
 msgid "_Print..."
@@ -1444,24 +1339,23 @@ msgstr "Properti..."
 
 #: ../src/ui.c:150
 msgid "Modify document properties"
-msgstr ""
+msgstr "Ubah properti dokumen"
 
 #: ../src/ui.c:155
 msgid "Template _Designer..."
-msgstr ""
+msgstr "_Perancang Templat..."
 
 #: ../src/ui.c:157
 msgid "Create a custom template"
-msgstr ""
+msgstr "Buat suatu templat ubahan"
 
 #: ../src/ui.c:162
 msgid "_Close"
 msgstr "_Tutup"
 
 #: ../src/ui.c:164
-#, fuzzy
 msgid "Close the current file"
-msgstr "Menutup berkas yang aktif saat ini"
+msgstr "Tutup berkas kini"
 
 #: ../src/ui.c:169
 msgid "_Quit"
@@ -1471,46 +1365,37 @@ msgstr "_Keluar"
 msgid "Quit the program"
 msgstr "Keluar dari program"
 
-#: ../src/ui.c:178
-#: ../src/ui.c:180
-#: ../src/ui.c:976
-#, fuzzy
+#: ../src/ui.c:178 ../src/ui.c:180 ../src/ui.c:976
 msgid "Undo"
-msgstr "Batalkan"
+msgstr "Tak jadi"
 
-#: ../src/ui.c:185
-#: ../src/ui.c:187
-#: ../src/ui.c:983
-#, fuzzy
+#: ../src/ui.c:185 ../src/ui.c:187 ../src/ui.c:983
 msgid "Redo"
-msgstr "Jadi Lagi"
+msgstr "Jadi lagi"
 
 #: ../src/ui.c:192
 msgid "Cut"
 msgstr "Potong"
 
 #: ../src/ui.c:194
-#, fuzzy
 msgid "Cut the selection"
-msgstr "Potong bagian yang dipilih"
+msgstr "Potong pilihan"
 
 #: ../src/ui.c:199
 msgid "Copy"
 msgstr "Salin"
 
 #: ../src/ui.c:201
-#, fuzzy
 msgid "Copy the selection"
-msgstr "Salin bagian yang dipilih"
+msgstr "Salin pilihan"
 
 #: ../src/ui.c:208
-#, fuzzy
 msgid "Paste the clipboard"
-msgstr "Tempel isi clipboard"
+msgstr "Tempel isi papan klip"
 
 #: ../src/ui.c:215
 msgid "Delete the selected objects"
-msgstr ""
+msgstr "Hapus objek yang dipilih"
 
 #: ../src/ui.c:220
 msgid "Select All"
@@ -1518,24 +1403,23 @@ msgstr "Pilih Semua"
 
 #: ../src/ui.c:222
 msgid "Select all objects"
-msgstr ""
+msgstr "Pilih semua objek"
 
 #: ../src/ui.c:227
 msgid "Un-select All"
-msgstr ""
+msgstr "Jangan Pilih Apapun"
 
 #: ../src/ui.c:229
 msgid "Remove all selections"
-msgstr ""
+msgstr "Hapus semua pilihan"
 
 #: ../src/ui.c:234
 msgid "Preferences"
 msgstr "Preferensi"
 
 #: ../src/ui.c:236
-#, fuzzy
 msgid "Configure the application"
-msgstr "Mengonfigurasi aplikasi"
+msgstr "Konfigurasikan aplikasi"
 
 #: ../src/ui.c:243
 msgid "Zoom in"
@@ -1543,7 +1427,7 @@ msgstr "Perbesar"
 
 #: ../src/ui.c:245
 msgid "Increase magnification"
-msgstr ""
+msgstr "Tingkatkan pembesaran"
 
 #: ../src/ui.c:250
 msgid "Zoom out"
@@ -1551,65 +1435,59 @@ msgstr "Perkecil"
 
 #: ../src/ui.c:252
 msgid "Decrease magnification"
-msgstr ""
+msgstr "Turunkan pembesaran"
 
 #: ../src/ui.c:257
 msgid "Zoom 1 to 1"
-msgstr ""
+msgstr "Zum 1:1"
 
 #: ../src/ui.c:259
 msgid "Restore scale to 100%"
-msgstr ""
+msgstr "Pulihkan skala ke 100%"
 
 #: ../src/ui.c:264
 msgid "Zoom to fit"
-msgstr ""
+msgstr "Zum pas"
 
 #: ../src/ui.c:266
 msgid "Set scale to fit window"
-msgstr ""
+msgstr "Atur skala agar pas jendela"
 
 #: ../src/ui.c:273
 msgid "Select Mode"
-msgstr ""
+msgstr "Pilih Mode"
 
 #: ../src/ui.c:275
 msgid "Select, move and modify objects"
 msgstr ""
 
-#: ../src/ui.c:280
-#: ../src/view-text.c:94
-#: ../data/ui/object-editor.ui.h:2
+#: ../src/ui.c:280 ../src/view-text.c:94 ../data/ui/object-editor.ui.h:2
 #: ../data/ui/prefs-dialog.ui.h:17
 msgid "Text"
 msgstr "Teks"
 
 #: ../src/ui.c:287
-#, fuzzy
 msgid "Box"
 msgstr "Kotak"
 
 #: ../src/ui.c:289
 msgid "Create box/rectangle object"
-msgstr ""
+msgstr "Buat objek kotak/persegi panjang"
 
-#: ../src/ui.c:294
-#: ../data/ui/object-editor.ui.h:16
+#: ../src/ui.c:294 ../data/ui/object-editor.ui.h:17
 #: ../data/ui/prefs-dialog.ui.h:20
-#, fuzzy
 msgid "Line"
-msgstr "Baris"
+msgstr "Garis"
 
 #: ../src/ui.c:301
 msgid "Ellipse"
-msgstr ""
+msgstr "Elips"
 
 #: ../src/ui.c:303
 msgid "Create ellipse/circle object"
-msgstr ""
+msgstr "Buat objek elips/lingkaran"
 
-#: ../src/ui.c:308
-#: ../data/ui/object-editor.ui.h:19
+#: ../src/ui.c:308 ../data/ui/object-editor.ui.h:20
 msgid "Image"
 msgstr "Gambar"
 
@@ -1619,35 +1497,35 @@ msgstr ""
 
 #: ../src/ui.c:324
 msgid "Raise object to top"
-msgstr ""
+msgstr "Naikkan objek ke puncak"
 
 #: ../src/ui.c:331
 msgid "Lower object to bottom"
-msgstr ""
+msgstr "Turunkan objek ke dasar"
 
 #: ../src/ui.c:338
 msgid "Rotate object 90 degrees counter-clockwise"
-msgstr ""
+msgstr "Putar objek 90 derajat melawan arah jarum jam"
 
 #: ../src/ui.c:345
 msgid "Rotate object 90 degrees clockwise"
-msgstr ""
+msgstr "Putar objek 90 derajat searah jarum jam"
 
 #: ../src/ui.c:352
 msgid "Flip object horizontally"
-msgstr ""
+msgstr "Jungkirkan objek arah horisontal"
 
 #: ../src/ui.c:359
 msgid "Flip object vertically"
-msgstr ""
+msgstr "Jungkirkan objek arah vertikal"
 
 #: ../src/ui.c:366
 msgid "Align objects to left edges"
-msgstr ""
+msgstr "Ratakan objek ke tepi kiri"
 
 #: ../src/ui.c:371
 msgid "Align center"
-msgstr ""
+msgstr "Rata tengah"
 
 #: ../src/ui.c:373
 msgid "Align objects to horizontal centers"
@@ -1655,7 +1533,7 @@ msgstr ""
 
 #: ../src/ui.c:380
 msgid "Align objects to right edges"
-msgstr ""
+msgstr "Ratakan objek ke tepi kanan"
 
 #: ../src/ui.c:385
 msgid "Align top"
@@ -1663,15 +1541,15 @@ msgstr "Rata atas"
 
 #: ../src/ui.c:387
 msgid "Align objects to top edges"
-msgstr ""
+msgstr "Ratakan objek ke tepi atas"
 
 #: ../src/ui.c:392
 msgid "Align middle"
-msgstr ""
+msgstr "Rata tengah"
 
 #: ../src/ui.c:394
 msgid "Align objects to vertical centers"
-msgstr ""
+msgstr "Ratakan ke tengah vertikal"
 
 #: ../src/ui.c:399
 msgid "Align bottom"
@@ -1679,19 +1557,19 @@ msgstr "Rata bawah"
 
 #: ../src/ui.c:401
 msgid "Align objects to bottom edges"
-msgstr ""
+msgstr "Ratakan objek ke tepi bawah"
 
 #: ../src/ui.c:408
 msgid "Center objects to horizontal label center"
-msgstr ""
+msgstr "Pusatkan objek ke tengah label horisontal"
 
 #: ../src/ui.c:415
 msgid "Center objects to vertical label center"
-msgstr ""
+msgstr "Pusatkan objek ke tengah label vertikal"
 
 #: ../src/ui.c:422
 msgid "Edit merge properties"
-msgstr ""
+msgstr "Sunting properti gabung"
 
 #: ../src/ui.c:429
 msgid "Contents"
@@ -1699,24 +1577,23 @@ msgstr "Isi"
 
 #: ../src/ui.c:431
 msgid "Open glabels manual"
-msgstr ""
+msgstr "Buka manual gLabels"
 
 #: ../src/ui.c:436
 msgid "About..."
 msgstr "Tentang..."
 
-#: ../src/ui.c:438
-#: ../src/ui-commands.c:1198
+#: ../src/ui.c:438 ../src/ui-commands.c:1198
 msgid "About glabels"
-msgstr ""
+msgstr "Tentang gLabels"
 
 #: ../src/ui.c:448
 msgid "Property toolbar"
-msgstr ""
+msgstr "Bilah alat properti"
 
 #: ../src/ui.c:450
 msgid "Change the visibility of the property toolbar in the current window"
-msgstr ""
+msgstr "Mengubah kenampakan bilah alat properti dalam jendela saat ini"
 
 #: ../src/ui.c:456
 msgid "Grid"
@@ -1724,12 +1601,11 @@ msgstr "Kisi"
 
 #: ../src/ui.c:458
 msgid "Change the visibility of the grid in the current window"
-msgstr ""
+msgstr "Mengubah kenampakan kisi dalam jendela saat ini"
 
 #: ../src/ui.c:464
-#, fuzzy
 msgid "Markup"
-msgstr "Kolom markup"
+msgstr "Markup"
 
 #: ../src/ui.c:466
 msgid "Change the visibility of markup lines in the current window"
@@ -1741,15 +1617,15 @@ msgstr "Bilah alat utama"
 
 #: ../src/ui.c:479
 msgid "Change the visibility of the main toolbar in the current window"
-msgstr ""
+msgstr "Mengubah kenampakan bilah alat utama dalam jendela saat ini"
 
 #: ../src/ui.c:485
 msgid "Drawing toolbar"
-msgstr ""
+msgstr "Bilah alat menggambar"
 
 #: ../src/ui.c:487
 msgid "Change the visibility of the drawing toolbar in the current window"
-msgstr ""
+msgstr "Mengubah kenampakan bilah alat menggambar dalam jendela saat ini"
 
 #: ../src/ui-commands.c:1135
 msgid "Glabels includes contributions from:"
@@ -1757,11 +1633,11 @@ msgstr ""
 
 #: ../src/ui-commands.c:1144
 msgid "See the file AUTHORS for additional credits,"
-msgstr ""
+msgstr "Lihat berkas AUTHORS untuk kredit tambahan,"
 
 #: ../src/ui-commands.c:1145
 msgid "or visit http://glabels.org/"
-msgstr ""
+msgstr "atau kunjungi http://glabels.org/"
 
 #: ../src/ui-commands.c:1162
 msgid "A label and business card creation program.\n"
@@ -1769,7 +1645,7 @@ msgstr ""
 
 #: ../src/ui-commands.c:1166
 msgid "translator-credits"
-msgstr "Andika Triwidada <andika@gmail.com>, 2012"
+msgstr "Andika Triwidada <andika@gmail.com>, 2012, 2014"
 
 #: ../src/ui-commands.c:1169
 msgid ""
@@ -1786,11 +1662,11 @@ msgstr ""
 
 #: ../src/warning-handler.c:69
 msgid "gLabels Error!"
-msgstr ""
+msgstr "Galat gLabels!"
 
 #: ../src/window.c:281
 msgid "(none) - gLabels"
-msgstr ""
+msgstr "(nihil) - gLabels"
 
 #: ../src/window.c:482
 msgid "(modified)"
@@ -1810,21 +1686,27 @@ msgid "User defined"
 msgstr ""
 
 #: ../libglabels/lgl-db.c:663
-msgid "Unable to locate paper size definitions.  Libglabels may not be installed correctly!"
+msgid ""
+"Unable to locate paper size definitions.  Libglabels may not be installed "
+"correctly!"
 msgstr ""
 
 #: ../libglabels/lgl-db.c:1062
-msgid "Unable to locate category definitions.  Libglabels may not be installed correctly!"
+msgid ""
+"Unable to locate category definitions.  Libglabels may not be installed "
+"correctly!"
 msgstr ""
 
 #: ../libglabels/lgl-db.c:1989
-msgid "Unable to locate any template files.  Libglabels may not be installed correctly!"
+msgid ""
+"Unable to locate any template files.  Libglabels may not be installed "
+"correctly!"
 msgstr ""
 
 #: ../libglabels/lgl-db.c:2056
-#, c-format
+#, fuzzy, c-format
 msgid "%s full page label"
-msgstr ""
+msgstr "Gunakan halaman penuh"
 
 #.
 #. * Translators: 1st %d = number of labels across a page,
@@ -1840,12 +1722,10 @@ msgstr ""
 #: ../libglabels/lgl-template.c:678
 #, c-format
 msgid "%d per sheet"
-msgstr ""
+msgstr "%d per lembar"
 
-#: ../libglabels/lgl-template.c:759
-#: ../libglabels/lgl-template.c:767
-#: ../libglabels/lgl-template.c:779
-#: ../libglabels/lgl-template.c:787
+#: ../libglabels/lgl-template.c:759 ../libglabels/lgl-template.c:767
+#: ../libglabels/lgl-template.c:779 ../libglabels/lgl-template.c:787
 msgid "diameter"
 msgstr "diameter"
 
@@ -1853,15 +1733,13 @@ msgstr "diameter"
 #. the CSS2 Specification (Section 4.3.2)
 #. This table must be sorted exactly as the enumerations in lglUnits
 #. [LGL_UNITS_POINT]
-#: ../libglabels/lgl-units.c:65
-#: ../data/ui/object-editor.ui.h:14
+#: ../libglabels/lgl-units.c:65 ../data/ui/object-editor.ui.h:15
 #: ../data/ui/prefs-dialog.ui.h:19
 msgid "points"
 msgstr "point"
 
 #. [LGL_UNITS_INCH]
-#: ../libglabels/lgl-units.c:66
-#: ../data/ui/object-editor.ui.h:27
+#: ../libglabels/lgl-units.c:66 ../data/ui/object-editor.ui.h:28
 #: ../data/ui/template-designer.ui.h:15
 msgid "inches"
 msgstr "inci"
@@ -1919,13 +1797,12 @@ msgstr "Terkini"
 
 #: ../data/ui/media-select.ui.h:2
 msgid "Brand:"
-msgstr ""
+msgstr "Merek:"
 
-#: ../data/ui/media-select.ui.h:3
-#: ../data/ui/new-label-dialog.ui.h:7
+#: ../data/ui/media-select.ui.h:3 ../data/ui/new-label-dialog.ui.h:10
 #: ../data/ui/template-designer.ui.h:12
 msgid "Page size:"
-msgstr ""
+msgstr "Ukuran halaman:"
 
 #: ../data/ui/media-select.ui.h:4
 msgid "Category:"
@@ -1939,49 +1816,54 @@ msgstr "Cari semua"
 msgid "Custom"
 msgstr "Gubahan"
 
-#: ../data/ui/new-label-dialog.ui.h:1
-msgid "Choose label or card product from hundreds of predefined templates or define your own."
+#: ../data/ui/new-label-dialog.ui.h:2
+msgid ""
+"Choose label or card product from hundreds of predefined templates or define "
+"your own."
 msgstr ""
 
-#: ../data/ui/new-label-dialog.ui.h:2
+#: ../data/ui/new-label-dialog.ui.h:4
 msgid "Select orientation of label content."
 msgstr ""
 
-#: ../data/ui/new-label-dialog.ui.h:3
+#: ../data/ui/new-label-dialog.ui.h:5
 msgid "Normal"
 msgstr "Normal"
 
-#: ../data/ui/new-label-dialog.ui.h:4
+#: ../data/ui/new-label-dialog.ui.h:6
 msgid "Rotated"
-msgstr ""
+msgstr "Diputar"
 
-#: ../data/ui/new-label-dialog.ui.h:5
+#: ../data/ui/new-label-dialog.ui.h:7
+#, fuzzy
+msgid "Review Selection"
+msgstr "Tinjau"
+
+#: ../data/ui/new-label-dialog.ui.h:8
 msgid "Please review and confirm your selection."
 msgstr ""
 
-#: ../data/ui/new-label-dialog.ui.h:6
-#: ../data/ui/template-designer.ui.h:9
+#: ../data/ui/new-label-dialog.ui.h:9 ../data/ui/template-designer.ui.h:9
 msgid "Description:"
 msgstr "Deskripsi:"
 
-#: ../data/ui/new-label-dialog.ui.h:8
+#: ../data/ui/new-label-dialog.ui.h:11
 msgid "Label size:"
-msgstr ""
+msgstr "Ukuran label:"
 
-#: ../data/ui/new-label-dialog.ui.h:9
+#: ../data/ui/new-label-dialog.ui.h:12
 msgid "Layout:"
 msgstr "Tata Letak:"
 
-#: ../data/ui/new-label-dialog.ui.h:10
+#: ../data/ui/new-label-dialog.ui.h:13
 msgid "Similar products:"
-msgstr ""
+msgstr "Produk serupa:"
 
-#: ../data/ui/new-label-dialog.ui.h:11
-#: ../data/ui/template-designer.ui.h:6
+#: ../data/ui/new-label-dialog.ui.h:14 ../data/ui/template-designer.ui.h:6
 msgid "Part #:"
 msgstr "Bagian #:"
 
-#: ../data/ui/new-label-dialog.ui.h:12
+#: ../data/ui/new-label-dialog.ui.h:15
 msgid "Vendor:"
 msgstr "Vendor:"
 
@@ -2001,8 +1883,7 @@ msgstr "Ukuran:"
 msgid "Style:"
 msgstr "Gaya:"
 
-#: ../data/ui/object-editor.ui.h:6
-#: ../data/ui/prefs-dialog.ui.h:14
+#: ../data/ui/object-editor.ui.h:6 ../data/ui/prefs-dialog.ui.h:14
 msgid "Color:"
 msgstr "Warna:"
 
@@ -2014,133 +1895,127 @@ msgstr " "
 msgid "key:"
 msgstr "kunci:"
 
-#: ../data/ui/object-editor.ui.h:9
-#: ../data/ui/prefs-dialog.ui.h:15
+#: ../data/ui/object-editor.ui.h:9 ../data/ui/prefs-dialog.ui.h:15
 msgid "Alignment:"
 msgstr "Perataan:"
 
 #: ../data/ui/object-editor.ui.h:10
-#: ../data/ui/prefs-dialog.ui.h:16
+msgid "Vertical alignment:"
+msgstr "Perataan vertikal:"
+
+#: ../data/ui/object-editor.ui.h:11 ../data/ui/prefs-dialog.ui.h:16
 msgid "Line Spacing:"
 msgstr "Jarak Baris:"
 
-#: ../data/ui/object-editor.ui.h:11
+#: ../data/ui/object-editor.ui.h:12
 msgid "Allow merge to automatically shrink text"
 msgstr ""
 
-#: ../data/ui/object-editor.ui.h:12
+#: ../data/ui/object-editor.ui.h:13
 msgid "Style"
 msgstr "Gaya"
 
-#: ../data/ui/object-editor.ui.h:13
-#: ../data/ui/prefs-dialog.ui.h:18
+#: ../data/ui/object-editor.ui.h:14 ../data/ui/prefs-dialog.ui.h:18
 #: ../data/ui/template-designer.ui.h:13
 msgid "Width:"
 msgstr "Lebar:"
 
-#: ../data/ui/object-editor.ui.h:15
+#: ../data/ui/object-editor.ui.h:16
 msgid "Key:"
 msgstr "Kunci:"
 
-#: ../data/ui/object-editor.ui.h:17
-#: ../data/ui/prefs-dialog.ui.h:21
-#, fuzzy
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:21
 msgid "Fill"
 msgstr "Isi"
 
-#: ../data/ui/object-editor.ui.h:18
+#: ../data/ui/object-editor.ui.h:19
 msgid "File:"
 msgstr "Berkas:"
 
-#: ../data/ui/object-editor.ui.h:20
+#: ../data/ui/object-editor.ui.h:21
 msgid "Literal:"
-msgstr ""
+msgstr "Literal:"
 
-#: ../data/ui/object-editor.ui.h:21
-#, fuzzy
+#: ../data/ui/object-editor.ui.h:22
 msgid "format:"
-msgstr "Format:"
+msgstr "format:"
 
-#: ../data/ui/object-editor.ui.h:22
-#, fuzzy
+#: ../data/ui/object-editor.ui.h:23
 msgid "digits:"
-msgstr "Kolom digit"
+msgstr "dijit:"
 
-#: ../data/ui/object-editor.ui.h:24
-#, fuzzy
+#: ../data/ui/object-editor.ui.h:25
 msgid "Backend:"
-msgstr "Backed autotool"
+msgstr "Backend:"
 
-#: ../data/ui/object-editor.ui.h:25
-#, fuzzy
+#: ../data/ui/object-editor.ui.h:26
 msgid "Checksum"
 msgstr "Checksum"
 
-#: ../data/ui/object-editor.ui.h:26
-#: ../data/ui/template-designer.ui.h:14
+#: ../data/ui/object-editor.ui.h:27 ../data/ui/template-designer.ui.h:14
 msgid "Height:"
 msgstr "Tinggi:"
 
-#: ../data/ui/object-editor.ui.h:28
+#: ../data/ui/object-editor.ui.h:29
 msgid "Reset image size"
-msgstr ""
+msgstr "Reset ukuran citra"
 
-#: ../data/ui/object-editor.ui.h:29
+#: ../data/ui/object-editor.ui.h:30
 msgid "Size"
 msgstr "Ukuran"
 
-#: ../data/ui/object-editor.ui.h:30
+#: ../data/ui/object-editor.ui.h:31
 msgid "Length:"
 msgstr "Panjang:"
 
-#: ../data/ui/object-editor.ui.h:31
+#: ../data/ui/object-editor.ui.h:32
 msgid "Angle:"
 msgstr "Sudut:"
 
-#: ../data/ui/object-editor.ui.h:32
+#: ../data/ui/object-editor.ui.h:33
 msgid "degrees"
 msgstr "derajat"
 
-#: ../data/ui/object-editor.ui.h:33
+#: ../data/ui/object-editor.ui.h:34
 msgid "X:"
 msgstr "X:"
 
-#: ../data/ui/object-editor.ui.h:34
+#: ../data/ui/object-editor.ui.h:35
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/ui/object-editor.ui.h:35
+#: ../data/ui/object-editor.ui.h:36
 msgid "Position"
 msgstr "Posisi"
 
-#: ../data/ui/object-editor.ui.h:36
+#: ../data/ui/object-editor.ui.h:37
 msgid "Enable shadow"
-msgstr ""
+msgstr "Fungsikan bayangan"
 
-#: ../data/ui/object-editor.ui.h:37
+#: ../data/ui/object-editor.ui.h:38
 msgid "X Offset:"
-msgstr ""
+msgstr "Ofset X:"
 
-#: ../data/ui/object-editor.ui.h:38
+#: ../data/ui/object-editor.ui.h:39
 msgid "Y Offset:"
-msgstr ""
+msgstr "Ofset Y:"
 
-#: ../data/ui/object-editor.ui.h:39
+#: ../data/ui/object-editor.ui.h:40
 msgid "Opacity:"
-msgstr ""
+msgstr "Kelegapan:"
 
-#: ../data/ui/object-editor.ui.h:41
+#: ../data/ui/object-editor.ui.h:42
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: ../data/ui/object-editor.ui.h:42
+#: ../data/ui/object-editor.ui.h:43
 msgid "Shadow"
-msgstr ""
+msgstr "Bayangan"
 
 #: ../data/ui/prefs-dialog.ui.h:2
 msgid "Select locale specific behavior."
-msgstr ""
+msgstr "Pilih perilaku spesifik lokal."
 
 #: ../data/ui/prefs-dialog.ui.h:3
 msgid "   "
@@ -2162,8 +2037,7 @@ msgstr "Milimeter"
 msgid "Units"
 msgstr "Unit"
 
-#: ../data/ui/prefs-dialog.ui.h:8
-#: ../templates/paper-sizes.xml.h:3
+#: ../data/ui/prefs-dialog.ui.h:8 ../templates/paper-sizes.xml.h:3
 msgid "US Letter"
 msgstr "US Letter"
 
@@ -2173,16 +2047,15 @@ msgstr "ISO A4"
 
 #: ../data/ui/prefs-dialog.ui.h:10
 msgid "Default page size"
-msgstr ""
+msgstr "Ukuran halaman baku"
 
 #: ../data/ui/prefs-dialog.ui.h:11
-#, fuzzy
 msgid "Locale"
-msgstr "Locale:"
+msgstr "Lokal"
 
 #: ../data/ui/prefs-dialog.ui.h:12
 msgid "Select default properties for new objects."
-msgstr ""
+msgstr "Pilih properti baku bagi objek-objek baru."
 
 #: ../data/ui/prefs-dialog.ui.h:13
 msgid "Font:"
@@ -2190,7 +2063,7 @@ msgstr "Fonta:"
 
 #: ../data/ui/prefs-dialog.ui.h:22
 msgid "Object defaults"
-msgstr ""
+msgstr "Baku objek"
 
 #: ../data/ui/property-bar.ui.h:3
 msgid "Bold"
@@ -2204,9 +2077,21 @@ msgstr "Rata kiri"
 msgid "Center align"
 msgstr "Rata tengah"
 
-#: ../data/ui/property-bar.ui.h:7
-msgid "Right align"
-msgstr "Rata kanan"
+#: ../data/ui/property-bar.ui.h:7
+msgid "Right align"
+msgstr "Rata kanan"
+
+#: ../data/ui/property-bar.ui.h:8
+msgid "Top vertical align"
+msgstr "Perataan vertikal puncak"
+
+#: ../data/ui/property-bar.ui.h:9
+msgid "Center vertical align"
+msgstr "Perataan vertikal tengah"
+
+#: ../data/ui/property-bar.ui.h:10
+msgid "Bottom vertical align"
+msgstr "Perataan vertikal dasar"
 
 #: ../data/ui/template-designer.ui.h:1
 msgid ""
@@ -2216,20 +2101,22 @@ msgid ""
 msgstr ""
 
 #: ../data/ui/template-designer.ui.h:4
-msgid "Please enter the following identifying information about the template stationery."
+msgid ""
+"Please enter the following identifying information about the template "
+"stationery."
 msgstr ""
 
 #: ../data/ui/template-designer.ui.h:5
 msgid "Brand/Manufacturer:"
-msgstr ""
+msgstr "Merek/Pabrikan:"
 
 #: ../data/ui/template-designer.ui.h:7
 msgid "(e.g., 8163A)"
-msgstr ""
+msgstr "(mis., 8163A)"
 
 #: ../data/ui/template-designer.ui.h:8
 msgid "(e.g., Avery, Acme, ...)"
-msgstr ""
+msgstr "(mis., Avery, Acme, ...)"
 
 #: ../data/ui/template-designer.ui.h:10
 msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
@@ -2248,8 +2135,9 @@ msgid "Rectangular or square (can have rounded corners)"
 msgstr ""
 
 #: ../data/ui/template-designer.ui.h:18
+#, fuzzy
 msgid "Round"
-msgstr ""
+msgstr "Bulat"
 
 #: ../data/ui/template-designer.ui.h:19
 msgid "Elliptical"
@@ -2260,7 +2148,9 @@ msgid "CD/DVD (including credit card CDs)"
 msgstr ""
 
 #: ../data/ui/template-designer.ui.h:21
-msgid "Please enter the following size parameters of a single label or card in your template."
+msgid ""
+"Please enter the following size parameters of a single label or card in your "
+"template."
 msgstr ""
 
 #: ../data/ui/template-designer.ui.h:22
@@ -2272,8 +2162,9 @@ msgid "2. Height:"
 msgstr "2. Tinggi:"
 
 #: ../data/ui/template-designer.ui.h:24
+#, fuzzy
 msgid "3. Round (radius of corner):"
-msgstr ""
+msgstr "Radius sudut"
 
 #: ../data/ui/template-designer.ui.h:25
 msgid "4. Horiz. waste (overprint allowed):"
@@ -2282,7 +2173,7 @@ msgstr ""
 #: ../data/ui/template-designer.ui.h:26
 #, fuzzy
 msgid "6. Margin"
-msgstr "Sunting Tepi"
+msgstr "6"
 
 #: ../data/ui/template-designer.ui.h:27
 msgid "5. Vert. waste (overprint allowed):"
@@ -2295,15 +2186,18 @@ msgstr ""
 #: ../data/ui/template-designer.ui.h:29
 #, fuzzy
 msgid "4. Margin"
-msgstr "Sunting Tepi"
+msgstr "+4"
 
 #: ../data/ui/template-designer.ui.h:30
-msgid "Please enter the following size parameters of a single label in your template."
+msgid ""
+"Please enter the following size parameters of a single label in your "
+"template."
 msgstr ""
 
 #: ../data/ui/template-designer.ui.h:31
+#, fuzzy
 msgid "1. Radius:"
-msgstr ""
+msgstr "Jari-jari:"
 
 #: ../data/ui/template-designer.ui.h:32
 msgid "2. Waste (overprint allowed):"
@@ -2312,23 +2206,27 @@ msgstr ""
 #: ../data/ui/template-designer.ui.h:33
 #, fuzzy
 msgid "3. Margin"
-msgstr "Sunting Tepi"
+msgstr "_Margin:"
 
 #: ../data/ui/template-designer.ui.h:34
+#, fuzzy
 msgid "1. Outer radius:"
-msgstr ""
+msgstr "Jari-jari:"
 
 #: ../data/ui/template-designer.ui.h:35
+#, fuzzy
 msgid "2. Inner radius:"
-msgstr ""
+msgstr "Jari-jari:"
 
 #: ../data/ui/template-designer.ui.h:36
+#, fuzzy
 msgid "3. Clipping width:"
-msgstr ""
+msgstr "Telusuri pemotongan"
 
 #: ../data/ui/template-designer.ui.h:37
+#, fuzzy
 msgid "4. Clipping height:"
-msgstr ""
+msgstr "Telusuri pemotongan"
 
 #: ../data/ui/template-designer.ui.h:38
 msgid "5. Waste (overprint allowed):"
@@ -2356,16 +2254,20 @@ msgid ""
 msgstr ""
 
 #: ../data/ui/template-designer.ui.h:48
-msgid "Note: if more than 2 layouts are required, the template must be edited manually."
+msgid ""
+"Note: if more than 2 layouts are required, the template must be edited "
+"manually."
 msgstr ""
 
 #: ../data/ui/template-designer.ui.h:49
+#, fuzzy
 msgid "Number of layouts:"
-msgstr ""
+msgstr "Tata Letak Tombol"
 
 #: ../data/ui/template-designer.ui.h:50
+#, fuzzy
 msgid "Please enter the following layout information."
-msgstr ""
+msgstr "Harap masukkan PIN berikut pada '%s':"
 
 #: ../data/ui/template-designer.ui.h:51
 msgid "Layout #1"
@@ -2377,31 +2279,31 @@ msgstr "Tata Letak #2"
 
 #: ../data/ui/template-designer.ui.h:53
 msgid "Number across (nx):"
-msgstr ""
+msgstr "Banyaknya melintang (nx):"
 
 #: ../data/ui/template-designer.ui.h:54
 msgid "Number down (ny):"
-msgstr ""
+msgstr "Banyaknya ke bawah (ny):"
 
 #: ../data/ui/template-designer.ui.h:55
 msgid "Distance from left edge (x0):"
-msgstr ""
+msgstr "Jarak dari tepi kiri (x0):"
 
 #: ../data/ui/template-designer.ui.h:56
 msgid "Distance from top edge (y0):"
-msgstr ""
+msgstr "Jarak dari tepi atas (y0):"
 
 #: ../data/ui/template-designer.ui.h:57
 msgid "Horizontal pitch (dx):"
-msgstr ""
+msgstr "Pitch horisontal (dx):"
 
 #: ../data/ui/template-designer.ui.h:58
 msgid "Vertical pitch (dy):"
-msgstr ""
+msgstr "Pitch vertikal (dy):"
 
 #: ../data/ui/template-designer.ui.h:59
 msgid "Print test sheet"
-msgstr ""
+msgstr "Cetak lembar uji"
 
 #: ../data/ui/template-designer.ui.h:60
 msgid ""
@@ -2416,93 +2318,104 @@ msgstr ""
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:1
 msgid "Sheets:"
-msgstr ""
+msgstr "Lembaran:"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:3
 msgid "from:"
 msgstr "dari:"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:4
-#, fuzzy
 msgid "to:"
-msgstr "Untuk"
+msgstr "untuk:"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:5
-#, fuzzy
 msgid "Copies"
-msgstr "Copies"
+msgstr "Salinan"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:6
 msgid "Start on label"
-msgstr ""
+msgstr "Mulai pada label"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:7
 msgid "on 1st sheet"
-msgstr ""
+msgstr "pada lembar ke-1"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:8
-#, fuzzy
 msgid "Copies:"
-msgstr "Copies"
+msgstr "Salinan:"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:9
-#, fuzzy
 msgid "Collate"
-msgstr "Collate"
+msgstr "Kolasi"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:10
 msgid "Merge Control"
 msgstr ""
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:14
-#, fuzzy
 msgid "Options"
 msgstr "Opsi"
 
+#: ../data/appdata/glabels-3.appdata.xml.in.h:1
+msgid ""
+"gLabels is a program for creating labels and business cards. It is designed "
+"to work with various laser/ink-jet peel-off label and business card sheets "
+"that you'll find at most office supply stores."
+msgstr ""
+
+#: ../data/appdata/glabels-3.appdata.xml.in.h:2
+msgid ""
+"gLabels can be used to design address labels, name tags, price tags, cd/dvd "
+"labels, or just about anything else that is organized in a regular pattern "
+"on a sheet of paper. Labels (or cards) can contain text, images, lines, "
+"shapes, and barcodes. gLabels also includes a document-merge feature which "
+"lets you print a unique label for each record from an external data source, "
+"such as a CSV file or an Evolution address book."
+msgstr ""
+
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:1
-#, fuzzy
 msgid "Show/hide main toolbar."
-msgstr "Tampilkan atau sembunyikan bilah alat utama"
+msgstr "Tampilkan/sembunyikan bilah alat utama."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:2
 msgid "Controls visibility of main toolbar."
-msgstr ""
+msgstr "Mengendalikan kenampakan bilah alat utama."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:3
 msgid "Show/hide drawing toolbar."
-msgstr ""
+msgstr "Tampilkan/sembunyikan bilah alat menggambar."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:4
 msgid "Controls visibility of drawing toolbar."
-msgstr ""
+msgstr "Mengendalikan kenampakan bilah alat menggambar."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:5
 msgid "Show/hide property toolbar."
-msgstr ""
+msgstr "Tampilkan/sembunyikan bilah alat properti."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:6
 msgid "Controls visibility of property toolbar."
-msgstr ""
+msgstr "Mengendalikan kenampakan bilah alat properti."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:7
 msgid "Show/hide grid."
-msgstr ""
+msgstr "Tampilkan/sembunyikan kisi."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:8
 msgid "Controls visibility of grid."
-msgstr ""
+msgstr "Mengendalikan kenampakan kisi."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:9
 msgid "Show/hide markup."
-msgstr ""
+msgstr "Tampilkan/sembunyikan markup."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:10
 msgid "Controls visibility of markup lines."
-msgstr ""
+msgstr "Mengendalikan kenampakan garis-garis markup."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:11
 msgid "Maximum recent files."
-msgstr ""
+msgstr "Berkas terkini maksimum."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:12
 msgid "Controls maximum number of recent files tracked."
@@ -2510,15 +2423,15 @@ msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:13
 msgid "Units."
-msgstr ""
+msgstr "Unit."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:14
 msgid "The default unit of measurement."
-msgstr ""
+msgstr "Unit pengukuran baku."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:15
 msgid "Default page size."
-msgstr ""
+msgstr "Ukuran halaman baku."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:16
 msgid "The preferred page size when searching templates."
@@ -2526,7 +2439,7 @@ msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:17
 msgid "Default font family."
-msgstr ""
+msgstr "Keluarga fonta baku."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:18
 msgid "The default font family for new text objects."
@@ -2534,7 +2447,7 @@ msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:19
 msgid "Default font size."
-msgstr ""
+msgstr "Ukuran fonta baku."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:20
 msgid "The default font size for new text objects."
@@ -2542,7 +2455,7 @@ msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:21
 msgid "Default font weight."
-msgstr ""
+msgstr "Bobot fonta baku."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:22
 msgid "The default font weight for new text objects."
@@ -2558,7 +2471,7 @@ msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:25
 msgid "Default text color."
-msgstr ""
+msgstr "Warna teks baku."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:26
 msgid "The default color of text for new text objects (0xRRGGBBAA)."
@@ -2566,15 +2479,16 @@ msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:27
 msgid "Default text alignment."
-msgstr ""
+msgstr "Perataan teks baku."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:28
 msgid "The default text alignment for new text objects."
 msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:29
+#, fuzzy
 msgid "Default text line spacing."
-msgstr ""
+msgstr "Jarak baris:"
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:30
 msgid "The default line spacing for new text objects."
@@ -2582,15 +2496,15 @@ msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:31
 msgid "Default line width."
-msgstr ""
+msgstr "Lebar garis baku."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:32
 msgid "The default line width for new objects."
-msgstr ""
+msgstr "Lebar garis baku untuk objek-objek baru."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:33
 msgid "Default line color."
-msgstr ""
+msgstr "Warna garis baku."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:34
 msgid "The default line color new objects (0xRRGGBBAA)."
@@ -2598,7 +2512,7 @@ msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:35
 msgid "Default fill color."
-msgstr ""
+msgstr "Warna isian baku."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:36
 msgid "The default fill color new objects (0xRRGGBBAA)."
@@ -2606,27 +2520,27 @@ msgstr ""
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:37
 msgid "Recent templates."
-msgstr ""
+msgstr "Templat terkini."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:38
 msgid "Recently used templates."
-msgstr ""
+msgstr "Templay yang baru-baru ini dipakai."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:39
 msgid "Recent fonts."
-msgstr ""
+msgstr "Fonta terkini."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:40
 msgid "Recently used font families."
-msgstr ""
+msgstr "Keluarga fonta yang baru-baru ini dipakai."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:41
 msgid "Recent colors."
-msgstr ""
+msgstr "Warna terkini."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:42
 msgid "Recently created custom colors."
-msgstr ""
+msgstr "Warna ubahan yang baru-baru ini dibuat."
 
 #: ../data/desktop/glabels-3.0.desktop.in.h:1
 msgid "gLabels Label Designer 3"
@@ -2638,7 +2552,7 @@ msgstr ""
 
 #: ../data/mime/glabels-3.0.xml.in.h:1
 msgid "gLabels Project File"
-msgstr ""
+msgstr "Berkas Projek gLabels"
 
 #. Most popular (at top of list)
 #: ../templates/paper-sizes.xml.h:2
@@ -2648,11 +2562,11 @@ msgstr "A4"
 #. Other US paper sizes
 #: ../templates/paper-sizes.xml.h:5
 msgid "US Legal"
-msgstr ""
+msgstr "US Legal"
 
 #: ../templates/paper-sizes.xml.h:6
 msgid "US Executive"
-msgstr ""
+msgstr "US Executive"
 
 #. Other ISO A series sizes
 #: ../templates/paper-sizes.xml.h:8
@@ -2743,11 +2657,11 @@ msgstr "B10"
 #. Envelopes
 #: ../templates/paper-sizes.xml.h:31
 msgid "#10 Envelope"
-msgstr ""
+msgstr "Amplop #10"
 
 #: ../templates/paper-sizes.xml.h:32
 msgid "Monarch Envelope"
-msgstr ""
+msgstr "Amplop Monarki"
 
 #: ../templates/paper-sizes.xml.h:33
 msgid "C5"
@@ -2804,79 +2718,76 @@ msgstr "SRA4"
 
 #: ../templates/categories.xml.h:1
 msgid "Any label"
-msgstr ""
+msgstr "Sebarang label"
 
 #. ====================================================================
 #. ===================================================================
-#: ../templates/categories.xml.h:2
-#: ../templates/endisch-templates.xml.h:1
+#: ../templates/categories.xml.h:2 ../templates/endisch-templates.xml.h:1
 #: ../templates/hama-iso-templates.xml.h:4
 #: ../templates/pearl-iso-templates.xml.h:4
 #: ../templates/rayfilm-templates.xml.h:8
 msgid "Round labels"
-msgstr ""
+msgstr "Label bulat"
 
 #. ===================================================================
-#: ../templates/categories.xml.h:3
-#: ../templates/endisch-templates.xml.h:2
+#: ../templates/categories.xml.h:3 ../templates/endisch-templates.xml.h:2
 #: ../templates/pearl-iso-templates.xml.h:58
 #: ../templates/rayfilm-templates.xml.h:9
 msgid "Elliptical labels"
-msgstr ""
+msgstr "Label elips"
 
 #. ====================================================================
-#: ../templates/categories.xml.h:4
-#: ../templates/endisch-templates.xml.h:4
+#: ../templates/categories.xml.h:4 ../templates/endisch-templates.xml.h:4
 #: ../templates/hama-iso-templates.xml.h:41
 #: ../templates/rayfilm-templates.xml.h:2
 msgid "Square labels"
-msgstr ""
+msgstr "Label bujur sangkat"
 
 #. ===================================================================
 #. ====================================================================
 #. ===================================================================
 #. ********************************************************************
-#: ../templates/categories.xml.h:5
-#: ../templates/ascom-iso-templates.xml.h:4
+#. ===================================================================
+#: ../templates/categories.xml.h:5 ../templates/ascom-iso-templates.xml.h:4
 #: ../templates/endisch-templates.xml.h:3
 #: ../templates/hama-iso-templates.xml.h:27
 #: ../templates/herma-iso-templates.xml.h:20
-#: ../templates/igepa-templates.xml.h:1
-#: ../templates/jac-iso-templates.xml.h:4
+#: ../templates/igepa-templates.xml.h:1 ../templates/jac-iso-templates.xml.h:4
 #: ../templates/rayfilm-templates.xml.h:1
+#: ../templates/sheetlabels-us-templates.xml.h:2
 msgid "Rectangular labels"
-msgstr ""
+msgstr "Label persegi panjang"
 
 #: ../templates/categories.xml.h:6
 msgid "Any card"
-msgstr ""
+msgstr "Sebarang kartu"
 
 #. ===================================================================
 #. ====================================================================
 #. ===================================================================
-#: ../templates/categories.xml.h:7
-#: ../templates/dataline-iso-templates.xml.h:6
+#: ../templates/categories.xml.h:7 ../templates/dataline-iso-templates.xml.h:6
 #: ../templates/geha-iso-templates.xml.h:4
 #: ../templates/hama-iso-templates.xml.h:8
 #: ../templates/pearl-iso-templates.xml.h:38
 msgid "Business cards"
-msgstr ""
+msgstr "Kartu nama"
 
 #: ../templates/categories.xml.h:8
 msgid "CD/DVD or other media"
-msgstr ""
+msgstr "CD/DVD atau media lain"
 
 #: ../templates/categories.xml.h:9
+#, fuzzy
 msgid "Mailing/shipping products"
-msgstr ""
+msgstr "Produk"
 
 #: ../templates/categories.xml.h:10
 msgid "Foldable cards"
-msgstr ""
+msgstr "Kartu yang dapat dilipat"
 
 #: ../templates/categories.xml.h:11
 msgid "Photo products"
-msgstr ""
+msgstr "Produk foto"
 
 #. TODO: Is this the real part #?
 #. ============================================================
@@ -2893,7 +2804,7 @@ msgstr ""
 #: ../templates/misc-iso-templates.xml.h:2
 #: ../templates/zweckform-iso-templates.xml.h:6
 msgid "Rectangular Labels"
-msgstr ""
+msgstr "Label Persegi Panjang"
 
 #. ===================================================================
 #: ../templates/ascom-iso-templates.xml.h:6
@@ -2909,41 +2820,43 @@ msgstr ""
 #: ../templates/ascom-iso-templates.xml.h:8
 #: ../templates/avery-iso-templates.xml.h:26
 #: ../templates/zweckform-iso-templates.xml.h:28
+#, fuzzy
 msgid "CD Inlet"
-msgstr ""
+msgstr "Chesterfield Inlet"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:2
 msgid "Square Labels"
-msgstr ""
+msgstr "Label Bujur Sangkar"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:4
 msgid "Small Round Labels"
-msgstr ""
+msgstr "Label Bulat Kecil"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:6
 msgid "Large Round Labels"
-msgstr ""
+msgstr "Label Bulat Besar"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:8
 #: ../templates/avery-other-templates.xml.h:2
 #: ../templates/worldlabel-us-templates.xml.h:5
 msgid "File Folder Labels"
-msgstr ""
+msgstr "Label Folder Berkas"
 
 #. ===================================================================
 #. ********************************************************************
 #: ../templates/avery-us-templates.xml.h:10
 #: ../templates/dataline-iso-templates.xml.h:10
 #: ../templates/meritline-us-templates.xml.h:6
-#: ../templates/sheetlabels-us-templates.xml.h:4
+#: ../templates/sheetlabels-us-templates.xml.h:6
 #: ../templates/uline-us-templates.xml.h:2
 #: ../templates/worldlabel-us-templates.xml.h:4
+#, fuzzy
 msgid "Shipping Labels"
-msgstr ""
+msgstr "Label"
 
 #. ===================================================================
 #. ********************************************************************
@@ -2956,52 +2869,54 @@ msgstr ""
 #: ../templates/maco-us-templates.xml.h:2
 #: ../templates/meritline-us-templates.xml.h:4
 #: ../templates/pearl-iso-templates.xml.h:2
-#: ../templates/sheetlabels-us-templates.xml.h:2
+#: ../templates/sheetlabels-us-templates.xml.h:4
 #: ../templates/worldlabel-us-templates.xml.h:3
 #: ../templates/zweckform-iso-templates.xml.h:4
 msgid "Address Labels"
-msgstr ""
+msgstr "Label Alamat"
 
 #. ===================================================================
 #. ********************************************************************
 #: ../templates/avery-us-templates.xml.h:14
 #: ../templates/dymo-other-templates.xml.h:6
 #: ../templates/meritline-us-templates.xml.h:8
-#: ../templates/sheetlabels-us-templates.xml.h:6
+#: ../templates/sheetlabels-us-templates.xml.h:8
 #: ../templates/worldlabel-us-templates.xml.h:2
 msgid "Return Address Labels"
-msgstr ""
+msgstr "Label Alamat Balik"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:16
 #: ../templates/maco-us-templates.xml.h:3
 #: ../templates/meritline-us-templates.xml.h:12
 #: ../templates/misc-us-templates.xml.h:23
-#: ../templates/sheetlabels-us-templates.xml.h:8
+#: ../templates/sheetlabels-us-templates.xml.h:10
 #: ../templates/worldlabel-us-templates.xml.h:9
 msgid "Round Labels"
-msgstr ""
+msgstr "Label Bulat"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:18
 #: ../templates/avery-iso-templates.xml.h:20
 #: ../templates/meritline-us-templates.xml.h:14
-#: ../templates/sheetlabels-us-templates.xml.h:14
+#: ../templates/sheetlabels-us-templates.xml.h:16
 #: ../templates/worldlabel-us-templates.xml.h:8
 msgid "Diskette Labels"
-msgstr ""
+msgstr "Label Disket"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:20
+#, fuzzy
 msgid "Tent Cards"
-msgstr ""
+msgstr "K_artu Alamat"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:22
-#: ../templates/sheetlabels-us-templates.xml.h:10
+#: ../templates/sheetlabels-us-templates.xml.h:12
 #: ../templates/worldlabel-us-templates.xml.h:7
+#, fuzzy
 msgid "Filing Labels"
-msgstr ""
+msgstr "Label"
 
 #. ===================================================================
 #. ============================================================
@@ -3018,22 +2933,23 @@ msgstr ""
 #: ../templates/rayfilm-templates.xml.h:15
 #: ../templates/zweckform-iso-templates.xml.h:30
 msgid "Business Cards"
-msgstr ""
+msgstr "Kartu Nama"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:26
 msgid "Index Cards"
-msgstr ""
+msgstr "Kartu Indeks"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:28
 msgid "Post cards"
-msgstr ""
+msgstr "Kartu pos"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:30
+#, fuzzy
 msgid "Name Badge Labels"
-msgstr ""
+msgstr "Label"
 
 #. ===================================================================
 #. ===============================================================
@@ -3044,22 +2960,21 @@ msgstr ""
 #: ../templates/avery-iso-templates.xml.h:6
 #: ../templates/geha-iso-templates.xml.h:10
 #: ../templates/herma-iso-templates.xml.h:14
-#: ../templates/igepa-templates.xml.h:5
-#: ../templates/jac-iso-templates.xml.h:2
+#: ../templates/igepa-templates.xml.h:5 ../templates/jac-iso-templates.xml.h:2
 #: ../templates/misc-us-templates.xml.h:8
 #: ../templates/misc-iso-templates.xml.h:22
 #: ../templates/misc-other-templates.xml.h:2
 #: ../templates/pearl-iso-templates.xml.h:64
 #: ../templates/rayfilm-templates.xml.h:10
-#: ../templates/sheetlabels-us-templates.xml.h:12
+#: ../templates/sheetlabels-us-templates.xml.h:14
 #: ../templates/worldlabel-us-templates.xml.h:12
 #: ../templates/zweckform-iso-templates.xml.h:8
 msgid "CD/DVD Labels"
-msgstr ""
+msgstr "Label CD/DVD"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:34
-#: ../templates/sheetlabels-us-templates.xml.h:16
+#: ../templates/sheetlabels-us-templates.xml.h:18
 msgid "CD/DVD Labels (Disc Labels)"
 msgstr ""
 
@@ -3072,7 +2987,7 @@ msgstr ""
 #: ../templates/avery-us-templates.xml.h:38
 #: ../templates/geha-iso-templates.xml.h:17
 #: ../templates/meritline-us-templates.xml.h:16
-#: ../templates/sheetlabels-us-templates.xml.h:18
+#: ../templates/sheetlabels-us-templates.xml.h:20
 #: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Video Tape Face Labels"
 msgstr ""
@@ -3080,24 +2995,26 @@ msgstr ""
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:42
 msgid "ID Labels"
-msgstr ""
+msgstr "Label ID"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:44
 #: ../templates/meritline-us-templates.xml.h:10
 #: ../templates/worldlabel-us-templates.xml.h:6
+#, fuzzy
 msgid "Full Sheet Labels"
-msgstr ""
+msgstr "Lembaran"
 
 #. the LSK labels can be torn in half down the center
 #: ../templates/avery-us-templates.xml.h:46
+#, fuzzy
 msgid "Divider Labels"
-msgstr ""
+msgstr "Label"
 
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:2
 msgid "Mini Labels"
-msgstr ""
+msgstr "Label Mini"
 
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:4
@@ -3106,25 +3023,28 @@ msgstr ""
 
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:8
+#, fuzzy
 msgid "Allround labels"
-msgstr ""
+msgstr "Label"
 
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:10
 #: ../templates/decadry-iso-templates.xml.h:2
+#, fuzzy
 msgid "Mailing labels"
-msgstr ""
+msgstr "Label"
 
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:12
 #: ../templates/misc-iso-templates.xml.h:12
 msgid "Address labels"
-msgstr ""
+msgstr "Label alamat"
 
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:16
+#, fuzzy
 msgid "Shipping labels"
-msgstr ""
+msgstr "Label"
 
 #. ===============================================================
 #. ===================================================================
@@ -3134,31 +3054,32 @@ msgstr ""
 #: ../templates/misc-us-templates.xml.h:21
 #: ../templates/misc-iso-templates.xml.h:6
 #: ../templates/zweckform-iso-templates.xml.h:10
+#, fuzzy
 msgid "Mailing Labels"
-msgstr ""
+msgstr "Label"
 
 #. ===============================================================
 #: ../templates/avery-iso-templates.xml.h:24
 #: ../templates/zweckform-iso-templates.xml.h:26
 msgid "CD Booklet"
-msgstr ""
+msgstr "Booklet CD"
 
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:28
 msgid "Mini Address Labels"
-msgstr ""
+msgstr "Label Alamat Mini"
 
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:30
 msgid "Identification Labels"
-msgstr ""
+msgstr "Label Identifikasi"
 
 #. ===================================================================
 #. ====================================================================
 #: ../templates/avery-iso-templates.xml.h:32
 #: ../templates/hama-iso-templates.xml.h:31
 msgid "Diskette labels"
-msgstr ""
+msgstr "Label disket"
 
 #.
 #. *********************************************************************
@@ -3193,6 +3114,11 @@ msgstr ""
 msgid "Standard Address Labels 38mm x 90mm"
 msgstr ""
 
+#. ===================================================================
+#: ../templates/canon-other-templates.xml.h:2
+msgid "CD/DVD Tray"
+msgstr "Baki CD/DVD"
+
 #. ===================================================================
 #: ../templates/databecker-iso-templates.xml.h:4
 msgid "CD/DVD Labels Standard Format (face only)"
@@ -3240,8 +3166,9 @@ msgstr "Folder Berkas"
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:12
+#, fuzzy
 msgid "Hanging Folder"
-msgstr ""
+msgstr "Folder:"
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:14
@@ -3264,8 +3191,7 @@ msgstr "Label A5"
 
 #. *******************************************************************
 #. ===================================================================
-#: ../templates/endisch-templates.xml.h:7
-#: ../templates/igepa-templates.xml.h:3
+#: ../templates/endisch-templates.xml.h:7 ../templates/igepa-templates.xml.h:3
 #: ../templates/jac-iso-templates.xml.h:6
 #: ../templates/pearl-iso-templates.xml.h:6
 #: ../templates/rayfilm-templates.xml.h:5
@@ -3284,24 +3210,27 @@ msgstr "Label SRA3"
 
 #. ===================================================================
 #: ../templates/geha-iso-templates.xml.h:2
+#, fuzzy
 msgid "Flyer paper"
-msgstr ""
+msgstr "Selebaran"
 
 #. ===================================================================
 #. ====================================================================
 #: ../templates/geha-iso-templates.xml.h:6
 #: ../templates/hama-iso-templates.xml.h:25
 msgid "Greeting cards"
-msgstr ""
+msgstr "Kartu ucapan"
 
 #. ===================================================================
 #: ../templates/geha-iso-templates.xml.h:8
+#, fuzzy
 msgid "Arch File inserts"
-msgstr ""
+msgstr "Arch A"
 
 #: ../templates/geha-iso-templates.xml.h:11
+#, fuzzy
 msgid "CD/DVD Inlet"
-msgstr ""
+msgstr "CD/DVD"
 
 #. ===================================================================
 #. ====================================================================
@@ -3309,8 +3238,9 @@ msgstr ""
 #: ../templates/geha-iso-templates.xml.h:13
 #: ../templates/hama-iso-templates.xml.h:17
 #: ../templates/pearl-iso-templates.xml.h:32
+#, fuzzy
 msgid "DVD inlet"
-msgstr ""
+msgstr "Chesterfield Inlet"
 
 #. ===================================================================
 #. ====================================================================
@@ -3332,73 +3262,84 @@ msgstr "Label foto paspor"
 #: ../templates/geha-iso-templates.xml.h:27
 #: ../templates/hama-iso-templates.xml.h:37
 #: ../templates/herma-iso-templates.xml.h:6
+#, fuzzy
 msgid "Arch File Labels"
-msgstr ""
+msgstr "Arch A"
 
 #. ===================================================================
 #: ../templates/geha-iso-templates.xml.h:29
 #: ../templates/misc-iso-templates.xml.h:28
 #: ../templates/misc-other-templates.xml.h:4
 msgid "Multi-Purpose Labels"
-msgstr ""
+msgstr "Label Serba Guna"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:2
+#, fuzzy
 msgid "Printable mousepad"
-msgstr ""
+msgstr "<tak-bisa-dicetak>"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:10
+#, fuzzy
 msgid "CD inlet"
-msgstr ""
+msgstr "Chesterfield Inlet"
 
 #. ====================================================================
 #. ===================================================================
 #: ../templates/hama-iso-templates.xml.h:12
 #: ../templates/pearl-iso-templates.xml.h:34
+#, fuzzy
 msgid "CD inlet (front)"
-msgstr ""
+msgstr "Depan"
 
 #. ===================================================================
 #: ../templates/hama-iso-templates.xml.h:13
 #: ../templates/pearl-iso-templates.xml.h:36
+#, fuzzy
 msgid "CD inlet (back)"
-msgstr ""
+msgstr "Chesterfield Inlet"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:15
+#, fuzzy
 msgid "Zip disc inlet"
-msgstr ""
+msgstr "Chesterfield Inlet"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:19
+#, fuzzy
 msgid "VHS-C inlet"
-msgstr ""
+msgstr "Chesterfield Inlet"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:21
+#, fuzzy
 msgid "Video-8 inlet"
-msgstr ""
+msgstr "Chesterfield Inlet"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:23
+#, fuzzy
 msgid "VHS inlet"
-msgstr ""
+msgstr "Chesterfield Inlet"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:33
 msgid "Zip disc labels"
-msgstr ""
+msgstr "Label Zip"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:39
+#, fuzzy
 msgid "Arch File labels"
-msgstr ""
+msgstr "Arch A"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:43
+#, fuzzy
 msgid "Mini Disc labels"
-msgstr ""
+msgstr "Label"
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:2
@@ -3407,14 +3348,16 @@ msgstr ""
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:4
+#, fuzzy
 msgid "Arch File Labels (large)"
-msgstr ""
+msgstr "Berkas \"%s\" terlalu besar"
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:10
 #: ../templates/zweckform-iso-templates.xml.h:20
+#, fuzzy
 msgid "Allround Labels"
-msgstr ""
+msgstr "Label"
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:12
@@ -3430,7 +3373,7 @@ msgstr ""
 #: ../templates/igepa-templates.xml.h:2
 #: ../templates/pearl-iso-templates.xml.h:18
 msgid "Floppy disk labels"
-msgstr ""
+msgstr "Label floppy disk"
 
 #. ===================================================================
 #: ../templates/igepa-templates.xml.h:4
@@ -3441,17 +3384,17 @@ msgstr ""
 #. *******************************************************************
 #: ../templates/jac-iso-templates.xml.h:8
 msgid "PVC labels"
-msgstr ""
+msgstr "Label PVC"
 
 #. ===================================================================
 #: ../templates/meritline-us-templates.xml.h:2
 msgid "Mini-CD Labels"
-msgstr ""
+msgstr "Label Mini-CD"
 
 #. ===================================================================
 #: ../templates/microapp-templates.xml.h:2
 msgid "Standard Labels"
-msgstr ""
+msgstr "Label Standar"
 
 #. ===================================================================
 #. TODO: Is this the actual part #?
@@ -3468,7 +3411,7 @@ msgstr ""
 #. TODO: Is this the actual part #?
 #: ../templates/misc-us-templates.xml.h:6
 msgid "Cassette Labels"
-msgstr ""
+msgstr "Label Kaset"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:10
@@ -3482,22 +3425,23 @@ msgstr ""
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:13
 msgid "CD Template Rectangles"
-msgstr ""
+msgstr "Persegi Panjang Templat CD"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:15
 msgid "Business Card CD"
-msgstr ""
+msgstr "CD Kartu Nama"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:17
+#, fuzzy
 msgid "Jewel Case Booklet"
-msgstr ""
+msgstr "Huruf besar kecil"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:19
 msgid "DLT Labels"
-msgstr ""
+msgstr "Label DLT"
 
 #. ===================================================================
 #. TODO: Is this the actual part #?
@@ -3518,19 +3462,21 @@ msgstr ""
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:33
+#, fuzzy
 msgid "Microtube labels"
-msgstr ""
+msgstr "Label"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:8
 msgid "General Labels"
-msgstr ""
+msgstr "Label Umum"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:10
 #: ../templates/pearl-iso-templates.xml.h:28
+#, fuzzy
 msgid "Self-adhesive labels"
-msgstr ""
+msgstr "Label"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:14
@@ -3550,13 +3496,13 @@ msgstr ""
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:30
 msgid "Universal Labels"
-msgstr ""
+msgstr "Label Universal"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:34
 #: ../templates/pearl-iso-templates.xml.h:16
 msgid "Bottle labels"
-msgstr ""
+msgstr "Label botol"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:38
@@ -3580,18 +3526,21 @@ msgstr ""
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:24
+#, fuzzy
 msgid "Photo labels semiglossy"
-msgstr ""
+msgstr "Label"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:26
+#, fuzzy
 msgid "Address Labels (STAMPIT)"
-msgstr ""
+msgstr "Label"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:30
+#, fuzzy
 msgid "SD card labels"
-msgstr ""
+msgstr "Label"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:40
@@ -3600,8 +3549,9 @@ msgstr ""
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:42
+#, fuzzy
 msgid "Business cards punched"
-msgstr ""
+msgstr "Bisnis"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:44
@@ -3616,7 +3566,7 @@ msgstr ""
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:48
 msgid "Name plates"
-msgstr ""
+msgstr "Papan nama"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:50
@@ -3636,7 +3586,7 @@ msgstr ""
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:56
 msgid "Foldable business cards"
-msgstr ""
+msgstr "Kartu nama yang dapat dilipat"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:62
@@ -3649,15 +3599,15 @@ msgstr ""
 
 #: ../templates/rayfilm-templates.xml.h:12
 msgid "Mini CD Labels"
-msgstr ""
+msgstr "Label Mini CD"
 
 #: ../templates/rayfilm-templates.xml.h:13
 msgid "Triangular labels"
-msgstr ""
+msgstr "Label segi tiga"
 
 #: ../templates/rayfilm-templates.xml.h:14
 msgid "Trapezoid labels"
-msgstr ""
+msgstr "Label trapesium"
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:12
@@ -3666,8 +3616,9 @@ msgstr ""
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:14
+#, fuzzy
 msgid "File Back Labels"
-msgstr ""
+msgstr "Label"
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:16
@@ -3677,15 +3628,15 @@ msgstr ""
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:18
 msgid "Video Labels (back)"
-msgstr ""
+msgstr "Label Video (belakang)"
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:22
+#, fuzzy
 msgid "Rectangular Copier Labels"
-msgstr ""
+msgstr "Label"
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:24
 msgid "Correction and Cover-up Labels"
 msgstr ""
-
index 931c226b02906d745d6ff886f7219d93c11e0464..6ef4726b3e692f390cc012a2860713279299b652 100644 (file)
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,13 +1,13 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2012, 2013.
+# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2012, 2013, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n"
-"POT-Creation-Date: 2013-10-11 18:32+0000\n"
-"PO-Revision-Date: 2013-10-13 14:16+0300\n"
+"POT-Creation-Date: 2014-02-11 12:42+0000\n"
+"PO-Revision-Date: 2014-11-01 21:24+0200\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
 "Language: lv\n"
@@ -1846,7 +1846,6 @@ msgid "Rotated"
 msgstr "Pagriezts"
 
 #: ../data/ui/new-label-dialog.ui.h:7
-#| msgid "Remove all selections"
 msgid "Review Selection"
 msgstr "Pārskatīt izvēli"
 
@@ -1911,7 +1910,6 @@ msgid "Alignment:"
 msgstr "Līdzinājums:"
 
 #: ../data/ui/object-editor.ui.h:10
-#| msgid "Alignment:"
 msgid "Vertical alignment:"
 msgstr "Vertikālā līdzināšana:"
 
@@ -2094,12 +2092,10 @@ msgid "Right align"
 msgstr "Līdzināt pie labās"
 
 #: ../data/ui/property-bar.ui.h:8
-#| msgid "Flip vertically"
 msgid "Top vertical align"
 msgstr "Augšējā vertikālā līdzināšana"
 
 #: ../data/ui/property-bar.ui.h:9
-#| msgid "Center vertically"
 msgid "Center vertical align"
 msgstr "Centra vertikālā līdzināšana"
 
@@ -2406,8 +2402,8 @@ msgstr ""
 "gLabels var izmantot, lai izstrādātu adrešu etiķetes, vārdu birkas, cenu "
 "birkas, cd/dvd etiķetes vai jebko citu, kas ir izkārtots regulārā rakstā uz "
 "papīra loksnes. Etiķetes (vai kartes) var saturēt tekstu, attēlus, līnijas, "
-"figūras un svītru kodus. gLabels ir arī dokumentu sapludināšanas iespēja, kas "
-"jums ļauj drukāt unikālas etiķetes katram ierakstam no ārēja datu avota, "
+"figūras un svītru kodus. gLabels ir arī dokumentu sapludināšanas iespēja, "
+"kas jums ļauj drukāt unikālas etiķetes katram ierakstam no ārēja datu avota, "
 "piemēram, CSV datnes vai Evolution adrešu grāmatas."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:1
@@ -3138,6 +3134,12 @@ msgstr "Vairāku pielietojumu etiķetes 17mm x 54mm"
 msgid "Standard Address Labels 38mm x 90mm"
 msgstr "Standarta adrešu etiķetes  38mm x 90mm"
 
+#. ===================================================================
+#: ../templates/canon-other-templates.xml.h:2
+#| msgid "CD/DVD Labels"
+msgid "CD/DVD Tray"
+msgstr "CD/DVD paplāte"
+
 #. ===================================================================
 #: ../templates/databecker-iso-templates.xml.h:4
 msgid "CD/DVD Labels Standard Format (face only)"
diff --git a/po/pl.po b/po/pl.po
deleted file mode 100644 (file)
index e0aad11..0000000
--- a/po/pl.po
+++ /dev/null
@@ -1,3568 +0,0 @@
-# Polish translation for gLabels
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>, 2002.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gLabels\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-10 00:37-0400\n"
-"PO-Revision-Date: 2002-07-23 11:43+0100\n"
-"Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
-"Language-Team: Polish <pl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../src/bc.c:66
-msgid "POSTNET (any)"
-msgstr ""
-
-#: ../src/bc.c:69
-msgid "POSTNET-5 (ZIP only)"
-msgstr ""
-
-#: ../src/bc.c:72
-msgid "POSTNET-9 (ZIP+4)"
-msgstr ""
-
-#: ../src/bc.c:75
-msgid "POSTNET-11 (DPBC)"
-msgstr ""
-
-#: ../src/bc.c:80
-msgid "CEPNET"
-msgstr ""
-
-#: ../src/bc.c:83
-msgid "EAN (any)"
-msgstr ""
-
-#: ../src/bc.c:86
-msgid "EAN-8"
-msgstr ""
-
-#: ../src/bc.c:89
-msgid "EAN-8 +2"
-msgstr ""
-
-#: ../src/bc.c:92
-msgid "EAN-8 +5"
-msgstr ""
-
-#: ../src/bc.c:95
-msgid "EAN-13"
-msgstr ""
-
-#: ../src/bc.c:98
-msgid "EAN-13 +2"
-msgstr ""
-
-#: ../src/bc.c:101
-msgid "EAN-13 +5"
-msgstr ""
-
-#: ../src/bc.c:104
-msgid "UPC (UPC-A or UPC-E)"
-msgstr ""
-
-#: ../src/bc.c:107 ../src/bc.c:348
-msgid "UPC-A"
-msgstr ""
-
-#: ../src/bc.c:110
-msgid "UPC-A +2"
-msgstr ""
-
-#: ../src/bc.c:113
-msgid "UPC-A +5"
-msgstr ""
-
-#: ../src/bc.c:116 ../src/bc.c:351
-msgid "UPC-E"
-msgstr ""
-
-#: ../src/bc.c:119
-msgid "UPC-E +2"
-msgstr ""
-
-#: ../src/bc.c:122
-msgid "UPC-E +5"
-msgstr ""
-
-#: ../src/bc.c:125 ../src/bc.c:288
-msgid "ISBN"
-msgstr ""
-
-#: ../src/bc.c:128
-msgid "ISBN +5"
-msgstr ""
-
-#: ../src/bc.c:131 ../src/bc.c:204
-msgid "Code 39"
-msgstr ""
-
-#: ../src/bc.c:134 ../src/bc.c:216
-msgid "Code 128"
-msgstr ""
-
-#: ../src/bc.c:137
-msgid "Code 128C"
-msgstr ""
-
-#: ../src/bc.c:140
-msgid "Code 128B"
-msgstr ""
-
-#: ../src/bc.c:143 ../src/bc.c:285
-msgid "Interleaved 2 of 5"
-msgstr ""
-
-#: ../src/bc.c:146 ../src/bc.c:180
-msgid "Codabar"
-msgstr ""
-
-#: ../src/bc.c:149
-msgid "MSI"
-msgstr ""
-
-#: ../src/bc.c:152
-msgid "Plessey"
-msgstr ""
-
-#: ../src/bc.c:155 ../src/bc.c:213
-msgid "Code 93"
-msgstr ""
-
-#: ../src/bc.c:162
-msgid "Australia Post Standard"
-msgstr ""
-
-#: ../src/bc.c:165
-msgid "Australia Post Reply Paid"
-msgstr ""
-
-#: ../src/bc.c:168
-msgid "Australia Post Route Code"
-msgstr ""
-
-#: ../src/bc.c:171
-msgid "Australia Post Redirect"
-msgstr ""
-
-#: ../src/bc.c:174
-msgid "Aztec Code"
-msgstr ""
-
-#: ../src/bc.c:177
-msgid "Aztec Rune"
-msgstr ""
-
-#: ../src/bc.c:183
-msgid "Code One"
-msgstr ""
-
-#: ../src/bc.c:186
-msgid "Code 11"
-msgstr ""
-
-#: ../src/bc.c:189
-msgid "Code 16K"
-msgstr ""
-
-#: ../src/bc.c:192
-msgid "Code 2 of 5 Matrix"
-msgstr ""
-
-#: ../src/bc.c:195
-msgid "Code 2 of 5 IATA"
-msgstr ""
-
-#: ../src/bc.c:198
-msgid "Code 2 of 5 Data Logic"
-msgstr ""
-
-#: ../src/bc.c:201
-msgid "Code 32 (Italian Pharmacode)"
-msgstr ""
-
-#: ../src/bc.c:207
-msgid "Code 39 Extended"
-msgstr ""
-
-#: ../src/bc.c:210
-msgid "Code 49"
-msgstr ""
-
-#: ../src/bc.c:219
-msgid "Code 128 (Mode C supression)"
-msgstr ""
-
-#: ../src/bc.c:222
-msgid "DAFT Code"
-msgstr ""
-
-#: ../src/bc.c:225
-msgid "Data Matrix"
-msgstr ""
-
-#: ../src/bc.c:228
-msgid "Deutsche Post Leitcode"
-msgstr ""
-
-#: ../src/bc.c:231
-msgid "Deutsche Post Identcode"
-msgstr ""
-
-#: ../src/bc.c:234
-msgid "Dutch Post KIX Code"
-msgstr ""
-
-#: ../src/bc.c:237
-msgid "European Article Number (EAN)"
-msgstr ""
-
-#: ../src/bc.c:240
-msgid "Grid Matrix"
-msgstr ""
-
-#: ../src/bc.c:243
-msgid "GS1-128"
-msgstr ""
-
-#: ../src/bc.c:246
-msgid "GS1 DataBar-14"
-msgstr ""
-
-#: ../src/bc.c:255
-msgid "GS1 DataBar-14 Stacked"
-msgstr ""
-
-#: ../src/bc.c:258
-msgid "GS1 DataBar-14 Stacked Omni."
-msgstr ""
-
-#: ../src/bc.c:261
-msgid "GS1 DataBar Extended Stacked"
-msgstr ""
-
-#: ../src/bc.c:264
-msgid "HIBC Code 128"
-msgstr ""
-
-#: ../src/bc.c:267
-msgid "HIBC Code 39"
-msgstr ""
-
-#: ../src/bc.c:270
-msgid "HIBC Data Matrix"
-msgstr ""
-
-#: ../src/bc.c:273
-msgid "HIBC QR Code"
-msgstr ""
-
-#: ../src/bc.c:276
-msgid "HIBC PDF417"
-msgstr ""
-
-#: ../src/bc.c:279
-msgid "HIBC Micro PDF417"
-msgstr ""
-
-#: ../src/bc.c:282
-msgid "HIBC Aztec Code"
-msgstr ""
-
-#: ../src/bc.c:291
-msgid "ITF-14"
-msgstr ""
-
-#: ../src/bc.c:294
-msgid "Japanese Postal"
-msgstr ""
-
-#: ../src/bc.c:297
-msgid "Korean Postal"
-msgstr ""
-
-#: ../src/bc.c:300
-msgid "LOGMARS"
-msgstr ""
-
-#: ../src/bc.c:303
-msgid "Micro PDF417"
-msgstr ""
-
-#: ../src/bc.c:306
-msgid "Micro QR Code"
-msgstr ""
-
-#: ../src/bc.c:309
-msgid "MSI Plessey"
-msgstr ""
-
-#: ../src/bc.c:312
-msgid "NVE-18"
-msgstr ""
-
-#: ../src/bc.c:315
-msgid "PDF417"
-msgstr ""
-
-#: ../src/bc.c:318
-msgid "PDF417 Truncated"
-msgstr ""
-
-#: ../src/bc.c:321
-msgid "PLANET"
-msgstr ""
-
-#: ../src/bc.c:324
-msgid "PostNet"
-msgstr ""
-
-#: ../src/bc.c:327
-#, fuzzy
-msgid "Pharmacode"
-msgstr "Kod paskowy"
-
-#: ../src/bc.c:330
-msgid "Pharmacode 2-track"
-msgstr ""
-
-#: ../src/bc.c:333
-msgid "Pharmazentral Nummer (PZN)"
-msgstr ""
-
-#: ../src/bc.c:336
-msgid "QR Code"
-msgstr ""
-
-#: ../src/bc.c:339
-msgid "Royal Mail 4-State"
-msgstr ""
-
-#: ../src/bc.c:342
-#, fuzzy
-msgid "Telepen"
-msgstr "Usuñ"
-
-#: ../src/bc.c:345
-msgid "Telepen Numeric"
-msgstr ""
-
-#: ../src/bc.c:354
-msgid "USPS One Code"
-msgstr ""
-
-#: ../src/bc.c:357
-msgid "UK Plessey"
-msgstr ""
-
-#: ../src/bc.c:364
-msgid "IEC16022 (DataMatrix)"
-msgstr ""
-
-#: ../src/bc.c:371
-msgid "IEC18004 (QRCode)"
-msgstr ""
-
-#: ../src/color-combo-button.c:198 ../src/color-combo.c:178
-#, fuzzy
-msgid "Default Color"
-msgstr "Usuñ"
-
-#: ../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
-#, fuzzy
-msgid "Green"
-msgstr "stopni(e)"
-
-#: ../src/color-combo-menu.c:103
-msgid "Cyan"
-msgstr ""
-
-#: ../src/color-combo-menu.c:104
-#, fuzzy
-msgid "SkyBlue"
-msgstr "Styl"
-
-#: ../src/color-combo-menu.c:105
-msgid "Violet"
-msgstr ""
-
-#: ../src/color-combo-menu.c:107
-#, fuzzy
-msgid "Pink"
-msgstr "Wydrukuj"
-
-#: ../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
-#, fuzzy
-msgid "Light Green"
-msgstr "stopni(e)"
-
-#: ../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 ""
-
-#: ../src/color-combo-menu.c:119
-#, no-c-format
-msgid "25% Gray"
-msgstr ""
-
-#: ../src/color-combo-menu.c:121
-#, no-c-format
-msgid "40% Gray"
-msgstr ""
-
-#: ../src/color-combo-menu.c:123
-#, no-c-format
-msgid "50% Gray"
-msgstr ""
-
-#: ../src/color-combo-menu.c:125
-#, no-c-format
-msgid "60% Gray"
-msgstr ""
-
-#: ../src/color-combo-menu.c:126
-msgid "Black"
-msgstr ""
-
-#: ../src/color-combo-menu.c:254 ../src/color-combo-menu.c:373
-#, fuzzy
-msgid "Custom Color"
-msgstr "Kolor:"
-
-#: ../src/color-combo-menu.c:319
-#, fuzzy, c-format
-msgid "Custom Color #%u"
-msgstr "Kolor:"
-
-#: ../src/critical-error-handler.c:70
-msgid "gLabels Fatal Error!"
-msgstr ""
-
-#: ../src/file.c:84
-msgid "New Label or Card"
-msgstr "Nowa etykieta lub karta"
-
-#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
-#, fuzzy
-msgid "Label properties"
-msgstr "W³a¶ciwo¶ci tekstu"
-
-#: ../src/file.c:267 ../src/file.c:557
-msgid "All files"
-msgstr ""
-
-#: ../src/file.c:272 ../src/file.c:562
-#, fuzzy
-msgid "gLabels documents"
-msgstr "Glabels: Preferencje"
-
-#: ../src/file.c:319 ../src/file.c:620
-#, fuzzy
-msgid "Empty file name selection"
-msgstr "Usuwa wszelkie zaznaczenia"
-
-#: ../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
-#, fuzzy, c-format
-msgid "Could not open file \"%s\""
-msgstr "Nie mo¿na otworzyæ pliku"
-
-#: ../src/file.c:413
-msgid "Not a supported file format"
-msgstr ""
-
-#: ../src/file.c:491 ../src/file.c:670
-#, fuzzy, c-format
-msgid "Could not save file \"%s\""
-msgstr "Nie mo¿na zapisaæ pliku"
-
-#: ../src/file.c:495 ../src/file.c:674
-msgid "Error encountered during save.  The file is still not saved."
-msgstr ""
-
-#: ../src/file.c:535
-#, fuzzy, c-format
-msgid "Save \"%s\" as"
-msgstr "Zapisz etykietê jako"
-
-#: ../src/file.c:623
-#, fuzzy
-msgid "Please supply a valid file name"
-msgstr "Nale¿y podaæ nazwê pliku"
-
-#: ../src/file.c:644
-#, c-format
-msgid "Overwrite file \"%s\"?"
-msgstr ""
-
-#: ../src/file.c:648
-msgid "File already exists."
-msgstr ""
-
-#: ../src/file.c:744
-#, c-format
-msgid "Save changes to document \"%s\" before closing?"
-msgstr ""
-
-#: ../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
-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
-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
-#, fuzzy
-msgid "Sample text"
-msgstr "Próbne dane"
-
-#: ../src/glabels-batch.c:53
-#, fuzzy
-msgid "set output filename (default=\"output.pdf\")"
-msgstr "okre¶l nazwê pliku wyj¶ciowego (domy¶lnie=\"output.ps\")"
-
-#: ../src/glabels-batch.c:53 ../src/glabels-batch.c:67
-msgid "filename"
-msgstr "nazwa pliku"
-
-#: ../src/glabels-batch.c:55
-msgid "number of sheets (default=1)"
-msgstr "liczba arkuszy (domy¶lnie=1)"
-
-#: ../src/glabels-batch.c:55
-msgid "sheets"
-msgstr "arkusz(e/y)"
-
-#: ../src/glabels-batch.c:57
-msgid "number of copies (default=1)"
-msgstr "liczba kopii (domy¶lnie=1)"
-
-#: ../src/glabels-batch.c:57
-msgid "copies"
-msgstr "kopi(a/e/i)"
-
-#: ../src/glabels-batch.c:59
-#, fuzzy
-msgid "first label on first sheet (default=1)"
-msgstr "liczba arkuszy (domy¶lnie=1)"
-
-#: ../src/glabels-batch.c:59
-msgid "first"
-msgstr ""
-
-#: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:13
-msgid "print outlines (to test printer alignment)"
-msgstr "drukowanie ramek (w celu przetestowania wyrównania)"
-
-#: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
-msgid "print in reverse (i.e. a mirror image)"
-msgstr "drukowanie odwrócone (np. odbicie zwierciadlane)"
-
-#: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:11
-msgid "print crop marks"
-msgstr ""
-
-#: ../src/glabels-batch.c:67
-msgid "input file for merging"
-msgstr ""
-
-#: ../src/glabels-batch.c:69 ../src/glabels.c:64
-msgid "[FILE...]"
-msgstr ""
-
-#: ../src/glabels-batch.c:99
-msgid "Print files created with gLabels."
-msgstr ""
-
-#: ../src/glabels-batch.c:107 ../src/glabels.c:89
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-
-#: ../src/glabels-batch.c:151
-#, fuzzy, c-format
-msgid "cannot perform document merge with glabels file %s\n"
-msgstr "nie mo¿na otworzyæ pliku glabels o nazwie %s\n"
-
-#: ../src/glabels-batch.c:186
-#, c-format
-msgid "cannot open glabels file %s\n"
-msgstr "nie mo¿na otworzyæ pliku glabels o nazwie %s\n"
-
-#: ../src/glabels.c:81
-msgid "Launch gLabels label and business card designer."
-msgstr ""
-
-#: ../src/label-barcode.c:154 ../src/ui.c:319
-msgid "Create barcode object"
-msgstr "Tworzy kod paskowy"
-
-#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
-#, fuzzy
-msgid "Barcode data"
-msgstr "Dane kodu paskowego"
-
-#: ../src/label-barcode.c:263
-#, fuzzy
-msgid "Barcode property"
-msgstr "Modyfikacja w³a¶ciwo¶ci kodu paskowego"
-
-#: ../src/label-barcode.c:485
-#, fuzzy
-msgid "Barcode data empty"
-msgstr "Dane kodu paskowego"
-
-#: ../src/label-barcode.c:489
-#, fuzzy
-msgid "Invalid barcode data"
-msgstr "Niepoprawny kod paskowy"
-
-#: ../src/label-box.c:156
-#, fuzzy
-msgid "Create box object"
-msgstr "Tworzy obiekt tekstowy"
-
-#: ../src/label-box.c:230 ../src/label-ellipse.c:232 ../src/stock.c:93
-#: ../data/ui/property-bar.ui.h:3
-msgid "Fill color"
-msgstr ""
-
-#: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
-#: ../src/stock.c:94 ../data/ui/property-bar.ui.h:8
-msgid "Line color"
-msgstr ""
-
-#: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
-#: ../data/ui/property-bar.ui.h:9
-msgid "Line width"
-msgstr ""
-
-#: ../src/label.c:402
-msgid "Untitled"
-msgstr ""
-
-#: ../src/label.c:705 ../src/ui.c:422
-#, fuzzy
-msgid "Merge properties"
-msgstr "W³a¶ciwo¶ci z³±czania"
-
-#: ../src/label.c:1197 ../src/ui.c:215
-msgid "Delete"
-msgstr "Usuñ"
-
-#: ../src/label.c:1230 ../src/ui.c:324
-#, fuzzy
-msgid "Bring to front"
-msgstr "Przesun na wierzch"
-
-#: ../src/label.c:1266 ../src/ui.c:331
-#, fuzzy
-msgid "Send to back"
-msgstr "Przesuñ w dó³"
-
-#: ../src/label.c:1307
-#, fuzzy
-msgid "Rotate"
-msgstr "Obróæ"
-
-#: ../src/label.c:1342 ../src/ui.c:338
-#, fuzzy
-msgid "Rotate left"
-msgstr "Obróæ"
-
-#: ../src/label.c:1375 ../src/ui.c:345
-#, fuzzy
-msgid "Rotate right"
-msgstr "Obróæ"
-
-#: ../src/label.c:1410 ../src/ui.c:352
-msgid "Flip horizontally"
-msgstr ""
-
-#: ../src/label.c:1445 ../src/ui.c:359
-msgid "Flip vertically"
-msgstr ""
-
-#: ../src/label.c:1485 ../src/ui.c:366
-#, fuzzy
-msgid "Align left"
-msgstr "Wyrównanie:"
-
-#: ../src/label.c:1542 ../src/ui.c:373
-msgid "Align right"
-msgstr ""
-
-#: ../src/label.c:1603 ../src/ui.c:380
-msgid "Align horizontal center"
-msgstr ""
-
-#: ../src/label.c:1679 ../src/ui.c:387
-#, fuzzy
-msgid "Align tops"
-msgstr "Wyrównanie:"
-
-#: ../src/label.c:1736 ../src/ui.c:394
-msgid "Align bottoms"
-msgstr ""
-
-#: ../src/label.c:1797 ../src/ui.c:401
-msgid "Align vertical center"
-msgstr ""
-
-#: ../src/label.c:1875 ../src/ui.c:408
-msgid "Center horizontally"
-msgstr ""
-
-#: ../src/label.c:1922 ../src/ui.c:415
-#, fuzzy
-msgid "Center vertically"
-msgstr "Ogólne"
-
-#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
-msgid "Paste"
-msgstr ""
-
-#: ../src/label-ellipse.c:160
-#, fuzzy
-msgid "Create ellipse object"
-msgstr "Tworzy liniê"
-
-#: ../src/label-image.c:200 ../src/ui.c:312
-msgid "Create image object"
-msgstr "Tworzy obraz"
-
-#: ../src/label-image.c:333 ../src/label-image.c:474
-#, fuzzy
-msgid "Set image"
-msgstr "Wyzeruj rozmiar obrazu"
-
-#: ../src/label-line.c:147 ../src/ui.c:298
-msgid "Create line object"
-msgstr "Tworzy liniê"
-
-#: ../src/label-object.c:383 ../src/label-object.c:416
-msgid "Move"
-msgstr ""
-
-#: ../src/label-object.c:467
-#, fuzzy
-msgid "Resize"
-msgstr "Rozmiar strony:"
-
-#: ../src/label-object.c:1185
-msgid "Shadow state"
-msgstr ""
-
-#: ../src/label-object.c:1228
-msgid "Shadow offset"
-msgstr ""
-
-#: ../src/label-object.c:1276
-msgid "Shadow color"
-msgstr ""
-
-#: ../src/label-object.c:1319
-msgid "Shadow opacity"
-msgstr ""
-
-#: ../src/label-text.c:279 ../src/ui.c:284
-msgid "Create text object"
-msgstr "Tworzy obiekt tekstowy"
-
-#: ../src/label-text.c:451
-msgid "Typing"
-msgstr ""
-
-#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
-#, fuzzy
-msgid "Font family"
-msgstr "Nie zapisuj"
-
-#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
-#, fuzzy
-msgid "Font size"
-msgstr "Nie zapisuj"
-
-#: ../src/label-text.c:655
-#, fuzzy
-msgid "Font weight"
-msgstr "Obróæ"
-
-#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
-msgid "Italic"
-msgstr ""
-
-#: ../src/label-text.c:721
-#, fuzzy
-msgid "Align text"
-msgstr "Wyrównanie:"
-
-#: ../src/label-text.c:754
-msgid "Line spacing"
-msgstr ""
-
-#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
-msgid "Text color"
-msgstr ""
-
-#: ../src/label-text.c:931
-msgid "Auto shrink"
-msgstr ""
-
-#: ../src/media-select.c:349 ../src/media-select.c:353
-#: ../src/media-select.c:502 ../src/media-select.c:701
-msgctxt "Brand"
-msgid "Any"
-msgstr ""
-
-#: ../src/media-select.c:358 ../src/media-select.c:871
-msgctxt "Page size"
-msgid "Any"
-msgstr ""
-
-#: ../src/media-select.c:367 ../src/media-select.c:370
-#: ../src/media-select.c:880
-msgctxt "Category"
-msgid "Any"
-msgstr ""
-
-#: ../src/media-select.c:968
-#, fuzzy
-msgid "No recent templates found."
-msgstr "Nie znaleziono pliku szablonu!"
-
-#: ../src/media-select.c:970
-msgid "Try selecting a template in the \"Search all\" tab."
-msgstr ""
-
-#. Translators: "No match" means that for the given template search criteria, there
-#. * were no matches found.
-#: ../src/media-select.c:1061
-msgid "No match."
-msgstr ""
-
-#: ../src/media-select.c:1063
-msgid "Try selecting a different brand, page size or category."
-msgstr ""
-
-#: ../src/media-select.c:1157
-#, fuzzy
-msgid "No custom templates found."
-msgstr "Nie znaleziono pliku szablonu!"
-
-#: ../src/media-select.c:1159
-msgid ""
-"You may create new templates or try searching for pre-defined templates in "
-"the \"Search all\" tab."
-msgstr ""
-
-#. Translators: "None" here means that no document-merge source or
-#. * method has been selected.
-#: ../src/merge.c:171 ../src/merge.c:212 ../src/merge.c:376 ../src/merge.c:379
-msgid "None"
-msgstr "Brak"
-
-#: ../src/merge-evolution.c:316
-msgid "Couldn't construct query"
-msgstr ""
-
-#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
-#, fuzzy
-msgid "Couldn't open addressbook."
-msgstr "Nie mo¿na otworzyæ pliku"
-
-#: ../src/merge-evolution.c:348
-#, fuzzy
-msgid "Couldn't list available fields."
-msgstr "Nie mo¿na zapisaæ pliku"
-
-#: ../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 "Nie mo¿na otworzyæ pliku"
-
-#: ../src/merge-init.c:125
-msgid "VCards"
-msgstr ""
-
-#: ../src/merge-properties-dialog.c:282
-#, fuzzy
-msgid "Merge Properties"
-msgstr "W³a¶ciwo¶ci z³±czania"
-
-#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
-msgid "Select merge-database source"
-msgstr "Wybierz Œród³o bazy danych z³±czania "
-
-#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
-msgid "N/A"
-msgstr "N/A"
-
-#: ../src/merge-properties-dialog.c:345
-msgid "Select"
-msgstr "Wybierz"
-
-#: ../src/merge-properties-dialog.c:352
-msgid "Record/Field"
-msgstr ""
-
-#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
-msgid "Data"
-msgstr "Dane"
-
-#. Translators: "Fixed" here means that for the given document-merge method, there are
-#. * no further choices to further define the source of data.  E.g. if you select the
-#. * evolution-data-server, there are no further choices -- the source is "Fixed."
-#.
-#: ../src/merge-properties-dialog.c:443
-#, fuzzy
-msgid "Fixed"
-msgstr "Pola"
-
-#. 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 "Wybierz"
-
-#: ../src/new-label-dialog.c:215
-msgid "Choose Orientation"
-msgstr ""
-
-#: ../src/new-label-dialog.c:229
-msgid "Review"
-msgstr ""
-
-#: ../src/object-editor-bc-page.c:93 ../src/object-editor-shadow-page.c:93
-#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:339
-#: ../src/ui-property-bar.c:280
-#, fuzzy
-msgid "Default"
-msgstr "Usuñ"
-
-#: ../src/object-editor.c:159 ../src/object-editor.c:460
-#, fuzzy
-msgid "Object properties"
-msgstr "W³a¶ciwo¶ci tekstu"
-
-#: ../src/object-editor.c:309
-#, fuzzy
-msgid "Box object properties"
-msgstr "Modyfikacja w³a¶ciwo¶ci skrzynki"
-
-#: ../src/object-editor.c:328
-#, fuzzy
-msgid "Ellipse object properties"
-msgstr "Modyfikacja w³a¶ciwo¶ci elipsy"
-
-#: ../src/object-editor.c:347
-#, fuzzy
-msgid "Line object properties"
-msgstr "Modyfikacja w³a¶ciwo¶ci skrzynki"
-
-#: ../src/object-editor.c:364
-#, fuzzy
-msgid "Image object properties"
-msgstr "Modyfikacja w³a¶ciwo¶ci obrazu"
-
-#: ../src/object-editor.c:381
-#, fuzzy
-msgid "Text object properties"
-msgstr "Modyfikacja w³a¶ciwo¶ci skrzynki"
-
-#: ../src/object-editor.c:403
-#, fuzzy
-msgid "Barcode object properties"
-msgstr "Modyfikacja w³a¶ciwo¶ci kodu paskowego"
-
-#: ../src/object-editor-edit-page.c:76
-msgid "Insert merge field"
-msgstr "Wstaw pole z³±czenia"
-
-#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:345
-#: ../src/ui-property-bar.c:292
-#, fuzzy
-msgid "No Fill"
-msgstr "Wype³nienie"
-
-#: ../src/object-editor-image-page.c:278
-msgid "All Files"
-msgstr ""
-
-#: ../src/object-editor-image-page.c:283
-#, fuzzy
-msgid "All Images"
-msgstr "Obraz"
-
-#: ../src/object-editor-image-page.c:298
-#, c-format
-msgid "%s (*.%s)"
-msgstr ""
-
-#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:342
-#: ../src/ui-property-bar.c:304
-#, fuzzy
-msgid "No Line"
-msgstr "Brak"
-
-#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
-#, fuzzy
-msgid "gLabels Preferences"
-msgstr "Glabels: Preferencje"
-
-#. ===================================================================
-#: ../src/print-op.c:205 ../src/print-op-dialog.c:217
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:4
-#: ../templates/misc-iso-templates.xml.h:34
-msgid "Labels"
-msgstr "Etykiety"
-
-#: ../src/stock.c:70
-#, fuzzy
-msgid "_Select Mode"
-msgstr "Wybierz"
-
-#: ../src/stock.c:71
-#, fuzzy
-msgid "_Text"
-msgstr "Tekst"
-
-#: ../src/stock.c:72
-#, fuzzy
-msgid "_Line"
-msgstr "Linia"
-
-#: ../src/stock.c:73
-#, fuzzy
-msgid "_Box"
-msgstr "Skrzynka"
-
-#: ../src/stock.c:74
-#, fuzzy
-msgid "_Ellipse"
-msgstr "Elipsa"
-
-#: ../src/stock.c:75
-#, fuzzy
-msgid "_Image"
-msgstr "Obraz"
-
-#: ../src/stock.c:76
-#, fuzzy
-msgid "Bar_code"
-msgstr "Kod paskowy"
-
-#: ../src/stock.c:77
-#, fuzzy
-msgid "_Merge Properties"
-msgstr "W³a¶ciwo¶ci z³±czania"
-
-#: ../src/stock.c:78
-#, fuzzy
-msgid "Object _Properties"
-msgstr "W³a¶ciwo¶ci tekstu"
-
-#: ../src/stock.c:79
-#, fuzzy
-msgid "Bring to _Front"
-msgstr "Przesun na wierzch"
-
-#: ../src/stock.c:80
-#, fuzzy
-msgid "Send to _Back"
-msgstr "Przesuñ w dó³"
-
-#: ../src/stock.c:81
-#, fuzzy
-msgid "Rotate _Left"
-msgstr "Obróæ"
-
-#: ../src/stock.c:82
-#, fuzzy
-msgid "Rotate _Right"
-msgstr "Obróæ"
-
-#: ../src/stock.c:83
-msgid "Flip _Horizontally"
-msgstr ""
-
-#: ../src/stock.c:84
-msgid "Flip _Vertically"
-msgstr ""
-
-#: ../src/stock.c:85
-msgid "_Lefts"
-msgstr ""
-
-#: ../src/stock.c:86
-msgid "_Rights"
-msgstr ""
-
-#: ../src/stock.c:87
-msgid "_Centers"
-msgstr ""
-
-#: ../src/stock.c:88
-#, fuzzy
-msgid "_Tops"
-msgstr "_Narzêdzia"
-
-#: ../src/stock.c:89
-msgid "Bottoms"
-msgstr ""
-
-#: ../src/stock.c:90
-msgid "Centers"
-msgstr ""
-
-#: ../src/stock.c:91 ../src/stock.c:92
-msgid "Label Ce_nter"
-msgstr ""
-
-#: ../src/stock.c:95 ../src/stock.c:97
-#, fuzzy
-msgid "Linked"
-msgstr "Linia"
-
-#: ../src/stock.c:96 ../src/stock.c:98
-#, fuzzy
-msgid "Not Linked"
-msgstr "Brak"
-
-#: ../src/template-designer.c:404
-msgid "New gLabels Template"
-msgstr ""
-
-#: ../src/template-designer.c:461
-msgid "Welcome"
-msgstr ""
-
-#: ../src/template-designer.c:500
-#, fuzzy
-msgid "Name and Description"
-msgstr "Opis:"
-
-#: ../src/template-designer.c:548
-#, fuzzy
-msgid "Page Size"
-msgstr "Rozmiar strony:"
-
-#: ../src/template-designer.c:614
-#, fuzzy
-msgid "Label or Card Shape"
-msgstr "Nowa etykieta lub karta"
-
-#: ../src/template-designer.c:661
-#, fuzzy
-msgid "Label or Card Size"
-msgstr "Nowa etykieta lub karta"
-
-#: ../src/template-designer.c:760
-#, fuzzy
-msgid "Label Size (round)"
-msgstr "Rozmiar etykiety:"
-
-#: ../src/template-designer.c:841
-msgid "Label Size (CD/DVD)"
-msgstr ""
-
-#: ../src/template-designer.c:932
-msgid "Number of Layouts"
-msgstr ""
-
-#: ../src/template-designer.c:1000
-#, fuzzy
-msgid "Layout(s)"
-msgstr "Wygl±d:"
-
-#: ../src/template-designer.c:1105
-msgid "Design Completed"
-msgstr ""
-
-#: ../src/template-designer.c:1133
-msgid "Edit gLabels Template"
-msgstr ""
-
-#: ../src/template-designer.c:1423
-msgid "Brand and part# match an existing template!"
-msgstr ""
-
-#. Menu entries.
-#: ../src/ui.c:93
-#, fuzzy
-msgid "_File"
-msgstr "Wype³nienie"
-
-#: ../src/ui.c:94
-#, fuzzy
-msgid "Open Recent _Files"
-msgstr "Otwiera plik"
-
-#: ../src/ui.c:95
-msgid "_Edit"
-msgstr ""
-
-#: ../src/ui.c:96
-#, fuzzy
-msgid "_View"
-msgstr "_Nowa"
-
-#: ../src/ui.c:97
-msgid "Customize Main Toolbar"
-msgstr ""
-
-#: ../src/ui.c:98
-msgid "Customize Drawing Toolbar"
-msgstr ""
-
-#: ../src/ui.c:99
-msgid "Customize Properties Toolbar"
-msgstr ""
-
-#: ../src/ui.c:100
-msgid "_Objects"
-msgstr ""
-
-#: ../src/ui.c:101
-#, fuzzy
-msgid "_Create"
-msgstr "Tworzy obiekt tekstowy"
-
-#: ../src/ui.c:102
-msgid "_Order"
-msgstr ""
-
-#: ../src/ui.c:103
-#, fuzzy
-msgid "_Rotate/Flip"
-msgstr "Obróæ"
-
-#: ../src/ui.c:104
-msgid "Align _Horizontal"
-msgstr ""
-
-#: ../src/ui.c:105
-msgid "Align _Vertical"
-msgstr ""
-
-#: ../src/ui.c:106
-msgid "_Help"
-msgstr ""
-
-#. Popup entries.
-#: ../src/ui.c:109 ../src/ui.c:110
-msgid "Context Menu"
-msgstr ""
-
-#: ../src/ui.c:115
-msgid "_New"
-msgstr "_Nowa"
-
-#: ../src/ui.c:117
-#, fuzzy
-msgid "Create a new file"
-msgstr "Tworzy liniê"
-
-#: ../src/ui.c:122
-#, fuzzy
-msgid "_Open..."
-msgstr "Otwórz"
-
-#: ../src/ui.c:124
-msgid "Open a file"
-msgstr "Otwiera plik"
-
-#: ../src/ui.c:129
-#, fuzzy
-msgid "_Save"
-msgstr "Zapisz jako"
-
-#: ../src/ui.c:131
-#, fuzzy
-msgid "Save current file"
-msgstr "Zapisuje bie¿±cy plik"
-
-#: ../src/ui.c:136
-#, fuzzy
-msgid "Save _As..."
-msgstr "Zapisz jako"
-
-#: ../src/ui.c:138
-#, fuzzy
-msgid "Save the current file to a different name"
-msgstr "Zapisuje bie¿±cy plik"
-
-#: ../src/ui.c:143
-#, fuzzy
-msgid "_Print..."
-msgstr "Wydrukuj"
-
-#: ../src/ui.c:145
-#, fuzzy
-msgid "Print the current file"
-msgstr "Drukuje bie¿±cy plik"
-
-#: ../src/ui.c:150
-#, fuzzy
-msgid "Properties..."
-msgstr "W³a¶ciwo¶ci tekstu"
-
-#: ../src/ui.c:152
-#, fuzzy
-msgid "Modify document properties"
-msgstr "Modyfikacja w³a¶ciwo¶ci z³±czania dokumentów"
-
-#: ../src/ui.c:157
-msgid "Template _Designer..."
-msgstr ""
-
-#: ../src/ui.c:159
-#, fuzzy
-msgid "Create a custom template"
-msgstr "Tworzy liniê"
-
-#: ../src/ui.c:164
-msgid "_Close"
-msgstr ""
-
-#: ../src/ui.c:166
-#, fuzzy
-msgid "Close the current file"
-msgstr "Zapisuje bie¿±cy plik"
-
-#: ../src/ui.c:171
-msgid "_Quit"
-msgstr ""
-
-#: ../src/ui.c:173
-msgid "Quit the program"
-msgstr ""
-
-#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
-msgid "Undo"
-msgstr ""
-
-#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
-msgid "Redo"
-msgstr ""
-
-#: ../src/ui.c:194
-msgid "Cut"
-msgstr ""
-
-#: ../src/ui.c:196
-msgid "Cut the selection"
-msgstr ""
-
-#: ../src/ui.c:201
-msgid "Copy"
-msgstr ""
-
-#: ../src/ui.c:203
-#, fuzzy
-msgid "Copy the selection"
-msgstr "Usuwa wszelkie zaznaczenia"
-
-#: ../src/ui.c:210
-msgid "Paste the clipboard"
-msgstr ""
-
-#: ../src/ui.c:217
-#, fuzzy
-msgid "Delete the selected objects"
-msgstr "Tworzy obiekt tekstowy"
-
-#: ../src/ui.c:222
-#, fuzzy
-msgid "Select All"
-msgstr "O_dznacz wszystko"
-
-#: ../src/ui.c:224
-#, fuzzy
-msgid "Select all objects"
-msgstr "Wybierz, przeno¶ i modyfikuj obiekty"
-
-#: ../src/ui.c:229
-#, fuzzy
-msgid "Un-select All"
-msgstr "O_dznacz wszystko"
-
-#: ../src/ui.c:231
-msgid "Remove all selections"
-msgstr "Usuwa wszelkie zaznaczenia"
-
-#: ../src/ui.c:236
-#, fuzzy
-msgid "Preferences"
-msgstr "Glabels: Preferencje"
-
-#: ../src/ui.c:238
-msgid "Configure the application"
-msgstr ""
-
-#: ../src/ui.c:245
-#, fuzzy
-msgid "Zoom in"
-msgstr "Powiêksz"
-
-#: ../src/ui.c:247
-msgid "Increase magnification"
-msgstr ""
-
-#: ../src/ui.c:252
-#, fuzzy
-msgid "Zoom out"
-msgstr "Pomniejsz"
-
-#: ../src/ui.c:254
-msgid "Decrease magnification"
-msgstr ""
-
-#: ../src/ui.c:259
-#, fuzzy
-msgid "Zoom 1 to 1"
-msgstr "Powiêkszenie 1:1"
-
-#: ../src/ui.c:261
-msgid "Restore scale to 100%"
-msgstr ""
-
-#: ../src/ui.c:266
-#, fuzzy
-msgid "Zoom to fit"
-msgstr "Powiêksza 1:1"
-
-#: ../src/ui.c:268
-msgid "Set scale to fit window"
-msgstr ""
-
-#: ../src/ui.c:275
-#, fuzzy
-msgid "Select Mode"
-msgstr "Wybierz"
-
-#: ../src/ui.c:277
-msgid "Select, move and modify objects"
-msgstr "Wybierz, przeno¶ i modyfikuj obiekty"
-
-#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
-#: ../data/ui/prefs-dialog.ui.h:17
-msgid "Text"
-msgstr "Tekst"
-
-#: ../src/ui.c:289
-#, fuzzy
-msgid "Box"
-msgstr "Skrzynka"
-
-#: ../src/ui.c:291
-msgid "Create box/rectangle object"
-msgstr "Tworzy skrzynkê/prostok±t"
-
-#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
-#: ../data/ui/prefs-dialog.ui.h:9
-msgid "Line"
-msgstr "Linia"
-
-#: ../src/ui.c:303
-#, fuzzy
-msgid "Ellipse"
-msgstr "Elipsa"
-
-#: ../src/ui.c:305
-msgid "Create ellipse/circle object"
-msgstr "Tworzy elipsê/okr±g"
-
-#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
-msgid "Image"
-msgstr "Obraz"
-
-#: ../src/ui.c:317
-#, fuzzy
-msgid "Barcode"
-msgstr "Kod paskowy"
-
-#: ../src/ui.c:326
-msgid "Raise object to top"
-msgstr ""
-
-#: ../src/ui.c:333
-msgid "Lower object to bottom"
-msgstr ""
-
-#: ../src/ui.c:340
-msgid "Rotate object 90 degrees counter-clockwise"
-msgstr ""
-
-#: ../src/ui.c:347
-msgid "Rotate object 90 degrees clockwise"
-msgstr ""
-
-#: ../src/ui.c:354
-msgid "Flip object horizontally"
-msgstr ""
-
-#: ../src/ui.c:361
-msgid "Flip object vertically"
-msgstr ""
-
-#: ../src/ui.c:368
-msgid "Align objects to left edges"
-msgstr ""
-
-#: ../src/ui.c:375
-msgid "Align objects to right edges"
-msgstr ""
-
-#: ../src/ui.c:382
-msgid "Align objects to horizontal centers"
-msgstr ""
-
-#: ../src/ui.c:389
-#, fuzzy
-msgid "Align objects to top edges"
-msgstr "Modyfikacja w³a¶ciwo¶ci skrzynki"
-
-#: ../src/ui.c:396
-msgid "Align objects to bottom edges"
-msgstr ""
-
-#: ../src/ui.c:403
-msgid "Align objects to vertical centers"
-msgstr ""
-
-#: ../src/ui.c:410
-msgid "Center objects to horizontal label center"
-msgstr ""
-
-#: ../src/ui.c:417
-msgid "Center objects to vertical label center"
-msgstr ""
-
-#: ../src/ui.c:424
-msgid "Edit merge properties"
-msgstr "Modyfikuje w³a¶ciwo¶ci z³±czania"
-
-#: ../src/ui.c:431
-msgid "Contents"
-msgstr ""
-
-#: ../src/ui.c:433
-#, fuzzy
-msgid "Open glabels manual"
-msgstr "Otwórz etykietê"
-
-#: ../src/ui.c:438
-msgid "About..."
-msgstr ""
-
-#: ../src/ui.c:440
-msgid "About glabels"
-msgstr ""
-
-#: ../src/ui.c:450
-msgid "Property toolbar"
-msgstr ""
-
-#: ../src/ui.c:452
-msgid "Change the visibility of the property toolbar in the current window"
-msgstr ""
-
-#: ../src/ui.c:458
-msgid "Grid"
-msgstr ""
-
-#: ../src/ui.c:460
-msgid "Change the visibility of the grid in the current window"
-msgstr ""
-
-#: ../src/ui.c:466
-msgid "Markup"
-msgstr ""
-
-#: ../src/ui.c:468
-msgid "Change the visibility of markup lines in the current window"
-msgstr ""
-
-#: ../src/ui.c:479
-msgid "Main toolbar"
-msgstr ""
-
-#: ../src/ui.c:481
-msgid "Change the visibility of the main toolbar in the current window"
-msgstr ""
-
-#: ../src/ui.c:487
-msgid "Drawing toolbar"
-msgstr ""
-
-#: ../src/ui.c:489
-msgid "Change the visibility of the drawing toolbar in the current window"
-msgstr ""
-
-#: ../src/ui-commands.c:1135
-msgid "Glabels includes contributions from:"
-msgstr ""
-
-#: ../src/ui-commands.c:1141
-msgid "See the file AUTHORS for additional credits,"
-msgstr ""
-
-#: ../src/ui-commands.c:1142
-msgid "or visit http://glabels.org/"
-msgstr ""
-
-#: ../src/ui-commands.c:1154
-msgid "A label and business card creation program.\n"
-msgstr ""
-
-#: ../src/ui-commands.c:1158
-msgid "translator-credits"
-msgstr ""
-
-#: ../src/ui-commands.c:1161
-#, fuzzy
-msgid ""
-"gLabels is free software: you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation, either version 3 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"gLabels is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-msgstr ""
-"Program do tworzenia etykiet i wizytówek dla GNOME.\n"
-"\n"
-"Glabels jest oprogramowaniem wolnodostêpnym, mo¿na rozpowszechniaæ go lub/"
-"imodyfikowaæ na zasadach Licencji Publicznej GNU opublikowanej przez Free "
-"Software Foundation; zarówno w wersji 2 tej licencji, jak (do wyboru) i "
-"dowolnej póŒniejszej wersji.\n"
-"\n"
-"Ten program jest rozpowszechniany w nadziei u¿yteczno¶ci, lecz BEZ ¯ADNEJ "
-"GWARANCJI; nawet wynikaj±cej z RÊKOJMI lub U¯YWANIA W OKREŠLONYM CELU. "
-"Zajrzyj do Licencji Publicznej GNU aby uzyskaæ wiêcej szczegó³ów.\n"
-
-#: ../src/ui-commands.c:1190
-#, fuzzy
-msgid "glabels"
-msgstr "Etykiety"
-
-#: ../src/warning-handler.c:69
-#, fuzzy
-msgid "gLabels Error!"
-msgstr "Glabels: Preferencje"
-
-#: ../src/window.c:284
-msgid "(none) - gLabels"
-msgstr ""
-
-#: ../src/window.c:485
-msgid "(modified)"
-msgstr ""
-
-#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
-#, c-format
-msgid "Bad root node = \"%s\""
-msgstr "Niepoprawny wêze³ g³ówny = \"%s\""
-
-#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
-#, c-format
-msgid "bad node =  \"%s\""
-msgstr "niepoprawny wêze³ = \"%s\""
-
-#: ../src/xml-label.c:199 ../src/xml-label.c:237
-msgid "xmlParseFile error"
-msgstr "b³±d przetwarzania pliku xml"
-
-#: ../src/xml-label.c:274
-msgid "No document root"
-msgstr "Brak g³ównego dokumentu"
-
-#: ../src/xml-label.c:282
-msgid "Importing from glabels 0.1 format"
-msgstr ""
-
-#: ../src/xml-label.c:291
-msgid "Importing from glabels 0.4 format"
-msgstr ""
-
-#: ../src/xml-label.c:301
-#, fuzzy, c-format
-msgid "Unknown glabels Namespace -- Using %s"
-msgstr ""
-"dokument jest niepoprawnego typu, nie odnaleziono przestrzeni nazw glabels"
-
-#: ../src/xml-label.c:370
-#, fuzzy, c-format
-msgid "bad node in Document node =  \"%s\""
-msgstr "Niepoprawny wêze³ g³ówny = \"%s\""
-
-#: ../src/xml-label.c:868
-#, fuzzy, c-format
-msgid "bad node in Data node =  \"%s\""
-msgstr "niepoprawny wêze³ = \"%s\""
-
-#: ../src/xml-label.c:944
-#, c-format
-msgid "Unknown embedded file format: \"%s\""
-msgstr ""
-
-#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
-msgid "Utf8 conversion error."
-msgstr ""
-
-#: ../src/xml-label.c:1157
-msgid "Problem saving xml file."
-msgstr "Problem podczas zapisu pliku xml."
-
-#. Create and append an "Other" entry.
-#. Translators: "Other" here means other page size.  Meaning a page size
-#. * other than the standard ones that libglabels knows about such as
-#. * "letter", "A4", etc.
-#: ../libglabels/db.c:270
-msgid "Other"
-msgstr ""
-
-#. Create and append a "User defined" entry.
-#: ../libglabels/db.c:279
-#, fuzzy
-msgid "User defined"
-msgstr "Wstaw pole z³±czenia"
-
-#: ../libglabels/db.c:665
-msgid ""
-"Unable to locate paper size definitions.  Libglabels may not be installed "
-"correctly!"
-msgstr ""
-
-#: ../libglabels/db.c:1057
-msgid ""
-"Unable to locate category definitions.  Libglabels may not be installed "
-"correctly!"
-msgstr ""
-
-#: ../libglabels/db.c:2097
-msgid ""
-"Unable to locate any template files.  Libglabels may not be installed "
-"correctly!"
-msgstr ""
-
-#: ../libglabels/db.c:2164
-#, c-format
-msgid "%s full page label"
-msgstr ""
-
-#: ../libglabels/template.c:156
-#, c-format
-msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
-msgstr ""
-
-#.
-#. * Translators: 1st %d = number of labels across a page,
-#. *              2nd %d = number of labels down a page,
-#. *              3rd %d = total number of labels on a page (sheet).
-#.
-#: ../libglabels/template.c:727
-#, fuzzy, c-format
-msgid "%d × %d (%d per sheet)"
-msgstr "%d x %d (%d na arkusz)"
-
-#. Translators: %d is the total number of labels on a page (sheet).
-#: ../libglabels/template.c:732
-#, fuzzy, c-format
-msgid "%d per sheet"
-msgstr "%d x %d (%d na arkusz)"
-
-#: ../libglabels/template.c:802 ../libglabels/template.c:808
-#: ../libglabels/template.c:818 ../libglabels/template.c:824
-#, fuzzy
-msgid "diameter"
-msgstr "Milimetry"
-
-#. The ids are identical to the absolute length units supported in
-#. the CSS2 Specification (Section 4.3.2)
-#. This table must be sorted exactly as the enumerations in lglUnits
-#. [LGL_UNITS_POINT]
-#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
-#: ../data/ui/prefs-dialog.ui.h:22
-msgid "points"
-msgstr "punkty(-ów)"
-
-#. [LGL_UNITS_INCH]
-#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
-#: ../data/ui/template-designer.ui.h:62
-msgid "inches"
-msgstr "cali"
-
-#. [LGL_UNITS_MM]
-#: ../libglabels/units.c:67
-msgid "mm"
-msgstr "mm"
-
-#. [LGL_UNITS_CM]
-#: ../libglabels/units.c:68
-msgid "cm"
-msgstr ""
-
-#. [LGL_UNITS_PICA]
-#: ../libglabels/units.c:69
-msgid "picas"
-msgstr ""
-
-#: ../libglabels/xml-template.c:223
-msgid "Missing name or brand/part attributes."
-msgstr ""
-
-#. This should always be an id, but just in case a name
-#. slips by!
-#: ../libglabels/xml-template.c:244
-#, c-format
-msgid "Unknown page size id \"%s\", trying as name"
-msgstr ""
-
-#: ../libglabels/xml-template.c:256
-#, c-format
-msgid "Unknown page size id or name \"%s\""
-msgstr ""
-
-#: ../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:757
-msgid "Name attribute also missing."
-msgstr ""
-
-#.
-#. * Local Variables:       -- emacs
-#. * mode: C                -- emacs
-#. * c-basic-offset: 8      -- emacs
-#. * tab-width: 8           -- emacs
-#. * indent-tabs-mode: nil  -- emacs
-#. * End:                   -- emacs
-#.
-#: ../data/ui/merge-properties-dialog.ui.h:1
-msgid "Format:"
-msgstr "Format:"
-
-#: ../data/ui/merge-properties-dialog.ui.h:2
-msgid "Location:"
-msgstr "Po³o¿enie:"
-
-#: ../data/ui/merge-properties-dialog.ui.h:3
-msgid "Record selection/preview"
-msgstr ""
-
-#: ../data/ui/merge-properties-dialog.ui.h:4
-#, fuzzy
-msgid "Select all"
-msgstr "O_dznacz wszystko"
-
-#: ../data/ui/merge-properties-dialog.ui.h:5
-#, fuzzy
-msgid "Source"
-msgstr "¬ród³o"
-
-#: ../data/ui/merge-properties-dialog.ui.h:6
-#, fuzzy
-msgid "Unselect all"
-msgstr "O_dznacz wszystko"
-
-#: ../data/ui/media-select.ui.h:1
-msgid "Brand:"
-msgstr ""
-
-#: ../data/ui/media-select.ui.h:2
-msgid "Category:"
-msgstr ""
-
-#: ../data/ui/media-select.ui.h:3
-#, fuzzy
-msgid "Custom"
-msgstr "W³asny klucz pola"
-
-#: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
-#: ../data/ui/template-designer.ui.h:42
-msgid "Page size:"
-msgstr "Rozmiar strony:"
-
-#: ../data/ui/media-select.ui.h:5
-msgid "Recent"
-msgstr ""
-
-#: ../data/ui/media-select.ui.h:6
-#, fuzzy
-msgid "Search all"
-msgstr "O_dznacz wszystko"
-
-#: ../data/ui/new-label-dialog.ui.h:1
-msgid ""
-"Choose label or card product from hundreds of predefined templates or define "
-"your own."
-msgstr ""
-
-#: ../data/ui/new-label-dialog.ui.h:2 ../data/ui/template-designer.ui.h:27
-msgid "Description:"
-msgstr "Opis:"
-
-#: ../data/ui/new-label-dialog.ui.h:3
-msgid "Label size:"
-msgstr "Rozmiar etykiety:"
-
-#: ../data/ui/new-label-dialog.ui.h:4
-msgid "Layout:"
-msgstr "Wygl±d:"
-
-#: ../data/ui/new-label-dialog.ui.h:5
-#, fuzzy
-msgid "Normal"
-msgstr "Format:"
-
-#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
-msgid "Part #:"
-msgstr ""
-
-#: ../data/ui/new-label-dialog.ui.h:8
-msgid "Please review and confirm your selection."
-msgstr ""
-
-#: ../data/ui/new-label-dialog.ui.h:9
-#, fuzzy
-msgid "Rotated"
-msgstr "Obróæ"
-
-#: ../data/ui/new-label-dialog.ui.h:10
-msgid "Select orientation of label content."
-msgstr ""
-
-#: ../data/ui/new-label-dialog.ui.h:11
-msgid "Similar products:"
-msgstr ""
-
-#: ../data/ui/new-label-dialog.ui.h:12
-msgid "Vendor:"
-msgstr ""
-
-#: ../data/ui/object-editor.ui.h:2
-#, no-c-format
-msgid "%"
-msgstr "%"
-
-#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
-msgid "Alignment:"
-msgstr "Wyrównanie:"
-
-#: ../data/ui/object-editor.ui.h:4
-msgid "Allow merge to automatically shrink text"
-msgstr ""
-
-#: ../data/ui/object-editor.ui.h:5
-msgid "Angle:"
-msgstr "K±t"
-
-#: ../data/ui/object-editor.ui.h:6
-msgid "Checksum"
-msgstr ""
-
-#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
-msgid "Color:"
-msgstr "Kolor:"
-
-#: ../data/ui/object-editor.ui.h:9
-msgid "Enable shadow"
-msgstr ""
-
-#: ../data/ui/object-editor.ui.h:10
-#, fuzzy
-msgid "Family:"
-msgstr "Wype³nienie"
-
-#: ../data/ui/object-editor.ui.h:11
-#, fuzzy
-msgid "File:"
-msgstr "Wype³nienie"
-
-#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
-msgid "Fill"
-msgstr "Wype³nienie"
-
-#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
-msgid "Height:"
-msgstr "Wysoko¶æ:"
-
-#: ../data/ui/object-editor.ui.h:15
-msgid "Key:"
-msgstr "Klucz:"
-
-#: ../data/ui/object-editor.ui.h:16
-msgid "Length:"
-msgstr "D³ugo¶æ:"
-
-#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
-msgid "Line Spacing:"
-msgstr ""
-
-#: ../data/ui/object-editor.ui.h:19
-msgid "Literal:"
-msgstr "Litera³:"
-
-#: ../data/ui/object-editor.ui.h:20
-msgid "Opacity:"
-msgstr ""
-
-#: ../data/ui/object-editor.ui.h:21
-msgid "Position"
-msgstr "Pozycja"
-
-#: ../data/ui/object-editor.ui.h:22
-msgid "Reset image size"
-msgstr "Wyzeruj rozmiar obrazu"
-
-#: ../data/ui/object-editor.ui.h:23
-msgid "Shadow"
-msgstr ""
-
-#: ../data/ui/object-editor.ui.h:24
-msgid "Size"
-msgstr "Rozmiar"
-
-#: ../data/ui/object-editor.ui.h:25
-#, fuzzy
-msgid "Size:"
-msgstr "Rozmiar"
-
-#: ../data/ui/object-editor.ui.h:26
-#, fuzzy
-msgid "Style"
-msgstr "Styl"
-
-#: ../data/ui/object-editor.ui.h:27
-#, fuzzy
-msgid "Style:"
-msgstr "Styl"
-
-#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
-#: ../data/ui/template-designer.ui.h:61
-msgid "Width:"
-msgstr "Szeroko¶æ:"
-
-#: ../data/ui/object-editor.ui.h:30
-msgid "X Offset:"
-msgstr ""
-
-#: ../data/ui/object-editor.ui.h:31
-msgid "X:"
-msgstr "X:"
-
-#: ../data/ui/object-editor.ui.h:32
-msgid "Y Offset:"
-msgstr ""
-
-#: ../data/ui/object-editor.ui.h:33
-msgid "Y:"
-msgstr "Y:"
-
-#: ../data/ui/object-editor.ui.h:34
-msgid "degrees"
-msgstr "stopni(e)"
-
-#: ../data/ui/object-editor.ui.h:35
-msgid "dialog1"
-msgstr ""
-
-#: ../data/ui/object-editor.ui.h:36
-msgid "digits:"
-msgstr ""
-
-#: ../data/ui/object-editor.ui.h:37
-#, fuzzy
-msgid "format:"
-msgstr "Format:"
-
-#: ../data/ui/prefs-dialog.ui.h:1
-msgid "   "
-msgstr ""
-
-#: ../data/ui/prefs-dialog.ui.h:4
-msgid "Default page size"
-msgstr "Domy¶lny rozmiar strony"
-
-#: ../data/ui/prefs-dialog.ui.h:6
-msgid "Font:"
-msgstr "Czcionka:"
-
-#: ../data/ui/prefs-dialog.ui.h:7
-msgid "ISO A4"
-msgstr ""
-
-#: ../data/ui/prefs-dialog.ui.h:8
-msgid "Inches"
-msgstr "Cale"
-
-#: ../data/ui/prefs-dialog.ui.h:11
-#, fuzzy
-msgid "Locale"
-msgstr "Skala"
-
-#: ../data/ui/prefs-dialog.ui.h:12
-msgid "Millimeters"
-msgstr "Milimetry"
-
-#: ../data/ui/prefs-dialog.ui.h:13
-msgid "Object defaults"
-msgstr ""
-
-#: ../data/ui/prefs-dialog.ui.h:14
-msgid "Points"
-msgstr "Punkty"
-
-#: ../data/ui/prefs-dialog.ui.h:15
-msgid "Select default properties for new objects."
-msgstr ""
-
-#: ../data/ui/prefs-dialog.ui.h:16
-msgid "Select locale specific behavior."
-msgstr ""
-
-#: ../data/ui/prefs-dialog.ui.h:18 ../templates/paper-sizes.xml.h:35
-msgid "US Letter"
-msgstr ""
-
-#: ../data/ui/prefs-dialog.ui.h:19
-msgid "Units"
-msgstr ""
-
-#: ../data/ui/property-bar.ui.h:1
-msgid "Bold"
-msgstr ""
-
-#: ../data/ui/property-bar.ui.h:2
-#, fuzzy
-msgid "Center align"
-msgstr "Ogólne"
-
-#: ../data/ui/property-bar.ui.h:7
-msgid "Left align"
-msgstr ""
-
-#: ../data/ui/property-bar.ui.h:10
-msgid "Right align"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:1
-msgid "(e.g., \"Mailing Labels,\" \"Business Cards,\" ...)"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:2
-msgid "(e.g., 8163A)"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:3
-msgid "(e.g., Avery, Acme, ...)"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:4
-msgid "1. Outer radius:"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:5
-msgid "1. Radius:"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:6
-#, fuzzy
-msgid "1. Width:"
-msgstr "Szeroko¶æ:"
-
-#: ../data/ui/template-designer.ui.h:7
-#, fuzzy
-msgid "2. Height:"
-msgstr "Wysoko¶æ:"
-
-#: ../data/ui/template-designer.ui.h:8
-msgid "2. Inner radius:"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:9
-msgid "2. Waste (overprint allowed):"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:10
-msgid "3. Clipping width:"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:11
-msgid "3. Margin"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:12
-msgid "3. Round (radius of corner):"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:13
-msgid "4. Clipping height:"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:14
-msgid "4. Horiz. waste (overprint allowed):"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:15
-msgid "5. Vert. waste (overprint allowed):"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:16
-msgid "5. Waste (overprint allowed):"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:17
-msgid "6. Margin"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:18
-msgid "Brand/Manufacturer:"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:19
-msgid "CD/DVD (including credit card CDs)"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:20
-msgid ""
-"Congratulations!\n"
-"\n"
-"You have completed the gLabels Template Designer.\n"
-"If you wish to accept and save your design, click \"Apply.\"\n"
-"\n"
-"Otherwise, you may click \"Cancel\" to abandon your design\n"
-"or \"Back\" to continue editing this design."
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:28
-msgid "Distance from left edge (x0):"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:29
-msgid "Distance from top edge (y0):"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:31
-msgid "Horizontal pitch (dx):"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:32
-msgid ""
-"How many layouts will your template contain? \n"
-"\n"
-"A layout is a set of labels or cards that can be arranged in a simple grid.\n"
-"Most templates only need one layout, as in the first example.\n"
-"The second example illustrates when two layouts are needed."
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:37
-#, fuzzy
-msgid "Layout #1"
-msgstr "Wygl±d:"
-
-#: ../data/ui/template-designer.ui.h:38
-#, fuzzy
-msgid "Layout #2"
-msgstr "Wygl±d:"
-
-#: ../data/ui/template-designer.ui.h:39
-msgid "Number across (nx):"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:40
-msgid "Number down (ny):"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:41
-msgid "Number of layouts:"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:44
-msgid ""
-"Please enter the following identifying information about the template "
-"stationery."
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:45
-msgid "Please enter the following layout information."
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:46
-msgid ""
-"Please enter the following size parameters of a single label in your "
-"template."
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:47
-msgid ""
-"Please enter the following size parameters of a single label or card in your "
-"template."
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:48
-msgid "Please select the basic shape of the labels or cards."
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:49
-msgid "Please select the page size of the template stationery."
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:50
-#, fuzzy
-msgid "Print test sheet"
-msgstr "na pierwszym arkuszu"
-
-#: ../data/ui/template-designer.ui.h:51
-msgid "Rectangular or square (can have rounded corners)"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:52
-msgid "Round"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:53
-msgid ""
-"Templates needing\n"
-"two layouts."
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:55
-msgid ""
-"Templates needing only\n"
-"one layout."
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:57
-msgid "Vertical pitch (dy):"
-msgstr ""
-
-#: ../data/ui/template-designer.ui.h:58
-msgid ""
-"Welcome to the gLabels Template Designer.\n"
-"\n"
-"This dialog will assist you in the creation of a custom gLabels template."
-msgstr ""
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:1
-msgid "Collate"
-msgstr "Uk³adanie"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:2
-#, fuzzy
-msgid "Copies"
-msgstr "Kopie:"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:3
-msgid "Copies:"
-msgstr "Kopie:"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:5
-#, fuzzy
-msgid "Merge Control"
-msgstr "Kontrola z³±czania dokumentów"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:6
-#, fuzzy
-msgid "Options"
-msgstr "Opcje"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:7
-msgid "Sheets:"
-msgstr "Arkusze:"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:8
-msgid "Start on label"
-msgstr "Rozpocznij od etykiety"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:9
-msgid "from:"
-msgstr "od:"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:10
-msgid "on 1st sheet"
-msgstr "na pierwszym arkuszu"
-
-#: ../data/ui/print-op-dialog-custom-widget.ui.h:14
-msgid "to:"
-msgstr "do:"
-
-#: ../data/desktop/glabels-3.0.desktop.in.h:1
-msgid "Create labels, business cards and media covers"
-msgstr ""
-
-#: ../data/desktop/glabels-3.0.desktop.in.h:2
-msgid "gLabels Label Designer 3"
-msgstr ""
-
-#: ../data/mime/glabels-3.0.xml.in.h:1
-#, fuzzy
-msgid "gLabels Project File"
-msgstr "W³a¶ciwo¶ci tekstu"
-
-#. Envelopes
-#: ../templates/paper-sizes.xml.h:2
-msgid "#10 Envelope"
-msgstr ""
-
-#. Other ISO A series sizes
-#: ../templates/paper-sizes.xml.h:4
-msgid "A0"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:5
-msgid "A1"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:6
-msgid "A10"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:7
-msgid "A2"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:8
-msgid "A3"
-msgstr ""
-
-#. Most popular (at top of list)
-#: ../templates/paper-sizes.xml.h:10
-msgid "A4"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:11
-msgid "A5"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:12
-msgid "A6"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:13
-msgid "A7"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:14
-msgid "A8"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:15
-msgid "A9"
-msgstr ""
-
-#. ISO B series sizes
-#: ../templates/paper-sizes.xml.h:17
-msgid "B0"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:18
-msgid "B1"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:19
-msgid "B10"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:20
-msgid "B2"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:21
-msgid "B3"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:22
-msgid "B4"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:23
-msgid "B5"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:24
-msgid "B6"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:25
-msgid "B7"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:26
-msgid "B8"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:27
-msgid "B9"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:28
-msgid "C5"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:29
-msgid "C6"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:30
-msgid "DL"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:31
-msgid "Monarch Envelope"
-msgstr ""
-
-#: ../templates/paper-sizes.xml.h:32
-msgid "US Executive"
-msgstr ""
-
-#. Other US paper sizes
-#: ../templates/paper-sizes.xml.h:34
-msgid "US Legal"
-msgstr ""
-
-#: ../templates/categories.xml.h:1
-msgid "Any card"
-msgstr ""
-
-#: ../templates/categories.xml.h:2
-#, fuzzy
-msgid "Any label"
-msgstr "Otwórz etykietê"
-
-#. ===================================================================
-#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
-msgid "Business cards"
-msgstr ""
-
-#: ../templates/categories.xml.h:4
-msgid "CD/DVD or other media"
-msgstr ""
-
-#: ../templates/categories.xml.h:5
-msgid "Mailing/shipping products"
-msgstr ""
-
-#: ../templates/categories.xml.h:6
-#, fuzzy
-msgid "Rectangular labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
-#, fuzzy
-msgid "Round labels"
-msgstr "Rozpocznij od etykiety"
-
-#: ../templates/categories.xml.h:8
-#, fuzzy
-msgid "Square labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#. ********************************************************************
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:2
-#: ../templates/avery-iso-templates.xml.h:2
-#: ../templates/dymo-other-templates.xml.h:4
-#: ../templates/maco-us-templates.xml.h:2
-#: ../templates/misc-iso-templates.xml.h:2
-#: ../templates/pearl-iso-templates.xml.h:2
-#: ../templates/worldlabel-us-templates.xml.h:1
-#: ../templates/zweckform-iso-templates.xml.h:2
-msgid "Address Labels"
-msgstr ""
-
-#. ===================================================================
-#. ============================================================
-#. ===================================================================
-#. ********************************************************************
-#. ===================================================================
-#: ../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 ""
-
-#. ===================================================================
-#. ===============================================================
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:6
-#: ../templates/avery-iso-templates.xml.h:14
-#: ../templates/misc-us-templates.xml.h:8
-#: ../templates/misc-iso-templates.xml.h:16
-#: ../templates/pearl-iso-templates.xml.h:20
-#: ../templates/worldlabel-us-templates.xml.h:2
-#: ../templates/zweckform-iso-templates.xml.h:8
-#, fuzzy
-msgid "CD/DVD Labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:8
-msgid "CD/DVD Labels (Disc Labels)"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:10
-#, fuzzy
-msgid "CD/DVD Labels (Spine Labels)"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:12
-#: ../templates/avery-iso-templates.xml.h:16
-#: ../templates/worldlabel-us-templates.xml.h:3
-msgid "Diskette Labels"
-msgstr ""
-
-#. the LSK labels can be torn in half down the center
-#: ../templates/avery-us-templates.xml.h:14
-#, fuzzy
-msgid "Divider Labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:16
-#: ../templates/avery-other-templates.xml.h:2
-#: ../templates/worldlabel-us-templates.xml.h:4
-#, fuzzy
-msgid "File Folder Labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:18
-#: ../templates/worldlabel-us-templates.xml.h:5
-#, fuzzy
-msgid "Filing Labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:20
-#: ../templates/worldlabel-us-templates.xml.h:6
-msgid "Full Sheet Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:22
-#, fuzzy
-msgid "ID Labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:24
-msgid "Index Cards"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:26
-#, fuzzy
-msgid "Large Round Labels"
-msgstr "Rozpocznij od etykiety"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:28
-msgid "Name Badge Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:30
-msgid "Post cards"
-msgstr ""
-
-#. ===================================================================
-#. ********************************************************************
-#: ../templates/avery-us-templates.xml.h:32
-#: ../templates/dymo-other-templates.xml.h:12
-#: ../templates/worldlabel-us-templates.xml.h:8
-msgid "Return Address Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:34
-#: ../templates/maco-us-templates.xml.h:3
-#: ../templates/misc-us-templates.xml.h:30
-#: ../templates/worldlabel-us-templates.xml.h:9
-#, fuzzy
-msgid "Round Labels"
-msgstr "Rozpocznij od etykiety"
-
-#. ===================================================================
-#. ********************************************************************
-#: ../templates/avery-us-templates.xml.h:36
-#: ../templates/uline-us-templates.xml.h:2
-#: ../templates/worldlabel-us-templates.xml.h:10
-msgid "Shipping Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:38
-#, fuzzy
-msgid "Small Round Labels"
-msgstr "Rozpocznij od etykiety"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:40
-#, fuzzy
-msgid "Square Labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:42
-msgid "Tent Cards"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:44
-#: ../templates/worldlabel-us-templates.xml.h:11
-msgid "Video Tape Face Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/avery-us-templates.xml.h:46
-#: ../templates/worldlabel-us-templates.xml.h:12
-msgid "Video Tape Spine Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:4
-msgid "Address labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:6
-#, fuzzy
-msgid "Allround labels"
-msgstr "Rozpocznij od etykiety"
-
-#. ===============================================================
-#: ../templates/avery-iso-templates.xml.h:10
-msgid "CD Booklet"
-msgstr ""
-
-#. ===============================================================
-#: ../templates/avery-iso-templates.xml.h:12
-msgid "CD Inlet"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:18
-msgid "Diskette labels"
-msgstr ""
-
-#. ===============================================================
-#. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:20
-#: ../templates/misc-us-templates.xml.h:20
-#: ../templates/misc-iso-templates.xml.h:36
-#: ../templates/zweckform-iso-templates.xml.h:16
-msgid "Mailing Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:22
-#, fuzzy
-msgid "Mailing labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:24
-msgid "Mini Address Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:26
-#, fuzzy
-msgid "Mini Labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:28
-#, fuzzy
-msgid "Shipping labels"
-msgstr "Otwórz etykietê"
-
-#: ../templates/brother-other-templates.xml.h:1
-msgid "Multi Purpose Labels 17mm x 54mm"
-msgstr ""
-
-#: ../templates/brother-other-templates.xml.h:2
-#, fuzzy
-msgid "Shipping Labels 62mm x 100mm"
-msgstr "Otwórz etykietê"
-
-#.
-#. *********************************************************************
-#. *********************************************************************
-#. Labels for the Brother QL-500/550/650 PC Label Printers
-#.
-#. These templates work with the Brother Linux Printer CUPS Driver.  It
-#. is unknown if these work correctly with the foomatic print driver for
-#. these printers.
-#.
-#. One difference from typical templates is that the template size is
-#. not the actual media size - it is the size of the printable area,
-#. which is smaller than the media size.  This is because (at least with
-#. the Brother driver) coordinates are relative the corner of this area.
-#.
-#. *********************************************************************
-#. *********************************************************************
-#.
-#: ../templates/brother-other-templates.xml.h:20
-msgid "Standard Address Labels 29mm x 90mm"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:2
-msgid "3.5in Diskette"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:6
-msgid "File Folder"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:8
-msgid "Hanging Folder"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:10
-#, fuzzy
-msgid "Large Address Labels"
-msgstr "Rozpocznij od etykiety"
-
-#. ===================================================================
-#: ../templates/dymo-other-templates.xml.h:14
-#, fuzzy
-msgid "Shipping Address Labels"
-msgstr "Otwórz etykietê"
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:2
-msgid "Business Card CD"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:6
-msgid "CD Template Rectangles"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:10
-msgid "CD/DVD Labels (Face Only)"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:12
-#: ../templates/misc-iso-templates.xml.h:18
-msgid "CD/DVD Labels (face only)"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:14
-#, fuzzy
-msgid "Cassette Labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:16
-#, fuzzy
-msgid "DLT Labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:18
-msgid "Jewel Case Booklet"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:22
-msgid "Microtube labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:24
-msgid "Mini-CD Labels"
-msgstr ""
-
-#: ../templates/misc-us-templates.xml.h:25
-msgid "PRO CD Labels 2-up (CD spine only)"
-msgstr ""
-
-#: ../templates/misc-us-templates.xml.h:26
-msgid "PRO CD Labels 2-up (Face only)"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:28
-#: ../templates/misc-iso-templates.xml.h:42
-msgid "PRO CD Labels 2-up (face only)"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:32
-msgid "Slimline CD Case (rightside up)"
-msgstr ""
-
-#: ../templates/misc-us-templates.xml.h:33
-msgid "Slimline CD Case (upside down)"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:4
-#: ../templates/zweckform-iso-templates.xml.h:4
-msgid "Allround Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:6
-msgid "Arch File Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:8
-msgid "Arch File Labels (large)"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:10
-msgid "Arch File Labels (small)"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:14
-#, fuzzy
-msgid "CD Labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:20
-msgid "CD/DVD Labels Standard Format (face only)"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:22
-msgid "Diskette Labels (face only)"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:24
-msgid "EPSON Photo Stickers 16"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:26
-msgid "Etiketten"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:28
-msgid "Fridge Magnet Stickers"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:30
-#, fuzzy
-msgid "General Labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:32
-msgid "Inkjet/Laser Labels 70x37mm"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:38
-msgid "Mailing Labels-2 columns"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:40
-msgid "Mailing Labels-3 columns"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:44
-#: ../templates/zweckform-iso-templates.xml.h:24
-msgid "Rectangular Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:46
-#, fuzzy
-msgid "Universal Labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:48
-msgid "Video Labels (face only)"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/misc-other-templates.xml.h:2
-#, fuzzy
-msgid "Multi-Purpose Labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:4
-#, fuzzy
-msgid "Address Labels (STAMPIT)"
-msgstr "Rozpocznij od etykiety"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:6
-#, fuzzy
-msgid "Bottle labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:10
-msgid "Business cards glossy, both sides printable"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:12
-msgid "Business cards high glossy"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:14
-msgid "Business cards punched"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:16
-msgid "Business cards punched dull"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:18
-msgid "Business cards punched glossy"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:22
-#, fuzzy
-msgid "Floppy disk labels"
-msgstr "Rozpocznij od etykiety"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:24
-msgid "Foldable business cards"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:26
-msgid "Foldable business cards glossy/dull"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:28
-#, fuzzy
-msgid "Labels A4"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:30
-#, fuzzy
-msgid "Labels A5"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:32
-#, fuzzy
-msgid "Labels A6"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:34
-msgid "Membership cards"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:36
-msgid "Membership cards, both sides printable"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:38
-msgid "Name plates"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:40
-msgid "Passport photo labels glossy"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:42
-#, fuzzy
-msgid "Photo labels"
-msgstr "Rozpocznij od etykiety"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:44
-msgid "Photo labels semiglossy"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:48
-#, fuzzy
-msgid "SD card labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:50
-msgid "Self-adhesive film transparent"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:52
-msgid "Self-adhesive film weatherproof"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:54
-#, fuzzy
-msgid "Self-adhesive labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:56
-msgid "Self-adhesive window film"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:10
-msgid "Correction and Cover-up Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:12
-#, fuzzy
-msgid "File Back Labels"
-msgstr "Etykiety"
-
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:14
-msgid "Lever Arch File Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:18
-msgid "Multi-purpose Stick+Lift Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:20
-msgid "QSL-Karten Etiketten 70mm x 50,8mm"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:22
-msgid "Rectangular Copier Labels"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:26
-msgid "Video Labels (back)"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Text file with comma delimeters (CSV)"
-#~ msgstr "Tekst oddzielony przecinkami (CSV)"
-
-#, fuzzy
-#~ msgid "Text file with colon delimeters"
-#~ msgstr "Tekst oddzielany dwukropkami"
-
-#, fuzzy
-#~ msgid "Text file with tab delimeters"
-#~ msgstr "Tekst oddzielony tabulacjami"
-
-#, fuzzy
-#~ msgid "<b>Media type</b>"
-#~ msgstr "Typ no¶nika"
-
-#, fuzzy
-#~ msgid "<b>Label orientation</b>"
-#~ msgstr "U³o¿enie etykiety"
-
-#~ msgid "%s x %s %s"
-#~ msgstr "%s x %s %s"
-
-#~ msgid "%.5g x %.5g %s"
-#~ msgstr "%.5g x %.5g %s"
-
-#, fuzzy
-#~ msgid "<b>Copies</b>"
-#~ msgstr "Kopie"
-
-#~ msgid "print this message"
-#~ msgstr "wy¶wietla ten komunikat"
-
-#~ msgid "print the version of glabels-batch being used"
-#~ msgstr "wy¶wietla aktualnie u¿ywan± wersjê glabel-batch"
-
-#~ msgid "[OPTION...] GLABELS_FILE..."
-#~ msgstr "[OPCJA...] PLIK_GLABELS..."
-
-#~ msgid "missing glabels file\n"
-#~ msgstr "brak pliku glabels\n"
-
-#~ msgid "Open"
-#~ msgstr "Otwórz"
-
-#, fuzzy
-#~ msgid "_Delete"
-#~ msgstr "Usuñ"
-
-#, fuzzy
-#~ msgid "P_rinter"
-#~ msgstr "Wydrukuj"
-
-#~ msgid "Print preview"
-#~ msgstr "Podgl±d wydruku"
-
-#, fuzzy
-#~ msgid "magenta"
-#~ msgstr "Obraz"
-
-#, fuzzy
-#~ msgid "No paper files found!"
-#~ msgstr "Nie znaleziono pliku szablonu!"
-
-#, fuzzy
-#~ msgid "Customize"
-#~ msgstr "W³asny klucz pola"
-
-#, fuzzy
-#~ msgid "Font selector"
-#~ msgstr "Usuwa wszelkie zaznaczenia"
-
-#, fuzzy
-#~ msgid "New"
-#~ msgstr "_Nowa"
-
-#, fuzzy
-#~ msgid "Object property editor"
-#~ msgstr "W³a¶ciwo¶ci tekstu"
-
-#, fuzzy
-#~ msgid "Pr_eferences..."
-#~ msgstr "Glabels: Preferencje"
-
-#, fuzzy
-#~ msgid "Properties"
-#~ msgstr "W³a¶ciwo¶ci tekstu"
-
-#, fuzzy
-#~ msgid "Save"
-#~ msgstr "Zapisz jako"
-
-#~ msgid "Save As"
-#~ msgstr "Zapisz jako"
-
-#, fuzzy
-#~ msgid "Select _All"
-#~ msgstr "O_dznacz wszystko"
-
-#, fuzzy
-#~ msgid "U_n-select All"
-#~ msgstr "O_dznacz wszystko"
-
-#, fuzzy
-#~ msgid "_Merge Properties..."
-#~ msgstr "W³a¶ciwo¶ci z³±czania"
-
-#, fuzzy
-#~ msgid "Object _Properties..."
-#~ msgstr "W³a¶ciwo¶ci tekstu"
-
-#~ msgid "Display units"
-#~ msgstr "Jednostki wy¶wietlania"
-
-#~ msgid "Outline"
-#~ msgstr "Ramka"
-
-#~ msgid "Edit line object properties"
-#~ msgstr "Modyfikacja w³a¶ciwo¶ci linii"
-
-#~ msgid "Edit text object properties"
-#~ msgstr "Modyfikacja w³a¶ciowo¶ci tekstu"
-
-#~ msgid "Maintain current aspect ratio"
-#~ msgstr "Utrzymywanie aktualnych proporcji"
-
-#, fuzzy
-#~ msgid "Open %s"
-#~ msgstr "Otwórz"
-
-#~ msgid "Revert to saved copy of %s?"
-#~ msgstr "Przywróciæ zapisan± kopiê pliku %s?"
-
-#~ msgid "Unknown media type. Using default."
-#~ msgstr "Nieznany typ no¶nika. U¿yto warto¶ci domy¶lnych."
-
-#~ msgid ""
-#~ "``%s'' has been modified.\n"
-#~ "\n"
-#~ "Do you wish to save it?"
-#~ msgstr ""
-#~ "Plik \"%s\" zosta³ zmodyfikowany.\n"
-#~ "\n"
-#~ "Czy chcesz go zapisaæ?"
-
-#~ msgid "Close / Save label as"
-#~ msgstr "Zamyka / Zapisuje etykietê jako"
-
-#~ msgid "Label no longer valid!"
-#~ msgstr "Etykieta nie jest ju¿ poprawna!"
-
-#~ msgid "Error writing file"
-#~ msgstr "B³±d podczas zapisu pliku"
-
-#~ msgid "Edit properties..."
-#~ msgstr "Modyfikuj w³a¶ciwo¶ci..."
-
-#~ msgid "Appearance"
-#~ msgstr "Wygl±d"
-
-#~ msgid "Position/Size"
-#~ msgstr "Pozycja/Rozmiar"
-
-#~ msgid "Image format not currently supported"
-#~ msgstr "Format obrazu aktualnie nie jest obs³ugiwany"
-
-#~ msgid "Show text with barcode"
-#~ msgstr "Wy¶wietlanie tekstu z kodem paskowym"
-
-#~ msgid "Column"
-#~ msgstr "Kolumna"
-
-#~ msgid "Make a new, empty label"
-#~ msgstr "Tworzy now±, pust± etykietê"
-
-#~ msgid "  New   "
-#~ msgstr "  Nowa  "
-
-#~ msgid "New Label/Card"
-#~ msgstr "Nowa Etykieta/Karta"
-
-#~ msgid "  Open  "
-#~ msgstr "  Otwórz  "
-
-#~ msgid "  Save  "
-#~ msgstr "  Zapisz  "
-
-#~ msgid " Print  "
-#~ msgstr " Wydrukuj  "
-
-#~ msgid "Function is not implemented!"
-#~ msgstr "Funkcja nie jest zaimplementowana!"
index 1d0cb5ea66a7e20e5b599eb04e94c0adca11bcc3..8d049eef7f4ca3491a5fe456ebe2e0d1a4577b61 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the glabels package.
 #
 # Andrej Žnidaršič <andrej.znidarsic@gmail.com>, 2009-2010.
-# Matej Urbančič <mateju@svn.gnome.org>, 2012-2013.
+# Matej Urbančič <mateju@svn.gnome.org>, 2012-2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels master\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n"
-"POT-Creation-Date: 2013-10-13 14:06+0000\n"
-"PO-Revision-Date: 2013-10-13 23:48+0100\n"
+"POT-Creation-Date: 2014-03-21 18:43+0000\n"
+"PO-Revision-Date: 2014-03-21 21:31+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenščina <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
@@ -2391,6 +2391,10 @@ msgid ""
 "to work with various laser/ink-jet peel-off label and business card sheets "
 "that you'll find at most office supply stores."
 msgstr ""
+"gLabels je program za ustvarjanje nalepk in vizitk. Zasnovan je kot "
+"združljiv z različnimi vnaprej pripravljenimi nalepkami in vizitkami za "
+"laserske in brizgalne tiskalnike, ki jih najdete v večini trgovin s "
+"pisarniškim materialom."
 
 #: ../data/appdata/glabels-3.appdata.xml.in.h:2
 msgid ""
@@ -2401,6 +2405,12 @@ msgid ""
 "lets you print a unique label for each record from an external data source, "
 "such as a CSV file or an Evolution address book."
 msgstr ""
+"gLabels lahko uporabimo za oblikovanje nalepk za naslove, imenskih oznak, "
+"cen, nalepk za zgoščenke oziroma za vse, kar je razporejeno po določenem "
+"vzorcu na list papirja. Nalepke (ali vizitke) lahko vsebujejo besedilo, "
+"slike, črte, like in črtne kode. gLabels vsebuje tudi možnost spajanja "
+"dokumentov, ki omogoča tiskanje posebne nalepke za vsak zapis v zunanjem "
+"viru podatkov, kot je datoteka CSV ali adresar Evolution."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:1
 msgid "Show/hide main toolbar."
@@ -3130,6 +3140,12 @@ msgstr "Večnamenske nalepke 17mm x 54mm"
 msgid "Standard Address Labels 38mm x 90mm"
 msgstr "Običajne nalepke naslovov 38mm x 90mm"
 
+#. ===================================================================
+#: ../templates/canon-other-templates.xml.h:2
+#| msgid "CD/DVD Labels"
+msgid "CD/DVD Tray"
+msgstr "Pladenj CD/DVD"
+
 #. ===================================================================
 #: ../templates/databecker-iso-templates.xml.h:4
 msgid "CD/DVD Labels Standard Format (face only)"
index d988c5fe1538543518b9d09da1abe6cde807006f..6287052a08b2e9ebfb2f57d155dce59069b6054f 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,13 +1,14 @@
 # Serbian translation for glabels.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2012—2014.
 # Copyright (C) 2012 glabels's COPYRIGHT HOLDER
 # This file is distributed under the same license as the glabels package.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2012.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2012—2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: glabels glabels-3_0\n"
+"Project-Id-Version: glabels glabels-3_2\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n"
-"POT-Creation-Date: 2012-02-26 18:28+0000\n"
-"PO-Revision-Date: 2012-03-04 14:14+0200\n"
+"POT-Creation-Date: 2014-02-11 12:42+0000\n"
+"PO-Revision-Date: 2014-03-24 10:21+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@@ -16,6 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Project-Style: gnome\n"
 
 #: ../src/bc-backends.c:81
 msgid "Built-in"
@@ -131,11 +133,11 @@ msgstr "Шифра 128Б"
 
 #: ../src/bc-backends.c:187 ../src/bc-backends.c:329
 msgid "Interleaved 2 of 5"
-msgstr ""
+msgstr "Преплетено 2 од 5"
 
 #: ../src/bc-backends.c:190 ../src/bc-backends.c:224
 msgid "Codabar"
-msgstr ""
+msgstr "Кодабар"
 
 #: ../src/bc-backends.c:193
 msgid "MSI"
@@ -143,7 +145,7 @@ msgstr "МСИ"
 
 #: ../src/bc-backends.c:196
 msgid "Plessey"
-msgstr ""
+msgstr "Плеси"
 
 #: ../src/bc-backends.c:199 ../src/bc-backends.c:257
 msgid "Code 93"
@@ -155,23 +157,23 @@ msgstr "Стандард аустралијске поште"
 
 #: ../src/bc-backends.c:209
 msgid "Australia Post Reply Paid"
-msgstr ""
+msgstr "Плаћен одговор аустралијске поште"
 
 #: ../src/bc-backends.c:212
 msgid "Australia Post Route Code"
-msgstr ""
+msgstr "Шифра достављања аустралијске поште"
 
 #: ../src/bc-backends.c:215
 msgid "Australia Post Redirect"
-msgstr ""
+msgstr "Преусмеравање аустралијске поште"
 
 #: ../src/bc-backends.c:218
 msgid "Aztec Code"
-msgstr "ШиÑ\84Ñ\80а Ð\90Ñ\86Ñ\82ек"
+msgstr "Ð\90Ñ\81Ñ\82еÑ\88ка Ñ\88иÑ\84Ñ\80а"
 
 #: ../src/bc-backends.c:221
 msgid "Aztec Rune"
-msgstr ""
+msgstr "Астешке руне"
 
 #: ../src/bc-backends.c:227
 msgid "Code One"
@@ -219,15 +221,15 @@ msgstr "Матрица података"
 
 #: ../src/bc-backends.c:272
 msgid "Deutsche Post Leitcode"
-msgstr ""
+msgstr "Шифра вођења немачке поште"
 
 #: ../src/bc-backends.c:275
 msgid "Deutsche Post Identcode"
-msgstr ""
+msgstr "Шифра препознавања немачке поште"
 
 #: ../src/bc-backends.c:278
 msgid "Dutch Post KIX Code"
-msgstr ""
+msgstr "Шифра КИКс немачке поште"
 
 #: ../src/bc-backends.c:281
 msgid "EAN"
@@ -235,7 +237,7 @@ msgstr "ЕАН"
 
 #: ../src/bc-backends.c:284
 msgid "Grid Matrix"
-msgstr ""
+msgstr "Матрица мреже"
 
 #: ../src/bc-backends.c:287
 msgid "GS1-128"
@@ -243,19 +245,19 @@ msgstr "ГС1-128"
 
 #: ../src/bc-backends.c:290
 msgid "GS1 DataBar-14"
-msgstr "Ð\93С1 Ð¢Ñ\80акаÐ\9fодатака-14"
+msgstr "Ð\93С1 Ð¢Ñ\80аке Ð¿одатака-14"
 
 #: ../src/bc-backends.c:299
 msgid "GS1 DataBar-14 Stacked"
-msgstr ""
+msgstr "ГС1 Траке података-14 наслагано"
 
 #: ../src/bc-backends.c:302
 msgid "GS1 DataBar-14 Stacked Omni."
-msgstr ""
+msgstr "ГС1 Траке података-14 наслагано омни."
 
 #: ../src/bc-backends.c:305
 msgid "GS1 DataBar Extended Stacked"
-msgstr ""
+msgstr "ГС1 Траке података проширено наслагано"
 
 #: ../src/bc-backends.c:308
 msgid "HIBC Code 128"
@@ -283,7 +285,7 @@ msgstr "ХИБЦ Микро ПДФ417"
 
 #: ../src/bc-backends.c:326
 msgid "HIBC Aztec Code"
-msgstr ""
+msgstr "ХИБЦ астешка шифра"
 
 #: ../src/bc-backends.c:335
 msgid "ITF-14"
@@ -315,7 +317,7 @@ msgstr "Микро КуР шифра"
 
 #: ../src/bc-backends.c:356
 msgid "MSI Plessey"
-msgstr ""
+msgstr "МСИ Плеси"
 
 #: ../src/bc-backends.c:359
 msgid "NVE-18"
@@ -327,7 +329,7 @@ msgstr "ПДФ417"
 
 #: ../src/bc-backends.c:365
 msgid "PDF417 Truncated"
-msgstr ""
+msgstr "ПДФ417 скраћени"
 
 #: ../src/bc-backends.c:368
 msgid "PLANET"
@@ -339,15 +341,15 @@ msgstr "ПостНет"
 
 #: ../src/bc-backends.c:374
 msgid "Pharmacode"
-msgstr ""
+msgstr "Фармацеутска шифра"
 
 #: ../src/bc-backends.c:377
 msgid "Pharmacode 2-track"
-msgstr ""
+msgstr "Фармацеутска шифра 2-трага"
 
 #: ../src/bc-backends.c:380
 msgid "Pharmazentral Nummer (PZN)"
-msgstr ""
+msgstr "Фармацеутски средишњи број (ПЗН)"
 
 #: ../src/bc-backends.c:383
 msgid "QR Code"
@@ -355,15 +357,15 @@ msgstr "КуР шифра"
 
 #: ../src/bc-backends.c:386
 msgid "Royal Mail 4-State"
-msgstr ""
+msgstr "Шифра Краљевске поште са 4-стања"
 
 #: ../src/bc-backends.c:389
 msgid "Telepen"
-msgstr ""
+msgstr "Телепен"
 
 #: ../src/bc-backends.c:392
 msgid "Telepen Numeric"
-msgstr ""
+msgstr "Телепен бројевни"
 
 #: ../src/bc-backends.c:401
 msgid "USPS One Code"
@@ -371,7 +373,7 @@ msgstr "Шифра УСПС један"
 
 #: ../src/bc-backends.c:404
 msgid "UK Plessey"
-msgstr ""
+msgstr "Британски Плеси"
 
 #: ../src/bc-backends.c:411
 msgid "IEC16022 (DataMatrix)"
@@ -395,7 +397,7 @@ msgstr "Браон"
 
 #: ../src/color-combo-menu.c:85
 msgid "Dark Goldenrod"
-msgstr ""
+msgstr "Тамнозлатна"
 
 #: ../src/color-combo-menu.c:86
 msgid "Dark Green"
@@ -403,11 +405,11 @@ msgstr "Тамнозелена"
 
 #: ../src/color-combo-menu.c:87
 msgid "Dark Cyan"
-msgstr ""
+msgstr "Тамноцијан"
 
 #: ../src/color-combo-menu.c:88
 msgid "Navy Blue"
-msgstr ""
+msgstr "Морскоплава"
 
 #: ../src/color-combo-menu.c:89
 msgid "Dark Violet"
@@ -427,7 +429,7 @@ msgstr "Тамножута"
 
 #: ../src/color-combo-menu.c:94
 msgid "Medium green"
-msgstr ""
+msgstr "Средње зелена"
 
 #: ../src/color-combo-menu.c:95
 msgid "Turquoise"
@@ -443,7 +445,7 @@ msgstr "Љубичаста"
 
 #: ../src/color-combo-menu.c:99
 msgid "Salmon"
-msgstr ""
+msgstr "Ружичастожута"
 
 #: ../src/color-combo-menu.c:100
 msgid "Gold"
@@ -491,11 +493,11 @@ msgstr "Светлотиркизна"
 
 #: ../src/color-combo-menu.c:112
 msgid "Slate Gray"
-msgstr ""
+msgstr "Сиви шкриљац"
 
 #: ../src/color-combo-menu.c:113
 msgid "Thistle"
-msgstr ""
+msgstr "Јарко розе"
 
 #: ../src/color-combo-menu.c:115
 msgid "White"
@@ -541,13 +543,13 @@ msgstr "Произвољна боја #%u"
 
 #: ../src/critical-error-handler.c:70
 msgid "gLabels Fatal Error!"
-msgstr ""
+msgstr "Кобна грешка Гномових налепница!"
 
 #: ../src/file.c:84
 msgid "New Label or Card"
 msgstr "Нова налепница или позивница"
 
-#: ../src/file.c:175 ../src/label.c:601 ../src/label.c:645
+#: ../src/file.c:175 ../src/label.c:602 ../src/label.c:646
 msgid "Label properties"
 msgstr "Својства налепнице"
 
@@ -701,15 +703,15 @@ msgstr "прва"
 
 #: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print outlines (to test printer alignment)"
-msgstr ""
+msgstr "штампа контуре (зарад испробавања поравнања штампача)"
 
 #: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
-msgstr ""
+msgstr "штампа обрнуто (нпр. одраз у огледалу)"
 
 #: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print crop marks"
-msgstr ""
+msgstr "штампа ознаке исецања"
 
 #: ../src/glabels-batch.c:67
 msgid "input file for merging"
@@ -736,7 +738,8 @@ msgstr ""
 #: ../src/glabels-batch.c:151
 #, c-format
 msgid "cannot perform document merge with glabels file %s\n"
-msgstr "не могу да извршим стапање документа са датотеком гномових налепница „%s“\n"
+msgstr ""
+"не могу да извршим стапање документа са датотеком гномових налепница „%s“\n"
 
 #: ../src/glabels-batch.c:186
 #, c-format
@@ -772,93 +775,93 @@ msgid "Create box object"
 msgstr "Направите четворострани објекат"
 
 #: ../src/label-box.c:230 ../src/label-ellipse.c:232
-#: ../data/ui/property-bar.ui.h:9
+#: ../data/ui/property-bar.ui.h:12
 msgid "Fill color"
 msgstr "Боја попуњавања"
 
 #: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
-#: ../data/ui/property-bar.ui.h:10
+#: ../data/ui/property-bar.ui.h:13
 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:11
+#: ../data/ui/property-bar.ui.h:14
 msgid "Line width"
 msgstr "Ширина линије"
 
-#: ../src/label.c:405
+#: ../src/label.c:406
 msgid "Untitled"
 msgstr "Без наслова"
 
-#: ../src/label.c:719 ../src/ui.c:420
+#: ../src/label.c:720 ../src/ui.c:420
 msgid "Merge properties"
 msgstr "Својства стапања"
 
-#: ../src/label.c:1215 ../src/ui.c:213
+#: ../src/label.c:1216 ../src/ui.c:213
 msgid "Delete"
 msgstr "Обриши"
 
-#: ../src/label.c:1248 ../src/ui.c:322
+#: ../src/label.c:1251 ../src/ui.c:322
 msgid "Bring to front"
 msgstr "Изнад свега"
 
-#: ../src/label.c:1284 ../src/ui.c:329
+#: ../src/label.c:1287 ../src/ui.c:329
 msgid "Send to back"
 msgstr "Пошаљи у позадину"
 
-#: ../src/label.c:1325
+#: ../src/label.c:1328
 msgid "Rotate"
 msgstr "Окрени"
 
-#: ../src/label.c:1360 ../src/ui.c:336
+#: ../src/label.c:1363 ../src/ui.c:336
 msgid "Rotate left"
 msgstr "Окрени на лево"
 
-#: ../src/label.c:1393 ../src/ui.c:343
+#: ../src/label.c:1396 ../src/ui.c:343
 msgid "Rotate right"
 msgstr "Окрени на десно"
 
-#: ../src/label.c:1428 ../src/ui.c:350
+#: ../src/label.c:1431 ../src/ui.c:350
 msgid "Flip horizontally"
 msgstr "Изврни водоравно"
 
-#: ../src/label.c:1463 ../src/ui.c:357
+#: ../src/label.c:1466 ../src/ui.c:357
 msgid "Flip vertically"
 msgstr "Изврни усправно"
 
-#: ../src/label.c:1503 ../src/ui.c:364
+#: ../src/label.c:1506 ../src/ui.c:364
 msgid "Align left"
 msgstr "Поравнај на лево"
 
-#: ../src/label.c:1560 ../src/ui.c:378
+#: ../src/label.c:1563 ../src/ui.c:378
 msgid "Align right"
 msgstr "Поравнај на десно"
 
-#: ../src/label.c:1621
+#: ../src/label.c:1624
 msgid "Align horizontal center"
 msgstr "Водоравно поравнај по средини"
 
-#: ../src/label.c:1697
+#: ../src/label.c:1700
 msgid "Align tops"
 msgstr "Поравнај по горњој ивици"
 
-#: ../src/label.c:1754
+#: ../src/label.c:1757
 msgid "Align bottoms"
 msgstr "Поравнај по доњој ивици"
 
-#: ../src/label.c:1815
+#: ../src/label.c:1818
 msgid "Align vertical center"
 msgstr "Усправно поравнај по средини"
 
-#: ../src/label.c:1893 ../src/ui.c:406
+#: ../src/label.c:1896 ../src/ui.c:406
 msgid "Center horizontally"
 msgstr "Водоравно центрирано"
 
-#: ../src/label.c:1940 ../src/ui.c:413
+#: ../src/label.c:1943 ../src/ui.c:413
 msgid "Center vertically"
 msgstr "Усправно центрирано"
 
-#: ../src/label.c:2628 ../src/label.c:2670 ../src/label.c:2696 ../src/ui.c:206
+#: ../src/label.c:2664 ../src/label.c:2706 ../src/label.c:2732 ../src/ui.c:206
 msgid "Paste"
 msgstr "Убаци"
 
@@ -866,11 +869,11 @@ msgstr "Убаци"
 msgid "Create ellipse object"
 msgstr "Направи елипсу"
 
-#: ../src/label-image.c:200 ../src/ui.c:310
+#: ../src/label-image.c:199 ../src/ui.c:310
 msgid "Create image object"
 msgstr "Направите сликовни објекат"
 
-#: ../src/label-image.c:333 ../src/label-image.c:474
+#: ../src/label-image.c:332 ../src/label-image.c:473
 msgid "Set image"
 msgstr "Подеси слику"
 
@@ -878,67 +881,71 @@ msgstr "Подеси слику"
 msgid "Create line object"
 msgstr "Направите линијски објекат"
 
-#: ../src/label-object.c:394 ../src/label-object.c:428
+#: ../src/label-object.c:392 ../src/label-object.c:423
 msgid "Move"
 msgstr "Премести"
 
-#: ../src/label-object.c:479
+#: ../src/label-object.c:474
 msgid "Resize"
 msgstr "Промени величину"
 
-#: ../src/label-object.c:1217
+#: ../src/label-object.c:1258
 msgid "Shadow state"
 msgstr "Стање сенке"
 
-#: ../src/label-object.c:1260
+#: ../src/label-object.c:1301
 msgid "Shadow offset"
 msgstr "Померај сенке"
 
-#: ../src/label-object.c:1308
+#: ../src/label-object.c:1349
 msgid "Shadow color"
 msgstr "Боја сенке"
 
-#: ../src/label-object.c:1351
+#: ../src/label-object.c:1392
 msgid "Shadow opacity"
 msgstr "Провидност сенке"
 
-#: ../src/label-text.c:281 ../src/ui.c:282
+#: ../src/label-text.c:293 ../src/ui.c:282
 msgid "Create text object"
 msgstr "Направите текстуални објекат"
 
-#: ../src/label-text.c:453
+#: ../src/label-text.c:467
 msgid "Typing"
 msgstr "Куцање"
 
-#: ../src/label-text.c:586 ../data/ui/property-bar.ui.h:1
+#: ../src/label-text.c:601 ../data/ui/property-bar.ui.h:1
 msgid "Font family"
 msgstr "Породица писма"
 
-#: ../src/label-text.c:624 ../data/ui/property-bar.ui.h:2
+#: ../src/label-text.c:639 ../data/ui/property-bar.ui.h:2
 msgid "Font size"
 msgstr "Величина писма"
 
-#: ../src/label-text.c:657
+#: ../src/label-text.c:672
 msgid "Font weight"
 msgstr "Тежина писма"
 
-#: ../src/label-text.c:690 ../data/ui/property-bar.ui.h:4
+#: ../src/label-text.c:705 ../data/ui/property-bar.ui.h:4
 msgid "Italic"
 msgstr "Искошено"
 
-#: ../src/label-text.c:723
+#: ../src/label-text.c:738
 msgid "Align text"
 msgstr "Поравнај текст"
 
-#: ../src/label-text.c:756
+#: ../src/label-text.c:771
+msgid "Vertically align text"
+msgstr "Усправно поравнај текст"
+
+#: ../src/label-text.c:804
 msgid "Line spacing"
 msgstr "Размак линија"
 
-#: ../src/label-text.c:789 ../data/ui/property-bar.ui.h:8
+#: ../src/label-text.c:837 ../data/ui/property-bar.ui.h:11
 msgid "Text color"
 msgstr "Боја текста"
 
-#: ../src/label-text.c:933
+#: ../src/label-text.c:997
 msgid "Auto shrink"
 msgstr "Сам смањи"
 
@@ -984,7 +991,8 @@ msgstr "Нема подударања."
 
 #: ../src/media-select.c:1085
 msgid "Try selecting a different brand, page size or category."
-msgstr "Покушајте да изаберете другачију марку, величину папира или категорију."
+msgstr ""
+"Покушајте да изаберете другачију марку, величину папира или категорију."
 
 #: ../src/media-select.c:1179
 msgid "No custom templates found."
@@ -1062,9 +1070,9 @@ msgstr "Изабери"
 
 #: ../src/merge-properties-dialog.c:348
 msgid "Record/Field"
-msgstr ""
+msgstr "Запис/Поље"
 
-#: ../src/merge-properties-dialog.c:356 ../data/ui/object-editor.ui.h:23
+#: ../src/merge-properties-dialog.c:356 ../data/ui/object-editor.ui.h:24
 msgid "Data"
 msgstr "Подаци"
 
@@ -1077,25 +1085,25 @@ msgid "Fixed"
 msgstr "Стално"
 
 #. Translators: "Up" refers to the direction towards the top of a label.
-#: ../src/mini-preview.c:1054
+#: ../src/mini-preview.c:1051
 msgid "Up"
 msgstr "Горе"
 
-#: ../src/new-label-dialog.c:203
+#: ../src/new-label-dialog.c:212 ../data/ui/new-label-dialog.ui.h:1
 msgid "Select Product"
 msgstr "Изабери пројекат"
 
-#: ../src/new-label-dialog.c:215
+#: ../src/new-label-dialog.c:225 ../data/ui/new-label-dialog.ui.h:3
 msgid "Choose Orientation"
 msgstr "Изабери усмерење"
 
-#: ../src/new-label-dialog.c:229
+#: ../src/new-label-dialog.c:240
 msgid "Review"
 msgstr "Преглед"
 
 #: ../src/object-editor-bc-page.c:97 ../src/object-editor-shadow-page.c:93
-#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:335
-#: ../src/ui-property-bar.c:277
+#: ../src/object-editor-text-page.c:102 ../src/prefs-dialog.c:335
+#: ../src/ui-property-bar.c:289
 msgid "Default"
 msgstr "Основно"
 
@@ -1105,34 +1113,34 @@ msgstr "Својства објекта"
 
 #: ../src/object-editor.c:314
 msgid "Box object properties"
-msgstr ""
+msgstr "Својства објекта квадрата"
 
 #: ../src/object-editor.c:333
 msgid "Ellipse object properties"
-msgstr ""
+msgstr "Својства објекта елипсе"
 
 #: ../src/object-editor.c:352
 msgid "Line object properties"
-msgstr ""
+msgstr "Својства објекта линије"
 
 #: ../src/object-editor.c:369
 msgid "Image object properties"
-msgstr ""
+msgstr "Својства објекта слике"
 
 #: ../src/object-editor.c:386
 msgid "Text object properties"
-msgstr ""
+msgstr "Својства објекта текста"
 
 #: ../src/object-editor.c:408
 msgid "Barcode object properties"
-msgstr ""
+msgstr "Својства објекта квадрата"
 
 #: ../src/object-editor-edit-page.c:76
 msgid "Insert merge field"
-msgstr ""
+msgstr "Уметни поље стапања"
 
 #: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:341
-#: ../src/ui-property-bar.c:287
+#: ../src/ui-property-bar.c:299
 msgid "No Fill"
 msgstr "Без испуњавања"
 
@@ -1150,7 +1158,7 @@ msgid "%s (*.%s)"
 msgstr "%s (*.%s)"
 
 #: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:338
-#: ../src/ui-property-bar.c:297
+#: ../src/ui-property-bar.c:309
 msgid "No Line"
 msgstr "Без линије"
 
@@ -1264,7 +1272,7 @@ msgstr "П_оредак"
 
 #: ../src/ui.c:101
 msgid "_Rotate/Flip"
-msgstr ""
+msgstr "_Заокрени/Преврни"
 
 #: ../src/ui.c:102
 msgid "_Alignment"
@@ -1464,7 +1472,7 @@ msgstr "Квадрат"
 msgid "Create box/rectangle object"
 msgstr "Направите квадратни/правоугаони објекат"
 
-#: ../src/ui.c:294 ../data/ui/object-editor.ui.h:16
+#: ../src/ui.c:294 ../data/ui/object-editor.ui.h:17
 #: ../data/ui/prefs-dialog.ui.h:20
 msgid "Line"
 msgstr "Линија"
@@ -1477,13 +1485,13 @@ msgstr "Елипса"
 msgid "Create ellipse/circle object"
 msgstr "Направите елипсоидни/кружни објекат"
 
-#: ../src/ui.c:308 ../data/ui/object-editor.ui.h:19
+#: ../src/ui.c:308 ../data/ui/object-editor.ui.h:20
 msgid "Image"
 msgstr "Слика"
 
 #: ../src/ui.c:315
 msgid "Barcode"
-msgstr "ТÑ\80акаÑ\81Ñ\82и ÐºÐ¾Ì\82д"
+msgstr "ТÑ\80акаÑ\81Ñ\82а Ñ\88иÑ\84Ñ\80а"
 
 #: ../src/ui.c:324
 msgid "Raise object to top"
@@ -1519,47 +1527,47 @@ msgstr "Усредишти"
 
 #: ../src/ui.c:373
 msgid "Align objects to horizontal centers"
-msgstr ""
+msgstr "Поравнајте објекте на водоравно средиште"
 
 #: ../src/ui.c:380
 msgid "Align objects to right edges"
-msgstr ""
+msgstr "Поравнајте објекте на десну ивицу"
 
 #: ../src/ui.c:385
 msgid "Align top"
-msgstr ""
+msgstr "Поравнај горе"
 
 #: ../src/ui.c:387
 msgid "Align objects to top edges"
-msgstr ""
+msgstr "Поравнајте објекте на горњу ивицу"
 
 #: ../src/ui.c:392
 msgid "Align middle"
-msgstr ""
+msgstr "Поравнај по средини"
 
 #: ../src/ui.c:394
 msgid "Align objects to vertical centers"
-msgstr ""
+msgstr "Поравнајте објекте на усправна средишта"
 
 #: ../src/ui.c:399
 msgid "Align bottom"
-msgstr ""
+msgstr "Поравнај доле"
 
 #: ../src/ui.c:401
 msgid "Align objects to bottom edges"
-msgstr ""
+msgstr "Поравнајте објекте на доњу ивицу"
 
 #: ../src/ui.c:408
 msgid "Center objects to horizontal label center"
-msgstr ""
+msgstr "Поставите објекте на водоравно средиште налепнице"
 
 #: ../src/ui.c:415
 msgid "Center objects to vertical label center"
-msgstr ""
+msgstr "Поставите објекте на усправно средиште налепнице"
 
 #: ../src/ui.c:422
 msgid "Edit merge properties"
-msgstr ""
+msgstr "Уредите својства стапања"
 
 #: ../src/ui.c:429
 msgid "Contents"
@@ -1738,13 +1746,13 @@ msgstr "пречник"
 #. the CSS2 Specification (Section 4.3.2)
 #. This table must be sorted exactly as the enumerations in lglUnits
 #. [LGL_UNITS_POINT]
-#: ../libglabels/lgl-units.c:65 ../data/ui/object-editor.ui.h:14
+#: ../libglabels/lgl-units.c:65 ../data/ui/object-editor.ui.h:15
 #: ../data/ui/prefs-dialog.ui.h:19
 msgid "points"
 msgstr "тачака"
 
 #. [LGL_UNITS_INCH]
-#: ../libglabels/lgl-units.c:66 ../data/ui/object-editor.ui.h:27
+#: ../libglabels/lgl-units.c:66 ../data/ui/object-editor.ui.h:28
 #: ../data/ui/template-designer.ui.h:15
 msgid "inches"
 msgstr "инча"
@@ -1794,7 +1802,7 @@ msgstr "Одзначи све"
 
 #: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Record selection/preview"
-msgstr ""
+msgstr "Снимите избор/преглед"
 
 #: ../data/ui/media-select.ui.h:1
 msgid "Recent"
@@ -1804,7 +1812,7 @@ msgstr "Скорашње"
 msgid "Brand:"
 msgstr "Марка:"
 
-#: ../data/ui/media-select.ui.h:3 ../data/ui/new-label-dialog.ui.h:7
+#: ../data/ui/media-select.ui.h:3 ../data/ui/new-label-dialog.ui.h:10
 #: ../data/ui/template-designer.ui.h:12
 msgid "Page size:"
 msgstr "Величина странице"
@@ -1821,7 +1829,7 @@ msgstr "Тражи све"
 msgid "Custom"
 msgstr "Произвољно"
 
-#: ../data/ui/new-label-dialog.ui.h:1
+#: ../data/ui/new-label-dialog.ui.h:2
 msgid ""
 "Choose label or card product from hundreds of predefined templates or define "
 "your own."
@@ -1829,43 +1837,47 @@ msgstr ""
 "Изаберите налепницу или картицу из хиљаду унапред одређених шаблона или "
 "одредите вашу сопствену."
 
-#: ../data/ui/new-label-dialog.ui.h:2
+#: ../data/ui/new-label-dialog.ui.h:4
 msgid "Select orientation of label content."
 msgstr "Изаберите усмерење садржаја налепнице."
 
-#: ../data/ui/new-label-dialog.ui.h:3
+#: ../data/ui/new-label-dialog.ui.h:5
 msgid "Normal"
 msgstr "Нормално"
 
-#: ../data/ui/new-label-dialog.ui.h:4
+#: ../data/ui/new-label-dialog.ui.h:6
 msgid "Rotated"
 msgstr "Заокренуто"
 
-#: ../data/ui/new-label-dialog.ui.h:5
+#: ../data/ui/new-label-dialog.ui.h:7
+msgid "Review Selection"
+msgstr "Прегледај избор"
+
+#: ../data/ui/new-label-dialog.ui.h:8
 msgid "Please review and confirm your selection."
 msgstr "Молим прегледајте и потврдите ваш избор."
 
-#: ../data/ui/new-label-dialog.ui.h:6 ../data/ui/template-designer.ui.h:9
+#: ../data/ui/new-label-dialog.ui.h:9 ../data/ui/template-designer.ui.h:9
 msgid "Description:"
 msgstr "Опис:"
 
-#: ../data/ui/new-label-dialog.ui.h:8
+#: ../data/ui/new-label-dialog.ui.h:11
 msgid "Label size:"
 msgstr "Величина налепнице:"
 
-#: ../data/ui/new-label-dialog.ui.h:9
+#: ../data/ui/new-label-dialog.ui.h:12
 msgid "Layout:"
 msgstr "Распоред:"
 
-#: ../data/ui/new-label-dialog.ui.h:10
+#: ../data/ui/new-label-dialog.ui.h:13
 msgid "Similar products:"
 msgstr "Слични производи:"
 
-#: ../data/ui/new-label-dialog.ui.h:11 ../data/ui/template-designer.ui.h:6
+#: ../data/ui/new-label-dialog.ui.h:14 ../data/ui/template-designer.ui.h:6
 msgid "Part #:"
 msgstr "Део #:"
 
-#: ../data/ui/new-label-dialog.ui.h:12
+#: ../data/ui/new-label-dialog.ui.h:15
 msgid "Vendor:"
 msgstr "Продавац:"
 
@@ -1895,119 +1907,123 @@ msgstr " "
 
 #: ../data/ui/object-editor.ui.h:8
 msgid "key:"
-msgstr ""
+msgstr "кључ:"
 
 #: ../data/ui/object-editor.ui.h:9 ../data/ui/prefs-dialog.ui.h:15
 msgid "Alignment:"
 msgstr "Поравнање:"
 
-#: ../data/ui/object-editor.ui.h:10 ../data/ui/prefs-dialog.ui.h:16
+#: ../data/ui/object-editor.ui.h:10
+msgid "Vertical alignment:"
+msgstr "Усправно поравнање:"
+
+#: ../data/ui/object-editor.ui.h:11 ../data/ui/prefs-dialog.ui.h:16
 msgid "Line Spacing:"
 msgstr "Размак линија:"
 
-#: ../data/ui/object-editor.ui.h:11
+#: ../data/ui/object-editor.ui.h:12
 msgid "Allow merge to automatically shrink text"
 msgstr "Дозволи стапање зарад самоскупљања текста"
 
-#: ../data/ui/object-editor.ui.h:12
+#: ../data/ui/object-editor.ui.h:13
 msgid "Style"
 msgstr "Стил"
 
-#: ../data/ui/object-editor.ui.h:13 ../data/ui/prefs-dialog.ui.h:18
+#: ../data/ui/object-editor.ui.h:14 ../data/ui/prefs-dialog.ui.h:18
 #: ../data/ui/template-designer.ui.h:13
 msgid "Width:"
 msgstr "Ширина:"
 
-#: ../data/ui/object-editor.ui.h:15
+#: ../data/ui/object-editor.ui.h:16
 msgid "Key:"
 msgstr "Кључ:"
 
-#: ../data/ui/object-editor.ui.h:17 ../data/ui/prefs-dialog.ui.h:21
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:21
 msgid "Fill"
 msgstr "Попуна"
 
-#: ../data/ui/object-editor.ui.h:18
+#: ../data/ui/object-editor.ui.h:19
 msgid "File:"
 msgstr "Датотека:"
 
-#: ../data/ui/object-editor.ui.h:20
+#: ../data/ui/object-editor.ui.h:21
 msgid "Literal:"
 msgstr "Дословно:"
 
-#: ../data/ui/object-editor.ui.h:21
+#: ../data/ui/object-editor.ui.h:22
 msgid "format:"
 msgstr "облик:"
 
-#: ../data/ui/object-editor.ui.h:22
+#: ../data/ui/object-editor.ui.h:23
 msgid "digits:"
 msgstr "цифре:"
 
-#: ../data/ui/object-editor.ui.h:24
+#: ../data/ui/object-editor.ui.h:25
 msgid "Backend:"
 msgstr "Позадинац:"
 
-#: ../data/ui/object-editor.ui.h:25
+#: ../data/ui/object-editor.ui.h:26
 msgid "Checksum"
 msgstr "Сума провере"
 
-#: ../data/ui/object-editor.ui.h:26 ../data/ui/template-designer.ui.h:14
+#: ../data/ui/object-editor.ui.h:27 ../data/ui/template-designer.ui.h:14
 msgid "Height:"
 msgstr "Висина:"
 
-#: ../data/ui/object-editor.ui.h:28
+#: ../data/ui/object-editor.ui.h:29
 msgid "Reset image size"
 msgstr "Врати величину слике"
 
-#: ../data/ui/object-editor.ui.h:29
+#: ../data/ui/object-editor.ui.h:30
 msgid "Size"
 msgstr "Величина"
 
-#: ../data/ui/object-editor.ui.h:30
+#: ../data/ui/object-editor.ui.h:31
 msgid "Length:"
 msgstr "Дужина:"
 
-#: ../data/ui/object-editor.ui.h:31
+#: ../data/ui/object-editor.ui.h:32
 msgid "Angle:"
 msgstr "Угао:"
 
-#: ../data/ui/object-editor.ui.h:32
+#: ../data/ui/object-editor.ui.h:33
 msgid "degrees"
 msgstr "степени"
 
-#: ../data/ui/object-editor.ui.h:33
+#: ../data/ui/object-editor.ui.h:34
 msgid "X:"
 msgstr "Водоравно:"
 
-#: ../data/ui/object-editor.ui.h:34
+#: ../data/ui/object-editor.ui.h:35
 msgid "Y:"
 msgstr "Усправно:"
 
-#: ../data/ui/object-editor.ui.h:35
+#: ../data/ui/object-editor.ui.h:36
 msgid "Position"
 msgstr "Положај"
 
-#: ../data/ui/object-editor.ui.h:36
+#: ../data/ui/object-editor.ui.h:37
 msgid "Enable shadow"
 msgstr "Укључи сенке"
 
-#: ../data/ui/object-editor.ui.h:37
+#: ../data/ui/object-editor.ui.h:38
 msgid "X Offset:"
 msgstr "Водоравни померај:"
 
-#: ../data/ui/object-editor.ui.h:38
+#: ../data/ui/object-editor.ui.h:39
 msgid "Y Offset:"
 msgstr "Усправни померај:"
 
-#: ../data/ui/object-editor.ui.h:39
+#: ../data/ui/object-editor.ui.h:40
 msgid "Opacity:"
 msgstr "Непровидност:"
 
-#: ../data/ui/object-editor.ui.h:41
+#: ../data/ui/object-editor.ui.h:42
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: ../data/ui/object-editor.ui.h:42
+#: ../data/ui/object-editor.ui.h:43
 msgid "Shadow"
 msgstr "Сенка"
 
@@ -2079,6 +2095,18 @@ msgstr "Поравнајте по средини"
 msgid "Right align"
 msgstr "Поравнајте на десно"
 
+#: ../data/ui/property-bar.ui.h:8
+msgid "Top vertical align"
+msgstr "Поравнајте усправно горе"
+
+#: ../data/ui/property-bar.ui.h:9
+msgid "Center vertical align"
+msgstr "Поравнајте усправно по средини"
+
+#: ../data/ui/property-bar.ui.h:10
+msgid "Bottom vertical align"
+msgstr "Поравнајте усправно доле"
+
 #: ../data/ui/template-designer.ui.h:1
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
@@ -2350,12 +2378,40 @@ msgstr "Сложи"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:10
 msgid "Merge Control"
-msgstr ""
+msgstr "Споји контролу"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:14
 msgid "Options"
 msgstr "Могућности"
 
+#: ../data/appdata/glabels-3.appdata.xml.in.h:1
+msgid ""
+"gLabels is a program for creating labels and business cards. It is designed "
+"to work with various laser/ink-jet peel-off label and business card sheets "
+"that you'll find at most office supply stores."
+msgstr ""
+"Гномове налепнице је програм за стварање налепница и пословних картица. "
+"Осмишљен је да ради са разним листовима лепљивих налепница и пословних "
+"картица за ласерске и штампаче са бризгалицама које можете наћи у већини "
+"радњи канцеларијског прибора."
+
+#: ../data/appdata/glabels-3.appdata.xml.in.h:2
+msgid ""
+"gLabels can be used to design address labels, name tags, price tags, cd/dvd "
+"labels, or just about anything else that is organized in a regular pattern "
+"on a sheet of paper. Labels (or cards) can contain text, images, lines, "
+"shapes, and barcodes. gLabels also includes a document-merge feature which "
+"lets you print a unique label for each record from an external data source, "
+"such as a CSV file or an Evolution address book."
+msgstr ""
+"Гномове налепнице можете користити да направите налепнице за адресе, "
+"именике, ценовнике, цд/двд, или за било шта друго што је организовано у "
+"регуларном шаблону на листу папира. Налепнице (или картице) могу да садрже "
+"текст, слике, линије, облике, и тракасте шифре. Гномове налепнице такође "
+"укључују функцију стапања документа која вам допушта да штампате јединствену "
+"налепницу за свки снимак са спољног извора података, као што је ЦСВ датотека "
+"или адресар Еволуције."
+
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:1
 msgid "Show/hide main toolbar."
 msgstr "Приказује/скрива главну линију алата."
@@ -2390,11 +2446,11 @@ msgstr "Управља видљивошћу мреже."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:9
 msgid "Show/hide markup."
-msgstr ""
+msgstr "Прикажите/сакријте означавање."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:10
 msgid "Controls visibility of markup lines."
-msgstr ""
+msgstr "Управљаjте видљивошћу линија означавања."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:11
 msgid "Maximum recent files."
@@ -2446,11 +2502,11 @@ msgstr "Основна тежина писма за нове текстуалн
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:23
 msgid "Default font italic flag."
-msgstr ""
+msgstr "Опција основног искошеног писма."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:24
 msgid "The default font italic state for new text objects."
-msgstr ""
+msgstr "Основно стање искошеног писма за нове текстуалне објекте."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:25
 msgid "Default text color."
@@ -2610,7 +2666,7 @@ msgstr "Б3"
 
 #: ../templates/paper-sizes.xml.h:23
 msgid "B4"
-msgstr ""
+msgstr "Б4"
 
 #: ../templates/paper-sizes.xml.h:24
 msgid "B5"
@@ -2630,7 +2686,7 @@ msgstr "Б8"
 
 #: ../templates/paper-sizes.xml.h:28
 msgid "B9"
-msgstr ""
+msgstr "Б9"
 
 #: ../templates/paper-sizes.xml.h:29
 msgid "B10"
@@ -2707,18 +2763,21 @@ msgstr "Било која налепница"
 #: ../templates/categories.xml.h:2 ../templates/endisch-templates.xml.h:1
 #: ../templates/hama-iso-templates.xml.h:4
 #: ../templates/pearl-iso-templates.xml.h:4
+#: ../templates/rayfilm-templates.xml.h:8
 msgid "Round labels"
 msgstr "Заобљене налепнице"
 
 #. ===================================================================
 #: ../templates/categories.xml.h:3 ../templates/endisch-templates.xml.h:2
 #: ../templates/pearl-iso-templates.xml.h:58
+#: ../templates/rayfilm-templates.xml.h:9
 msgid "Elliptical labels"
 msgstr "Елипсоидне налепнице"
 
 #. ====================================================================
 #: ../templates/categories.xml.h:4 ../templates/endisch-templates.xml.h:4
 #: ../templates/hama-iso-templates.xml.h:41
+#: ../templates/rayfilm-templates.xml.h:2
 msgid "Square labels"
 msgstr "Четвртасте налепнице"
 
@@ -2726,11 +2785,14 @@ msgstr "Четвртасте налепнице"
 #. ====================================================================
 #. ===================================================================
 #. ********************************************************************
+#. ===================================================================
 #: ../templates/categories.xml.h:5 ../templates/ascom-iso-templates.xml.h:4
 #: ../templates/endisch-templates.xml.h:3
 #: ../templates/hama-iso-templates.xml.h:27
 #: ../templates/herma-iso-templates.xml.h:20
-#: ../templates/jac-iso-templates.xml.h:4
+#: ../templates/igepa-templates.xml.h:1 ../templates/jac-iso-templates.xml.h:4
+#: ../templates/rayfilm-templates.xml.h:1
+#: ../templates/sheetlabels-us-templates.xml.h:2
 msgid "Rectangular labels"
 msgstr "Правоугаоне налепнице"
 
@@ -2754,11 +2816,11 @@ msgstr "ЦД/ДВД или други медиј"
 
 #: ../templates/categories.xml.h:9
 msgid "Mailing/shipping products"
-msgstr ""
+msgstr "Поштански/доставни производи"
 
 #: ../templates/categories.xml.h:10
 msgid "Foldable cards"
-msgstr ""
+msgstr "Склопиве картице"
 
 #: ../templates/categories.xml.h:11
 msgid "Photo products"
@@ -2788,7 +2850,7 @@ msgstr "Правоугаоне налепнице"
 #: ../templates/meritline-us-templates.xml.h:18
 #: ../templates/worldlabel-us-templates.xml.h:11
 msgid "Video Tape Spine Labels"
-msgstr ""
+msgstr "Бочне налепнице видео трака"
 
 #. ===================================================================
 #. ===============================================================
@@ -2796,7 +2858,7 @@ msgstr ""
 #: ../templates/avery-iso-templates.xml.h:26
 #: ../templates/zweckform-iso-templates.xml.h:28
 msgid "CD Inlet"
-msgstr ""
+msgstr "ЦД уметак"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:2
@@ -2818,14 +2880,14 @@ msgstr "Велике заобљене налепнице"
 #: ../templates/avery-other-templates.xml.h:2
 #: ../templates/worldlabel-us-templates.xml.h:5
 msgid "File Folder Labels"
-msgstr ""
+msgstr "Налепнице за фасцикле докумената"
 
 #. ===================================================================
 #. ********************************************************************
 #: ../templates/avery-us-templates.xml.h:10
 #: ../templates/dataline-iso-templates.xml.h:10
 #: ../templates/meritline-us-templates.xml.h:6
-#: ../templates/sheetlabels-us-templates.xml.h:4
+#: ../templates/sheetlabels-us-templates.xml.h:6
 #: ../templates/uline-us-templates.xml.h:2
 #: ../templates/worldlabel-us-templates.xml.h:4
 msgid "Shipping Labels"
@@ -2842,7 +2904,7 @@ msgstr "Налепнице за доставу"
 #: ../templates/maco-us-templates.xml.h:2
 #: ../templates/meritline-us-templates.xml.h:4
 #: ../templates/pearl-iso-templates.xml.h:2
-#: ../templates/sheetlabels-us-templates.xml.h:2
+#: ../templates/sheetlabels-us-templates.xml.h:4
 #: ../templates/worldlabel-us-templates.xml.h:3
 #: ../templates/zweckform-iso-templates.xml.h:4
 msgid "Address Labels"
@@ -2853,7 +2915,7 @@ msgstr "Налепнице за адресе"
 #: ../templates/avery-us-templates.xml.h:14
 #: ../templates/dymo-other-templates.xml.h:6
 #: ../templates/meritline-us-templates.xml.h:8
-#: ../templates/sheetlabels-us-templates.xml.h:6
+#: ../templates/sheetlabels-us-templates.xml.h:8
 #: ../templates/worldlabel-us-templates.xml.h:2
 msgid "Return Address Labels"
 msgstr "Налепнице повратних адреса"
@@ -2863,7 +2925,7 @@ msgstr "Налепнице повратних адреса"
 #: ../templates/maco-us-templates.xml.h:3
 #: ../templates/meritline-us-templates.xml.h:12
 #: ../templates/misc-us-templates.xml.h:23
-#: ../templates/sheetlabels-us-templates.xml.h:8
+#: ../templates/sheetlabels-us-templates.xml.h:10
 #: ../templates/worldlabel-us-templates.xml.h:9
 msgid "Round Labels"
 msgstr "Заобљене налепнице"
@@ -2872,22 +2934,22 @@ msgstr "Заобљене налепнице"
 #: ../templates/avery-us-templates.xml.h:18
 #: ../templates/avery-iso-templates.xml.h:20
 #: ../templates/meritline-us-templates.xml.h:14
-#: ../templates/sheetlabels-us-templates.xml.h:14
+#: ../templates/sheetlabels-us-templates.xml.h:16
 #: ../templates/worldlabel-us-templates.xml.h:8
 msgid "Diskette Labels"
-msgstr ""
+msgstr "Дискетне налепнице"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:20
 msgid "Tent Cards"
-msgstr ""
+msgstr "Шатор картице"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:22
-#: ../templates/sheetlabels-us-templates.xml.h:10
+#: ../templates/sheetlabels-us-templates.xml.h:12
 #: ../templates/worldlabel-us-templates.xml.h:7
 msgid "Filing Labels"
-msgstr ""
+msgstr "Налепнице за одлагање докумената"
 
 #. ===================================================================
 #. ============================================================
@@ -2901,6 +2963,7 @@ msgstr ""
 #: ../templates/decadry-iso-templates.xml.h:6
 #: ../templates/misc-us-templates.xml.h:25
 #: ../templates/misc-iso-templates.xml.h:4
+#: ../templates/rayfilm-templates.xml.h:15
 #: ../templates/zweckform-iso-templates.xml.h:30
 msgid "Business Cards"
 msgstr "Пословне картице"
@@ -2908,7 +2971,7 @@ msgstr "Пословне картице"
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:26
 msgid "Index Cards"
-msgstr ""
+msgstr "Картице за пописивање"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:28
@@ -2918,7 +2981,7 @@ msgstr "Разгледнице"
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:30
 msgid "Name Badge Labels"
-msgstr ""
+msgstr "Налепнице за беџеве са именима"
 
 #. ===================================================================
 #. ===============================================================
@@ -2929,12 +2992,13 @@ msgstr ""
 #: ../templates/avery-iso-templates.xml.h:6
 #: ../templates/geha-iso-templates.xml.h:10
 #: ../templates/herma-iso-templates.xml.h:14
-#: ../templates/jac-iso-templates.xml.h:2
+#: ../templates/igepa-templates.xml.h:5 ../templates/jac-iso-templates.xml.h:2
 #: ../templates/misc-us-templates.xml.h:8
 #: ../templates/misc-iso-templates.xml.h:22
 #: ../templates/misc-other-templates.xml.h:2
 #: ../templates/pearl-iso-templates.xml.h:64
-#: ../templates/sheetlabels-us-templates.xml.h:12
+#: ../templates/rayfilm-templates.xml.h:10
+#: ../templates/sheetlabels-us-templates.xml.h:14
 #: ../templates/worldlabel-us-templates.xml.h:12
 #: ../templates/zweckform-iso-templates.xml.h:8
 msgid "CD/DVD Labels"
@@ -2942,20 +3006,20 @@ msgstr "ЦД/ДВД налепнице"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:34
-#: ../templates/sheetlabels-us-templates.xml.h:16
+#: ../templates/sheetlabels-us-templates.xml.h:18
 msgid "CD/DVD Labels (Disc Labels)"
 msgstr "ЦД/ДВД налепнице (налепнице за дискове)"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:36
 msgid "CD/DVD Labels (Spine Labels)"
-msgstr ""
+msgstr "ЦД/ДВД налепнице (налепнице за бокове)"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:38
 #: ../templates/geha-iso-templates.xml.h:17
 #: ../templates/meritline-us-templates.xml.h:16
-#: ../templates/sheetlabels-us-templates.xml.h:18
+#: ../templates/sheetlabels-us-templates.xml.h:20
 #: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Video Tape Face Labels"
 msgstr "Насловне налепнице видео трака"
@@ -2963,19 +3027,19 @@ msgstr "Насловне налепнице видео трака"
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:42
 msgid "ID Labels"
-msgstr ""
+msgstr "ИД налепнице"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:44
 #: ../templates/meritline-us-templates.xml.h:10
 #: ../templates/worldlabel-us-templates.xml.h:6
 msgid "Full Sheet Labels"
-msgstr ""
+msgstr "Налепнице на читавом листу"
 
 #. the LSK labels can be torn in half down the center
 #: ../templates/avery-us-templates.xml.h:46
 msgid "Divider Labels"
-msgstr ""
+msgstr "Налепнице за раздвајање"
 
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:2
@@ -2985,7 +3049,7 @@ msgstr "Мале налепнице"
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:4
 msgid "Self-Adhesive Name Badges (Acetate Silk)"
-msgstr ""
+msgstr "Самолепљиви беџеви са именима (ацетонска свила)"
 
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:8
@@ -3034,7 +3098,7 @@ msgstr "Малене налепнице за адресе"
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:30
 msgid "Identification Labels"
-msgstr ""
+msgstr "Налепнице за препознавање"
 
 #. ===================================================================
 #. ====================================================================
@@ -3062,24 +3126,30 @@ msgstr "Дискетне налепнице"
 #.
 #: ../templates/brother-other-templates.xml.h:18
 msgid "Standard Address Labels 29mm x 90mm"
-msgstr ""
+msgstr "Уобичајене налепнице за адресе 29mm x 90mm"
 
 #: ../templates/brother-other-templates.xml.h:19
 msgid "Shipping Labels 62mm x 100mm"
-msgstr ""
+msgstr "Налепнице за доставу 62mm x 100mm"
 
 #: ../templates/brother-other-templates.xml.h:20
 msgid "Multi Purpose Labels 17mm x 54mm"
-msgstr ""
+msgstr "Вишенаменске налепнице 17mm x 54mm"
 
 #: ../templates/brother-other-templates.xml.h:21
 msgid "Standard Address Labels 38mm x 90mm"
-msgstr ""
+msgstr "Уобичајене налепнице за адресе 38mm x 90mm"
+
+#. ===================================================================
+#: ../templates/canon-other-templates.xml.h:2
+#| msgid "CD/DVD Labels"
+msgid "CD/DVD Tray"
+msgstr "ЦД/ДВД фиока"
 
 #. ===================================================================
 #: ../templates/databecker-iso-templates.xml.h:4
 msgid "CD/DVD Labels Standard Format (face only)"
-msgstr ""
+msgstr "ЦД/ДВД налепнице уобичајеног облика (само лице)"
 
 #. ===================================================================
 #. ============================================================
@@ -3088,91 +3158,98 @@ msgstr ""
 #: ../templates/desmat-templates.xml.h:2
 #: ../templates/misc-iso-templates.xml.h:20
 msgid "CD Labels"
-msgstr ""
+msgstr "ЦД налепнице"
 
 #. ===================================================================
 #. ====================================================================
+#. ===================================================================
 #: ../templates/dataline-iso-templates.xml.h:2
 #: ../templates/hama-iso-templates.xml.h:35
+#: ../templates/misc-iso-templates.xml.h:32
 msgid "CD/DVD labels"
-msgstr ""
+msgstr "ЦД/ДВД налепнице"
 
 #. ===================================================================
 #: ../templates/dataline-iso-templates.xml.h:8
 #: ../templates/pearl-iso-templates.xml.h:60
 msgid "Membership cards"
-msgstr ""
+msgstr "Чланске картице"
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:2
 #: ../templates/geha-iso-templates.xml.h:23
 msgid "Large Address Labels"
-msgstr ""
+msgstr "Велике налепнице за адресе"
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:8
 msgid "Shipping Address Labels"
-msgstr ""
+msgstr "Налепнице за адресе достављања"
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:10
 msgid "File Folder"
-msgstr ""
+msgstr "Фасцикла за документа"
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:12
 msgid "Hanging Folder"
-msgstr ""
+msgstr "Фасцикле за качење"
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:14
 msgid "3.5in Diskette"
-msgstr ""
+msgstr "Дискете 3.5 инча"
 
 #. ===================================================================
 #: ../templates/endisch-templates.xml.h:5
 #: ../templates/pearl-iso-templates.xml.h:20
+#: ../templates/rayfilm-templates.xml.h:3
 msgid "Labels A6"
 msgstr "Налепнице А6"
 
 #. ===================================================================
 #: ../templates/endisch-templates.xml.h:6
 #: ../templates/pearl-iso-templates.xml.h:22
+#: ../templates/rayfilm-templates.xml.h:4
 msgid "Labels A5"
 msgstr "Налепнице А5"
 
 #. *******************************************************************
 #. ===================================================================
-#: ../templates/endisch-templates.xml.h:7
+#: ../templates/endisch-templates.xml.h:7 ../templates/igepa-templates.xml.h:3
 #: ../templates/jac-iso-templates.xml.h:6
 #: ../templates/pearl-iso-templates.xml.h:6
+#: ../templates/rayfilm-templates.xml.h:5
 msgid "Labels A4"
 msgstr "Налепнице А4"
 
 #: ../templates/endisch-templates.xml.h:8
+#: ../templates/rayfilm-templates.xml.h:6
 msgid "Labels A3"
 msgstr "Налепнице А3"
 
 #: ../templates/endisch-templates.xml.h:9
+#: ../templates/rayfilm-templates.xml.h:7
 msgid "Labels SRA3"
 msgstr "Налепнице СРА3"
 
 #. ===================================================================
 #: ../templates/geha-iso-templates.xml.h:2
 msgid "Flyer paper"
-msgstr ""
+msgstr "Папир за пресавијање"
 
 #. ===================================================================
 #. ====================================================================
 #: ../templates/geha-iso-templates.xml.h:6
 #: ../templates/hama-iso-templates.xml.h:25
 msgid "Greeting cards"
-msgstr ""
+msgstr "Честитке"
 
 #. ===================================================================
 #: ../templates/geha-iso-templates.xml.h:8
 msgid "Arch File inserts"
-msgstr ""
+msgstr "Умеци архиве докумената"
 
 #: ../templates/geha-iso-templates.xml.h:11
 msgid "CD/DVD Inlet"
@@ -3199,7 +3276,7 @@ msgstr "Фотографске налепнице"
 #. ===================================================================
 #: ../templates/geha-iso-templates.xml.h:21
 msgid "Passport photo labels"
-msgstr ""
+msgstr "Фотографске налепнице за пасош"
 
 #. ===================================================================
 #. ====================================================================
@@ -3208,7 +3285,7 @@ msgstr ""
 #: ../templates/hama-iso-templates.xml.h:37
 #: ../templates/herma-iso-templates.xml.h:6
 msgid "Arch File Labels"
-msgstr ""
+msgstr "Налепнице за архиве докумената"
 
 #. ===================================================================
 #: ../templates/geha-iso-templates.xml.h:29
@@ -3220,7 +3297,7 @@ msgstr "Вишенаменске налепнице"
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:2
 msgid "Printable mousepad"
-msgstr ""
+msgstr "Подметак за миша"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:10
@@ -3243,305 +3320,323 @@ msgstr "ЦД уметак (полеђина)"
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:15
 msgid "Zip disc inlet"
-msgstr ""
+msgstr "Уметак зип диска"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:19
 msgid "VHS-C inlet"
-msgstr ""
+msgstr "ВХС-Ц уметак"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:21
 msgid "Video-8 inlet"
-msgstr ""
+msgstr "Видео-8 уметак"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:23
 msgid "VHS inlet"
-msgstr ""
+msgstr "ВХС уметак"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:33
 msgid "Zip disc labels"
-msgstr ""
+msgstr "Налепнице зип дискова"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:39
 msgid "Arch File labels"
-msgstr ""
+msgstr "Налепнице архиве докумената"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:43
 msgid "Mini Disc labels"
-msgstr ""
+msgstr "Налепнице мини дискова"
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:2
 msgid "Arch File Labels (small)"
-msgstr ""
+msgstr "Налепнице архиве докумената (мале)"
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:4
 msgid "Arch File Labels (large)"
-msgstr ""
+msgstr "Налепнице архиве докумената (велике)"
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:10
 #: ../templates/zweckform-iso-templates.xml.h:20
 msgid "Allround Labels"
-msgstr ""
+msgstr "Општенаменске налепнице"
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:12
 msgid "Video Labels (face only)"
-msgstr ""
+msgstr "Налепнице за снимке (само лице)"
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:16
 msgid "Diskette Labels (face only)"
-msgstr ""
+msgstr "Налепнице за дискете (само лице)"
+
+#. ===================================================================
+#: ../templates/igepa-templates.xml.h:2
+#: ../templates/pearl-iso-templates.xml.h:18
+msgid "Floppy disk labels"
+msgstr "Налепнице за флопи дискове"
+
+#. ===================================================================
+#: ../templates/igepa-templates.xml.h:4
+#: ../templates/zweckform-iso-templates.xml.h:2
+msgid "Lever Arch File Labels"
+msgstr "Налепнице за архиве докумената са полугом"
 
 #. *******************************************************************
 #: ../templates/jac-iso-templates.xml.h:8
 msgid "PVC labels"
-msgstr ""
+msgstr "ПВЦ налепнице"
 
 #. ===================================================================
 #: ../templates/meritline-us-templates.xml.h:2
 msgid "Mini-CD Labels"
-msgstr ""
+msgstr "Мини-ЦД налепнице"
 
 #. ===================================================================
 #: ../templates/microapp-templates.xml.h:2
 msgid "Standard Labels"
-msgstr ""
+msgstr "Уобичајене налепнице"
 
 #. ===================================================================
 #. TODO: Is this the actual part #?
 #: ../templates/misc-us-templates.xml.h:2
 #: ../templates/misc-iso-templates.xml.h:24
 msgid "CD/DVD Labels (face only)"
-msgstr ""
+msgstr "ЦД/ДВД налепнице (само лице)"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:4
 msgid "CD/DVD Labels (Face Only)"
-msgstr ""
+msgstr "ЦД/ДВД налепнице (само лице)"
 
 #. TODO: Is this the actual part #?
 #: ../templates/misc-us-templates.xml.h:6
 msgid "Cassette Labels"
-msgstr ""
+msgstr "Налепнице за касете"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:10
 msgid "Slimline CD Case (rightside up)"
-msgstr ""
+msgstr "Танко ЦД кућиште (одговарајуће)"
 
 #: ../templates/misc-us-templates.xml.h:11
 msgid "Slimline CD Case (upside down)"
-msgstr ""
+msgstr "Танко ЦД кућиште (претурено)"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:13
 msgid "CD Template Rectangles"
-msgstr ""
+msgstr "Правоугаони шаблони за ЦД"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:15
 msgid "Business Card CD"
-msgstr ""
+msgstr "Пословне картице за ЦД"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:17
 msgid "Jewel Case Booklet"
-msgstr ""
+msgstr "Украсна пресавијена футрола"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:19
 msgid "DLT Labels"
-msgstr ""
+msgstr "ДЛТ налепнице"
 
 #. ===================================================================
 #. TODO: Is this the actual part #?
 #: ../templates/misc-us-templates.xml.h:27
-#: ../templates/misc-iso-templates.xml.h:34
+#: ../templates/misc-iso-templates.xml.h:36
 msgid "PRO CD Labels 2-up (face only)"
-msgstr ""
+msgstr "ПРО ЦД налепнице 2-горе (само лице)"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:29
 msgid "PRO CD Labels 2-up (Face only)"
-msgstr ""
+msgstr "ПРО ЦД налепнице 2-горе (само лице)"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:31
 msgid "PRO CD Labels 2-up (CD spine only)"
-msgstr ""
+msgstr "ПРО ЦД налепнице 2-горе (само бок ЦД-а)"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:33
 msgid "Microtube labels"
-msgstr ""
+msgstr "Налепнице за цевчице"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:8
 msgid "General Labels"
-msgstr ""
+msgstr "Опште налепнице"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:10
 #: ../templates/pearl-iso-templates.xml.h:28
 msgid "Self-adhesive labels"
-msgstr ""
+msgstr "Самолепљиве налепнице"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:14
 msgid "Fridge Magnet Stickers"
-msgstr ""
+msgstr "Магнетне налепнице за фрижидер"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:16
 msgid "Inkjet/Laser Labels 70x37mm"
-msgstr ""
+msgstr "Налепнице за ласер и млазне штампаче 70x37mm"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:18
 msgid "EPSON Photo Stickers 16"
-msgstr ""
+msgstr "ЕПСОН-ове фотографске налепнице 16"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:30
 msgid "Universal Labels"
-msgstr ""
+msgstr "Универзалне налепнице"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:32
+#: ../templates/misc-iso-templates.xml.h:34
 #: ../templates/pearl-iso-templates.xml.h:16
 msgid "Bottle labels"
-msgstr ""
+msgstr "Налепнице за боце"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:36
+#: ../templates/misc-iso-templates.xml.h:38
 msgid "Etiketten"
-msgstr ""
+msgstr "Етикете"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:8
 msgid "Self-adhesive film weatherproof"
-msgstr ""
+msgstr "Самолепљива фолија отпорна на услове"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:10
 msgid "Self-adhesive film transparent"
-msgstr ""
+msgstr "Самолепљива провидна фолија"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:14
 msgid "Self-adhesive window film"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:18
-msgid "Floppy disk labels"
-msgstr ""
+msgstr "Самолепљива фолија за прозоре"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:24
 msgid "Photo labels semiglossy"
-msgstr ""
+msgstr "Полусјајне фотографске налепнице"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:26
 msgid "Address Labels (STAMPIT)"
-msgstr ""
+msgstr "Налепнице за адресе (СТАМПИТ)"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:30
 msgid "SD card labels"
-msgstr ""
+msgstr "Налепнице за СД картице"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:40
 msgid "Passport photo labels glossy"
-msgstr ""
+msgstr "Сјајне фотографске налепнице за пасош"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:42
 msgid "Business cards punched"
-msgstr ""
+msgstr "Обложене пословне картице"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:44
 msgid "Business cards punched dull"
-msgstr ""
+msgstr "Једноставне обложене пословне картице"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:46
 msgid "Business cards high glossy"
-msgstr ""
+msgstr "Врло накићене пословне картице"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:48
 msgid "Name plates"
-msgstr ""
+msgstr "Плочице са именима"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:50
 msgid "Business cards glossy, both sides printable"
-msgstr ""
+msgstr "Накићене пословне картице, обе стране за штампање"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:52
 msgid "Business cards punched glossy"
-msgstr ""
+msgstr "Накићене обложене пословне картице"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:54
 msgid "Foldable business cards glossy/dull"
-msgstr ""
+msgstr "Накићене/сувопарне пресављиве пословне картице"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:56
 msgid "Foldable business cards"
-msgstr ""
+msgstr "Пресављиве пословне картице"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:62
 msgid "Membership cards, both sides printable"
-msgstr ""
+msgstr "Чланске картице, обе стране за штампање"
 
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:2
-msgid "Lever Arch File Labels"
-msgstr ""
+#: ../templates/rayfilm-templates.xml.h:11
+msgid "Business card CD Labels"
+msgstr "ЦД налепнице пословне картице"
+
+#: ../templates/rayfilm-templates.xml.h:12
+msgid "Mini CD Labels"
+msgstr "Налепнице за мини ЦД "
+
+#: ../templates/rayfilm-templates.xml.h:13
+msgid "Triangular labels"
+msgstr "Троугаоне налепнице"
+
+#: ../templates/rayfilm-templates.xml.h:14
+msgid "Trapezoid labels"
+msgstr "Трапезоидне налепнице"
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:12
 msgid "QSL-Karten Etiketten 70mm x 50,8mm"
-msgstr ""
+msgstr "КуСЛ-Карте етикете 70mm x 50,8mm"
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:14
 msgid "File Back Labels"
-msgstr ""
+msgstr "Налепнице за полеђину документа"
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:16
 msgid "Multi-purpose Stick+Lift Labels"
-msgstr ""
+msgstr "Вишенаменске налепнице „Залепи+Одлепи“"
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:18
 msgid "Video Labels (back)"
-msgstr ""
+msgstr "Налепнице за снимке (полеђина)"
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:22
 msgid "Rectangular Copier Labels"
-msgstr ""
+msgstr "Правоугаоне налепнице за умножавање"
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:24
 msgid "Correction and Cover-up Labels"
-msgstr ""
+msgstr "Налепнице за исправке и прекривање"
index ed41ba28a23c1b01b1e643dfad4748401b46166a..fcbd40790f74a54c0d0beb501c933ac66edd9348 100644 (file)
@@ -1,13 +1,14 @@
 # Serbian translation for glabels.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2012—2014.
 # Copyright (C) 2012 glabels's COPYRIGHT HOLDER
 # This file is distributed under the same license as the glabels package.
-# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2012.
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2012—2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: glabels glabels-3_0\n"
+"Project-Id-Version: glabels glabels-3_2\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n"
-"POT-Creation-Date: 2012-02-26 18:28+0000\n"
-"PO-Revision-Date: 2012-03-04 14:14+0200\n"
+"POT-Creation-Date: 2014-02-11 12:42+0000\n"
+"PO-Revision-Date: 2014-03-24 10:21+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@@ -16,6 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Project-Style: gnome\n"
 
 #: ../src/bc-backends.c:81
 msgid "Built-in"
@@ -131,11 +133,11 @@ msgstr "Šifra 128B"
 
 #: ../src/bc-backends.c:187 ../src/bc-backends.c:329
 msgid "Interleaved 2 of 5"
-msgstr ""
+msgstr "Prepleteno 2 od 5"
 
 #: ../src/bc-backends.c:190 ../src/bc-backends.c:224
 msgid "Codabar"
-msgstr ""
+msgstr "Kodabar"
 
 #: ../src/bc-backends.c:193
 msgid "MSI"
@@ -143,7 +145,7 @@ msgstr "MSI"
 
 #: ../src/bc-backends.c:196
 msgid "Plessey"
-msgstr ""
+msgstr "Plesi"
 
 #: ../src/bc-backends.c:199 ../src/bc-backends.c:257
 msgid "Code 93"
@@ -155,23 +157,23 @@ msgstr "Standard australijske pošte"
 
 #: ../src/bc-backends.c:209
 msgid "Australia Post Reply Paid"
-msgstr ""
+msgstr "Plaćen odgovor australijske pošte"
 
 #: ../src/bc-backends.c:212
 msgid "Australia Post Route Code"
-msgstr ""
+msgstr "Šifra dostavljanja australijske pošte"
 
 #: ../src/bc-backends.c:215
 msgid "Australia Post Redirect"
-msgstr ""
+msgstr "Preusmeravanje australijske pošte"
 
 #: ../src/bc-backends.c:218
 msgid "Aztec Code"
-msgstr "Šifra Actek"
+msgstr "Asteška šifra"
 
 #: ../src/bc-backends.c:221
 msgid "Aztec Rune"
-msgstr ""
+msgstr "Asteške rune"
 
 #: ../src/bc-backends.c:227
 msgid "Code One"
@@ -219,15 +221,15 @@ msgstr "Matrica podataka"
 
 #: ../src/bc-backends.c:272
 msgid "Deutsche Post Leitcode"
-msgstr ""
+msgstr "Šifra vođenja nemačke pošte"
 
 #: ../src/bc-backends.c:275
 msgid "Deutsche Post Identcode"
-msgstr ""
+msgstr "Šifra prepoznavanja nemačke pošte"
 
 #: ../src/bc-backends.c:278
 msgid "Dutch Post KIX Code"
-msgstr ""
+msgstr "Šifra KIKs nemačke pošte"
 
 #: ../src/bc-backends.c:281
 msgid "EAN"
@@ -235,7 +237,7 @@ msgstr "EAN"
 
 #: ../src/bc-backends.c:284
 msgid "Grid Matrix"
-msgstr ""
+msgstr "Matrica mreže"
 
 #: ../src/bc-backends.c:287
 msgid "GS1-128"
@@ -243,19 +245,19 @@ msgstr "GS1-128"
 
 #: ../src/bc-backends.c:290
 msgid "GS1 DataBar-14"
-msgstr "GS1 TrakaPodataka-14"
+msgstr "GS1 Trake podataka-14"
 
 #: ../src/bc-backends.c:299
 msgid "GS1 DataBar-14 Stacked"
-msgstr ""
+msgstr "GS1 Trake podataka-14 naslagano"
 
 #: ../src/bc-backends.c:302
 msgid "GS1 DataBar-14 Stacked Omni."
-msgstr ""
+msgstr "GS1 Trake podataka-14 naslagano omni."
 
 #: ../src/bc-backends.c:305
 msgid "GS1 DataBar Extended Stacked"
-msgstr ""
+msgstr "GS1 Trake podataka prošireno naslagano"
 
 #: ../src/bc-backends.c:308
 msgid "HIBC Code 128"
@@ -283,7 +285,7 @@ msgstr "HIBC Mikro PDF417"
 
 #: ../src/bc-backends.c:326
 msgid "HIBC Aztec Code"
-msgstr ""
+msgstr "HIBC asteška šifra"
 
 #: ../src/bc-backends.c:335
 msgid "ITF-14"
@@ -315,7 +317,7 @@ msgstr "Mikro KuR šifra"
 
 #: ../src/bc-backends.c:356
 msgid "MSI Plessey"
-msgstr ""
+msgstr "MSI Plesi"
 
 #: ../src/bc-backends.c:359
 msgid "NVE-18"
@@ -327,7 +329,7 @@ msgstr "PDF417"
 
 #: ../src/bc-backends.c:365
 msgid "PDF417 Truncated"
-msgstr ""
+msgstr "PDF417 skraćeni"
 
 #: ../src/bc-backends.c:368
 msgid "PLANET"
@@ -339,15 +341,15 @@ msgstr "PostNet"
 
 #: ../src/bc-backends.c:374
 msgid "Pharmacode"
-msgstr ""
+msgstr "Farmaceutska šifra"
 
 #: ../src/bc-backends.c:377
 msgid "Pharmacode 2-track"
-msgstr ""
+msgstr "Farmaceutska šifra 2-traga"
 
 #: ../src/bc-backends.c:380
 msgid "Pharmazentral Nummer (PZN)"
-msgstr ""
+msgstr "Farmaceutski središnji broj (PZN)"
 
 #: ../src/bc-backends.c:383
 msgid "QR Code"
@@ -355,15 +357,15 @@ msgstr "KuR šifra"
 
 #: ../src/bc-backends.c:386
 msgid "Royal Mail 4-State"
-msgstr ""
+msgstr "Šifra Kraljevske pošte sa 4-stanja"
 
 #: ../src/bc-backends.c:389
 msgid "Telepen"
-msgstr ""
+msgstr "Telepen"
 
 #: ../src/bc-backends.c:392
 msgid "Telepen Numeric"
-msgstr ""
+msgstr "Telepen brojevni"
 
 #: ../src/bc-backends.c:401
 msgid "USPS One Code"
@@ -371,7 +373,7 @@ msgstr "Šifra USPS jedan"
 
 #: ../src/bc-backends.c:404
 msgid "UK Plessey"
-msgstr ""
+msgstr "Britanski Plesi"
 
 #: ../src/bc-backends.c:411
 msgid "IEC16022 (DataMatrix)"
@@ -395,7 +397,7 @@ msgstr "Braon"
 
 #: ../src/color-combo-menu.c:85
 msgid "Dark Goldenrod"
-msgstr ""
+msgstr "Tamnozlatna"
 
 #: ../src/color-combo-menu.c:86
 msgid "Dark Green"
@@ -403,11 +405,11 @@ msgstr "Tamnozelena"
 
 #: ../src/color-combo-menu.c:87
 msgid "Dark Cyan"
-msgstr ""
+msgstr "Tamnocijan"
 
 #: ../src/color-combo-menu.c:88
 msgid "Navy Blue"
-msgstr ""
+msgstr "Morskoplava"
 
 #: ../src/color-combo-menu.c:89
 msgid "Dark Violet"
@@ -427,7 +429,7 @@ msgstr "Tamnožuta"
 
 #: ../src/color-combo-menu.c:94
 msgid "Medium green"
-msgstr ""
+msgstr "Srednje zelena"
 
 #: ../src/color-combo-menu.c:95
 msgid "Turquoise"
@@ -443,7 +445,7 @@ msgstr "Ljubičasta"
 
 #: ../src/color-combo-menu.c:99
 msgid "Salmon"
-msgstr ""
+msgstr "Ružičastožuta"
 
 #: ../src/color-combo-menu.c:100
 msgid "Gold"
@@ -491,11 +493,11 @@ msgstr "Svetlotirkizna"
 
 #: ../src/color-combo-menu.c:112
 msgid "Slate Gray"
-msgstr ""
+msgstr "Sivi škriljac"
 
 #: ../src/color-combo-menu.c:113
 msgid "Thistle"
-msgstr ""
+msgstr "Jarko roze"
 
 #: ../src/color-combo-menu.c:115
 msgid "White"
@@ -541,13 +543,13 @@ msgstr "Proizvoljna boja #%u"
 
 #: ../src/critical-error-handler.c:70
 msgid "gLabels Fatal Error!"
-msgstr ""
+msgstr "Kobna greška Gnomovih nalepnica!"
 
 #: ../src/file.c:84
 msgid "New Label or Card"
 msgstr "Nova nalepnica ili pozivnica"
 
-#: ../src/file.c:175 ../src/label.c:601 ../src/label.c:645
+#: ../src/file.c:175 ../src/label.c:602 ../src/label.c:646
 msgid "Label properties"
 msgstr "Svojstva nalepnice"
 
@@ -701,15 +703,15 @@ msgstr "prva"
 
 #: ../src/glabels-batch.c:61 ../data/ui/print-op-dialog-custom-widget.ui.h:11
 msgid "print outlines (to test printer alignment)"
-msgstr ""
+msgstr "štampa konture (zarad isprobavanja poravnanja štampača)"
 
 #: ../src/glabels-batch.c:63 ../data/ui/print-op-dialog-custom-widget.ui.h:12
 msgid "print in reverse (i.e. a mirror image)"
-msgstr ""
+msgstr "štampa obrnuto (npr. odraz u ogledalu)"
 
 #: ../src/glabels-batch.c:65 ../data/ui/print-op-dialog-custom-widget.ui.h:13
 msgid "print crop marks"
-msgstr ""
+msgstr "štampa oznake isecanja"
 
 #: ../src/glabels-batch.c:67
 msgid "input file for merging"
@@ -736,7 +738,8 @@ msgstr ""
 #: ../src/glabels-batch.c:151
 #, c-format
 msgid "cannot perform document merge with glabels file %s\n"
-msgstr "ne mogu da izvršim stapanje dokumenta sa datotekom gnomovih nalepnica „%s“\n"
+msgstr ""
+"ne mogu da izvršim stapanje dokumenta sa datotekom gnomovih nalepnica „%s“\n"
 
 #: ../src/glabels-batch.c:186
 #, c-format
@@ -772,93 +775,93 @@ msgid "Create box object"
 msgstr "Napravite četvorostrani objekat"
 
 #: ../src/label-box.c:230 ../src/label-ellipse.c:232
-#: ../data/ui/property-bar.ui.h:9
+#: ../data/ui/property-bar.ui.h:12
 msgid "Fill color"
 msgstr "Boja popunjavanja"
 
 #: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
-#: ../data/ui/property-bar.ui.h:10
+#: ../data/ui/property-bar.ui.h:13
 msgid "Line color"
 msgstr "Boja linije"
 
 #: ../src/label-box.c:289 ../src/label-ellipse.c:290 ../src/label-line.c:241
-#: ../data/ui/property-bar.ui.h:11
+#: ../data/ui/property-bar.ui.h:14
 msgid "Line width"
 msgstr "Širina linije"
 
-#: ../src/label.c:405
+#: ../src/label.c:406
 msgid "Untitled"
 msgstr "Bez naslova"
 
-#: ../src/label.c:719 ../src/ui.c:420
+#: ../src/label.c:720 ../src/ui.c:420
 msgid "Merge properties"
 msgstr "Svojstva stapanja"
 
-#: ../src/label.c:1215 ../src/ui.c:213
+#: ../src/label.c:1216 ../src/ui.c:213
 msgid "Delete"
 msgstr "Obriši"
 
-#: ../src/label.c:1248 ../src/ui.c:322
+#: ../src/label.c:1251 ../src/ui.c:322
 msgid "Bring to front"
 msgstr "Iznad svega"
 
-#: ../src/label.c:1284 ../src/ui.c:329
+#: ../src/label.c:1287 ../src/ui.c:329
 msgid "Send to back"
 msgstr "Pošalji u pozadinu"
 
-#: ../src/label.c:1325
+#: ../src/label.c:1328
 msgid "Rotate"
 msgstr "Okreni"
 
-#: ../src/label.c:1360 ../src/ui.c:336
+#: ../src/label.c:1363 ../src/ui.c:336
 msgid "Rotate left"
 msgstr "Okreni na levo"
 
-#: ../src/label.c:1393 ../src/ui.c:343
+#: ../src/label.c:1396 ../src/ui.c:343
 msgid "Rotate right"
 msgstr "Okreni na desno"
 
-#: ../src/label.c:1428 ../src/ui.c:350
+#: ../src/label.c:1431 ../src/ui.c:350
 msgid "Flip horizontally"
 msgstr "Izvrni vodoravno"
 
-#: ../src/label.c:1463 ../src/ui.c:357
+#: ../src/label.c:1466 ../src/ui.c:357
 msgid "Flip vertically"
 msgstr "Izvrni uspravno"
 
-#: ../src/label.c:1503 ../src/ui.c:364
+#: ../src/label.c:1506 ../src/ui.c:364
 msgid "Align left"
 msgstr "Poravnaj na levo"
 
-#: ../src/label.c:1560 ../src/ui.c:378
+#: ../src/label.c:1563 ../src/ui.c:378
 msgid "Align right"
 msgstr "Poravnaj na desno"
 
-#: ../src/label.c:1621
+#: ../src/label.c:1624
 msgid "Align horizontal center"
 msgstr "Vodoravno poravnaj po sredini"
 
-#: ../src/label.c:1697
+#: ../src/label.c:1700
 msgid "Align tops"
 msgstr "Poravnaj po gornjoj ivici"
 
-#: ../src/label.c:1754
+#: ../src/label.c:1757
 msgid "Align bottoms"
 msgstr "Poravnaj po donjoj ivici"
 
-#: ../src/label.c:1815
+#: ../src/label.c:1818
 msgid "Align vertical center"
 msgstr "Uspravno poravnaj po sredini"
 
-#: ../src/label.c:1893 ../src/ui.c:406
+#: ../src/label.c:1896 ../src/ui.c:406
 msgid "Center horizontally"
 msgstr "Vodoravno centrirano"
 
-#: ../src/label.c:1940 ../src/ui.c:413
+#: ../src/label.c:1943 ../src/ui.c:413
 msgid "Center vertically"
 msgstr "Uspravno centrirano"
 
-#: ../src/label.c:2628 ../src/label.c:2670 ../src/label.c:2696 ../src/ui.c:206
+#: ../src/label.c:2664 ../src/label.c:2706 ../src/label.c:2732 ../src/ui.c:206
 msgid "Paste"
 msgstr "Ubaci"
 
@@ -866,11 +869,11 @@ msgstr "Ubaci"
 msgid "Create ellipse object"
 msgstr "Napravi elipsu"
 
-#: ../src/label-image.c:200 ../src/ui.c:310
+#: ../src/label-image.c:199 ../src/ui.c:310
 msgid "Create image object"
 msgstr "Napravite slikovni objekat"
 
-#: ../src/label-image.c:333 ../src/label-image.c:474
+#: ../src/label-image.c:332 ../src/label-image.c:473
 msgid "Set image"
 msgstr "Podesi sliku"
 
@@ -878,67 +881,71 @@ msgstr "Podesi sliku"
 msgid "Create line object"
 msgstr "Napravite linijski objekat"
 
-#: ../src/label-object.c:394 ../src/label-object.c:428
+#: ../src/label-object.c:392 ../src/label-object.c:423
 msgid "Move"
 msgstr "Premesti"
 
-#: ../src/label-object.c:479
+#: ../src/label-object.c:474
 msgid "Resize"
 msgstr "Promeni veličinu"
 
-#: ../src/label-object.c:1217
+#: ../src/label-object.c:1258
 msgid "Shadow state"
 msgstr "Stanje senke"
 
-#: ../src/label-object.c:1260
+#: ../src/label-object.c:1301
 msgid "Shadow offset"
 msgstr "Pomeraj senke"
 
-#: ../src/label-object.c:1308
+#: ../src/label-object.c:1349
 msgid "Shadow color"
 msgstr "Boja senke"
 
-#: ../src/label-object.c:1351
+#: ../src/label-object.c:1392
 msgid "Shadow opacity"
 msgstr "Providnost senke"
 
-#: ../src/label-text.c:281 ../src/ui.c:282
+#: ../src/label-text.c:293 ../src/ui.c:282
 msgid "Create text object"
 msgstr "Napravite tekstualni objekat"
 
-#: ../src/label-text.c:453
+#: ../src/label-text.c:467
 msgid "Typing"
 msgstr "Kucanje"
 
-#: ../src/label-text.c:586 ../data/ui/property-bar.ui.h:1
+#: ../src/label-text.c:601 ../data/ui/property-bar.ui.h:1
 msgid "Font family"
 msgstr "Porodica pisma"
 
-#: ../src/label-text.c:624 ../data/ui/property-bar.ui.h:2
+#: ../src/label-text.c:639 ../data/ui/property-bar.ui.h:2
 msgid "Font size"
 msgstr "Veličina pisma"
 
-#: ../src/label-text.c:657
+#: ../src/label-text.c:672
 msgid "Font weight"
 msgstr "Težina pisma"
 
-#: ../src/label-text.c:690 ../data/ui/property-bar.ui.h:4
+#: ../src/label-text.c:705 ../data/ui/property-bar.ui.h:4
 msgid "Italic"
 msgstr "Iskošeno"
 
-#: ../src/label-text.c:723
+#: ../src/label-text.c:738
 msgid "Align text"
 msgstr "Poravnaj tekst"
 
-#: ../src/label-text.c:756
+#: ../src/label-text.c:771
+msgid "Vertically align text"
+msgstr "Uspravno poravnaj tekst"
+
+#: ../src/label-text.c:804
 msgid "Line spacing"
 msgstr "Razmak linija"
 
-#: ../src/label-text.c:789 ../data/ui/property-bar.ui.h:8
+#: ../src/label-text.c:837 ../data/ui/property-bar.ui.h:11
 msgid "Text color"
 msgstr "Boja teksta"
 
-#: ../src/label-text.c:933
+#: ../src/label-text.c:997
 msgid "Auto shrink"
 msgstr "Sam smanji"
 
@@ -984,7 +991,8 @@ msgstr "Nema podudaranja."
 
 #: ../src/media-select.c:1085
 msgid "Try selecting a different brand, page size or category."
-msgstr "Pokušajte da izaberete drugačiju marku, veličinu papira ili kategoriju."
+msgstr ""
+"Pokušajte da izaberete drugačiju marku, veličinu papira ili kategoriju."
 
 #: ../src/media-select.c:1179
 msgid "No custom templates found."
@@ -1062,9 +1070,9 @@ msgstr "Izaberi"
 
 #: ../src/merge-properties-dialog.c:348
 msgid "Record/Field"
-msgstr ""
+msgstr "Zapis/Polje"
 
-#: ../src/merge-properties-dialog.c:356 ../data/ui/object-editor.ui.h:23
+#: ../src/merge-properties-dialog.c:356 ../data/ui/object-editor.ui.h:24
 msgid "Data"
 msgstr "Podaci"
 
@@ -1077,25 +1085,25 @@ msgid "Fixed"
 msgstr "Stalno"
 
 #. Translators: "Up" refers to the direction towards the top of a label.
-#: ../src/mini-preview.c:1054
+#: ../src/mini-preview.c:1051
 msgid "Up"
 msgstr "Gore"
 
-#: ../src/new-label-dialog.c:203
+#: ../src/new-label-dialog.c:212 ../data/ui/new-label-dialog.ui.h:1
 msgid "Select Product"
 msgstr "Izaberi projekat"
 
-#: ../src/new-label-dialog.c:215
+#: ../src/new-label-dialog.c:225 ../data/ui/new-label-dialog.ui.h:3
 msgid "Choose Orientation"
 msgstr "Izaberi usmerenje"
 
-#: ../src/new-label-dialog.c:229
+#: ../src/new-label-dialog.c:240
 msgid "Review"
 msgstr "Pregled"
 
 #: ../src/object-editor-bc-page.c:97 ../src/object-editor-shadow-page.c:93
-#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:335
-#: ../src/ui-property-bar.c:277
+#: ../src/object-editor-text-page.c:102 ../src/prefs-dialog.c:335
+#: ../src/ui-property-bar.c:289
 msgid "Default"
 msgstr "Osnovno"
 
@@ -1105,34 +1113,34 @@ msgstr "Svojstva objekta"
 
 #: ../src/object-editor.c:314
 msgid "Box object properties"
-msgstr ""
+msgstr "Svojstva objekta kvadrata"
 
 #: ../src/object-editor.c:333
 msgid "Ellipse object properties"
-msgstr ""
+msgstr "Svojstva objekta elipse"
 
 #: ../src/object-editor.c:352
 msgid "Line object properties"
-msgstr ""
+msgstr "Svojstva objekta linije"
 
 #: ../src/object-editor.c:369
 msgid "Image object properties"
-msgstr ""
+msgstr "Svojstva objekta slike"
 
 #: ../src/object-editor.c:386
 msgid "Text object properties"
-msgstr ""
+msgstr "Svojstva objekta teksta"
 
 #: ../src/object-editor.c:408
 msgid "Barcode object properties"
-msgstr ""
+msgstr "Svojstva objekta kvadrata"
 
 #: ../src/object-editor-edit-page.c:76
 msgid "Insert merge field"
-msgstr ""
+msgstr "Umetni polje stapanja"
 
 #: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:341
-#: ../src/ui-property-bar.c:287
+#: ../src/ui-property-bar.c:299
 msgid "No Fill"
 msgstr "Bez ispunjavanja"
 
@@ -1150,7 +1158,7 @@ msgid "%s (*.%s)"
 msgstr "%s (*.%s)"
 
 #: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:338
-#: ../src/ui-property-bar.c:297
+#: ../src/ui-property-bar.c:309
 msgid "No Line"
 msgstr "Bez linije"
 
@@ -1264,7 +1272,7 @@ msgstr "P_oredak"
 
 #: ../src/ui.c:101
 msgid "_Rotate/Flip"
-msgstr ""
+msgstr "_Zaokreni/Prevrni"
 
 #: ../src/ui.c:102
 msgid "_Alignment"
@@ -1464,7 +1472,7 @@ msgstr "Kvadrat"
 msgid "Create box/rectangle object"
 msgstr "Napravite kvadratni/pravougaoni objekat"
 
-#: ../src/ui.c:294 ../data/ui/object-editor.ui.h:16
+#: ../src/ui.c:294 ../data/ui/object-editor.ui.h:17
 #: ../data/ui/prefs-dialog.ui.h:20
 msgid "Line"
 msgstr "Linija"
@@ -1477,13 +1485,13 @@ msgstr "Elipsa"
 msgid "Create ellipse/circle object"
 msgstr "Napravite elipsoidni/kružni objekat"
 
-#: ../src/ui.c:308 ../data/ui/object-editor.ui.h:19
+#: ../src/ui.c:308 ../data/ui/object-editor.ui.h:20
 msgid "Image"
 msgstr "Slika"
 
 #: ../src/ui.c:315
 msgid "Barcode"
-msgstr "Trakasti kôd"
+msgstr "Trakasta šifra"
 
 #: ../src/ui.c:324
 msgid "Raise object to top"
@@ -1519,47 +1527,47 @@ msgstr "Usredišti"
 
 #: ../src/ui.c:373
 msgid "Align objects to horizontal centers"
-msgstr ""
+msgstr "Poravnajte objekte na vodoravno središte"
 
 #: ../src/ui.c:380
 msgid "Align objects to right edges"
-msgstr ""
+msgstr "Poravnajte objekte na desnu ivicu"
 
 #: ../src/ui.c:385
 msgid "Align top"
-msgstr ""
+msgstr "Poravnaj gore"
 
 #: ../src/ui.c:387
 msgid "Align objects to top edges"
-msgstr ""
+msgstr "Poravnajte objekte na gornju ivicu"
 
 #: ../src/ui.c:392
 msgid "Align middle"
-msgstr ""
+msgstr "Poravnaj po sredini"
 
 #: ../src/ui.c:394
 msgid "Align objects to vertical centers"
-msgstr ""
+msgstr "Poravnajte objekte na uspravna središta"
 
 #: ../src/ui.c:399
 msgid "Align bottom"
-msgstr ""
+msgstr "Poravnaj dole"
 
 #: ../src/ui.c:401
 msgid "Align objects to bottom edges"
-msgstr ""
+msgstr "Poravnajte objekte na donju ivicu"
 
 #: ../src/ui.c:408
 msgid "Center objects to horizontal label center"
-msgstr ""
+msgstr "Postavite objekte na vodoravno središte nalepnice"
 
 #: ../src/ui.c:415
 msgid "Center objects to vertical label center"
-msgstr ""
+msgstr "Postavite objekte na uspravno središte nalepnice"
 
 #: ../src/ui.c:422
 msgid "Edit merge properties"
-msgstr ""
+msgstr "Uredite svojstva stapanja"
 
 #: ../src/ui.c:429
 msgid "Contents"
@@ -1738,13 +1746,13 @@ msgstr "prečnik"
 #. the CSS2 Specification (Section 4.3.2)
 #. This table must be sorted exactly as the enumerations in lglUnits
 #. [LGL_UNITS_POINT]
-#: ../libglabels/lgl-units.c:65 ../data/ui/object-editor.ui.h:14
+#: ../libglabels/lgl-units.c:65 ../data/ui/object-editor.ui.h:15
 #: ../data/ui/prefs-dialog.ui.h:19
 msgid "points"
 msgstr "tačaka"
 
 #. [LGL_UNITS_INCH]
-#: ../libglabels/lgl-units.c:66 ../data/ui/object-editor.ui.h:27
+#: ../libglabels/lgl-units.c:66 ../data/ui/object-editor.ui.h:28
 #: ../data/ui/template-designer.ui.h:15
 msgid "inches"
 msgstr "inča"
@@ -1794,7 +1802,7 @@ msgstr "Odznači sve"
 
 #: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Record selection/preview"
-msgstr ""
+msgstr "Snimite izbor/pregled"
 
 #: ../data/ui/media-select.ui.h:1
 msgid "Recent"
@@ -1804,7 +1812,7 @@ msgstr "Skorašnje"
 msgid "Brand:"
 msgstr "Marka:"
 
-#: ../data/ui/media-select.ui.h:3 ../data/ui/new-label-dialog.ui.h:7
+#: ../data/ui/media-select.ui.h:3 ../data/ui/new-label-dialog.ui.h:10
 #: ../data/ui/template-designer.ui.h:12
 msgid "Page size:"
 msgstr "Veličina stranice"
@@ -1821,7 +1829,7 @@ msgstr "Traži sve"
 msgid "Custom"
 msgstr "Proizvoljno"
 
-#: ../data/ui/new-label-dialog.ui.h:1
+#: ../data/ui/new-label-dialog.ui.h:2
 msgid ""
 "Choose label or card product from hundreds of predefined templates or define "
 "your own."
@@ -1829,43 +1837,47 @@ msgstr ""
 "Izaberite nalepnicu ili karticu iz hiljadu unapred određenih šablona ili "
 "odredite vašu sopstvenu."
 
-#: ../data/ui/new-label-dialog.ui.h:2
+#: ../data/ui/new-label-dialog.ui.h:4
 msgid "Select orientation of label content."
 msgstr "Izaberite usmerenje sadržaja nalepnice."
 
-#: ../data/ui/new-label-dialog.ui.h:3
+#: ../data/ui/new-label-dialog.ui.h:5
 msgid "Normal"
 msgstr "Normalno"
 
-#: ../data/ui/new-label-dialog.ui.h:4
+#: ../data/ui/new-label-dialog.ui.h:6
 msgid "Rotated"
 msgstr "Zaokrenuto"
 
-#: ../data/ui/new-label-dialog.ui.h:5
+#: ../data/ui/new-label-dialog.ui.h:7
+msgid "Review Selection"
+msgstr "Pregledaj izbor"
+
+#: ../data/ui/new-label-dialog.ui.h:8
 msgid "Please review and confirm your selection."
 msgstr "Molim pregledajte i potvrdite vaš izbor."
 
-#: ../data/ui/new-label-dialog.ui.h:6 ../data/ui/template-designer.ui.h:9
+#: ../data/ui/new-label-dialog.ui.h:9 ../data/ui/template-designer.ui.h:9
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../data/ui/new-label-dialog.ui.h:8
+#: ../data/ui/new-label-dialog.ui.h:11
 msgid "Label size:"
 msgstr "Veličina nalepnice:"
 
-#: ../data/ui/new-label-dialog.ui.h:9
+#: ../data/ui/new-label-dialog.ui.h:12
 msgid "Layout:"
 msgstr "Raspored:"
 
-#: ../data/ui/new-label-dialog.ui.h:10
+#: ../data/ui/new-label-dialog.ui.h:13
 msgid "Similar products:"
 msgstr "Slični proizvodi:"
 
-#: ../data/ui/new-label-dialog.ui.h:11 ../data/ui/template-designer.ui.h:6
+#: ../data/ui/new-label-dialog.ui.h:14 ../data/ui/template-designer.ui.h:6
 msgid "Part #:"
 msgstr "Deo #:"
 
-#: ../data/ui/new-label-dialog.ui.h:12
+#: ../data/ui/new-label-dialog.ui.h:15
 msgid "Vendor:"
 msgstr "Prodavac:"
 
@@ -1895,119 +1907,123 @@ msgstr " "
 
 #: ../data/ui/object-editor.ui.h:8
 msgid "key:"
-msgstr ""
+msgstr "ključ:"
 
 #: ../data/ui/object-editor.ui.h:9 ../data/ui/prefs-dialog.ui.h:15
 msgid "Alignment:"
 msgstr "Poravnanje:"
 
-#: ../data/ui/object-editor.ui.h:10 ../data/ui/prefs-dialog.ui.h:16
+#: ../data/ui/object-editor.ui.h:10
+msgid "Vertical alignment:"
+msgstr "Uspravno poravnanje:"
+
+#: ../data/ui/object-editor.ui.h:11 ../data/ui/prefs-dialog.ui.h:16
 msgid "Line Spacing:"
 msgstr "Razmak linija:"
 
-#: ../data/ui/object-editor.ui.h:11
+#: ../data/ui/object-editor.ui.h:12
 msgid "Allow merge to automatically shrink text"
 msgstr "Dozvoli stapanje zarad samoskupljanja teksta"
 
-#: ../data/ui/object-editor.ui.h:12
+#: ../data/ui/object-editor.ui.h:13
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/ui/object-editor.ui.h:13 ../data/ui/prefs-dialog.ui.h:18
+#: ../data/ui/object-editor.ui.h:14 ../data/ui/prefs-dialog.ui.h:18
 #: ../data/ui/template-designer.ui.h:13
 msgid "Width:"
 msgstr "Širina:"
 
-#: ../data/ui/object-editor.ui.h:15
+#: ../data/ui/object-editor.ui.h:16
 msgid "Key:"
 msgstr "Ključ:"
 
-#: ../data/ui/object-editor.ui.h:17 ../data/ui/prefs-dialog.ui.h:21
+#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:21
 msgid "Fill"
 msgstr "Popuna"
 
-#: ../data/ui/object-editor.ui.h:18
+#: ../data/ui/object-editor.ui.h:19
 msgid "File:"
 msgstr "Datoteka:"
 
-#: ../data/ui/object-editor.ui.h:20
+#: ../data/ui/object-editor.ui.h:21
 msgid "Literal:"
 msgstr "Doslovno:"
 
-#: ../data/ui/object-editor.ui.h:21
+#: ../data/ui/object-editor.ui.h:22
 msgid "format:"
 msgstr "oblik:"
 
-#: ../data/ui/object-editor.ui.h:22
+#: ../data/ui/object-editor.ui.h:23
 msgid "digits:"
 msgstr "cifre:"
 
-#: ../data/ui/object-editor.ui.h:24
+#: ../data/ui/object-editor.ui.h:25
 msgid "Backend:"
 msgstr "Pozadinac:"
 
-#: ../data/ui/object-editor.ui.h:25
+#: ../data/ui/object-editor.ui.h:26
 msgid "Checksum"
 msgstr "Suma provere"
 
-#: ../data/ui/object-editor.ui.h:26 ../data/ui/template-designer.ui.h:14
+#: ../data/ui/object-editor.ui.h:27 ../data/ui/template-designer.ui.h:14
 msgid "Height:"
 msgstr "Visina:"
 
-#: ../data/ui/object-editor.ui.h:28
+#: ../data/ui/object-editor.ui.h:29
 msgid "Reset image size"
 msgstr "Vrati veličinu slike"
 
-#: ../data/ui/object-editor.ui.h:29
+#: ../data/ui/object-editor.ui.h:30
 msgid "Size"
 msgstr "Veličina"
 
-#: ../data/ui/object-editor.ui.h:30
+#: ../data/ui/object-editor.ui.h:31
 msgid "Length:"
 msgstr "Dužina:"
 
-#: ../data/ui/object-editor.ui.h:31
+#: ../data/ui/object-editor.ui.h:32
 msgid "Angle:"
 msgstr "Ugao:"
 
-#: ../data/ui/object-editor.ui.h:32
+#: ../data/ui/object-editor.ui.h:33
 msgid "degrees"
 msgstr "stepeni"
 
-#: ../data/ui/object-editor.ui.h:33
+#: ../data/ui/object-editor.ui.h:34
 msgid "X:"
 msgstr "Vodoravno:"
 
-#: ../data/ui/object-editor.ui.h:34
+#: ../data/ui/object-editor.ui.h:35
 msgid "Y:"
 msgstr "Uspravno:"
 
-#: ../data/ui/object-editor.ui.h:35
+#: ../data/ui/object-editor.ui.h:36
 msgid "Position"
 msgstr "Položaj"
 
-#: ../data/ui/object-editor.ui.h:36
+#: ../data/ui/object-editor.ui.h:37
 msgid "Enable shadow"
 msgstr "Uključi senke"
 
-#: ../data/ui/object-editor.ui.h:37
+#: ../data/ui/object-editor.ui.h:38
 msgid "X Offset:"
 msgstr "Vodoravni pomeraj:"
 
-#: ../data/ui/object-editor.ui.h:38
+#: ../data/ui/object-editor.ui.h:39
 msgid "Y Offset:"
 msgstr "Uspravni pomeraj:"
 
-#: ../data/ui/object-editor.ui.h:39
+#: ../data/ui/object-editor.ui.h:40
 msgid "Opacity:"
 msgstr "Neprovidnost:"
 
-#: ../data/ui/object-editor.ui.h:41
+#: ../data/ui/object-editor.ui.h:42
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: ../data/ui/object-editor.ui.h:42
+#: ../data/ui/object-editor.ui.h:43
 msgid "Shadow"
 msgstr "Senka"
 
@@ -2079,6 +2095,18 @@ msgstr "Poravnajte po sredini"
 msgid "Right align"
 msgstr "Poravnajte na desno"
 
+#: ../data/ui/property-bar.ui.h:8
+msgid "Top vertical align"
+msgstr "Poravnajte uspravno gore"
+
+#: ../data/ui/property-bar.ui.h:9
+msgid "Center vertical align"
+msgstr "Poravnajte uspravno po sredini"
+
+#: ../data/ui/property-bar.ui.h:10
+msgid "Bottom vertical align"
+msgstr "Poravnajte uspravno dole"
+
 #: ../data/ui/template-designer.ui.h:1
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
@@ -2350,12 +2378,40 @@ msgstr "Složi"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:10
 msgid "Merge Control"
-msgstr ""
+msgstr "Spoji kontrolu"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:14
 msgid "Options"
 msgstr "Mogućnosti"
 
+#: ../data/appdata/glabels-3.appdata.xml.in.h:1
+msgid ""
+"gLabels is a program for creating labels and business cards. It is designed "
+"to work with various laser/ink-jet peel-off label and business card sheets "
+"that you'll find at most office supply stores."
+msgstr ""
+"Gnomove nalepnice je program za stvaranje nalepnica i poslovnih kartica. "
+"Osmišljen je da radi sa raznim listovima lepljivih nalepnica i poslovnih "
+"kartica za laserske i štampače sa brizgalicama koje možete naći u većini "
+"radnji kancelarijskog pribora."
+
+#: ../data/appdata/glabels-3.appdata.xml.in.h:2
+msgid ""
+"gLabels can be used to design address labels, name tags, price tags, cd/dvd "
+"labels, or just about anything else that is organized in a regular pattern "
+"on a sheet of paper. Labels (or cards) can contain text, images, lines, "
+"shapes, and barcodes. gLabels also includes a document-merge feature which "
+"lets you print a unique label for each record from an external data source, "
+"such as a CSV file or an Evolution address book."
+msgstr ""
+"Gnomove nalepnice možete koristiti da napravite nalepnice za adrese, "
+"imenike, cenovnike, cd/dvd, ili za bilo šta drugo što je organizovano u "
+"regularnom šablonu na listu papira. Nalepnice (ili kartice) mogu da sadrže "
+"tekst, slike, linije, oblike, i trakaste šifre. Gnomove nalepnice takođe "
+"uključuju funkciju stapanja dokumenta koja vam dopušta da štampate jedinstvenu "
+"nalepnicu za svki snimak sa spoljnog izvora podataka, kao što je CSV datoteka "
+"ili adresar Evolucije."
+
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:1
 msgid "Show/hide main toolbar."
 msgstr "Prikazuje/skriva glavnu liniju alata."
@@ -2390,11 +2446,11 @@ msgstr "Upravlja vidljivošću mreže."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:9
 msgid "Show/hide markup."
-msgstr ""
+msgstr "Prikažite/sakrijte označavanje."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:10
 msgid "Controls visibility of markup lines."
-msgstr ""
+msgstr "Upravljajte vidljivošću linija označavanja."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:11
 msgid "Maximum recent files."
@@ -2446,11 +2502,11 @@ msgstr "Osnovna težina pisma za nove tekstualne objekte."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:23
 msgid "Default font italic flag."
-msgstr ""
+msgstr "Opcija osnovnog iskošenog pisma."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:24
 msgid "The default font italic state for new text objects."
-msgstr ""
+msgstr "Osnovno stanje iskošenog pisma za nove tekstualne objekte."
 
 #: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:25
 msgid "Default text color."
@@ -2610,7 +2666,7 @@ msgstr "B3"
 
 #: ../templates/paper-sizes.xml.h:23
 msgid "B4"
-msgstr ""
+msgstr "B4"
 
 #: ../templates/paper-sizes.xml.h:24
 msgid "B5"
@@ -2630,7 +2686,7 @@ msgstr "B8"
 
 #: ../templates/paper-sizes.xml.h:28
 msgid "B9"
-msgstr ""
+msgstr "B9"
 
 #: ../templates/paper-sizes.xml.h:29
 msgid "B10"
@@ -2707,18 +2763,21 @@ msgstr "Bilo koja nalepnica"
 #: ../templates/categories.xml.h:2 ../templates/endisch-templates.xml.h:1
 #: ../templates/hama-iso-templates.xml.h:4
 #: ../templates/pearl-iso-templates.xml.h:4
+#: ../templates/rayfilm-templates.xml.h:8
 msgid "Round labels"
 msgstr "Zaobljene nalepnice"
 
 #. ===================================================================
 #: ../templates/categories.xml.h:3 ../templates/endisch-templates.xml.h:2
 #: ../templates/pearl-iso-templates.xml.h:58
+#: ../templates/rayfilm-templates.xml.h:9
 msgid "Elliptical labels"
 msgstr "Elipsoidne nalepnice"
 
 #. ====================================================================
 #: ../templates/categories.xml.h:4 ../templates/endisch-templates.xml.h:4
 #: ../templates/hama-iso-templates.xml.h:41
+#: ../templates/rayfilm-templates.xml.h:2
 msgid "Square labels"
 msgstr "Četvrtaste nalepnice"
 
@@ -2726,11 +2785,14 @@ msgstr "Četvrtaste nalepnice"
 #. ====================================================================
 #. ===================================================================
 #. ********************************************************************
+#. ===================================================================
 #: ../templates/categories.xml.h:5 ../templates/ascom-iso-templates.xml.h:4
 #: ../templates/endisch-templates.xml.h:3
 #: ../templates/hama-iso-templates.xml.h:27
 #: ../templates/herma-iso-templates.xml.h:20
-#: ../templates/jac-iso-templates.xml.h:4
+#: ../templates/igepa-templates.xml.h:1 ../templates/jac-iso-templates.xml.h:4
+#: ../templates/rayfilm-templates.xml.h:1
+#: ../templates/sheetlabels-us-templates.xml.h:2
 msgid "Rectangular labels"
 msgstr "Pravougaone nalepnice"
 
@@ -2754,11 +2816,11 @@ msgstr "CD/DVD ili drugi medij"
 
 #: ../templates/categories.xml.h:9
 msgid "Mailing/shipping products"
-msgstr ""
+msgstr "Poštanski/dostavni proizvodi"
 
 #: ../templates/categories.xml.h:10
 msgid "Foldable cards"
-msgstr ""
+msgstr "Sklopive kartice"
 
 #: ../templates/categories.xml.h:11
 msgid "Photo products"
@@ -2788,7 +2850,7 @@ msgstr "Pravougaone nalepnice"
 #: ../templates/meritline-us-templates.xml.h:18
 #: ../templates/worldlabel-us-templates.xml.h:11
 msgid "Video Tape Spine Labels"
-msgstr ""
+msgstr "Bočne nalepnice video traka"
 
 #. ===================================================================
 #. ===============================================================
@@ -2796,7 +2858,7 @@ msgstr ""
 #: ../templates/avery-iso-templates.xml.h:26
 #: ../templates/zweckform-iso-templates.xml.h:28
 msgid "CD Inlet"
-msgstr ""
+msgstr "CD umetak"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:2
@@ -2818,14 +2880,14 @@ msgstr "Velike zaobljene nalepnice"
 #: ../templates/avery-other-templates.xml.h:2
 #: ../templates/worldlabel-us-templates.xml.h:5
 msgid "File Folder Labels"
-msgstr ""
+msgstr "Nalepnice za fascikle dokumenata"
 
 #. ===================================================================
 #. ********************************************************************
 #: ../templates/avery-us-templates.xml.h:10
 #: ../templates/dataline-iso-templates.xml.h:10
 #: ../templates/meritline-us-templates.xml.h:6
-#: ../templates/sheetlabels-us-templates.xml.h:4
+#: ../templates/sheetlabels-us-templates.xml.h:6
 #: ../templates/uline-us-templates.xml.h:2
 #: ../templates/worldlabel-us-templates.xml.h:4
 msgid "Shipping Labels"
@@ -2842,7 +2904,7 @@ msgstr "Nalepnice za dostavu"
 #: ../templates/maco-us-templates.xml.h:2
 #: ../templates/meritline-us-templates.xml.h:4
 #: ../templates/pearl-iso-templates.xml.h:2
-#: ../templates/sheetlabels-us-templates.xml.h:2
+#: ../templates/sheetlabels-us-templates.xml.h:4
 #: ../templates/worldlabel-us-templates.xml.h:3
 #: ../templates/zweckform-iso-templates.xml.h:4
 msgid "Address Labels"
@@ -2853,7 +2915,7 @@ msgstr "Nalepnice za adrese"
 #: ../templates/avery-us-templates.xml.h:14
 #: ../templates/dymo-other-templates.xml.h:6
 #: ../templates/meritline-us-templates.xml.h:8
-#: ../templates/sheetlabels-us-templates.xml.h:6
+#: ../templates/sheetlabels-us-templates.xml.h:8
 #: ../templates/worldlabel-us-templates.xml.h:2
 msgid "Return Address Labels"
 msgstr "Nalepnice povratnih adresa"
@@ -2863,7 +2925,7 @@ msgstr "Nalepnice povratnih adresa"
 #: ../templates/maco-us-templates.xml.h:3
 #: ../templates/meritline-us-templates.xml.h:12
 #: ../templates/misc-us-templates.xml.h:23
-#: ../templates/sheetlabels-us-templates.xml.h:8
+#: ../templates/sheetlabels-us-templates.xml.h:10
 #: ../templates/worldlabel-us-templates.xml.h:9
 msgid "Round Labels"
 msgstr "Zaobljene nalepnice"
@@ -2872,22 +2934,22 @@ msgstr "Zaobljene nalepnice"
 #: ../templates/avery-us-templates.xml.h:18
 #: ../templates/avery-iso-templates.xml.h:20
 #: ../templates/meritline-us-templates.xml.h:14
-#: ../templates/sheetlabels-us-templates.xml.h:14
+#: ../templates/sheetlabels-us-templates.xml.h:16
 #: ../templates/worldlabel-us-templates.xml.h:8
 msgid "Diskette Labels"
-msgstr ""
+msgstr "Disketne nalepnice"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:20
 msgid "Tent Cards"
-msgstr ""
+msgstr "Šator kartice"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:22
-#: ../templates/sheetlabels-us-templates.xml.h:10
+#: ../templates/sheetlabels-us-templates.xml.h:12
 #: ../templates/worldlabel-us-templates.xml.h:7
 msgid "Filing Labels"
-msgstr ""
+msgstr "Nalepnice za odlaganje dokumenata"
 
 #. ===================================================================
 #. ============================================================
@@ -2901,6 +2963,7 @@ msgstr ""
 #: ../templates/decadry-iso-templates.xml.h:6
 #: ../templates/misc-us-templates.xml.h:25
 #: ../templates/misc-iso-templates.xml.h:4
+#: ../templates/rayfilm-templates.xml.h:15
 #: ../templates/zweckform-iso-templates.xml.h:30
 msgid "Business Cards"
 msgstr "Poslovne kartice"
@@ -2908,7 +2971,7 @@ msgstr "Poslovne kartice"
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:26
 msgid "Index Cards"
-msgstr ""
+msgstr "Kartice za popisivanje"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:28
@@ -2918,7 +2981,7 @@ msgstr "Razglednice"
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:30
 msgid "Name Badge Labels"
-msgstr ""
+msgstr "Nalepnice za bedževe sa imenima"
 
 #. ===================================================================
 #. ===============================================================
@@ -2929,12 +2992,13 @@ msgstr ""
 #: ../templates/avery-iso-templates.xml.h:6
 #: ../templates/geha-iso-templates.xml.h:10
 #: ../templates/herma-iso-templates.xml.h:14
-#: ../templates/jac-iso-templates.xml.h:2
+#: ../templates/igepa-templates.xml.h:5 ../templates/jac-iso-templates.xml.h:2
 #: ../templates/misc-us-templates.xml.h:8
 #: ../templates/misc-iso-templates.xml.h:22
 #: ../templates/misc-other-templates.xml.h:2
 #: ../templates/pearl-iso-templates.xml.h:64
-#: ../templates/sheetlabels-us-templates.xml.h:12
+#: ../templates/rayfilm-templates.xml.h:10
+#: ../templates/sheetlabels-us-templates.xml.h:14
 #: ../templates/worldlabel-us-templates.xml.h:12
 #: ../templates/zweckform-iso-templates.xml.h:8
 msgid "CD/DVD Labels"
@@ -2942,20 +3006,20 @@ msgstr "CD/DVD nalepnice"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:34
-#: ../templates/sheetlabels-us-templates.xml.h:16
+#: ../templates/sheetlabels-us-templates.xml.h:18
 msgid "CD/DVD Labels (Disc Labels)"
 msgstr "CD/DVD nalepnice (nalepnice za diskove)"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:36
 msgid "CD/DVD Labels (Spine Labels)"
-msgstr ""
+msgstr "CD/DVD nalepnice (nalepnice za bokove)"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:38
 #: ../templates/geha-iso-templates.xml.h:17
 #: ../templates/meritline-us-templates.xml.h:16
-#: ../templates/sheetlabels-us-templates.xml.h:18
+#: ../templates/sheetlabels-us-templates.xml.h:20
 #: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Video Tape Face Labels"
 msgstr "Naslovne nalepnice video traka"
@@ -2963,19 +3027,19 @@ msgstr "Naslovne nalepnice video traka"
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:42
 msgid "ID Labels"
-msgstr ""
+msgstr "ID nalepnice"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:44
 #: ../templates/meritline-us-templates.xml.h:10
 #: ../templates/worldlabel-us-templates.xml.h:6
 msgid "Full Sheet Labels"
-msgstr ""
+msgstr "Nalepnice na čitavom listu"
 
 #. the LSK labels can be torn in half down the center
 #: ../templates/avery-us-templates.xml.h:46
 msgid "Divider Labels"
-msgstr ""
+msgstr "Nalepnice za razdvajanje"
 
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:2
@@ -2985,7 +3049,7 @@ msgstr "Male nalepnice"
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:4
 msgid "Self-Adhesive Name Badges (Acetate Silk)"
-msgstr ""
+msgstr "Samolepljivi bedževi sa imenima (acetonska svila)"
 
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:8
@@ -3034,7 +3098,7 @@ msgstr "Malene nalepnice za adrese"
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:30
 msgid "Identification Labels"
-msgstr ""
+msgstr "Nalepnice za prepoznavanje"
 
 #. ===================================================================
 #. ====================================================================
@@ -3062,24 +3126,30 @@ msgstr "Disketne nalepnice"
 #.
 #: ../templates/brother-other-templates.xml.h:18
 msgid "Standard Address Labels 29mm x 90mm"
-msgstr ""
+msgstr "Uobičajene nalepnice za adrese 29mm x 90mm"
 
 #: ../templates/brother-other-templates.xml.h:19
 msgid "Shipping Labels 62mm x 100mm"
-msgstr ""
+msgstr "Nalepnice za dostavu 62mm x 100mm"
 
 #: ../templates/brother-other-templates.xml.h:20
 msgid "Multi Purpose Labels 17mm x 54mm"
-msgstr ""
+msgstr "Višenamenske nalepnice 17mm x 54mm"
 
 #: ../templates/brother-other-templates.xml.h:21
 msgid "Standard Address Labels 38mm x 90mm"
-msgstr ""
+msgstr "Uobičajene nalepnice za adrese 38mm x 90mm"
+
+#. ===================================================================
+#: ../templates/canon-other-templates.xml.h:2
+#| msgid "CD/DVD Labels"
+msgid "CD/DVD Tray"
+msgstr "CD/DVD fioka"
 
 #. ===================================================================
 #: ../templates/databecker-iso-templates.xml.h:4
 msgid "CD/DVD Labels Standard Format (face only)"
-msgstr ""
+msgstr "CD/DVD nalepnice uobičajenog oblika (samo lice)"
 
 #. ===================================================================
 #. ============================================================
@@ -3088,91 +3158,98 @@ msgstr ""
 #: ../templates/desmat-templates.xml.h:2
 #: ../templates/misc-iso-templates.xml.h:20
 msgid "CD Labels"
-msgstr ""
+msgstr "CD nalepnice"
 
 #. ===================================================================
 #. ====================================================================
+#. ===================================================================
 #: ../templates/dataline-iso-templates.xml.h:2
 #: ../templates/hama-iso-templates.xml.h:35
+#: ../templates/misc-iso-templates.xml.h:32
 msgid "CD/DVD labels"
-msgstr ""
+msgstr "CD/DVD nalepnice"
 
 #. ===================================================================
 #: ../templates/dataline-iso-templates.xml.h:8
 #: ../templates/pearl-iso-templates.xml.h:60
 msgid "Membership cards"
-msgstr ""
+msgstr "Članske kartice"
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:2
 #: ../templates/geha-iso-templates.xml.h:23
 msgid "Large Address Labels"
-msgstr ""
+msgstr "Velike nalepnice za adrese"
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:8
 msgid "Shipping Address Labels"
-msgstr ""
+msgstr "Nalepnice za adrese dostavljanja"
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:10
 msgid "File Folder"
-msgstr ""
+msgstr "Fascikla za dokumenta"
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:12
 msgid "Hanging Folder"
-msgstr ""
+msgstr "Fascikle za kačenje"
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:14
 msgid "3.5in Diskette"
-msgstr ""
+msgstr "Diskete 3.5 inča"
 
 #. ===================================================================
 #: ../templates/endisch-templates.xml.h:5
 #: ../templates/pearl-iso-templates.xml.h:20
+#: ../templates/rayfilm-templates.xml.h:3
 msgid "Labels A6"
 msgstr "Nalepnice A6"
 
 #. ===================================================================
 #: ../templates/endisch-templates.xml.h:6
 #: ../templates/pearl-iso-templates.xml.h:22
+#: ../templates/rayfilm-templates.xml.h:4
 msgid "Labels A5"
 msgstr "Nalepnice A5"
 
 #. *******************************************************************
 #. ===================================================================
-#: ../templates/endisch-templates.xml.h:7
+#: ../templates/endisch-templates.xml.h:7 ../templates/igepa-templates.xml.h:3
 #: ../templates/jac-iso-templates.xml.h:6
 #: ../templates/pearl-iso-templates.xml.h:6
+#: ../templates/rayfilm-templates.xml.h:5
 msgid "Labels A4"
 msgstr "Nalepnice A4"
 
 #: ../templates/endisch-templates.xml.h:8
+#: ../templates/rayfilm-templates.xml.h:6
 msgid "Labels A3"
 msgstr "Nalepnice A3"
 
 #: ../templates/endisch-templates.xml.h:9
+#: ../templates/rayfilm-templates.xml.h:7
 msgid "Labels SRA3"
 msgstr "Nalepnice SRA3"
 
 #. ===================================================================
 #: ../templates/geha-iso-templates.xml.h:2
 msgid "Flyer paper"
-msgstr ""
+msgstr "Papir za presavijanje"
 
 #. ===================================================================
 #. ====================================================================
 #: ../templates/geha-iso-templates.xml.h:6
 #: ../templates/hama-iso-templates.xml.h:25
 msgid "Greeting cards"
-msgstr ""
+msgstr "Čestitke"
 
 #. ===================================================================
 #: ../templates/geha-iso-templates.xml.h:8
 msgid "Arch File inserts"
-msgstr ""
+msgstr "Umeci arhive dokumenata"
 
 #: ../templates/geha-iso-templates.xml.h:11
 msgid "CD/DVD Inlet"
@@ -3199,7 +3276,7 @@ msgstr "Fotografske nalepnice"
 #. ===================================================================
 #: ../templates/geha-iso-templates.xml.h:21
 msgid "Passport photo labels"
-msgstr ""
+msgstr "Fotografske nalepnice za pasoš"
 
 #. ===================================================================
 #. ====================================================================
@@ -3208,7 +3285,7 @@ msgstr ""
 #: ../templates/hama-iso-templates.xml.h:37
 #: ../templates/herma-iso-templates.xml.h:6
 msgid "Arch File Labels"
-msgstr ""
+msgstr "Nalepnice za arhive dokumenata"
 
 #. ===================================================================
 #: ../templates/geha-iso-templates.xml.h:29
@@ -3220,7 +3297,7 @@ msgstr "Višenamenske nalepnice"
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:2
 msgid "Printable mousepad"
-msgstr ""
+msgstr "Podmetak za miša"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:10
@@ -3243,305 +3320,323 @@ msgstr "CD umetak (poleđina)"
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:15
 msgid "Zip disc inlet"
-msgstr ""
+msgstr "Umetak zip diska"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:19
 msgid "VHS-C inlet"
-msgstr ""
+msgstr "VHS-C umetak"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:21
 msgid "Video-8 inlet"
-msgstr ""
+msgstr "Video-8 umetak"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:23
 msgid "VHS inlet"
-msgstr ""
+msgstr "VHS umetak"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:33
 msgid "Zip disc labels"
-msgstr ""
+msgstr "Nalepnice zip diskova"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:39
 msgid "Arch File labels"
-msgstr ""
+msgstr "Nalepnice arhive dokumenata"
 
 #. ====================================================================
 #: ../templates/hama-iso-templates.xml.h:43
 msgid "Mini Disc labels"
-msgstr ""
+msgstr "Nalepnice mini diskova"
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:2
 msgid "Arch File Labels (small)"
-msgstr ""
+msgstr "Nalepnice arhive dokumenata (male)"
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:4
 msgid "Arch File Labels (large)"
-msgstr ""
+msgstr "Nalepnice arhive dokumenata (velike)"
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:10
 #: ../templates/zweckform-iso-templates.xml.h:20
 msgid "Allround Labels"
-msgstr ""
+msgstr "Opštenamenske nalepnice"
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:12
 msgid "Video Labels (face only)"
-msgstr ""
+msgstr "Nalepnice za snimke (samo lice)"
 
 #. ===================================================================
 #: ../templates/herma-iso-templates.xml.h:16
 msgid "Diskette Labels (face only)"
-msgstr ""
+msgstr "Nalepnice za diskete (samo lice)"
+
+#. ===================================================================
+#: ../templates/igepa-templates.xml.h:2
+#: ../templates/pearl-iso-templates.xml.h:18
+msgid "Floppy disk labels"
+msgstr "Nalepnice za flopi diskove"
+
+#. ===================================================================
+#: ../templates/igepa-templates.xml.h:4
+#: ../templates/zweckform-iso-templates.xml.h:2
+msgid "Lever Arch File Labels"
+msgstr "Nalepnice za arhive dokumenata sa polugom"
 
 #. *******************************************************************
 #: ../templates/jac-iso-templates.xml.h:8
 msgid "PVC labels"
-msgstr ""
+msgstr "PVC nalepnice"
 
 #. ===================================================================
 #: ../templates/meritline-us-templates.xml.h:2
 msgid "Mini-CD Labels"
-msgstr ""
+msgstr "Mini-CD nalepnice"
 
 #. ===================================================================
 #: ../templates/microapp-templates.xml.h:2
 msgid "Standard Labels"
-msgstr ""
+msgstr "Uobičajene nalepnice"
 
 #. ===================================================================
 #. TODO: Is this the actual part #?
 #: ../templates/misc-us-templates.xml.h:2
 #: ../templates/misc-iso-templates.xml.h:24
 msgid "CD/DVD Labels (face only)"
-msgstr ""
+msgstr "CD/DVD nalepnice (samo lice)"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:4
 msgid "CD/DVD Labels (Face Only)"
-msgstr ""
+msgstr "CD/DVD nalepnice (samo lice)"
 
 #. TODO: Is this the actual part #?
 #: ../templates/misc-us-templates.xml.h:6
 msgid "Cassette Labels"
-msgstr ""
+msgstr "Nalepnice za kasete"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:10
 msgid "Slimline CD Case (rightside up)"
-msgstr ""
+msgstr "Tanko CD kućište (odgovarajuće)"
 
 #: ../templates/misc-us-templates.xml.h:11
 msgid "Slimline CD Case (upside down)"
-msgstr ""
+msgstr "Tanko CD kućište (pretureno)"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:13
 msgid "CD Template Rectangles"
-msgstr ""
+msgstr "Pravougaoni šabloni za CD"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:15
 msgid "Business Card CD"
-msgstr ""
+msgstr "Poslovne kartice za CD"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:17
 msgid "Jewel Case Booklet"
-msgstr ""
+msgstr "Ukrasna presavijena futrola"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:19
 msgid "DLT Labels"
-msgstr ""
+msgstr "DLT nalepnice"
 
 #. ===================================================================
 #. TODO: Is this the actual part #?
 #: ../templates/misc-us-templates.xml.h:27
-#: ../templates/misc-iso-templates.xml.h:34
+#: ../templates/misc-iso-templates.xml.h:36
 msgid "PRO CD Labels 2-up (face only)"
-msgstr ""
+msgstr "PRO CD nalepnice 2-gore (samo lice)"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:29
 msgid "PRO CD Labels 2-up (Face only)"
-msgstr ""
+msgstr "PRO CD nalepnice 2-gore (samo lice)"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:31
 msgid "PRO CD Labels 2-up (CD spine only)"
-msgstr ""
+msgstr "PRO CD nalepnice 2-gore (samo bok CD-a)"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:33
 msgid "Microtube labels"
-msgstr ""
+msgstr "Nalepnice za cevčice"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:8
 msgid "General Labels"
-msgstr ""
+msgstr "Opšte nalepnice"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:10
 #: ../templates/pearl-iso-templates.xml.h:28
 msgid "Self-adhesive labels"
-msgstr ""
+msgstr "Samolepljive nalepnice"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:14
 msgid "Fridge Magnet Stickers"
-msgstr ""
+msgstr "Magnetne nalepnice za frižider"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:16
 msgid "Inkjet/Laser Labels 70x37mm"
-msgstr ""
+msgstr "Nalepnice za laser i mlazne štampače 70x37mm"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:18
 msgid "EPSON Photo Stickers 16"
-msgstr ""
+msgstr "EPSON-ove fotografske nalepnice 16"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:30
 msgid "Universal Labels"
-msgstr ""
+msgstr "Univerzalne nalepnice"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:32
+#: ../templates/misc-iso-templates.xml.h:34
 #: ../templates/pearl-iso-templates.xml.h:16
 msgid "Bottle labels"
-msgstr ""
+msgstr "Nalepnice za boce"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:36
+#: ../templates/misc-iso-templates.xml.h:38
 msgid "Etiketten"
-msgstr ""
+msgstr "Etikete"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:8
 msgid "Self-adhesive film weatherproof"
-msgstr ""
+msgstr "Samolepljiva folija otporna na uslove"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:10
 msgid "Self-adhesive film transparent"
-msgstr ""
+msgstr "Samolepljiva providna folija"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:14
 msgid "Self-adhesive window film"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:18
-msgid "Floppy disk labels"
-msgstr ""
+msgstr "Samolepljiva folija za prozore"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:24
 msgid "Photo labels semiglossy"
-msgstr ""
+msgstr "Polusjajne fotografske nalepnice"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:26
 msgid "Address Labels (STAMPIT)"
-msgstr ""
+msgstr "Nalepnice za adrese (STAMPIT)"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:30
 msgid "SD card labels"
-msgstr ""
+msgstr "Nalepnice za SD kartice"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:40
 msgid "Passport photo labels glossy"
-msgstr ""
+msgstr "Sjajne fotografske nalepnice za pasoš"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:42
 msgid "Business cards punched"
-msgstr ""
+msgstr "Obložene poslovne kartice"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:44
 msgid "Business cards punched dull"
-msgstr ""
+msgstr "Jednostavne obložene poslovne kartice"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:46
 msgid "Business cards high glossy"
-msgstr ""
+msgstr "Vrlo nakićene poslovne kartice"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:48
 msgid "Name plates"
-msgstr ""
+msgstr "Pločice sa imenima"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:50
 msgid "Business cards glossy, both sides printable"
-msgstr ""
+msgstr "Nakićene poslovne kartice, obe strane za štampanje"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:52
 msgid "Business cards punched glossy"
-msgstr ""
+msgstr "Nakićene obložene poslovne kartice"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:54
 msgid "Foldable business cards glossy/dull"
-msgstr ""
+msgstr "Nakićene/suvoparne presavljive poslovne kartice"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:56
 msgid "Foldable business cards"
-msgstr ""
+msgstr "Presavljive poslovne kartice"
 
 #. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:62
 msgid "Membership cards, both sides printable"
-msgstr ""
+msgstr "Članske kartice, obe strane za štampanje"
 
-#. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:2
-msgid "Lever Arch File Labels"
-msgstr ""
+#: ../templates/rayfilm-templates.xml.h:11
+msgid "Business card CD Labels"
+msgstr "CD nalepnice poslovne kartice"
+
+#: ../templates/rayfilm-templates.xml.h:12
+msgid "Mini CD Labels"
+msgstr "Nalepnice za mini CD "
+
+#: ../templates/rayfilm-templates.xml.h:13
+msgid "Triangular labels"
+msgstr "Trougaone nalepnice"
+
+#: ../templates/rayfilm-templates.xml.h:14
+msgid "Trapezoid labels"
+msgstr "Trapezoidne nalepnice"
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:12
 msgid "QSL-Karten Etiketten 70mm x 50,8mm"
-msgstr ""
+msgstr "KuSL-Karte etikete 70mm x 50,8mm"
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:14
 msgid "File Back Labels"
-msgstr ""
+msgstr "Nalepnice za poleđinu dokumenta"
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:16
 msgid "Multi-purpose Stick+Lift Labels"
-msgstr ""
+msgstr "Višenamenske nalepnice „Zalepi+Odlepi“"
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:18
 msgid "Video Labels (back)"
-msgstr ""
+msgstr "Nalepnice za snimke (poleđina)"
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:22
 msgid "Rectangular Copier Labels"
-msgstr ""
+msgstr "Pravougaone nalepnice za umnožavanje"
 
 #. ===================================================================
 #: ../templates/zweckform-iso-templates.xml.h:24
 msgid "Correction and Cover-up Labels"
-msgstr ""
+msgstr "Nalepnice za ispravke i prekrivanje"
index 8f5684b7ba0e7f61ab89327f08f4af69fce41968..e2001f0fab67987dc4348b2812071b2800179ae1 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,7 +80,8 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = glabels-3$(EXEEXT) glabels-3-batch$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+       $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -127,6 +155,7 @@ glabels_3_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 glabels_3_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(glabels_3_LDFLAGS) $(LDFLAGS) -o $@
@@ -160,6 +189,18 @@ glabels_3_batch_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(glabels_3_batch_LDFLAGS) $(LDFLAGS) \
        -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -172,29 +213,26 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(glabels_3_SOURCES) $(glabels_3_batch_SOURCES)
 DIST_SOURCES = $(glabels_3_SOURCES) $(glabels_3_batch_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-       html-recursive info-recursive install-data-recursive \
-       install-dvi-recursive install-exec-recursive \
-       install-html-recursive install-info-recursive \
-       install-pdf-recursive install-ps-recursive install-recursive \
-       installcheck-recursive installdirs-recursive pdf-recursive \
-       ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+       ctags-recursive dvi-recursive html-recursive info-recursive \
+       install-data-recursive install-dvi-recursive \
+       install-exec-recursive install-html-recursive \
+       install-info-recursive install-pdf-recursive \
+       install-ps-recursive install-recursive installcheck-recursive \
+       installdirs-recursive pdf-recursive ps-recursive \
+       tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -202,9 +240,29 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
        distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -278,6 +336,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -801,10 +860,12 @@ install-binPROGRAMS: $(bin_PROGRAMS)
        fi; \
        for p in $$list; do echo "$$p $$p"; done | \
        sed 's/$(EXEEXT)$$//' | \
-       while read p p1; do if test -f $$p || test -f $$p1; \
-         then echo "$$p"; echo "$$p"; else :; fi; \
+       while read p p1; do if test -f $$p \
+        || test -f $$p1 \
+         ; then echo "$$p"; echo "$$p"; else :; fi; \
        done | \
-       sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+       sed -e 'p;s,.*/,,;n;h' \
+           -e 's|.*|.|' \
            -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
        sed 'N;N;N;s,\n, ,g' | \
        $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -825,7 +886,8 @@ uninstall-binPROGRAMS:
        @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
        files=`for p in $$list; do echo "$$p"; done | \
          sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-             -e 's/$$/$(EXEEXT)/' `; \
+             -e 's/$$/$(EXEEXT)/' \
+       `; \
        test -n "$$list" || exit 0; \
        echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -838,9 +900,11 @@ clean-binPROGRAMS:
        list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
        echo " rm -f" $$list; \
        rm -f $$list
+
 glabels-3$(EXEEXT): $(glabels_3_OBJECTS) $(glabels_3_DEPENDENCIES) $(EXTRA_glabels_3_DEPENDENCIES) 
        @rm -f glabels-3$(EXEEXT)
        $(AM_V_CCLD)$(glabels_3_LINK) $(glabels_3_OBJECTS) $(glabels_3_LDADD) $(LIBS)
+
 glabels-3-batch$(EXEEXT): $(glabels_3_batch_OBJECTS) $(glabels_3_batch_DEPENDENCIES) $(EXTRA_glabels_3_batch_DEPENDENCIES) 
        @rm -f glabels-3-batch$(EXEEXT)
        $(AM_V_CCLD)$(glabels_3_batch_LINK) $(glabels_3_batch_OBJECTS) $(glabels_3_batch_LDADD) $(LIBS)
@@ -957,14 +1021,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -980,22 +1044,25 @@ clean-libtool:
        -rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-       @fail= failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+       @fail=; \
+       if $(am__make_keepgoing); then \
+         failcom='fail=yes'; \
+       else \
+         failcom='exit 1'; \
+       fi; \
        dot_seen=no; \
        target=`echo $@ | sed s/-recursive//`; \
-       list='$(SUBDIRS)'; for subdir in $$list; do \
+       case "$@" in \
+         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+         *) list='$(SUBDIRS)' ;; \
+       esac; \
+       for subdir in $$list; do \
          echo "Making $$target in $$subdir"; \
          if test "$$subdir" = "."; then \
            dot_seen=yes; \
@@ -1010,57 +1077,12 @@ $(RECURSIVE_TARGETS):
          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
        fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-       @fail= failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
-       dot_seen=no; \
-       case "$@" in \
-         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-         *) list='$(SUBDIRS)' ;; \
-       esac; \
-       rev=''; for subdir in $$list; do \
-         if test "$$subdir" = "."; then :; else \
-           rev="$$subdir $$rev"; \
-         fi; \
-       done; \
-       rev="$$rev ."; \
-       target=`echo $@ | sed s/-recursive//`; \
-       for subdir in $$rev; do \
-         echo "Making $$target in $$subdir"; \
-         if test "$$subdir" = "."; then \
-           local_target="$$target-am"; \
-         else \
-           local_target="$$target"; \
-         fi; \
-         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-         || eval $$failcom; \
-       done && test -z "$$fail"
-tags-recursive:
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-       done
-ctags-recursive:
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-       done
+ID: $(am__tagged_files)
+       $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
        set x; \
        here=`pwd`; \
        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -1076,12 +1098,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
              set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
          fi; \
        done; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       $(am__define_uniq_tagged_files); \
        shift; \
        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
          test -n "$$unique" || unique=$$empty_fix; \
@@ -1093,15 +1110,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
              $$unique; \
          fi; \
        fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+       $(am__define_uniq_tagged_files); \
        test -z "$(CTAGS_ARGS)$$unique" \
          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
             $$unique
@@ -1110,6 +1123,21 @@ GTAGS:
        here=`$(am__cd) $(top_builddir) && pwd` \
          && $(am__cd) $(top_srcdir) \
          && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+       list='$(am__tagged_files)'; \
+       case "$(srcdir)" in \
+         [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+         *) sdir=$(subdir)/$(srcdir) ;; \
+       esac; \
+       for i in $$list; do \
+         if test -f "$$i"; then \
+           echo "$(subdir)/$$i"; \
+         else \
+           echo "$$sdir/$$i"; \
+         fi; \
+       done >> $(top_builddir)/cscope.files
 
 distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1281,25 +1309,23 @@ ps-am:
 
 uninstall-am: uninstall-binPROGRAMS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
-       ctags-recursive install install-am install-strip \
-       tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-       all all-am check check-am clean clean-binPROGRAMS \
-       clean-generic clean-libtool ctags ctags-recursive distclean \
-       distclean-compile distclean-generic distclean-libtool \
-       distclean-tags distdir dvi dvi-am html html-am info info-am \
-       install install-am install-binPROGRAMS install-data \
-       install-data-am install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am install-info \
-       install-info-am install-man install-pdf install-pdf-am \
-       install-ps install-ps-am install-strip installcheck \
-       installcheck-am installdirs installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-compile \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       tags tags-recursive uninstall uninstall-am \
-       uninstall-binPROGRAMS
+.MAKE: $(am__recursive_targets) all check install install-am \
+       install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+       check-am clean clean-binPROGRAMS clean-generic clean-libtool \
+       cscopelist-am ctags ctags-am distclean distclean-compile \
+       distclean-generic distclean-libtool distclean-tags distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+       install-binPROGRAMS install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am install-man \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       installdirs-am maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+       uninstall-am uninstall-binPROGRAMS
 
 
 marshal.h: marshal.list $(GLIB_GENMARSHAL)
index 0d9fed1d44d3ca94140139cd4d9d4603ac119f3f..d7ab99dab2afe32787a4e05c54faf09b14034624 100644 (file)
@@ -61,9 +61,11 @@ critical_error_handler (const gchar    *log_domain,
                         const gchar    *message,
                         gpointer        user_data)
 {
+        GtkWidget *dummy_window;
         GtkWidget *dialog;
 
-        dialog = gtk_message_dialog_new (NULL,
+        dummy_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+        dialog = gtk_message_dialog_new (GTK_WINDOW (dummy_window),
                                          GTK_DIALOG_MODAL,
                                          GTK_MESSAGE_ERROR,
                                          GTK_BUTTONS_NONE,
index ff06a6b73e2f8c1ba4dd6f72b457e772b5133a11..b637765838914b483f5ec3e22fda2170e7fe6e65 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/cursors
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -61,12 +88,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -75,6 +108,7 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 DATA = $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -120,6 +154,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -330,11 +365,11 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -471,15 +506,16 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-info install-info-am install-man install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
-       installcheck installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am install-man \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags-am uninstall uninstall-am
 
 
 cursor_pixdata.h: $(CURSOR_IMAGES)
index f2216edc6f1f22ef8d67793e7592715fbc215cde..13e9f943939614c9aebaffc1b092153982aeb214 100644 (file)
@@ -1185,7 +1185,7 @@ layout_text (glLabelText      *this,
         }
         else
         {
-                pango_layout_set_width (layout, object_w * PANGO_SCALE / scale_x);
+                pango_layout_set_width (layout, (object_w - 2*GL_LABEL_TEXT_MARGIN) * PANGO_SCALE / scale_x);
         }
         pango_layout_set_wrap (layout, PANGO_WRAP_WORD);
         pango_layout_set_alignment (layout, this->priv->align);
index 980b15d3643d40cebc9d2ae5a511f7dc6937c951..0710d3cc055ab9a940cc88628fa23c37b5699d54 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/pixmaps
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -60,12 +87,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -73,6 +106,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -118,6 +152,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -326,11 +361,11 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -466,15 +501,16 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-info install-info-am install-man install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
-       installcheck installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am install-man \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
index 8f5f1b7af419483c0592d8e3c75000e128caed8e..a7cb5f88a6bc53b86d6a3b73e01d24bb500d38d1 100644 (file)
@@ -60,9 +60,11 @@ warning_handler (const gchar    *log_domain,
                  const gchar    *message,
                  gpointer        user_data)
 {
+        GtkWidget *dummy_window;
         GtkWidget *dialog;
 
-        dialog = gtk_message_dialog_new (NULL,
+        dummy_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+        dialog = gtk_message_dialog_new (GTK_WINDOW (dummy_window),
                                          GTK_DIALOG_MODAL,
                                          GTK_MESSAGE_WARNING,
                                          GTK_BUTTONS_CLOSE,
@@ -73,6 +75,7 @@ warning_handler (const gchar    *log_domain,
         gtk_dialog_run (GTK_DIALOG (dialog));
 
        gtk_widget_destroy (GTK_WIDGET (dialog));
+        gtk_widget_destroy (GTK_WIDGET (dummy_window));
 }
 
 
index a0231715e8aea20cb094771a94cbe8df78725390..59e1db456cd3e3a214de1120f0ed46f700139392 100644 (file)
@@ -16,6 +16,7 @@ templates_DATA = \
        avery-iso-templates.xml \
        avery-other-templates.xml \
        brother-other-templates.xml \
+       canon-other-templates.xml \
        databecker-iso-templates.xml \
        dataline-iso-templates.xml      \
        decadry-iso-templates.xml \
index 1f0c7d210d06a1d9718aa0efc782d092fea24886..c4a6da24d2b1832d055af9508042cd335bc570e4 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \  ]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = templates
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -61,12 +88,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -103,6 +136,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(dtddir)" "$(DESTDIR)$(templatesdir)"
 DATA = $(dtd_DATA) $(templates_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -148,6 +182,7 @@ GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -314,6 +349,7 @@ templates_DATA = \
        avery-iso-templates.xml \
        avery-other-templates.xml \
        brother-other-templates.xml \
+       canon-other-templates.xml \
        databecker-iso-templates.xml \
        dataline-iso-templates.xml      \
        decadry-iso-templates.xml \
@@ -420,11 +456,11 @@ uninstall-templatesDATA:
        @list='$(templates_DATA)'; test -n "$(templatesdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(templatesdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -563,17 +599,17 @@ uninstall-am: uninstall-dtdDATA uninstall-templatesDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dtdDATA install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am install-man \
-       install-pdf install-pdf-am install-ps install-ps-am \
-       install-strip install-templatesDATA installcheck \
-       installcheck-am installdirs maintainer-clean \
+       cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am \
+       install-dtdDATA install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-man install-pdf install-pdf-am \
+       install-ps install-ps-am install-strip install-templatesDATA \
+       installcheck installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-       uninstall-dtdDATA uninstall-templatesDATA
+       mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+       uninstall-am uninstall-dtdDATA uninstall-templatesDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/templates/canon-other-templates.xml b/templates/canon-other-templates.xml
new file mode 100644 (file)
index 0000000..c3f181f
--- /dev/null
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<Glabels-templates>
+
+
+  <!-- =================================================================== -->
+  <!-- Type J CD/DVD Tray.                                                 -->
+  <!-- =================================================================== -->
+  <Template brand="Canon" part="Type J Tray" size="Other" width="135mm" height="295mm" _description="CD/DVD Tray">
+    <Label-cd id="0" radius="59mm" hole="11mm" waste="2mm">
+      <Markup-margin size="3.175mm"/>
+      <Layout nx="1" ny="1" x0="5.6mm" y0="58.5mm" dx="122mm" dy="122mm"/>
+    </Label-cd>
+  </Template>
+
+  <Template brand="Canon" part="MX920 CD Tray"  equiv="Type J Tray"/>
+  <Template brand="Canon" part="MG5400 CD Tray" equiv="Type J Tray"/>
+  <Template brand="Canon" part="MG6300 CD Tray" equiv="Type J Tray"/>
+  <Template brand="Canon" part="MG6500 CD Tray" equiv="Type J Tray"/>
+  <Template brand="Canon" part="iP7200 CD Tray" equiv="Type J Tray"/>
+
+
+</Glabels-templates>
index f3fe152f7d1f679e4bdfc3ecedeb52c52c2aef53..ea830b5c1a9d0335879a90539f25bbc6d0e7d9ca 100644 (file)
@@ -7,6 +7,7 @@
   <Vendor name="Ascom"         url="http://www.hovat.co.uk/hovat_labelling.html"       />
   <Vendor name="Avery"         url="http://www.avery.com/"                             />
   <Vendor name="Brother"       url="http://www.brother-usa.com/"                       />
+  <Vendor name="Canon"          url="http://www.canon.com/"                             />
   <Vendor name="Dataline"      url="http://www.esselte-dataline.com/uk/"               />
   <Vendor name="DECAdry"       url="http://www.decadry.com/"                           />
   <Vendor name="Desmat"                url="www.desmat.com/"                                   />