summaryrefslogtreecommitdiff
path: root/glabels2
diff options
context:
space:
mode:
Diffstat (limited to 'glabels2')
-rw-r--r--glabels2/AUTHORS18
-rw-r--r--glabels2/Makefile.am3
-rw-r--r--glabels2/Makefile.in452
-rw-r--r--glabels2/acconfig.h1
-rw-r--r--glabels2/acinclude.m4389
-rw-r--r--glabels2/aclocal.m4702
-rwxr-xr-xglabels2/autogen.sh42
-rw-r--r--glabels2/barcode-0.98/doc/barcode.info26
-rw-r--r--glabels2/barcode-0.98/doc/barcode.pdfbin160731 -> 192464 bytes
-rw-r--r--glabels2/barcode-0.98/doc/barcode.ps1202
-rw-r--r--glabels2/barcode-0.98/doc/barcodedoc.txt26
-rw-r--r--glabels2/config.h.in154
-rwxr-xr-xglabels2/configure6303
-rw-r--r--glabels2/configure.in6
-rw-r--r--glabels2/cvswrappers1
-rw-r--r--glabels2/data/predefined-labels.template350
-rwxr-xr-xglabels2/install-sh251
-rw-r--r--glabels2/macros/Makefile.am43
-rw-r--r--glabels2/macros/aclocal-include.m416
-rw-r--r--glabels2/macros/autogen.sh207
-rw-r--r--glabels2/macros/compiler-flags.m4109
-rw-r--r--glabels2/macros/curses.m4318
-rw-r--r--glabels2/macros/gnome-bonobo-check.m4166
-rw-r--r--glabels2/macros/gnome-common.m414
-rw-r--r--glabels2/macros/gnome-cxx-check.m410
-rw-r--r--glabels2/macros/gnome-fileutils.m4414
-rw-r--r--glabels2/macros/gnome-gettext.m4338
-rw-r--r--glabels2/macros/gnome-ghttp-check.m414
-rw-r--r--glabels2/macros/gnome-gnorba-check.m435
-rw-r--r--glabels2/macros/gnome-guile-checks.m4134
-rw-r--r--glabels2/macros/gnome-libgtop-check.m4217
-rw-r--r--glabels2/macros/gnome-objc-checks.m483
-rw-r--r--glabels2/macros/gnome-orbit-check.m433
-rw-r--r--glabels2/macros/gnome-pilot.m4213
-rw-r--r--glabels2/macros/gnome-print-check.m463
-rw-r--r--glabels2/macros/gnome-pthread-check.m418
-rw-r--r--glabels2/macros/gnome-support.m468
-rw-r--r--glabels2/macros/gnome-undelfs.m422
-rw-r--r--glabels2/macros/gnome-vfs.m4126
-rw-r--r--glabels2/macros/gnome-x-checks.m480
-rw-r--r--glabels2/macros/gnome-xml-check.m432
-rw-r--r--glabels2/macros/gnome.m4130
-rw-r--r--glabels2/macros/gperf-check.m479
-rw-r--r--glabels2/macros/linger.m428
-rw-r--r--glabels2/macros/need-declaration.m442
-rw-r--r--glabels2/macros/psiconv.m453
-rw-r--r--glabels2/po/Makefile.in.in243
-rw-r--r--glabels2/po/POTFILES.in1
-rw-r--r--glabels2/po/de.po1066
-rw-r--r--glabels2/po/es.po704
-rw-r--r--glabels2/po/fr.po2722
-rw-r--r--glabels2/po/glabels.pot709
-rw-r--r--glabels2/po/ja.po1149
-rw-r--r--glabels2/po/pl.po712
-rw-r--r--glabels2/po/pt_BR.po1051
-rw-r--r--glabels2/po/ru.po716
-rw-r--r--glabels2/po/zh_TW.Big5.po712
-rw-r--r--glabels2/src/Makefile.in478
-rw-r--r--glabels2/src/glabels-ui.xml5
-rw-r--r--glabels2/src/pixmaps/Makefile.in191
-rw-r--r--glabels2/src/stock-pixmaps/Makefile.in207
-rw-r--r--glabels2/src/view-barcode.c4
-rw-r--r--glabels2/src/view-box.c4
-rw-r--r--glabels2/src/view-ellipse.c4
-rw-r--r--glabels2/src/view-highlight.c72
-rw-r--r--glabels2/src/view-image.c4
-rw-r--r--glabels2/src/view-line.c4
-rw-r--r--glabels2/src/view-object.c9
-rw-r--r--glabels2/src/view-text.c4
-rw-r--r--glabels2/src/view.c444
-rw-r--r--glabels2/src/view.h79
-rw-r--r--glabels2/src/wdgt-text-props.c89
-rw-r--r--glabels2/stamp-h.in1
73 files changed, 10598 insertions, 13817 deletions
diff --git a/glabels2/AUTHORS b/glabels2/AUTHORS
index 9eb13bb..b29772d 100644
--- a/glabels2/AUTHORS
+++ b/glabels2/AUTHORS
@@ -44,6 +44,10 @@ Translations:
Marcus Bauer <m@7n7.de> -- German
Takeshi AIHANA <aihana@gnome.gr.jp> -- Japanese
Paulo Rogério Ormenese <pormenese@uol.com.br> -- Brazilian Portuguese
+ Víctor Moral <victor@pasmao.net> -- Spanish translations
+ Vitaly Lipatov <LAV@VL3143.spb.edu> -- Russian translations
+ Shell, Hin-lik Hung <shell@home.shellhung.org> -- Chinese Translations
+ Arkadiusz Lipiec <A.Lipiec@elka.pw.edu.pl> -- Polish Translations
The following people have submitted label templates or information about
@@ -68,6 +72,20 @@ particular products:
no-exit <no-exit@plunge.net>
Mozilla from marela <mozilla@marela.com>
Holger <holger@lange-online.net>
+ Bill Tihen <bill@tasis.ch>
+ Dan Gray <dan@dangray.org>
+ Keith Hudson <kwhudson@netin.com>
+ Tamas Bondar <tamas.bondar@pp.nic.fi>
+ George Mitchell <ghmitch@neteze.com>
+ Erich Pfennig <erich@alternativ.net>
+ Gwen Patton <ardrhi@voicenet.com>
+ Miek Gieben <miekg@atoom.net>
+ Joerg Schmitz-Linneweber <schmitz-linneweber@aston-technologie.de>
+ David Makovský <yakeen@sugama.cz>
+ Oliver Schwank <oli@flinx.sub.org>
+ Akkana <akkana@shallowsky.com>
+ Ted Poe <poet@theworld.com>
+ hans-helmut.belter <hans-helmut.belter@arcor.de>
And many others for their many helpful suggestions and bug reports -- thanks.
diff --git a/glabels2/Makefile.am b/glabels2/Makefile.am
index 74f2a8d..a355e91 100644
--- a/glabels2/Makefile.am
+++ b/glabels2/Makefile.am
@@ -5,7 +5,8 @@ LIB_BARCODE_DIR = barcode-0.98
SUBDIRS = po src doc
EXTRA_DIST = \
- glabels.desktop glabels.spec.in glabels.spec
+ glabels.desktop glabels.spec.in glabels.spec \
+ intltool-extract.in intltool-merge.in intltool-update.in
Applicationsdir = $(datadir)/gnome/apps/Applications
Applications_DATA = glabels.desktop
diff --git a/glabels2/Makefile.in b/glabels2/Makefile.in
deleted file mode 100644
index ccf2591..0000000
--- a/glabels2/Makefile.in
+++ /dev/null
@@ -1,452 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-DATADIRNAME = @DATADIRNAME@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLABELS_CFLAGS = @GLABELS_CFLAGS@
-GLABELS_LIBS = @GLABELS_LIBS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@
-INSTOBJEXT = @INSTOBJEXT@
-INTLDEPS = @INTLDEPS@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-PACKAGE = @PACKAGE@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-cxxflags_set = @cxxflags_set@
-
-LIB_BARCODE_DIR = barcode-0.98
-
-SUBDIRS = po src doc
-
-EXTRA_DIST = glabels.desktop glabels.spec.in glabels.spec
-
-
-Applicationsdir = $(datadir)/gnome/apps/Applications
-Applications_DATA = glabels.desktop
-
-pixmapdir = $(datadir)/pixmaps/glabels
-configdir = $(datadir)/glabels
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = glabels.spec
-DATA = $(Applications_DATA)
-
-DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
-Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 config.h.in \
-configure configure.in glabels.spec.in install-sh missing mkinstalldirs
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
- cd $(srcdir) && $(ACLOCAL)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
- cd $(srcdir) && $(AUTOCONF)
-
-config.h: stamp-h
- @if test ! -f $@; then \
- rm -f stamp-h; \
- $(MAKE) stamp-h; \
- else :; fi
-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES= CONFIG_HEADERS=config.h \
- $(SHELL) ./config.status
- @echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
- @if test ! -f $@; then \
- rm -f $(srcdir)/stamp-h.in; \
- $(MAKE) $(srcdir)/stamp-h.in; \
- else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
- cd $(top_srcdir) && $(AUTOHEADER)
- @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
- -rm -f config.h
-
-maintainer-clean-hdr:
-glabels.spec: $(top_builddir)/config.status glabels.spec.in
- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-install-ApplicationsDATA: $(Applications_DATA)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(Applicationsdir)
- @list='$(Applications_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Applicationsdir)/$$p"; \
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Applicationsdir)/$$p; \
- else if test -f $$p; then \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(Applicationsdir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(Applicationsdir)/$$p; \
- fi; fi; \
- done
-
-uninstall-ApplicationsDATA:
- @$(NORMAL_UNINSTALL)
- list='$(Applications_DATA)'; for p in $$list; do \
- rm -f $(DESTDIR)$(Applicationsdir)/$$p; \
- done
-
-# 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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
- @set fnord $(MAKEFLAGS); amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $(MAKEFLAGS); amf=$$2; \
- dot_seen=no; \
- rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
- rev="$$subdir $$rev"; \
- test "$$subdir" != "." || dot_seen=yes; \
- done; \
- test "$$dot_seen" = "no" && 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; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- here=`pwd` && cd $(srcdir) \
- && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
- -rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration. Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
- -rm -rf $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
- mkdir $(distdir)/=build
- mkdir $(distdir)/=inst
- dc_install_base=`cd $(distdir)/=inst && pwd`; \
- cd $(distdir)/=build \
- && ../configure --srcdir=.. --prefix=$$dc_install_base \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) dist
- -rm -rf $(distdir)
- @banner="$(distdir).tar.gz is ready for distribution"; \
- dashes=`echo "$$banner" | sed s/./=/g`; \
- echo "$$dashes"; \
- echo "$$banner"; \
- echo "$$dashes"
-dist: distdir
- -chmod -R a+r $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
- -rm -rf $(distdir)
-dist-all: distdir
- -chmod -R a+r $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
- -rm -rf $(distdir)
-distdir: $(DISTFILES)
- -rm -rf $(distdir)
- mkdir $(distdir)
- -chmod 777 $(distdir)
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
- else \
- test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
- fi; \
- done
- for subdir in $(SUBDIRS); do \
- if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
- || exit 1; \
- chmod 777 $(distdir)/$$subdir; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
- || exit 1; \
- fi; \
- done
- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-all-recursive-am: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am: install-ApplicationsDATA install-data-local
-install-data: install-data-recursive
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-ApplicationsDATA
-uninstall: uninstall-recursive
-all-am: Makefile $(DATA) config.h
-all-redirect: all-recursive-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
- $(mkinstalldirs) $(DESTDIR)$(Applicationsdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am: clean-hdr clean-tags clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am: distclean-hdr distclean-tags distclean-generic clean-am
-
-distclean: distclean-recursive
- -rm -f config.status
-
-maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \
- maintainer-clean-generic distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
- -rm -f config.status
-
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-uninstall-ApplicationsDATA install-ApplicationsDATA \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
-install-exec-am install-exec install-data-local install-data-am \
-install-data install-am install uninstall-am uninstall all-redirect \
-all-am all installdirs-am installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-install-data-local:
- @$(NORMAL_INSTALL)
- if test -d $(srcdir)/pixmaps; then \
- $(mkinstalldirs) $(pixmapdir); \
- for pixmap in $(srcdir)/pixmaps/*; do \
- if test -f $$pixmap; then \
- $(INSTALL_DATA) $$pixmap $(pixmapdir); \
- fi \
- done \
- fi
- if test -d $(srcdir)/data; then \
- $(mkinstalldirs) $(configdir); \
- for file in $(srcdir)/data/*.template; do \
- if test -f $$file; then \
- $(INSTALL_DATA) $$file $(configdir); \
- fi \
- done \
- fi
-
-dist-hook:
- if test -d pixmaps; then \
- mkdir $(distdir)/pixmaps; \
- for pixmap in pixmaps/*; do \
- if test -f $$pixmap; then \
- cp -p $$pixmap $(distdir)/pixmaps; \
- fi \
- done \
- fi
- if test -d data; then \
- mkdir $(distdir)/data; \
- for file in data/*.template; do \
- if test -f $$file; then \
- cp -p $$file $(distdir)/data; \
- fi \
- done \
- fi
- if test -d $(LIB_BARCODE_DIR); then \
- if test -f $(LIB_BARCODE_DIR)/Makefile; then \
- (cd $(LIB_BARCODE_DIR); $(MAKE) distclean); \
- fi; \
- mkdir $(distdir)/$(LIB_BARCODE_DIR); \
- cp -rp $(LIB_BARCODE_DIR)/* $(distdir)/$(LIB_BARCODE_DIR); \
- fi
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/glabels2/acconfig.h b/glabels2/acconfig.h
index 7e95887..f1e1b98 100644
--- a/glabels2/acconfig.h
+++ b/glabels2/acconfig.h
@@ -10,4 +10,3 @@
#undef PACKAGE_DATA_DIR
#undef PACKAGE_SOURCE_DIR
#undef GETTEXT_PACKAGE
-#undef HACKTEXT
diff --git a/glabels2/acinclude.m4 b/glabels2/acinclude.m4
new file mode 100644
index 0000000..0655ccd
--- /dev/null
+++ b/glabels2/acinclude.m4
@@ -0,0 +1,389 @@
+
+######################################################################
+# progtest.m4 from gettext 0.32
+######################################################################
+# Search path for a program which passes the given test.
+# Ulrich Drepper <drepper@cygnus.com>, 1996.
+#
+# This file file be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 1
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN(AM_PATH_PROG_WITH_TEST,
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+ /*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if [$3]; then
+ ac_cv_path_$1="$ac_dir/$ac_word"
+ break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+ ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test -n "[$]$1"; then
+ AC_MSG_RESULT([$]$1)
+else
+ AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
+
+
+######################################################################
+# lcmessage.m4 from gettext 0.32
+######################################################################
+# Check whether LC_MESSAGES is available in <locale.h>.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# This file file be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 1
+
+AC_DEFUN(AM_LC_MESSAGES,
+ [if test $ac_cv_header_locale_h = yes; then
+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+ if test $am_cv_val_LC_MESSAGES = yes; then
+ AC_DEFINE(HAVE_LC_MESSAGES)
+ fi
+ fi])
+
+
+
+######################################################################
+# gettext.m4 from gettext 0.32
+######################################################################
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# This file file be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 3
+
+AC_DEFUN(AM_WITH_NLS,
+ [AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+ AC_ARG_ENABLE(nls,
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+ AC_MSG_RESULT($USE_NLS)
+ AC_SUBST(USE_NLS)
+
+ USE_INCLUDED_LIBINTL=no
+
+ dnl If we use NLS figure out what method
+ if test "$USE_NLS" = "yes"; then
+ AC_DEFINE(ENABLE_NLS)
+ AC_MSG_CHECKING([whether included gettext is requested])
+ AC_ARG_WITH(included-gettext,
+ [ --with-included-gettext use the GNU gettext library included here],
+ nls_cv_force_use_gnu_gettext=$withval,
+ nls_cv_force_use_gnu_gettext=no)
+ AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+
+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+ dnl User does not insist on using GNU NLS library. Figure out what
+ dnl to use. If gettext or catgets are available (in this order) we
+ dnl use this. Else we have to fall back to GNU NLS library.
+ dnl catgets is only used if permitted by option --with-catgets.
+ nls_cv_header_intl=
+ nls_cv_header_libgt=
+ CATOBJEXT=NONE
+
+ AC_CHECK_HEADER(libintl.h,
+ [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
+ [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
+ gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
+
+ if test "$gt_cv_func_gettext_libc" != "yes"; then
+ AC_CHECK_LIB(intl, bindtextdomain,
+ [AC_CACHE_CHECK([for gettext in libintl],
+ gt_cv_func_gettext_libintl,
+ [AC_TRY_LINK([], [return (int) gettext ("")],
+ gt_cv_func_gettext_libintl=yes,
+ gt_cv_func_gettext_libintl=no)])])
+ fi
+
+ if test "$gt_cv_func_gettext_libc" = "yes" \
+ || test "$gt_cv_func_gettext_libintl" = "yes"; then
+ AC_DEFINE(HAVE_GETTEXT)
+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+ if test "$MSGFMT" != "no"; then
+ AC_CHECK_FUNCS(dcgettext)
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr],
+ [CATOBJEXT=.gmo
+ DATADIRNAME=share],
+ [CATOBJEXT=.mo
+ DATADIRNAME=lib])
+ INSTOBJEXT=.mo
+ fi
+ fi
+ ])
+
+ if test "$CATOBJEXT" = "NONE"; then
+ AC_MSG_CHECKING([whether catgets can be used])
+ AC_ARG_WITH(catgets,
+ [ --with-catgets use catgets functions if available],
+ nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
+ AC_MSG_RESULT($nls_cv_use_catgets)
+
+ if test "$nls_cv_use_catgets" = "yes"; then
+ dnl No gettext in C library. Try catgets next.
+ AC_CHECK_LIB(i, main)
+ AC_CHECK_FUNC(catgets,
+ [AC_DEFINE(HAVE_CATGETS)
+ INTLOBJS="\$(CATOBJS)"
+ AC_PATH_PROG(GENCAT, gencat, no)dnl
+ if test "$GENCAT" != "no"; then
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
+ if test "$GMSGFMT" = "no"; then
+ AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
+ fi
+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+ USE_INCLUDED_LIBINTL=yes
+ CATOBJEXT=.cat
+ INSTOBJEXT=.cat
+ DATADIRNAME=lib
+ INTLDEPS='$(top_builddir)/intl/libintl.a'
+ INTLLIBS=$INTLDEPS
+ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ nls_cv_header_intl=intl/libintl.h
+ nls_cv_header_libgt=intl/libgettext.h
+ fi])
+ fi
+ fi
+
+ if test "$CATOBJEXT" = "NONE"; then
+ dnl Neither gettext nor catgets in included in the C library.
+ dnl Fall back on GNU gettext library.
+ nls_cv_use_gnu_gettext=yes
+ fi
+ fi
+
+ if test "$nls_cv_use_gnu_gettext" = "yes"; then
+ dnl Mark actions used to generate GNU NLS library.
+ INTLOBJS="\$(GETTOBJS)"
+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+ AC_SUBST(MSGFMT)
+ USE_INCLUDED_LIBINTL=yes
+ CATOBJEXT=.gmo
+ INSTOBJEXT=.mo
+ DATADIRNAME=share
+ INTLDEPS='$(top_builddir)/intl/libintl.a'
+ INTLLIBS=$INTLDEPS
+ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ nls_cv_header_intl=intl/libintl.h
+ nls_cv_header_libgt=intl/libgettext.h
+ fi
+
+ dnl Test whether we really found GNU xgettext.
+ if test "$XGETTEXT" != ":"; then
+ dnl If it is no GNU xgettext we define it as : so that the
+ dnl Makefiles still can work.
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ : ;
+ else
+ AC_MSG_RESULT(
+ [found xgettext programs is not GNU xgettext; ignore it])
+ XGETTEXT=":"
+ fi
+ fi
+
+ # We need to process the po/ directory.
+ POSUB=po
+ else
+ DATADIRNAME=share
+ nls_cv_header_intl=intl/libintl.h
+ nls_cv_header_libgt=intl/libgettext.h
+ fi
+
+ # If this is used in GNU gettext we have to set USE_NLS to `yes'
+ # because some of the sources are only built for this goal.
+ if test "$PACKAGE" = gettext; then
+ USE_NLS=yes
+ USE_INCLUDED_LIBINTL=yes
+ fi
+
+ dnl These rules are solely for the distribution goal. While doing this
+ dnl we only have to keep exactly one list of the available catalogs
+ dnl in configure.in.
+ for lang in $ALL_LINGUAS; do
+ GMOFILES="$GMOFILES $lang.gmo"
+ POFILES="$POFILES $lang.po"
+ done
+
+ dnl Make all variables we use known to autoconf.
+ AC_SUBST(USE_INCLUDED_LIBINTL)
+ AC_SUBST(CATALOGS)
+ AC_SUBST(CATOBJEXT)
+ AC_SUBST(DATADIRNAME)
+ AC_SUBST(GMOFILES)
+ AC_SUBST(INSTOBJEXT)
+ AC_SUBST(INTLDEPS)
+ AC_SUBST(INTLLIBS)
+ AC_SUBST(INTLOBJS)
+ AC_SUBST(POFILES)
+ AC_SUBST(POSUB)
+ ])
+
+AC_DEFUN(AM_GNU_GETTEXT,
+ [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_PROG_RANLIB])dnl
+ AC_REQUIRE([AC_ISC_POSIX])dnl
+ AC_REQUIRE([AC_HEADER_STDC])dnl
+ AC_REQUIRE([AC_C_CONST])dnl
+ AC_REQUIRE([AC_C_INLINE])dnl
+ AC_REQUIRE([AC_TYPE_OFF_T])dnl
+ AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+ AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+ AC_REQUIRE([AC_FUNC_MMAP])dnl
+
+ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
+unistd.h values.h sys/param.h])
+ AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
+__argz_count __argz_stringify __argz_next])
+
+ if test "${ac_cv_func_stpcpy+set}" != "set"; then
+ AC_CHECK_FUNCS(stpcpy)
+ fi
+ if test "${ac_cv_func_stpcpy}" = "yes"; then
+ AC_DEFINE(HAVE_STPCPY)
+ fi
+
+ AM_LC_MESSAGES
+ AM_WITH_NLS
+
+ if test "x$CATOBJEXT" != "x"; then
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
+ else
+ AC_MSG_CHECKING(for catalogs to be installed)
+ NEW_LINGUAS=
+ for lang in ${LINGUAS=$ALL_LINGUAS}; do
+ case "$ALL_LINGUAS" in
+ *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+ esac
+ done
+ LINGUAS=$NEW_LINGUAS
+ AC_MSG_RESULT($LINGUAS)
+ fi
+
+ dnl Construct list of names of catalog files to be constructed.
+ if test -n "$LINGUAS"; then
+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+ fi
+ fi
+
+ dnl The reference to <locale.h> in the installed <libintl.h> file
+ dnl must be resolved because we cannot expect the users of this
+ dnl to define HAVE_LOCALE_H.
+ if test $ac_cv_header_locale_h = yes; then
+ INCLUDE_LOCALE_H="#include <locale.h>"
+ else
+ INCLUDE_LOCALE_H="\
+/* The system does not provide the header <locale.h>. Take care yourself. */"
+ fi
+ AC_SUBST(INCLUDE_LOCALE_H)
+
+ dnl Determine which catalog format we have (if any is needed)
+ dnl For now we know about two different formats:
+ dnl Linux libc-5 and the normal X/Open format
+ test -d intl || mkdir intl
+ if test "$CATOBJEXT" = ".cat"; then
+ AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
+
+ dnl Transform the SED scripts while copying because some dumb SEDs
+ dnl cannot handle comments.
+ sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
+ fi
+ dnl po2tbl.sed is always needed.
+ sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
+ $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
+
+ dnl In the intl/Makefile.in we have a special dependency which makes
+ dnl only sense for gettext. We comment this out for non-gettext
+ dnl packages.
+ if test "$PACKAGE" = "gettext"; then
+ GT_NO="#NO#"
+ GT_YES=
+ else
+ GT_NO=
+ GT_YES="#YES#"
+ fi
+ AC_SUBST(GT_NO)
+ AC_SUBST(GT_YES)
+
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+ dnl Try to locate is.
+ MKINSTALLDIRS=
+ if test -n "$ac_aux_dir"; then
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+ fi
+ if test -z "$MKINSTALLDIRS"; then
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
+ AC_SUBST(MKINSTALLDIRS)
+
+ dnl *** For now the libtool support in intl/Makefile is not for real.
+ l=
+ AC_SUBST(l)
+
+ dnl Generate list of files to be processed by xgettext which will
+ dnl be included in po/Makefile.
+ test -d po || mkdir po
+ if test "x$srcdir" != "x."; then
+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+ posrcprefix="$srcdir/"
+ else
+ posrcprefix="../$srcdir/"
+ fi
+ else
+ posrcprefix="../"
+ fi
+ rm -f po/POTFILES
+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ < $srcdir/po/POTFILES.in > po/POTFILES
+ ])
diff --git a/glabels2/aclocal.m4 b/glabels2/aclocal.m4
index d406fd9..b5338c5 100644
--- a/glabels2/aclocal.m4
+++ b/glabels2/aclocal.m4
@@ -10,6 +10,408 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE.
+
+# progtest.m4 from gettext 0.32
+# Search path for a program which passes the given test.
+# Ulrich Drepper <drepper@cygnus.com>, 1996.
+#
+# This file file be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 1
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN(AM_PATH_PROG_WITH_TEST,
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+ /*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if [$3]; then
+ ac_cv_path_$1="$ac_dir/$ac_word"
+ break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+ ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test -n "[$]$1"; then
+ AC_MSG_RESULT([$]$1)
+else
+ AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
+
+
+# lcmessage.m4 from gettext 0.32
+# Check whether LC_MESSAGES is available in <locale.h>.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# This file file be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 1
+
+AC_DEFUN(AM_LC_MESSAGES,
+ [if test $ac_cv_header_locale_h = yes; then
+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+ if test $am_cv_val_LC_MESSAGES = yes; then
+ AC_DEFINE(HAVE_LC_MESSAGES)
+ fi
+ fi])
+
+
+
+# gettext.m4 from gettext 0.32
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# This file file be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 3
+
+AC_DEFUN(AM_WITH_NLS,
+ [AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+ AC_ARG_ENABLE(nls,
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+ AC_MSG_RESULT($USE_NLS)
+ AC_SUBST(USE_NLS)
+
+ USE_INCLUDED_LIBINTL=no
+
+ dnl If we use NLS figure out what method
+ if test "$USE_NLS" = "yes"; then
+ AC_DEFINE(ENABLE_NLS)
+ AC_MSG_CHECKING([whether included gettext is requested])
+ AC_ARG_WITH(included-gettext,
+ [ --with-included-gettext use the GNU gettext library included here],
+ nls_cv_force_use_gnu_gettext=$withval,
+ nls_cv_force_use_gnu_gettext=no)
+ AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+
+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+ dnl User does not insist on using GNU NLS library. Figure out what
+ dnl to use. If gettext or catgets are available (in this order) we
+ dnl use this. Else we have to fall back to GNU NLS library.
+ dnl catgets is only used if permitted by option --with-catgets.
+ nls_cv_header_intl=
+ nls_cv_header_libgt=
+ CATOBJEXT=NONE
+
+ AC_CHECK_HEADER(libintl.h,
+ [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
+ [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
+ gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
+
+ if test "$gt_cv_func_gettext_libc" != "yes"; then
+ AC_CHECK_LIB(intl, bindtextdomain,
+ [AC_CACHE_CHECK([for gettext in libintl],
+ gt_cv_func_gettext_libintl,
+ [AC_TRY_LINK([], [return (int) gettext ("")],
+ gt_cv_func_gettext_libintl=yes,
+ gt_cv_func_gettext_libintl=no)])])
+ fi
+
+ if test "$gt_cv_func_gettext_libc" = "yes" \
+ || test "$gt_cv_func_gettext_libintl" = "yes"; then
+ AC_DEFINE(HAVE_GETTEXT)
+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+ if test "$MSGFMT" != "no"; then
+ AC_CHECK_FUNCS(dcgettext)
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr],
+ [CATOBJEXT=.gmo
+ DATADIRNAME=share],
+ [CATOBJEXT=.mo
+ DATADIRNAME=lib])
+ INSTOBJEXT=.mo
+ fi
+ fi
+ ])
+
+ if test "$CATOBJEXT" = "NONE"; then
+ AC_MSG_CHECKING([whether catgets can be used])
+ AC_ARG_WITH(catgets,
+ [ --with-catgets use catgets functions if available],
+ nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
+ AC_MSG_RESULT($nls_cv_use_catgets)
+
+ if test "$nls_cv_use_catgets" = "yes"; then
+ dnl No gettext in C library. Try catgets next.
+ AC_CHECK_LIB(i, main)
+ AC_CHECK_FUNC(catgets,
+ [AC_DEFINE(HAVE_CATGETS)
+ INTLOBJS="\$(CATOBJS)"
+ AC_PATH_PROG(GENCAT, gencat, no)dnl
+ if test "$GENCAT" != "no"; then
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
+ if test "$GMSGFMT" = "no"; then
+ AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
+ fi
+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+ USE_INCLUDED_LIBINTL=yes
+ CATOBJEXT=.cat
+ INSTOBJEXT=.cat
+ DATADIRNAME=lib
+ INTLDEPS='$(top_builddir)/intl/libintl.a'
+ INTLLIBS=$INTLDEPS
+ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ nls_cv_header_intl=intl/libintl.h
+ nls_cv_header_libgt=intl/libgettext.h
+ fi])
+ fi
+ fi
+
+ if test "$CATOBJEXT" = "NONE"; then
+ dnl Neither gettext nor catgets in included in the C library.
+ dnl Fall back on GNU gettext library.
+ nls_cv_use_gnu_gettext=yes
+ fi
+ fi
+
+ if test "$nls_cv_use_gnu_gettext" = "yes"; then
+ dnl Mark actions used to generate GNU NLS library.
+ INTLOBJS="\$(GETTOBJS)"
+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+ AC_SUBST(MSGFMT)
+ USE_INCLUDED_LIBINTL=yes
+ CATOBJEXT=.gmo
+ INSTOBJEXT=.mo
+ DATADIRNAME=share
+ INTLDEPS='$(top_builddir)/intl/libintl.a'
+ INTLLIBS=$INTLDEPS
+ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ nls_cv_header_intl=intl/libintl.h
+ nls_cv_header_libgt=intl/libgettext.h
+ fi
+
+ dnl Test whether we really found GNU xgettext.
+ if test "$XGETTEXT" != ":"; then
+ dnl If it is no GNU xgettext we define it as : so that the
+ dnl Makefiles still can work.
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ : ;
+ else
+ AC_MSG_RESULT(
+ [found xgettext programs is not GNU xgettext; ignore it])
+ XGETTEXT=":"
+ fi
+ fi
+
+ # We need to process the po/ directory.
+ POSUB=po
+ else
+ DATADIRNAME=share
+ nls_cv_header_intl=intl/libintl.h
+ nls_cv_header_libgt=intl/libgettext.h
+ fi
+
+ # If this is used in GNU gettext we have to set USE_NLS to `yes'
+ # because some of the sources are only built for this goal.
+ if test "$PACKAGE" = gettext; then
+ USE_NLS=yes
+ USE_INCLUDED_LIBINTL=yes
+ fi
+
+ dnl These rules are solely for the distribution goal. While doing this
+ dnl we only have to keep exactly one list of the available catalogs
+ dnl in configure.in.
+ for lang in $ALL_LINGUAS; do
+ GMOFILES="$GMOFILES $lang.gmo"
+ POFILES="$POFILES $lang.po"
+ done
+
+ dnl Make all variables we use known to autoconf.
+ AC_SUBST(USE_INCLUDED_LIBINTL)
+ AC_SUBST(CATALOGS)
+ AC_SUBST(CATOBJEXT)
+ AC_SUBST(DATADIRNAME)
+ AC_SUBST(GMOFILES)
+ AC_SUBST(INSTOBJEXT)
+ AC_SUBST(INTLDEPS)
+ AC_SUBST(INTLLIBS)
+ AC_SUBST(INTLOBJS)
+ AC_SUBST(POFILES)
+ AC_SUBST(POSUB)
+ ])
+
+AC_DEFUN(AM_GNU_GETTEXT,
+ [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_PROG_RANLIB])dnl
+ AC_REQUIRE([AC_ISC_POSIX])dnl
+ AC_REQUIRE([AC_HEADER_STDC])dnl
+ AC_REQUIRE([AC_C_CONST])dnl
+ AC_REQUIRE([AC_C_INLINE])dnl
+ AC_REQUIRE([AC_TYPE_OFF_T])dnl
+ AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+ AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+ AC_REQUIRE([AC_FUNC_MMAP])dnl
+
+ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
+unistd.h values.h sys/param.h])
+ AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
+__argz_count __argz_stringify __argz_next])
+
+ if test "${ac_cv_func_stpcpy+set}" != "set"; then
+ AC_CHECK_FUNCS(stpcpy)
+ fi
+ if test "${ac_cv_func_stpcpy}" = "yes"; then
+ AC_DEFINE(HAVE_STPCPY)
+ fi
+
+ AM_LC_MESSAGES
+ AM_WITH_NLS
+
+ if test "x$CATOBJEXT" != "x"; then
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
+ else
+ AC_MSG_CHECKING(for catalogs to be installed)
+ NEW_LINGUAS=
+ for lang in ${LINGUAS=$ALL_LINGUAS}; do
+ case "$ALL_LINGUAS" in
+ *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+ esac
+ done
+ LINGUAS=$NEW_LINGUAS
+ AC_MSG_RESULT($LINGUAS)
+ fi
+
+ dnl Construct list of names of catalog files to be constructed.
+ if test -n "$LINGUAS"; then
+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+ fi
+ fi
+
+ dnl The reference to <locale.h> in the installed <libintl.h> file
+ dnl must be resolved because we cannot expect the users of this
+ dnl to define HAVE_LOCALE_H.
+ if test $ac_cv_header_locale_h = yes; then
+ INCLUDE_LOCALE_H="#include <locale.h>"
+ else
+ INCLUDE_LOCALE_H="\
+/* The system does not provide the header <locale.h>. Take care yourself. */"
+ fi
+ AC_SUBST(INCLUDE_LOCALE_H)
+
+ dnl Determine which catalog format we have (if any is needed)
+ dnl For now we know about two different formats:
+ dnl Linux libc-5 and the normal X/Open format
+ test -d intl || mkdir intl
+ if test "$CATOBJEXT" = ".cat"; then
+ AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
+
+ dnl Transform the SED scripts while copying because some dumb SEDs
+ dnl cannot handle comments.
+ sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
+ fi
+ dnl po2tbl.sed is always needed.
+ sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
+ $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
+
+ dnl In the intl/Makefile.in we have a special dependency which makes
+ dnl only sense for gettext. We comment this out for non-gettext
+ dnl packages.
+ if test "$PACKAGE" = "gettext"; then
+ GT_NO="#NO#"
+ GT_YES=
+ else
+ GT_NO=
+ GT_YES="#YES#"
+ fi
+ AC_SUBST(GT_NO)
+ AC_SUBST(GT_YES)
+
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+ dnl Try to locate is.
+ MKINSTALLDIRS=
+ if test -n "$ac_aux_dir"; then
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+ fi
+ if test -z "$MKINSTALLDIRS"; then
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
+ AC_SUBST(MKINSTALLDIRS)
+
+ dnl *** For now the libtool support in intl/Makefile is not for real.
+ l=
+ AC_SUBST(l)
+
+ dnl Generate list of files to be processed by xgettext which will
+ dnl be included in po/Makefile.
+ test -d po || mkdir po
+ if test "x$srcdir" != "x."; then
+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+ posrcprefix="$srcdir/"
+ else
+ posrcprefix="../$srcdir/"
+ fi
+ else
+ posrcprefix="../"
+ fi
+ rm -f po/POTFILES
+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ < $srcdir/po/POTFILES.in > po/POTFILES
+ ])
+
+#serial 1
+# This test replaces the one in autoconf.
+# Currently this macro should have the same name as the autoconf macro
+# because gettext's gettext.m4 (distributed in the automake package)
+# still uses it. Otherwise, the use in gettext.m4 makes autoheader
+# give these diagnostics:
+# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
+# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
+
+undefine([AC_ISC_POSIX])
+
+AC_DEFUN([AC_ISC_POSIX],
+ [
+ dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
+ AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
+ ]
+)
+
# Do all the work for Automake. 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.
@@ -158,6 +560,130 @@ for am_file in <<$1>>; do
done<<>>dnl>>)
changequote([,]))])
+
+dnl AC_PROG_INTLTOOL([MINIMUM-VERSION])
+# serial 1 AC_PROG_INTLTOOL
+AC_DEFUN(AC_PROG_INTLTOOL,
+[
+
+if test -n "$1"; then
+ AC_MSG_CHECKING(for intltool >= $1)
+
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ printf "%d", $[1] * 100 + $[2]; }'`
+ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $[2]; }' < ${srcdir}/intltool-update.in`
+ changequote({{,}})
+ INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split(${{2}}, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${srcdir}/intltool-update.in`
+ changequote([,])
+
+ if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then
+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+ else
+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found. Your intltool is too old. You need intltool $1 or later.])
+ exit 1
+ fi
+fi
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -k -u -c $(top_builddir)/po/.intltool-merge-cache'
+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -p'
+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -o -u -c $(top_builddir)/po/.intltool-merge-cache'
+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache'
+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -x -u -c $(top_builddir)/po/.intltool-merge-cache'
+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u -c $(top_builddir)/po/.intltool-merge-cache'
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -s -u -c $(top_builddir)/po/.intltool-merge-cache'
+
+AC_SUBST(INTLTOOL_DESKTOP_RULE)
+AC_SUBST(INTLTOOL_DIRECTORY_RULE)
+AC_SUBST(INTLTOOL_KEYS_RULE)
+AC_SUBST(INTLTOOL_OAF_RULE)
+AC_SUBST(INTLTOOL_PONG_RULE)
+AC_SUBST(INTLTOOL_SERVER_RULE)
+AC_SUBST(INTLTOOL_SHEET_RULE)
+AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
+AC_SUBST(INTLTOOL_UI_RULE)
+AC_SUBST(INTLTOOL_XML_RULE)
+AC_SUBST(INTLTOOL_CAVES_RULE)
+AC_SUBST(INTLTOOL_SCHEMAS_RULE)
+
+# Use the tools built into the package, not the ones that are installed.
+
+INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
+INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
+INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
+
+AC_SUBST(INTLTOOL_EXTRACT)
+AC_SUBST(INTLTOOL_MERGE)
+AC_SUBST(INTLTOOL_UPDATE)
+
+AC_PATH_PROG(INTLTOOL_PERL, perl)
+if test -z "$INTLTOOL_PERL"; then
+ AC_MSG_ERROR([perl not found; required for intltool])
+fi
+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+ AC_MSG_ERROR([perl 5.x required for intltool])
+fi
+
+# Remove file type tags (using []) from po/POTFILES.
+
+ifdef([AC_DIVERSION_ICMDS],[
+ AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)
+ changequote(,)
+ mv -f po/POTFILES po/POTFILES.tmp
+ sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
+ rm -f po/POTFILES.tmp
+ changequote([,])
+ AC_DIVERT_POP()
+],[
+ ifdef([AC_CONFIG_COMMANDS_PRE],[
+ AC_CONFIG_COMMANDS_PRE([
+ changequote(,)
+ mv -f po/POTFILES po/POTFILES.tmp
+ sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
+ rm -f po/POTFILES.tmp
+ changequote([,])
+ ])
+ ])
+])
+
+# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
+
+AC_OUTPUT_COMMANDS([
+
+sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-extract.in > intltool-extract.out
+if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
+ rm -f intltool-extract.out
+else
+ mv -f intltool-extract.out intltool-extract
+fi
+chmod ugo+x intltool-extract
+chmod u+w intltool-extract
+
+sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-merge.in > intltool-merge.out
+if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
+ rm -f intltool-merge.out
+else
+ mv -f intltool-merge.out intltool-merge
+fi
+chmod ugo+x intltool-merge
+chmod u+w intltool-merge
+
+sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-update.in > intltool-update.out
+if cmp -s intltool-update intltool-update.out 2>/dev/null; then
+ rm -f intltool-update.out
+else
+ mv -f intltool-update.out intltool-update
+fi
+chmod ugo+x intltool-update
+chmod u+w intltool-update
+
+], INTLTOOL_PERL=${INTLTOOL_PERL})
+
+])
+
dnl
dnl GNOME_PLATFORM_GNOME_2(default, [force])
dnl
@@ -210,8 +736,7 @@ AC_DEFUN([GNOME_CHECK_PKGCONFIG],[
AC_MSG_CHECKING(for pkg-config)
pkgconfig_required_version=0.8.0
if test x$have_pkgconfig = xyes ; then
- $PKG_CONFIG --atleast-pkgconfig-version $pkgconfig_required_version
- if test $? -ne 0; then
+ if ! $PKG_CONFIG --atleast-pkgconfig-version $pkgconfig_required_version; then
echo "*** Your version of pkg-config is too old. You need version $pkgconfig_required_version or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
have_pkgconfig=no
@@ -241,24 +766,6 @@ AC_DEFUN([GNOME_REQUIRE_PKGCONFIG],[
GNOME_CHECK_PKGCONFIG([], fail)
])
-#serial 1
-# This test replaces the one in autoconf.
-# Currently this macro should have the same name as the autoconf macro
-# because gettext's gettext.m4 (distributed in the automake package)
-# still uses it. Otherwise, the use in gettext.m4 makes autoheader
-# give these diagnostics:
-# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-
-undefine([AC_ISC_POSIX])
-
-AC_DEFUN([AC_ISC_POSIX],
- [
- dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
- AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
- ]
-)
-
# serial 1
@@ -550,7 +1057,7 @@ AC_DEFUN(PKG_CHECK_MODULES, [
# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
+# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
#
# Modified to never use included libintl.
# Owen Taylor <otaylor@redhat.com>, 12/15/1998
@@ -568,6 +1075,55 @@ AC_DEFUN(PKG_CHECK_MODULES, [
# once we've installed glib-gettext.m4 :-( ]
#
+AC_DEFUN([AM_GLIB_LC_MESSAGES],
+ [if test $ac_cv_header_locale_h = yes; then
+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+ if test $am_cv_val_LC_MESSAGES = yes; then
+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
+ [Define if your <locale.h> file defines LC_MESSAGES.])
+ fi
+ fi])
+
+dnl AM_GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([AM_GLIB_PATH_PROG_WITH_TEST],
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+ /*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if [$3]; then
+ ac_cv_path_$1="$ac_dir/$ac_word"
+ break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+ ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+ AC_MSG_RESULT([$]$1)
+else
+ AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
+
# serial 5
AC_DEFUN(AM_GLIB_WITH_NLS,
@@ -587,36 +1143,45 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
nls_cv_header_intl=
nls_cv_header_libgt=
CATOBJEXT=NONE
+ XGETTEXT=:
AC_CHECK_HEADER(libintl.h,
[AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
[AC_TRY_LINK([#include <libintl.h>], [return (int) dgettext ("","")],
gt_cv_func_dgettext_libc=yes, gt_cv_func_dgettext_libc=no)])
- if test "$gt_cv_func_dgettext_libc" != "yes"; then
+ gt_cv_func_dgettext_libintl="no"
+ libintl_extra_libs=""
+
+ if test "$gt_cv_func_dgettext_libc" != "yes" ; then
AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CACHE_CHECK([for dgettext in libintl],
- gt_cv_func_dgettext_libintl,
- [AC_CHECK_LIB(intl, dgettext,
- gt_cv_func_dgettext_libintl=yes,
- gt_cv_func_dgettext_libintl=no)],
- gt_cv_func_dgettext_libintl=no)])
- fi
+ [AC_CHECK_LIB(intl, dgettext,
+ gt_cv_func_dgettext_libintl=yes)])
+
+ if test "$gt_cv_func_dgettext_libc" != "yes" ; then
+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
+ AC_MSG_RESULT([])
+ AC_CHECK_LIB(intl, dcgettext,
+ [gt_cv_func_dgettext_libintl=yes
+ libintl_extra_libs=-liconv],
+ :,-liconv)
+ fi
+ fi
if test "$gt_cv_func_dgettext_libintl" = "yes"; then
- LIBS="$LIBS -lintl";
+ LIBS="$LIBS -lintl $libintl_extra_libs";
fi
if test "$gt_cv_func_dgettext_libc" = "yes" \
|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
AC_DEFINE(HAVE_GETTEXT,1,
[Define if the GNU gettext() function is already present or preinstalled.])
- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+ AM_GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
if test "$MSGFMT" != "no"; then
AC_CHECK_FUNCS(dcgettext)
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ AM_GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
return _nl_msg_cat_cntr],
@@ -631,7 +1196,7 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
# Added by Martin Baulig 12/15/98 for libc5 systems
if test "$gt_cv_func_dgettext_libc" != "yes" \
&& test "$gt_cv_func_dgettext_libintl" = "yes"; then
- INTLLIBS=-lintl
+ INTLLIBS="-lintl $libintl_extra_libs"
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
fi
])
@@ -710,7 +1275,7 @@ unistd.h sys/param.h])
AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
strdup __argz_count __argz_stringify __argz_next])
- AM_LC_MESSAGES
+ AM_GLIB_LC_MESSAGES
AM_GLIB_WITH_NLS
if test "x$CATOBJEXT" != "x"; then
@@ -776,72 +1341,3 @@ strdup __argz_count __argz_stringify __argz_next])
])
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 1
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
- /*)
- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if [$3]; then
- ac_cv_path_$1="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
- ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
- AC_MSG_RESULT([$]$1)
-else
- AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 2
-
-AC_DEFUN([AM_LC_MESSAGES],
- [if test $ac_cv_header_locale_h = yes; then
- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
- if test $am_cv_val_LC_MESSAGES = yes; then
- AC_DEFINE(HAVE_LC_MESSAGES, 1,
- [Define if your <locale.h> file defines LC_MESSAGES.])
- fi
- fi])
-
diff --git a/glabels2/autogen.sh b/glabels2/autogen.sh
new file mode 100755
index 0000000..f6bcfb6
--- /dev/null
+++ b/glabels2/autogen.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="glabels"
+
+(test -f $srcdir/configure.in \
+ && test -f $srcdir/autogen.sh) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level $PKG_NAME directory"
+ exit 1
+}
+
+DIE=0
+
+# This is a bit complicated here since we can't use gnome-config yet.
+# It'll be easier after switching to pkg-config since we can then
+# use pkg-config to find the gnome-autogen.sh script.
+
+gnome_autogen=
+gnome_datadir=
+
+ifs_save="$IFS"; IFS=":"
+for dir in $PATH ; do
+ test -z "$dir" && dir=.
+ if test -f $dir/gnome-autogen.sh ; then
+ gnome_autogen="$dir/gnome-autogen.sh"
+ gnome_datadir=`echo $dir | sed -e 's,/bin$,/share,'`
+ break
+ fi
+done
+IFS="$ifs_save"
+
+if test -z "$gnome_autogen" ; then
+ echo "You need to install the gnome-common module and make"
+ echo "sure the gnome-autogen.sh script is in your \$PATH."
+ exit 1
+fi
+
+GNOME_DATADIR="$gnome_datadir" USE_GNOME2_MACROS=1 . $gnome_autogen
diff --git a/glabels2/barcode-0.98/doc/barcode.info b/glabels2/barcode-0.98/doc/barcode.info
index 693ca79..66b59d0 100644
--- a/glabels2/barcode-0.98/doc/barcode.info
+++ b/glabels2/barcode-0.98/doc/barcode.info
@@ -1,4 +1,4 @@
-This is barcode.info, produced by makeinfo version 4.0 from
+This is barcode.info, produced by makeinfo version 4.0b from
barcode.texinfo.
This file is the User's Manual for the barcode library (version
@@ -731,17 +731,17 @@ and then bless the package as version 1.0.

Tag Table:
-Node: Top153
-Node: Overview525
-Node: The Barcode Object1403
-Node: The Field List2820
-Node: The Intermediate Representation6585
-Node: Supported Flags8358
-Node: The API11342
-Node: The barcode Executable14028
-Node: The Command Line14457
-Node: Supported Encodings19556
-Node: PCL Output28996
-Node: Bugs and Pending Issues31315
+Node: Top154
+Node: Overview526
+Node: The Barcode Object1404
+Node: The Field List2821
+Node: The Intermediate Representation6586
+Node: Supported Flags8359
+Node: The API11343
+Node: The barcode Executable14029
+Node: The Command Line14458
+Node: Supported Encodings19557
+Node: PCL Output28997
+Node: Bugs and Pending Issues31316

End Tag Table
diff --git a/glabels2/barcode-0.98/doc/barcode.pdf b/glabels2/barcode-0.98/doc/barcode.pdf
index d7f66cb..b2268f4 100644
--- a/glabels2/barcode-0.98/doc/barcode.pdf
+++ b/glabels2/barcode-0.98/doc/barcode.pdf
Binary files differ
diff --git a/glabels2/barcode-0.98/doc/barcode.ps b/glabels2/barcode-0.98/doc/barcode.ps
index 6e2db98..cc6cc2c 100644
--- a/glabels2/barcode-0.98/doc/barcode.ps
+++ b/glabels2/barcode-0.98/doc/barcode.ps
@@ -8,7 +8,7 @@
%DVIPSWebPage: (www.radicaleye.com)
%DVIPSCommandLine: dvips -f barcode.dvi
%DVIPSParameters: dpi=600, compressed
-%DVIPSSource: TeX output 2002.03.01:2356
+%DVIPSSource: TeX output 2002.08.21:2135
%%BeginProcSet: texc.pro
%!
/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -117,16 +117,16 @@ D E
/Fc 10 115 df<EB0FFE90387FFFC048B512F04814FC3907FC0FFE48486C7E6D6C7F486C
7E82A26E7FA36C5A6C5AEA01E0C8FC5C49B5FC131F90B6FC000313F84813C0481300EA1F
FC485A127F5B12FF5BA45CA26C6C5A16F83B3FF807BFFF80391FFC1F3F390FFFFE1F6C49
-7E0001EBF80326003FE0C8FC292B7EA92C>97 D<13FFB5FCA512077EAF4AB4FC020F13E0
-023F13F891B57E9138FE07FFDAF8011380DAE00013C05C4AEB7FE017F0A3EE3FF8A317FC
-AC17F8A3EE7FF0A217E06E13FF17C06E481380DAF80313009138FE0FFE9039FC7FFFFC49
-6C13F0496C13C0C7D803FEC7FC2E407FBE33>I<EB03FF011F13E0017F13F890B57E48EB
-83FE3903FE01FF00075B4848481380121F13F8123FA2127F496C13006E5AEC007800FF91
-C7FCAC127FA27F003FEC07C0A26C6C130F16806C6C131F000715006C6C137F6CEBC1FE6C
-EBFFFC6D13F0011F5B010390C7FC222B7DA928>I<16FF92B5FCA5150781AFEB01FF011F
-13E3017F13FB90B7FC4813C148EB003F48487F48487F001F805B123FA2485AA312FFAC12
-7FA36C7EA3001F5C6C6C5B00074A13806D4913FC2603FF83B5FCC690B6FC6D13F7011F13
-C7903A03FE07FC002E407DBE33>I<49B47E010F13F0013F7F90B512FE48EBC3FF480100
+7E0001EBF80326003FE0C8FC292B7EA92C>97 D<13FFB5FCA512077EAFEC03FE91381FFF
+C0027F13F091B57E9138FE0FFE9138F003FF4A7E02C014804A6C13C017E0A3EE7FF0A317
+F8AC17F0A3EEFFE0A217C05D02C014806E4813006E485A9138FC1FFC01FCB55A496C13E0
+D9F01F1380C7D807FCC7FC2D407EBE33>I<EB03FF011F13E0017F13F890B57E48EB83FE
+3903FE01FF00075B4848481380121F13F8123FA2127F496C13006E5AEC007800FF91C7FC
+AC127FA27F003FEC07C0A26C6C130F16806C6C131F000715006C6C137F6CEBC1FE6CEBFF
+FC6D13F0011F5B010390C7FC222B7DA928>I<ED01FEEC01FFA5EC000F1507AFEB01FF01
+1F13C7017F13F790B6FC4813C148EB007F4848131F485A001F140F5B123FA2485AA312FF
+AC127FA36C7EA3001F141F6C7E00074A7E6D90B512F83803FF83C690B6FC6D13EF011F13
+CF903A03FE0FF8002D407DBE33>I<49B47E010F13F0013F7F90B512FE48EBC3FF480100
13804848EB7FC04848133F001F15E05B003FEC1FF0A2485A150F16F8A212FFA290B6FCA4
01F0C8FCA5127FA37F003F15F8A26C6C1301000F15F06D13036C6CEB07E06C9038800FC0
6C9038F07F806C6CB512006D5B010F13F8010013C0252B7EA92A>I<D907FE13FC90393F
@@ -159,7 +159,7 @@ A2485EA291C814C0A2B592B5FCA2491780A25E19005B5E60A24C5BA2495E4C5BA24C5B60
5E007F5F6D4A90C7FC4C5A003F5E6D495B001F4A5B6C6C495B6CD9801F13806C01E0B5C8
FC6C90B512FC6C6C14F06D14C0010F49C9FC010013E03B6570E34C>I<EE1FFE0303B512
E0031F14F8037F804AB7FC0207D9FC071380021FD9E00013C04A0180137FDAFFFEC7EAFF
-E049495B4949130749494913F049495B495B49495B5B90B5C714E0A2485B4818C05C4870
+E04949130349495B49494913F049495B495B49495B5B90B5C714E0A2485B4818C05C4870
13804A91380FFE0048705AEF00E0484992C7FCA25A5CA25AA25CA2B5FCA25CA491CBFCA6
5BA2F00380007FEF07C0F00FE06DEE1FF06C173F187F6C6DEDFFE0050313C06C6D020F13
806C043F13006C6DECFFFE6C01F8010713F86C01FE90B55A6DB712C0011F93C7FC010715
@@ -172,22 +172,22 @@ F04981495B49496D91C7FC495B5B92C8FC90B55E485B5F485B4860A248495CA248605C5F
C007013F495A6C9026F03FFEEBFE3FC690B5D8F81FB55A6DDAF0075C011FDAC00349C7FC
010749C75B9026007FF0EC1FF04B6571E355>I<EE1FFE0303B512C0031F14F092B612FC
020381020F9038FC07FF4AD9E0011380027F90C713C04A48EC7FE04913F8010749143F49
-5B5B495B495B92C8FC90B5FC485B48177F5C48EFFFC05F48494A13804D130048161F4AEC
-7FFC933803FFF848033F5B4AB612C091B75A4804FCC7FC17E004FCC8FC03E0C9FC02C0CA
-FCB5FC5CA591CBFCA67EF00380F007C0F00FE06CEF1FF0183F187F6C6DEDFFE06C040313
-C06E020F13806C6D023F13006C6DECFFFE6C6D010713F86C01FE90B55A013FB712C06D93
-C7FC010715F801001580020F01F0C8FC3C4271C04C>I<93381FFF804BB512F8031F14FF
-037F15C04AB77E0207D9FC0313F8021FD9E0007F4A0180EB3FFEDAFFFEC76C7E49491680
-49496E13C0495B49496E13E0495B494916F05B90B5C87E1AF8485B485F5C5A5C5AA2485B
-605A5CA2485FA24A17F0A2B55EA24A17E0A2601AC091C9FC95B51280A21A005F615F495F
-4D5B127F6D4B5B616C4C5B4D5B6C6D4A90C7FC4D5A6C6D495B6C4B5B6C6D010F13E06C01
-F8013F5B6CD9FE01B5C8FC013FB612FC6D15F0010715C0010002FCC9FC020F13C0454271
-C055>111 D<D907FCEC0FFE90261FFF8090387FFFE049D9E001B512F890B5D8F00714FE
-48DAFC0F802A03FE3FFE3FFC071380D9FC1F90267FE00013C0D807F890B50080EB7FE000
-0F93380001FF01F04A5B001F4B4913F001E04A5B003F4B5B13C04A495B007F5D018018E0
-5E00FF5B1AC0010091C76C13801A0091B5EC07FC48715AC74991C8FCA25BA25DA25BA25D
-A25BA25DA25BA25DA25BA25DA25BA25DA25BA292CBFCA290B5FCA25CA25AA25CA26C5B5C
-6D5AEB1F80444275C048>114 D E
+5B5B495B495B92C8FC90B5FC485B48177F5C48EFFFC05F48494A13804D130048EE1FFE4A
+EC7FFC933803FFF848033F5B4AB612C091B75A4804FCC7FC17E004FCC8FC03E0C9FC02C0
+CAFCB5FC5CA591CBFCA67EF00380F007C0F00FE06CEF1FF0183F187F6C6DEDFFE06C0403
+13C06E020F13806C6D023F13006C6DECFFFE6C6D010713F86C01FE90B55A013FB712C06D
+93C7FC010715F801001580020F01F0C8FC3C4271C04C>I<93381FFF804BB512F8031F14
+FF037F15C04AB77E0207D9FC0313F8021FD9E0007F4A0180EB3FFEDAFFFEC76C7E494916
+8049496E13C0495B49496E13E0495B494916F05B90B5C87E1AF8485B485F5C5A5C5AA248
+5B605A5CA2485FA24A17F0A2B55EA24A17E0A2601AC091C9FC95B51280A21A005F615F49
+5F4D5B127F6D4B5B616C4C5B4D5B6C6D4A90C7FC4D5A6C6D495B6C4B5B6C6D010F13E06C
+01F8013F5B6CD9FE01B5C8FC013FB612FC6D15F0010715C0010002FCC9FC020F13C04542
+71C055>111 D<D907FCEC0FFE90261FFF8090387FFFE049D9E001B512F890B5D8F00714
+FE48DAFC0F802A03FE3FFE3FFC071380D9FC1F90267FE00013C0D807F890B50080EB7FE0
+000F93380001FF01F04A5B001F4B4913F001E04A5B003F4B5B13C04A495B007F5D018018
+E05E00FF5B1AC0010091C76C13801A0091B5EC07FC48715AC74991C8FCA25BA25DA25BA2
+5DA25BA25DA25BA25DA25BA25DA25BA25DA25BA292CBFCA290B5FCA25CA25AA25CA26C5B
+5C6D5AEB1F80444275C048>114 D E
%EndDVIPSBitmapFont
%DVIPSBitmapFont: Fe cmbxti10 13.15 11
/Fe 11 120 df<EDFFC0020713F0023FEBFC3E91B56CB4FC4901E0B512800107D9003F13
@@ -215,23 +215,23 @@ EE1FF893393FF07FF0047F13FF17F1EEFFE1A24B01E313E0A205E113C04B01C1138005C0
A4157F5EA515FF5EA45C5EA45C5EA55C5EA45C93C9FCA45C5DA45D143FA25DA2EA07E039
1FF07FF0EA3FF8127F5D00FF13FF5D5DA201F190CAFCEBE1FE495A6C485A6CB45A6C5B00
071380D801FECBFC3C6382CC2C>I<EC1FF890383FFFFC5B5DA27F13005DA25BA25DA25B
-A25DA25BA25DA25BA292CAFCA25B4BB47EDAFE0F13F0033F13FC013F90B57E91B5EA07FF
-DBF8037FDBE0017F4913C015004A81A2495A5C5CA2485D605CA2485D605CA2485D95C7FC
-5C5E485EA291C7123F5F5A047FEB03C0499238F807E0A2003F03FF130F05F013C0495BEF
-E01F007F1880183F4903C01300187E12FF60496DEBC1F893387FC7F0EFFFE049021F5B6C
-486E90C7FC001FC8EA03FC3B4D78CB41>104 D<15F8EC03FC4A7E4A7EA25CA35DA25D6E
-5AEC03E091C8FCAEEB07F8EB1FFEEB7FFF90B57E3901FC7FC0D803F07FEA07E0D80FC07F
-A2381F80FFA2485A5B007E5CA25B00FE5C485A007C5C12005B92C7FCA25B5C133F5CA213
-7F5CA213FFECF00F48EC1F8014E0153F48150014C05D48147E14805D14816CEB01F84A5A
-4A5A6CEB1FC06CEBFF806D90C7FC6D5AEB07F0214E78CC27>I<EC7FE090B512F05A15E0
-A27E130315C0A25BA21580A25BA21500A25BA25CA2133FA25CA2137FA25CA213FFA25CA2
-5AA25CA25AA25CA25AA25CA25AA291C7FCA25AA25BA2123FA25BA2127F140F9038F81F80
-A200FF133F150013F0A25C147E13E05CA2387FE1F8A2383FE3F06CB45A6C5B6C5BC648C7
-FC1C4D77CB20>108 D<913801FFC0021F13F8027F13FE91B6FC4901001380D903FCEB3F
-C0D907F0130F010FEC3FE04948137F4A13FF133FA2017F4913C0A26F138017006E137E02
-FC90C7FCECFFC015FE6F7E16E06D80826D807F6D80010180EB003F1403EC003FD803C013
-0FD80FE01303EA3FF0486C7FA200FF5DA34B5A5B49495A495C49130F6CC7485AD83FC0EB
-7FC03A1FF803FF806CB548C7FC6C14F8000114E026001FFEC8FC2B3377B135>115
+A25DA25BA25DA25BA292CAFCA25B923801FFC0DAFE0F13F8033F13FE013F497F91B50003
+7FDBF8017F4B6C7F4913C05D92C77F5C495A5CA25C485D605CA2485D605CA2485D605C5E
+4894C7FCA291C75A5F5A043FEB01E0499238FC03F0A2003F037F130705F813E04914FFEF
+F00F007F18C0181F4903E01380F03F0012FF187E49027F5B93383FE3F8EFFFF049020F5B
+6C486E1380001FC8D801FEC7FC3C4D79CB41>104 D<15F8EC03FC4A7E4A7EA25CA35DA2
+5D6E5AEC03E091C8FCAEEB07F8EB1FFEEB7FFF90B57E3901FC7FC0D803F07FEA07E0D80F
+C07FA2381F80FFA2485A5B007E5CA25B00FE5C485A007C5C12005B92C7FCA25B5C133F5C
+A2137F5CA213FFECF00F48EC1F8014E0153F48150014C05D48147E14805D14816CEB01F8
+4A5A4A5A6CEB1FC06CEBFF806D90C7FC6D5AEB07F0214E78CC27>I<EC7FE090B512F05A
+15E0A27E130315C0A25BA21580A25BA21500A25BA25CA2133FA25CA2137FA25CA213FFA2
+5CA25AA25CA25AA25CA25AA25CA25AA291C7FCA25AA25BA2123FA25BA2127F140F9038F8
+1F80A200FF133F150013F0A25C147E13E05CA2387FE1F8A2383FE3F06CB45A6C5B6C5BC6
+48C7FC1C4D77CB20>108 D<913801FFC0021F13F8027F13FE91B6FC4901001380D903FC
+EB3FC0D907F0130F010FEC3FE04948137F4A13FF133FA2017F4913C0A26F138017006E13
+7E02FC90C7FCECFFC015FE6F7E16E06D80826D807F6D80010180EB003F1403EC003FD803
+C0130FD80FE01303EA3FF0486C7FA200FF5DA34B5A5B49495A495C49130F6CC7485AD83F
+C0EB7FC03A1FF803FF806CB548C7FC6C14F8000114E026001FFEC8FC2B3377B135>115
D<EC0FC04A7E4A7E147F14FFA35BA25DA25BA25DA25BA25DA25BA2003FB612C04815E0B7
FCA26C15C026001FFEC7FC133FA25CA2137FA25CA213FFA25CA25AA25CA25AA25CA25AA2
5CA25AED03C091380007E0A248140F16C049131F1680ED3F005D49137E5D4A5A000F495A
@@ -245,46 +245,45 @@ EC0FE00007EB3FC06CB55A6C91C7FC38007FFCEB1FE0234777C52A>I<D907F8EF1F80D9
D E
%EndDVIPSBitmapFont
%DVIPSBitmapFont: Ff cmbx12 13.14 13
-/Ff 13 117 df<923807FFE092B512FC020714FF021F81027F9038007FC0902601FFF0EB
-0FE04901C0497E4990C7487ED90FFC147F011F824A14FF495AA2137F5CA2715A715A715A
-EF078094C8FCA7EF07FCB9FCA526007FF0C7123F171FB3B3A2003FB5D8E00FB512F8A53D
-4D7ECC44>12 D<EA07E0EA1FF8EA3FFCEA7FFEA2B5FCA6EA7FFEA2EA3FFCEA1FF8EA07E0
-1010778F22>46 D<B700F8023FB512F8A5D8001F01C0C9380FE000745AB3B3AD6D180F63
-811A1F6D96C7FC626D7F1A7E6D7F6D606E6C4B5A6E6CED07F06E6C4B5A6E01C0EC3FC06E
-01F049B45A020101FF011F90C8FC6E91B55A033F15F8030715E0030092C9FC040713F055
-4C7CCA5E>85 D<ECFFFC010FEBFFC0017F14F090B612FC489038803FFE3B03FC0007FF80
-486C6D7F6D7F486D6C7F83167F83A2707E6C90C7FC6C5A6C5AC9FCA5ED1FFF021FB5FC49
-B6FC130F013FEBC03F9038FFFE00000313F04813C04890C7FC485A485AA2485AA2485AA4
-167FA26D14FF007F15EF6D01017F6C6C903907CFFF806C6CD90F8F13FE6C9038E07F076C
-9038FFFE0300014A7ED8003F9038F0007F0103018090C7FC37347CB23C>97
-D<EF1FF0EE3FFFA51600177FB3EC0FFF91B512E0010314F8010F14FC013FEB01FF903A7F
-F8003FFFD9FFE0130F48497F48497F4890C77E48815B121F5B123FA2127F5BA312FFAC12
-7FA36C7EA3121F6D5C120F6C6C5C6C6D5B6C5D6C01E0013F7F6D6C49EBFFE090393FFE03
-FE6DB512F801075C0100148091261FFC00EBC0003B4D7CCB44>100
-D<EC0FFF91B512F0010314FC010F14FF90263FFE077F90267FF0007F49486D7E4801806D
-7E486F7E4890C7120F484881707E121F491403003F82A2127F5B701380A212FFA390B8FC
-A401F8CAFCA5127FA27FA2123FA26C6CED0F80A26C6C151F6C17006E5C6C6D147E6C6D5C
-6C6D495AD93FFCEB07F0903A1FFF803FE0010790B55A010192C7FC6D6C13FC020713C031
-347DB238>I<ED7FF0913807FFFC023F7F4A7F902601FFE0138049018113C049484813E0
-EB0FFCEB1FF8A2EB3FF0A2017F6D13C04A6C1380EE7F00163E93C7FCACB77EA526007FF0
-C8FCB3B3A3003FB512F8A52B4D7DCC26>I<EB7FC0B5FCA512037EB3923801FFC0030F13
-F8033F7F4B13FFDBFE077F9138C1F0039126C3E0017FDAC78080ECCF0014DE02DC6D7F14
-FC5CA25CA35CB3AAB6D8C07FEBFFE0A53B4C7BCB44>104 D<EB7FC0B5FCA512037EB3B3
-B3AAB61280A5194C7BCB22>108 D<903A7FC001FFC0B5010F13F8033F7F4B13FFDBFE07
-7F9138C1F00300039026C3E0017F6CD9C78080ECCF0014DE02DC6D7F14FC5CA25CA35CB3
-AAB6D8C07FEBFFE0A53B327BB144>110 D<913807FF80027F13F80103B6FC010F15C090
-261FFE017F903A7FF0003FF849486D7E480180EB07FE4890C76C7E4817804980000F17C0
-48486E13E0A2003F17F0A249157F007F17F8A400FF17FCAB007F17F8A46C6CEDFFF0A200
-1F17E0A26C6C4A13C0A26C6C4A13806C6D4913006C5E6C01E0EB1FFC6D6C495A903A3FFE
-01FFF0010FB612C0010392C7FCD9007F13F80207138036347DB23D>I<903907FF807001
-7FEBF1F048B6FC1207380FFC01391FE0003F4848130F491307127F90C71203A2481401A2
-7FA27F01F090C7FC13FCEBFFC06C13FEECFFE06C14FC6C806CECFF806C15C06C15E06C15
-F06C7E011F14F8010114FCEB000FEC007FED1FFE0078140F00F8140715037E1501A27E16
-FC7E15036D14F86D13076D14F001F8EB1FE001FFEBFFC04890B51280486C1400D8F81F13
-FCD8E00313C027347CB230>115 D<14F8A51301A41303A21307A2130FA2131F133F137F
-13FF1203000F90B512F0B7FCA426007FF8C7FCB3A7167CAA013F14F880A290391FFE01F0
-010F1303903907FF87E06DEBFFC06D14806D6C1300EC0FFC26467EC430>I
-E
+/Ff 13 117 df<923803FFE092B512FC020714FF021F81027F9038007FC0DAFFF0EB0FE0
+010301C0804990C7EA3FF84948147F4A81494814FF495AA2137F5CA2715A715A715AEF07
+8094C8FCA8EF07FCB9FCA526007FF0C7123F171FB3B3003FB5D8E00FB512F8A53D4D7ECC
+44>12 D<EA07E0EA1FF8EA3FFCEA7FFEA2B5FCA6EA7FFEA2EA3FFCEA1FF8EA07E0101077
+8F22>46 D<B700F8023FB512F8A5D8001F01C0C9380FE000745AB3B3AD6D180F63811A1F
+6D96C7FC626D7F1A7E6D7F6D606E6C4B5A6E6CED07F06E6C4B5A6E01C0EC3FC06E01F049
+B45A020101FF011F90C8FC6E91B55A033F15F8030715E0030092C9FC040713F0554C7CCA
+5E>85 D<ECFFFC010FEBFFC0017F14F090B612FC489038803FFF2703FC00077F486C6D7F
+486C6D7F6E7E83707EA3707E6C90C7FC6C5A6C5AC9FCA4ED1FFF021FB5FC49B6FC130F01
+3FEBC03F9038FFFE00000313F04813C04890C7FC485A485AA2485AA2485AA4167FA26D14
+FF007F15EF6D01017F6C6C903907CFFF806C6CD90F8F13FE6C9038E07F076C9038FFFE03
+00014A7ED8003F9038F0007F0103018090C7FC37337CB13C>97 D<EF1FF0EE3FFFA51600
+177FB3A2EC0FFF91B512E0010314F8010F14FE013FEB01FF903A7FF8003FFFD9FFE0130F
+48497F48497F4890C77E4881485AA2485AA3127F5BA212FFAC127FA37F123FA2121F7F00
+0F5D6C6C5C5E6C6D5B6C01E0497F6C6D017FEBFFE090393FFE03FE6DB512F801075C0101
+14C09027001FFC00EBC0003B4D7CCB44>100 D<EC0FFF91B512F0010314FC010F14FF90
+263FFE077F90267FF0007F4948EB3FE04801806D7E48824890C76C7E4848140783485A00
+3F6F7EA3485A701380A312FFA290B8FCA401F8CAFCA5127FA27FA2123FA26C6CED0F80A2
+000F161F6C6C16006E5C6C6D147E6C6D5C6C6D495AD97FFCEB07F0903A1FFF803FE06D90
+B55A010392C7FCD9007F13FC020713C031337DB138>I<ED7FE0913807FFFC021F7F027F
+7F902601FFE0138049018113C0902607FE0113E049485A14F8131FEB3FF0A26F13C0EB7F
+E06F1380EE3E0093C7FCADB77EA526007FF0C8FCB3B3A2003FB512F8A52B4D7DCC26>I<
+EB7FC0B5FCA512037EB3A2923801FFC0030F13F8033F13FE4B7F9126C1FE077F9126C3F0
+037F9138C7C001DACF8080150002DE7F02FC81A25CA25CA35CB3A9B6D8C07FEBFFE0A53B
+4C7BCB44>104 D<EB7FC0B5FCA512037EB3B3B3AAB61280A5194C7BCB22>108
+D<903A7FC001FFC0B5010F13F8033F13FE4B7F9126C1FE077F9126C3F0037F00039038C7
+C0016CD9CF8080150002DE7F02FC81A25CA25CA35CB3A9B6D8C07FEBFFE0A53B317BB044
+>110 D<913807FF80027F13F80103B6FC010F15C090261FFE017F903A7FF0003FF8D9FF
+C0EB0FFC48496D7E4890C76C7E4817804980000F17C048486E13E0A2003F17F049157FA2
+007F17F8A400FF17FCAB007F17F8A36C6CEDFFF0A3001F17E06D5C000F17C06C6C4A1380
+6C17006C6D495A6C01E0EB1FFC6D6C495A903A3FFE01FFF0010FB612C0010392C7FCD900
+7F13F80207138036337DB13D>I<90390FFF8070017FEBF1F048B6FC1207380FFC01391F
+E0003F4848130F491307127F90C712035A1501A27FA213E06D90C7FC13FE387FFFF0ECFF
+C015F06C14FC6C14FF6C15806C15C06C15E0C615F0013F14F8010714FCEB007F14019138
+003FFE150F0078140700F81403A26C1401A37E16FC6C14036D14F87F6DEB07F001F8EB1F
+E001FFEBFFC091B51280D8FC7F1400D8F81F13FCD8E00313C027337CB130>115
+D<14F8A61301A41303A21307A2130FA2131F133F137F13FF1203000F90B512F0B7FCA426
+007FF8C7FCB3A6167CAA013F14F880A290391FFE01F0010F1303903907FF87E06DEBFFC0
+6D14806D6C1300EC0FFC26467EC430>I E
%EndDVIPSBitmapFont
%DVIPSBitmapFont: Fg cmti10 10.95 35
/Fg 35 122 df<933807FF80043F13E09338FE00F8DB01F0133EDB07E0130E4B48131F4C
@@ -305,7 +304,7 @@ FC5B12015BA212035B1207A25B120FA25BA2121FA290C9FCA25AA2123EA2127EA2127CA6
D<14031580A2EC01C0EC00E0A21570A215781538153CA3151EA4151FA2150FA7151FA915
3FA2153EA3157EA2157CA215FCA215F8A21401A215F0A2140315E0A2140715C0A2EC0F80
A2141F15005C143EA25CA25CA2495A5C1303495A5C130F49C7FC131E5B137C5B5B485A48
-5A485A48C8FC121E5A12705A5A205A7FC325>I<387FFFFEA3B5FCA21705799521>45
+5A485A48C8FC121E5A12705A5A205A7FC325>I<387FFFFCA3B5FCA21605799521>45
D<120FEA3FC0127FA212FFA31380EA7F00123C0A0A77891C>I<15031507150F151F151E
153E157EEC01FEEC03FC1407141FEB01FF90380FFBF8EB1FC3EB0E07130015F0A2140FA2
15E0A2141FA215C0A2143FA21580A2147FA21500A25CA25CA21301A25CA21303A25CA213
@@ -330,101 +329,102 @@ C094C8FC16F83C3E7BBD40>66 D<49B77E18F018FC903B0003FE0003FEEF00FF4BEC7F80
F03FC00207151F19E05DA2020F16F0A25DA2141FF03FE05DA2023F16C0187F4B1580A202
7FEDFF00604B495A4D5A02FF4A5A4D5A92C7EA3FC04CB4C7FC4990B512FC17E04ACAFCA2
1303A25CA21307A25CA2130FA25CA2131FA25CA2133FA25CA2137FA25C497EB67EA33C3E
-7BBD3E>80 D<92390FF001C0ED7FFE4AB5EA0380913907F80FC791390FC003EF91391F80
-01FF4AC71300027E805C495A4948143EA2495AA2010F153C5CA3011F1538A38094C7FC80
-A214FC6DB4FC15F015FE6DEBFFC06D14F06D14FC6D80143F020F7F020180EC001F150303
-007F167F163FA2161FA212075A5F120EA2001E153F94C7FCA2163E003E157E167C003F15
-FC4B5A486C5C4B5A6D495AD87DE0EB1F80D8F8F849C8FC017F13FE39F03FFFF8D8E00F13
-E048C690C9FC32427ABF33>83 D<277FFFFE01B500FC90B512E0B5FCA200039026800007
-90C7380FFC006C90C701FCEC07F049725A04035EA26350C7FCA20407150EA2040F5D1A3C
-041F153862163B6216734F5A6D14E303014B5A6C15C303034BC8FC1683DB0703140E191E
-030E151C61031C7F61ED380161157003F04A5A15E002014B5A15C0DA03804AC9FC60DA07
-00140E60140E605C029C5D14B8D97FF85D5C715A5C4A5DA24A92CAFC5F91C7FC705A137E
-5F137C5F137801705D53406EBD5B>87 D<147E49B47E903907C1C38090391F80EFC09038
-3F00FF017E137F4914804848133F485AA248481400120F5B001F5C157E485AA215FE007F
-5C90C7FCA21401485C5AA21403EDF0385AA21407EDE078020F1370127C021F13F0007E01
-3F13E0003E137FECF3E1261F01E313C03A0F8781E3803A03FF00FF00D800FC133E252977
-A72E>97 D<EB1FC0EA0FFF5CA2EA003FA291C7FCA25BA2137EA213FEA25BA21201A25BA2
-1203A25B147E3907F1FF809038F783E09038EF01F013FE390FF800F8A24913FC49137C48
-5A157E5B15FE123FA290C7FCA248130115FC127EA2140300FE14F85AA2EC07F0A215E048
-130F15C0141F15800078EB3F00127C147E003C5B383E01F8381E03E06C485A6CB4C7FCEA
-01F81F4076BE2A>I<EC1FE0ECFFF8903803F03E903807C00F90381F8007D93F00138001
-7E131F49137F485A485A000715005B000F147E484890C7FCA2485AA3127F90C9FCA35A5A
-A6481403007E5C5D151E003E5C5D6C5CEC03E0390F800F802603E07EC7FC3801FFF83800
-3FC0212977A72A>I<EE3F80ED1FFF1700A2ED007FA2167EA216FEA25EA21501A25EA215
-03A25EA21507A25E147E903801FF8F903807C1CF90391F80EFC090383F00FF017E137F5B
-48486D5A485AA2485A000F92C7FC5B001F5CA24848137EA215FE127F90C75AA214015A48
-5CA2140316384814F0A21407167891380FE070127C021F13F0007E013F5B003E137FECF3
-E1261F01E35B3A0F8781E3802703FF00FFC7FCD800FC133E294077BE2E>I<EC3F809038
-01FFE0903807E0F890381F803CEB3E0001FC131E485A485A12074848133E49133C121F48
-48137C15F8EC03F0397F000FE0ECFF80B5EAFC0014C048C8FCA45AA61506150E151E007C
-143C15786C14F0EC01E06CEB07C0390F801F003807C0FC3801FFF038007F801F2976A72A
->I<167C4BB4FC923807C78092380F83C0ED1F87161FED3F3FA2157EA21780EE0E004BC7
-FCA414015DA414035DA30103B512F8A390260007E0C7FCA3140F5DA5141F5DA4143F92C8
-FCA45C147EA414FE5CA413015CA4495AA4495AA4495A121E127F5C12FF49C9FCA2EAFE1E
-EAF83C1270EA7878EA3FE0EA0F802A5383BF1C>I<EC03F0EC0FFC91383E0E1C9138FC07
-7E903901F003FE1303903807E001D90FC013FCEB1F80A2EB3F004914F8137E01FE1303A2
-484814F0A2150712034914E0A2150F12074914C0A2151FA216805B153F1203ED7F006D5B
-A200015B0000495A9038F80F7E90387C1EFEEB1FF8903807E0FC90C7FC1401A25DA21403
-A25D001C1307007F5C48130F5D4A5A4AC7FC48137E00F85B387C03F0381FFFC0D803FEC8
-FC273B7CA72A>I<EB01FC13FF5CA21303A25CA21307A25CA2130FA25CA2131FA25CA213
-3FA291C8FCEC03F890387F0FFE91383E0F80D97E7813C0ECE007D9FFC013E014801400A2
-485A5BA25B0003140F16C05BA20007141F16805BA2000F143F16005B5D001F147EEDFE07
-4913FCA2003F0101130FEDF80E1300161E48ECF01CA2007E1538A200FE1570020013E048
-EC7FC00038EC1F0028407ABE2E>I<1478EB01FCA21303A314F8EB00E01400AD137C48B4
-FC38038F80EA0707000E13C0121E121CEA3C0F1238A2EA781F00701380A2EAF03F140012
-005B137E13FE5BA212015BA212035B1438120713E0000F1378EBC070A214F0EB80E0A2EB
-81C01383148038078700EA03FEEA00F8163E79BC1C>I<EB07F0EA03FF14E0A2EA000FA2
-14C0A2131FA21480A2133FA21400A25BA2137EA213FEA25BA21201A25BA21203A25BA212
-07A25BA2120FA25BA2121FA25BA2123FA290C7FCA25A1307127EA2EAFE0F130E12FCA213
-1E131CA2EA7C381378EA3C70EA1FE0EA0780144079BE17>108 D<D801F0D93F80137F3D
-07FC01FFE003FFC03D0F3E07C1F80F83F03D0E1F0F00FC1E01F8001E011C90387C380000
-1C49D97E707F003C01F05C0038157F4A5C26783FC05C12704A91C7FC91C7127E00F003FE
-1301494A5CEA007EA20301140301FE5F495CA203031407000160495C180F03075D000305
-1F13E0494A1480A2030FEC3F810007F001C0495CA2031F91383E0380120F494AEC0700A2
-033F150E001FEF1E1C4991C7EA0FF80007C7000EEC03E0432979A74A>I<D801F0EB3F80
-3A07FC01FFE03A0F3E07C1F83A0E1F0F00FC001E011C137C001C49137E003C13F012385C
-38783FC012705C91C7FC00F015FE495CEA007EA2150101FE5C5BA2150300015D5B15075E
-0003020F13704914C0A2031F13F00007ED80E05B1681EE01C0120F49EC0380A2EE070000
-1FEC0F0E49EB07FC0007C7EA01F02C2979A733>I<EC1FC0ECFFF8903803F07C90380FC0
-1FEB1F8090393F000F80017E14C0491307484814E0485A12075B000F15F0485AA2485AA2
-ED0FE0127F90C7FCA2151F4815C05AA2ED3F80A2ED7F00A248147E007C5C007E13015D4A
-5A003E495A6C495A4A5A260F803EC7FC3807C0FC3801FFF038003F80242977A72E>I<90
-3903E001F890390FF807FE903A1E7C1E0F80903A1C3E3C07C0013C137801389038E003E0
-EB783F017001C013F0ED80019038F07F0001E015F8147E1603000113FEA2C75AA2010114
-0717F05CA20103140F17E05CA20107EC1FC0A24A1480163F010F15005E167E5E131F4B5A
-6E485A4B5A90393FB80F80DA9C1FC7FCEC0FFCEC03E049C9FCA2137EA213FEA25BA21201
-A25BA21203A2387FFFE0B5FCA22D3A80A72E>I<D801F013FC3A07FC07FF803A0F3E0F03
-C0260E1F1C13E0001EEB380F001C1370003CEBE01F123814C0D8783F14C0007090388007
-0092C7FC91C8FC12F05BEA007EA313FE5BA312015BA312035BA312075BA3120F5BA3121F
-5B0007C9FC232979A726>114 D<EC7F80903801FFE0903807C0F890381F003C013E131C
-013C131E017C133E49137E15FEA2000114FCA215706D13007FEBFFC014FC6C13FF15806D
-13C06D13E0010F13F01300140F14071403120C123F387F80011403D8FF0013E0A300FCEB
-07C000F0EB0F8012700078EB1F006C133C381F01F83807FFE0C690C7FC1F297AA725>I<
-EB01C0EB03F01307A25CA2130FA25CA2131FA25CA2133FA291C7FCA2007FB51280B6FC15
-00D8007EC7FC13FEA25BA21201A25BA21203A25BA21207A25BA2120FA25BA2121F141C13
-80A2003F133C1438EB0078147014F05C495AEA1F03495A6C48C7FCEA07FCEA01F0193A78
-B81E>I<137C48B4141C26038F80137EEA0707000E7F001E15FE121CD83C0F5C12381501
-EA781F007001805BA2D8F03F1303140000005D5B017E1307A201FE5C5B150F1201495CA2
-151F0003EDC1C0491481A2153F1683EE0380A2ED7F07000102FF13005C01F8EBDF0F0000
-9038079F0E90397C0F0F1C90391FFC07F8903907F001F02A2979A731>I<017CEB01C048
-B4EB07F038038F80EA0707000E01C013F8121E001C1403EA3C0F0038EC01F0A2D8781F13
-0000705BA2EAF03F91C712E012005B017E130116C013FE5B1503000115805BA2ED070012
-03495B150EA25DA25D1578000114706D5B0000495A6D485AD97E0FC7FCEB1FFEEB03F025
-2979A72A>I<017C167048B491387001FC3A038F8001F8EA0707000E01C015FE001E1403
-001CEDF000EA3C0F0038177C1507D8781F4A133C00701380A2D8F03F130F020049133812
-005B017E011F14784C137013FE5B033F14F0000192C712E05BA2170100034A14C049137E
-17031880A2EF070015FE170E00010101141E01F86D131C0000D9039F5BD9FC076D5A903A
-3E0F07C1E0903A1FFC03FFC0902703F0007FC7FC372979A73C>I<903903F001F890390F
-FC07FE90393C1E0E0F9026780F1C138001F0EBB83FD801E013F89039C007F07FEA038000
-0714E0D9000F140048151C000E4AC7FCA2001E131FA2C75BA2143F92C8FCA35C147EA314
-FE4A131CA30101143C001E1538003F491378D87F811470018314F000FF5D9039077801C0
-39FE0F7C033A7C0E3C078027783C1E1EC7FC391FF80FFC3907E003F029297CA72A>I<13
-7C48B4143826038F8013FCEA0707000E7F001E1401001C15F8EA3C0F12381503D8781F14
-F000701380A2D8F03F1307020013E012005B017E130F16C013FE5B151F1201491480A215
-3F000315005BA25D157EA315FE5D00011301EBF8030000130790387C1FF8EB3FF9EB07E1
-EB00035DA21407000E5CEA3F80007F495AA24A5AD8FF0090C7FC143E007C137E00705B38
-7801F0383803E0381E0FC06CB4C8FCEA03F8263B79A72C>I E
+7BBD3E>80 D<92391FE00380ED7FFC913A01FFFE0700913907F01F8F91390FC007DF4AC6
+6CB4FC023E6D5A4A130014FC495A4948147CA2495AA2010F15785CA3011F1570A46E91C7
+FCA2808014FE90380FFFE015FC6DEBFF8016E06D806D806D6C7F141F02037FEC003FED07
+FF1501A281A282A212075A167E120EA2001E15FE5EA25E003E14015E003F14034B5A486C
+5C150F6D495A6D49C8FCD8F9F0137C39F8FE01F839F03FFFF0D8E00F13C026C001FEC9FC
+314279BF33>83 D<277FFFFE01B500FC90B512E0B5FCA20003902680000790C7380FFC00
+6C90C701FCEC07F049725A04035EA26350C7FCA20407150EA2040F5D1A3C041F15386216
+3B6216734F5A6D14E303014B5A6C15C303034BC8FC1683DB0703140E191E030E151C6103
+1C7F61ED380161157003F04A5A15E002014B5A15C0DA03804AC9FC60DA0700140E60140E
+605C029C5D14B8D97FF85D5C715A5C4A5DA24A92CAFC5F91C7FC705A137E5F137C5F1378
+01705D53406EBD5B>87 D<147E49B47E903907C1C38090391F80EFC090383F00FF017E13
+7F4914804848133F485AA248481400120F5B001F5C157E485AA215FE007F5C90C7FCA214
+01485C5AA21403EDF0385AA21407EDE078020F1370127C021F13F0007E013F13E0003E13
+7FECF3E1261F01E313C03A0F8781E3803A03FF00FF00D800FC133E252977A72E>97
+D<EB1FC0EA0FFF5CA2EA003FA291C7FCA25BA2137EA213FEA25BA21201A25BA21203A25B
+147E3907F1FF809038F783E09038EF01F013FE390FF800F8A24913FC49137C485A157E5B
+15FE123FA290C7FCA248130115FC127EA2140300FE14F85AA2EC07F0A215E048130F15C0
+141F15800078EB3F00127C147E003C5B383E01F8381E03E06C485A6CB4C7FCEA01F81F40
+76BE2A>I<EC1FC0ECFFF0903803F03C903807C01E90381F800E90383F000F017E133F49
+13FF485A485A000714FE5B000F14FC48481300A2485AA3127F90C8FCA35A5AA648140300
+7E1407150F151E003E143C15786C14F0EC03E0390F800F803903E07E003801FFF838003F
+C0202977A72A>I<EE3F80ED1FFF1700A2ED007FA2167EA216FEA25EA21501A25EA21503
+A25EA21507A25E147E903801FF8F903807C1CF90391F80EFC090383F00FF017E137F5B48
+486D5A485AA2485A000F92C7FC5B001F5CA24848137EA215FE127F90C75AA214015A485C
+A2140316384814F0A21407167891380FE070127C021F13F0007E013F5B003E137FECF3E1
+261F01E35B3A0F8781E3802703FF00FFC7FCD800FC133E294077BE2E>I<EC3F80903801
+FFE0903807E0F890381F803CEB3E0001FC131E485A485A12074848133E49133C121F4848
+137C15F8EC03F0397F000FE0ECFF809038FFFC00B512C048C8FCA45AA61506150E151E00
+7C143C15786C14F0EC01E06CEB07C0390F801F003807C0FC3801FFF038007F801F2976A7
+2A>I<167C4BB4FC923807C78092380F83C0ED1F87161FED3F3FA2157EA21780EE0E004B
+C7FCA414015DA414035DA30103B512F8A390260007E0C7FCA3140F5DA5141F5DA4143F92
+C8FCA45C147EA414FE5CA413015CA4495AA4495AA4495A121E127F5C12FF49C9FCA2EAFE
+1EEAF83C1270EA7878EA3FE0EA0F802A5383BF1C>I<EC03F0EC0FFC91383E0E1C9138FC
+077E903901F003FE1303903807E001D90FC013FCEB1F80A2EB3F004914F8137E01FE1303
+A2484814F0A2150712034914E0A2150F12074914C0A2151FA216805B153F1203ED7F006D
+5BA200015B0000495A9038F80F7E90387C1EFEEB1FF8903807E0FC90C7FC1401A25DA214
+03A25D001C1307007F5C48130F5D4A5A4AC7FC48137E00F85B387C03F0381FFFC0D803FE
+C8FC273B7CA72A>I<EB01FC13FF5CA21303A25CA21307A25CA2130FA25CA2131FA25CA2
+133FA291C8FCEC03F890387F0FFE91383E0F80D97E7813C0ECE007D9FFC013E014801400
+A2485A5BA25B0003140F16C05BA20007141F16805BA2000F143F16005B5D001F147EEDFE
+074913FCA2003F0101130FEDF80E1300161E48ECF01CA2007E1538A200FE1570020013E0
+48EC7FC00038EC1F0028407ABE2E>I<1478EB01FCA21303A314F8EB00E01400AD137C48
+B4FC38038F80EA0707000E13C0121E121CEA3C0F1238A2EA781F00701380A2EAF03F1400
+12005B137E13FE5BA212015BA212035B1438120713E0000F1378EBC070A214F0EB80E0A2
+EB81C01383148038078700EA03FEEA00F8163E79BC1C>I<EB07F0EA03FF14E0A2EA000F
+A214C0A2131FA21480A2133FA21400A25BA2137EA213FEA25BA21201A25BA21203A25BA2
+1207A25BA2120FA25BA2121FA25BA2123FA290C7FCA25A1307127EA2EAFE0F130E12FCA2
+131E131CA2EA7C381378EA3C70EA1FE0EA0780144079BE17>108
+D<D801F0D93F80137F3D07FC01FFE003FFC03D0F3E07C1F80F83F03D0E1F0F00FC1E01F8
+001E011C90387C3800001C49D97E707F003C01F05C0038157F4A5C26783FC05C12704A91
+C7FC91C7127E00F003FE1301494A5CEA007EA20301140301FE5F495CA203031407000160
+495C180F03075D0003051F13E0494A1480A2030FEC3F810007F001C0495CA2031F91383E
+0380120F494AEC0700A2033F150E001FEF1E1C4991C7EA0FF80007C7000EEC03E0432979
+A74A>I<D801F0EB3F803A07FC01FFE03A0F3E07C1F83A0E1F0F00FC001E011C137C001C
+49137E003C13F012385C38783FC012705C91C7FC00F015FE495CEA007EA2150101FE5C5B
+A2150300015D5B15075E0003020F13704914C0A2031F13F00007ED80E05B1681EE01C012
+0F49EC0380A2EE0700001FEC0F0E49EB07FC0007C7EA01F02C2979A733>I<EC1FC0ECFF
+F8903803F07C90380FC01FEB1F8090393F000F80017E14C0491307484814E0485A12075B
+000F15F0485AA2485AA2ED0FE0127F90C7FCA2151F4815C05AA2ED3F80A2ED7F00A24814
+7E007C5C007E13015D4A5A003E495A6C495A4A5A260F803EC7FC3807C0FC3801FFF03800
+3F80242977A72E>I<903903E001F890390FF807FE903A1E7C1E0F80903A1C3E3C07C001
+3C137801389038E003E0EB783F017001C013F0ED80019038F07F0001E015F8147E160300
+0113FEA2C75AA20101140717F05CA20103140F17E05CA20107EC1FC0A24A1480163F010F
+15005E167E5E131F4B5A6E485A4B5A90393FB80F80DA9C1FC7FCEC0FFCEC03E049C9FCA2
+137EA213FEA25BA21201A25BA21203A2387FFFE0B5FCA22D3A80A72E>I<D801F013FC3A
+07FC07FF803A0F3E0F03C0260E1F1C13E0001EEB380F001C1370003CEBE01F123814C0D8
+783F14C00070903880070092C7FC91C8FC12F05BEA007EA313FE5BA312015BA312035BA3
+12075BA3120F5BA3121F5B0007C9FC232979A726>114 D<EC7F80903801FFE0903807C0
+F890381F003C013E131C013C131E017C133E49137E15FEA2000114FCA215706D13007FEB
+FFC014FC6C13FF15806D13C06D13E0010F13F01300140F14071403120C123F387F800114
+03D8FF0013E0A300FCEB07C000F0EB0F8012700078EB1F006C133C381F01F83807FFE0C6
+90C7FC1F297AA725>I<EB01C0EB03F01307A25CA2130FA25CA2131FA25CA2133FA291C7
+FCA2007FB51280B6FC1500D8007EC7FC13FEA25BA21201A25BA21203A25BA21207A25BA2
+120FA25BA2121F141C1380A2003F133C1438EB0078147014F05C495AEA1F03495A6C48C7
+FCEA07FCEA01F0193A78B81E>I<137C48B4141C26038F80137EEA0707000E7F001E15FE
+121CD83C0F5C12381501EA781F007001805BA2D8F03F1303140000005D5B017E1307A201
+FE5C5B150F1201495CA2151F0003EDC1C0491481A2153F1683EE0380A2ED7F07000102FF
+13005C01F8EBDF0F00009038079F0E90397C0F0F1C90391FFC07F8903907F001F02A2979
+A731>I<017CEB01C048B4EB07F038038F80EA0707000E01C013F8121E001C1403EA3C0F
+0038EC01F0A2D8781F130000705BA2EAF03F91C712E012005B017E130116C013FE5B1503
+000115805BA2ED07001203495B150EA25DA25D1578000114706D5B0000495A6D485AD97E
+0FC7FCEB1FFEEB03F0252979A72A>I<017C167048B491387001FC3A038F8001F8EA0707
+000E01C015FE001E1403001CEDF000EA3C0F0038177C1507D8781F4A133C00701380A2D8
+F03F130F020049133812005B017E011F14784C137013FE5B033F14F0000192C712E05BA2
+170100034A14C049137E17031880A2EF070015FE170E00010101141E01F86D131C0000D9
+039F5BD9FC076D5A903A3E0F07C1E0903A1FFC03FFC0902703F0007FC7FC372979A73C>
+I<903903F001F890390FFC07FE90393C1E0E0F9026780F1C138001F0EBB83FD801E013F8
+9039C007F07FEA0380000714E0D9000F140048151C000E4AC7FCA2001E131FA2C75BA214
+3F92C8FCA35C147EA314FE4A131CA30101143C001E1538003F491378D87F811470018314
+F000FF5D9039077801C039FE0F7C033A7C0E3C078027783C1E1EC7FC391FF80FFC3907E0
+03F029297CA72A>I<137C48B4143826038F8013FCEA0707000E7F001E1401001C15F8EA
+3C0F12381503D8781F14F000701380A2D8F03F1307020013E012005B017E130F16C013FE
+5B151F1201491480A2153F000315005BA25D157EA315FE5D00011301EBF8030000130790
+387C1FF8EB3FF9EB07E1EB00035DA21407000E5CEA3F80007F495AA24A5AD8FF0090C7FC
+143E007C137E00705B387801F0383803E0381E0FC06CB4C8FCEA03F8263B79A72C>I
+E
%EndDVIPSBitmapFont
%DVIPSBitmapFont: Fh cmsl10 10.95 33
/Fh 33 122 df<007FB5FCA2B512FEA418067C961E>45 D<157015F014011407143F9038
@@ -470,88 +470,88 @@ BD40>I<DCFFC01338030F01F01378037F01FC13F0913A01FF803F01913A07FC000781DA
A412FF5BA75BA2181C183C1838A27F007F1778187018F0003F5F6D150160001F16036C6C
4B5A95C7FC6C6C5D6C6C151E6C6C5D6C6C15F86D6C495A6D6CEB07C0D91FF0EB1F80D907
FE01FEC8FC0101B512F86D6C13E0DA07FEC9FC3D4276BF42>I<013FB812F8A39026007F
-F0C7127F6E48140F18034B14011800A31978147F4B1570A502FF143892C7FCA319001778
-4915704A14F016011603160F91B6FC495DA29138FC001F16071603160101075D5CA21970
-19F019E0010F4A5A4A90C7120119C0A218031980011F16075CF00F00A260181E013F163E
-4A157E4D5A1703017F150F01FFEDFFF8B9FCA2603D3E7DBD3E>69
-D<011FB512FC5BA29039003FF8006E5AA25DA5143F5DA5147F5DA514FF92C7FCA55B5CA5
-13035CA513075CA5130F5CA5131F5CA3133F497E007FB512F0A2B6FC263E7EBD21>73
-D<90263FFFF0933807FFFE5013FC629026007FF8EFFC00023F4D5AA2023BEF77F0A2DA39
-FC16E7A2F101CF0279EE038FDA70FE5FF1070FA2190E1A1FDAF07F151C02E06019381970
-6F7EF1E03F130102C0DB01C05BA26F6CEB0380A2953807007F0103160E4A6C6C93C7FC60
-A2606201076D6C5B02005F60A26F6C485A94380380015B010EDB07005BA2923801FC0EA2
-4D1303131E011C6D6C485C5FA25F1907013CEC7FC0013860013C5D137C01FE6EC7120F26
-07FF80013E4A7EB500FC031FB512F8043C5E4A131C573E7DBD53>77
-D<90263FFFE0023FB5FC6F16FEA29026003FF8020313C0021F030013004A6C157C023B16
-3C6F15381439810238167802787FDA707F157082153F82031F15F002F07FDAE00F5D8215
-078203031401010180DAC0015D82811780047F1303010315C04A013F5C17E0161F17F004
-0F1307010715F891C7000791C7FC17FC160317FE04015B4915FF010E6E130E188E177F18
-CEEF3FDE011E16FE011C6F5AA2170FA21707133C01386F5A133C017C150113FE2607FF80
-1400B512FC18705C483E7DBD44>I<013FB612FEEFFFE018F8903B007FF0000FFC6E48EB
-01FF7113804BEC7FC0183F19E0F01FF0A2147F5D19F8A402FFED3FF092C8FCA219E0A2F0
-7FC05B4AEDFF8019004D5A4D5AEF0FF80103ED3FE04A903801FF8091B648C7FC17F002FC
-CAFCA213075CA5130F5CA5131F5CA5133F5CA3137F497EB612E0A25D3D3E7DBD3E>80
-D<9239FF8003800207EBF007021F9038FC0F0091387F00FE02FCEB1F1FD903F0EB07BF49
-486DB4FC49487F4A6D5A49C8FC49157E133E137E173E49153CA57F1738A26D92C7FC8080
-80EB7FFEECFFE06D13FEEDFFC06D14F06D14FC010380010080143F020380DA003F7F1503
-1500707E163F161FA2160F121CA31607160F003C5EA35F003E151F94C7FC007E5D007F15
-3E6D5C16FC01E0495AD87DF0495AD8FCFCEB0FC03AF87F803F8027F01FFFFEC8FCD8E007
-13F839C0007FC031427BBF33>83 D<B600E090B512FC4B15F8A2000101C0C7000F13006C
-49EC03FCEF01F091C9FC60A317015A495EA417031203495EA4170712074993C7FCA45F12
-0F49150EA4171E121F49151CA4173C123F491538A31778177017F05F001F15015F16036D
-4A5A000F93C8FC5E6C6C141E6C6C5C000115F86C6C495A017FEB07C090393FC03F809026
-0FFFFEC9FC010313F89038007FC03E4073BD44>85 D<EC7FC0903803FFF890380FC07E90
-383E003F496D7E01FF6D7E82A248140782A26C5A137890C7120FA25EA2EC03FF147F9038
-07FF1FEB1FE0D97F805B3801FE00EA03F8485A4848133F485A003F5D49EC81C048C7FCA2
-157F48ED03804814FFA2007F5B913903BF0700903880073F3A3FC00E1F8E260FE03C13FC
-3A03FFF00FF83A007FC003E02A2A7CA82D>97 D<EB3F80EA1FFFA3C6FC137FA291C9FCA5
-5B5BA512015BA4EC07F80003EB3FFF9039F8F80FC09039FBE003E09039FF8001F891C77E
-5B4848147E49147F5B821780A2120F5B17C0A3167F001F16805BA4EEFF00123F5B4B5AA2
-4B5A5E007F4A5AA24B5A6D495A4BC7FCD87CE0137E39F87001F839F03C07E039E00FFF80
-260003FCC8FC2A4077BE33>I<EC1FF0ECFFFE903903F01F8090390FC003C0D93F0013E0
-017E130F49131F000115F04848EB3FE0485AA24848EB1FC0001FEC0F004990C7FC123FA2
-485AA412FF90C9FCA96CEC0380150716006C6C5B151E001F5C6C6C5B6C6C5B6C6C485A39
-01F80F8026007FFEC7FCEB0FF0242A7AA828>I<EE03F8ED01FFA3ED000F1607A217F0A4
-160FA217E0A4161FA217C0A491380FF03FECFFFC902603F81F138090390FC007BF90391F
-8003FF90387E0001497F0001157F48481500485A120F5B001F5D485A5E5B127FA2150112
-FF90C75BA41503A25EA37E1507A26C4A5A7F001F141F6C6C133F6C6CEBFFF83B03F001EF
-FFC03900F80F8F90383FFE0FD90FF0EBE0002D407ABE33>I<EC3FE0903801FFF8903807
-E07E90380F801F90393F000F80017E14C049EB07E0485A12034848EB03F0485AA2121F5B
-123FA248481307A290B6FCA2D8FF80C8FC90C9FCA87EED01C015036C15806D1307001FEC
-0F006D131E000F5C6C6C5B6C6C485A3900FC07C0D93FFFC7FCEB07F8242A7BA828>I<ED
-07F0ED3FFCEDFC1E913803F03F4A48B4FC4A481380141FEC3F81DA7F0113008102FE137C
-93C7FCA213015CA513035CA50007B512F8A3260007F0C8FCA3130F5CA5131F5CA5133F5C
-A5137F91C9FCA55B5BA4EA03FF007F13FEB5FCA229407DBF1C>I<1478EB01FE130314FF
-A25B14FE130314FCEB00F01400ACEB03F8EA01FF14F0A2EA001F130FA314E0A5131F14C0
-A5133F1480A5137F1400A55B5BA4EA03FF007F13F0A2B5FC183E7DBD1A>105
-D<143FEB1FFF5BA213017FA214FEA5130114FCA5130314F8A5130714F0A5130F14E0A513
-1F14C0A5133F1480A5137F1400A55B5BA4EA03FF007F13F8A2B5FC183F7DBE1A>108
-D<903907F007F8D803FFEB1FFF9139E0781FC09138E1E00F3B001FE38007E090380FE700
-02EE14F014FC14D814F85CA24A130F131F4A14E0A4161F133F4A14C0A4163F137F91C713
-80A4167F5B491500A300015D486C491380B5D8F87F13FCA32E287DA733>110
-D<EC0FF0ECFFFE903903F01F8090390FC007C049C66C7E013E6D7E01FC6D7E4848804914
-7C0003157E485A000F157F5B121FA2485AA2007F1680A2170048C85AA54B5AA25E5A6C4A
-5A7E4B5A5E6C140F6C6C5C4B5A6C6C013EC7FC6C6C5B6C6C485A3900FC0FE090383FFF80
-D90FF8C8FC292A7BA82D>I<903907F01F80D803FFEB7FE09138E1E1F09138E387F83900
-1FE707EB0FE614EE02FC13F002D813E09138F801804AC7FCA25C131FA25CA4133F5CA513
-7F91C8FCA55B5BA31201487EB512FEA325287EA724>114 D<9138FF81C0010713E39038
-1F807F90397C003F8049131F4848130F5B00031407A248481400A27FA27F6D90C7FCEBFF
-8014FC6C13FF6C14C015F06C6C7F011F7F13079038007FFE1403140100381300157EA212
-3C153E157E007C147CA2007E147815F8007F495A4A5A486C485A26F9E01FC7FC38E0FFFC
-38C01FE0222A7DA824>I<EB0380A4130791C7FCA25BA25BA2133EA2137E13FE12011207
-001FB512C0B6FCA2D801FCC7FCA312035BA512075BA5120F5BA41407001F130E13C0A414
-1E141C1380A26D5AA2000F5B14F03807E1E03801FF80D8007EC7FC1A3978B723>I<B539
-E007FFF05D17E02707FE000313006C48EB01FC6F5A5E00014A5A5EA24B5A6D1307000092
-C7FC5D150E6D5B7F5DA25D1480013F5B14815D14C3011F5B02C7C8FCA214CE14EEEB0FFC
-A25CA26D5A5CA25CA26D5A2C2878A630>118 D<B500C3B53803FFFCA204FE14F8290FFE
-003FE00013C0D807F86D48EB7F000003173E183C150F18386D5E0001141F705B153F4D5A
-15776D4B5A0000ECE7F04DC7FCEC01C3170E9038FF0383017F5D91380703F85FEC0E0102
-1E5CD93F9C14F002BC6D5A02B813FDDAF8005B4A13FF5F6D5A94C8FC5C4A137E167C6DC7
-FC1678010E14383E2878A642>I<90B539E007FFF05E18E0902707FE000313006D48EB01
-FC705A5F01014A5A5F16036E5C0100140794C7FC160E805E805E1678ED8070023F13F05E
-ED81C015C191381FC38015C793C8FC15EF15EEEC0FFCA25DA26E5AA25DA26E5A5DA24AC9
-FC5C140E141E141C5C121C003F5B5A485B495A130300FE5B4848CAFCEA701EEA783CEA3F
-F0EA0FC0343A80A630>121 D E
+F0C7127F6E48140F18034B14011800A31978147F4B1570A502FF147092C7FCA3190017F0
+495D4A1301A21607161F91B6FC495DA29138FC003F160F1607160301075D5CA219E01801
+19C0010FEC07004A90C712031980A218071900011F5E5C181EA2183E183C013F167C4A15
+FC4D5A1707017F151F01FF4AB45AB9FCA2603D3E7DBD3E>69 D<011FB512FC5BA2903900
+3FF8006E5AA25DA5143F5DA5147F5DA514FF92C7FCA55B5CA513035CA513075CA5130F5C
+A5131F5CA3133F497E007FB512F0A2B6FC263E7EBD21>73 D<90263FFFF093381FFFF850
+13F0629026007FF8EFF000023F4D5AA2023B933801DFC0A2DA39FCED039FA2F1073F1479
+0271040E5BEC70FE191C19381A7F02F01670DAE07F94C7FC19E0A2F001C06201016D6C49
+5A02C05FF00700A2180E6F6C14010103161C028003385BA218706F7EF0E00313070200DA
+01C05BA2923907F00380A294380700075B010E902603F80E5C5FA25F190F011E6D6C5A01
+1C605FA2EEFDC0DB00FF141F013C5D013860013C92C7FC017C5C01FE027E143F2607FF80
+017C4A7EB500FC037FB512E004785E4A1338553E7CBD53>77 D<90263FFFE0023FB5FC6F
+16FEA29026003FF8020313C0021F030013004A6C157C023B163C6F153814398102381678
+02787FDA707F157082153F82031F15F002F07FDAE00F5D8215078203031401010180DAC0
+015D82811780047F1303010315C04A013F5C17E0161F17F0040F1307010715F891C70007
+91C7FC17FC160317FE04015B4915FF010E6E130E188E177F18CEEF3FDE011E16FE011C6F
+5AA2170FA21707133C01386F5A133C017C150113FE2607FF801400B512FC18705C483E7D
+BD44>I<013FB612FEEFFFE018F8903B007FF0000FFC6E48EB01FF7113804BEC7FC0183F
+19E0F01FF0A2147F5D19F8A402FFED3FF092C8FCA219E0A2F07FC05B4AEDFF8019004D5A
+4D5AEF0FF80103ED3FE04A903801FF8091B648C7FC17F002FCCAFCA213075CA5130F5CA5
+131F5CA5133F5CA3137F497EB612E0A25D3D3E7DBD3E>80 D<9238FF80070207EBE00F02
+1FEBF81E91387F00FE02FCEB1F3ED903F0EB0FFE49481307494813034AEB01FC49C7FC49
+1400133E137E177C491578A57F1770A26D1500808080EB7FFEECFFE06D13FEEDFFC06D14
+F06D14FC010380010080143F02031480DA003F13C015031500EE7FE0163F161FA2160F12
+1CA31607160F003C16C0A31780003E151F1700007E5D007F153E6D5C16FC01E0495AD87D
+F0495AD8FCFCEB0FC03AF87F803F8027F01FFFFEC7FCD8E00713F839C0007FC030427BBF
+33>83 D<B600E090B512FC4B15F8A2000101C0C7000F13006C49EC03FCEF01F091C9FC60
+A317015A495EA417031203495EA4170712074993C7FCA45F120F49150EA4171E121F4915
+1CA4173C123F491538A31778177017F05F001F15015F16036D4A5A000F93C8FC5E6C6C14
+1E6C6C5C000115F86C6C495A017FEB07C090393FC03F8090260FFFFEC9FC010313F89038
+007FC03E4073BD44>85 D<EC7FC0903803FFF890380FC07E90383E003F496D7E01FF6D7E
+82A248140782A26C5A137890C7120FA25EA2EC03FF147F903807FF1FEB1FE0D97F805B38
+01FE00EA03F8485A4848133F485A003F5D49EC81C048C7FCA2157F48ED03804814FFA200
+7F5B913903BF0700903880073F3A3FC00E1F8E260FE03C13FC3A03FFF00FF83A007FC003
+E02A2A7CA82D>97 D<EB3F80EA1FFFA3C6FC137FA291C9FCA55B5BA512015BA4EC07F800
+03EB3FFF9039F8F80FC09039FBE003E09039FF8001F891C77E5B4848147E49147F5B8217
+80A2120F5B17C0A3167F001F16805BA4EEFF00123F5B4B5AA24B5A5E007F4A5AA24B5A6D
+495A4BC7FCD87CE0137E39F87001F839F03C07E039E00FFF80260003FCC8FC2A4077BE33
+>I<EC1FF0ECFFFE903903F01F8090390FC003C0D93F0013E0017E130F49131F000115F0
+4848EB3FE0485AA24848EB1FC0001FEC0F004990C7FC123FA2485AA412FF90C9FCA96CEC
+0380150716006C6C5B151E001F5C6C6C5B6C6C5B6C6C485A3901F80F8026007FFEC7FCEB
+0FF0242A7AA828>I<EE03F8ED01FFA3ED000F1607A217F0A4160FA217E0A4161FA217C0
+A491380FF03FECFFFC902603F81F138090390FC007BF90391F8003FF90387E0001497F00
+01157F48481500485A120F5B001F5D485A5E5B127FA2150112FF90C75BA41503A25EA37E
+1507A26C4A5A7F001F141F6C6C133F6C6CEBFFF83B03F001EFFFC03900F80F8F90383FFE
+0FD90FF0EBE0002D407ABE33>I<EC3FE0903801FFF8903807E07E90380F801F90393F00
+0F80017E14C049EB07E0485A12034848EB03F0485AA2121F5B123FA248481307A290B6FC
+A2D8FF80C8FC90C9FCA87EED01C015036C15806D1307001FEC0F006D131E000F5C6C6C5B
+6C6C485A3900FC07C0D93FFFC7FCEB07F8242A7BA828>I<ED07F0ED3FFCEDFC1E913803
+F03F4A48B4FC4A481380141FEC3F81DA7F0113008102FE137C93C7FCA213015CA513035C
+A50007B512F8A3260007F0C8FCA3130F5CA5131F5CA5133F5CA5137F91C9FCA55B5BA4EA
+03FF007F13FEB5FCA229407DBF1C>I<1478EB01FE130314FFA25B14FE130314FCEB00F0
+1400ACEB03F8EA01FF14F0A2EA001F130FA314E0A5131F14C0A5133F1480A5137F1400A5
+5B5BA4EA03FF007F13F0A2B5FC183E7DBD1A>105 D<143FEB1FFF5BA213017FA214FEA5
+130114FCA5130314F8A5130714F0A5130F14E0A5131F14C0A5133F1480A5137F1400A55B
+5BA4EA03FF007F13F8A2B5FC183F7DBE1A>108 D<903907F007F8D803FFEB1FFF9139E0
+781FC09138E1E00F3B001FE38007E090380FE70002EE14F014FC14D814F85CA24A130F13
+1F4A14E0A4161F133F4A14C0A4163F137F91C71380A4167F5B491500A300015D486C4913
+80B5D8F87F13FCA32E287DA733>110 D<EC0FF0ECFFFE903903F01F8090390FC007C049
+C66C7E013E6D7E01FC6D7E48488049147C0003157E485A000F157F5B121FA2485AA2007F
+1680A2170048C85AA54B5AA25E5A6C4A5A7E4B5A5E6C140F6C6C5C4B5A6C6C013EC7FC6C
+6C5B6C6C485A3900FC0FE090383FFF80D90FF8C8FC292A7BA82D>I<903907F01F80D803
+FFEB7FE09138E1E1F09138E387F839001FE707EB0FE614EE02FC13F002D813E09138F801
+804AC7FCA25C131FA25CA4133F5CA5137F91C8FCA55B5BA31201487EB512FEA325287EA7
+24>114 D<9138FF81C0010713E390381F807F90397C003F8049131F4848130F5B000314
+07A248481400A27FA27F6D90C7FCEBFF8014FC6C13FF6C14C015F06C6C7F011F7F130790
+38007FFE1403140100381300157EA2123C153E157E007C147CA2007E147815F8007F495A
+4A5A486C485A26F9E01FC7FC38E0FFFC38C01FE0222A7DA824>I<EB0380A4130791C7FC
+A25BA25BA2133EA2137E13FE12011207001FB512C0B6FCA2D801FCC7FCA312035BA51207
+5BA5120F5BA41407001F130E13C0A4141E141C1380A26D5AA2000F5B14F03807E1E03801
+FF80D8007EC7FC1A3978B723>I<B539E007FFF05D17E02707FE000313006C48EB01FC6F
+5A5E00014A5A5EA24B5A6D1307000092C7FC5D150E6D5B7F5DA25D1480013F5B14815D14
+C3011F5B02C7C8FCA214CE14EEEB0FFCA25CA26D5A5CA25CA26D5A2C2878A630>118
+D<B500C3B53803FFFCA204FE14F8290FFE003FE00013C0D807F86D48EB7F000003173E18
+3C150F18386D5E0001141F705B153F4D5A15776D4B5A0000ECE7F04DC7FCEC01C3170E90
+38FF0383017F5D91380703F85FEC0E01021E5CD93F9C14F002BC6D5A02B813FDDAF8005B
+4A13FF5F6D5A94C8FC5C4A137E167C6DC7FC1678010E14383E2878A642>I<90B539E007
+FFF05E18E0902707FE000313006D48EB01FC705A5F01014A5A5F16036E5C0100140794C7
+FC160E805E805E1678ED8070023F13F05EED81C015C191381FC38015C793C8FC15EF15EE
+EC0FFCA25DA26E5AA25DA26E5A5DA24AC9FC5C140E141E141C5C121C003F5B5A485B495A
+130300FE5B4848CAFCEA701EEA783CEA3FF0EA0FC0343A80A630>121
+D E
%EndDVIPSBitmapFont
%DVIPSBitmapFont: Fi cmbx12 17.28 43
/Fi 43 122 df<EA01FCEA07FF4813804813C04813E04813F0A2B512F8A76C13F0A26C13
@@ -903,88 +903,88 @@ C8FCA4497FA2497FA2815B81EB0FE781EB1FC381EB3F8181EB7F0081497F49800001143F
>I<D87FFF90381FFFC0B56C4813E0A46C496C13C0D803F8903803F8006D1307A26C6C49
5AA26C6C5C151F6D5CEC803F013F5CECC07F011F91C7FCA290380FE0FEA214F101075BA2
903803FBF8A201015B14FF6D5BA26E5AA36E5AB1903803FFF8497F497FA26D5B6D5B2B38
-7EB730>I<007FB612F0A2B712F8A36C15F0A225077B7D30>95 D<EB3FFC48B57E4814E0
-4880488048809038F00FFE9038E001FF806F7E6C48133F6C4880C8121FA491B5FC130F13
-7F48B6FC12075A48EBC01F383FFC00EA7FE0138048C7FC5AA46C143FA26C6C137F9038C0
-01FF263FF80FEBFFC06CB712E0A2000714F76C14C3C6020013C0D93FF090C7FC2B2A7CA8
-30>97 D<EA3FFC487E12FFA2127F123F1200AAEC03FE91381FFF80027F13E091B57E90B6
-12FC82ECFE079138F001FF4A6C13804A137F4AEB3FC091C7121F4915E0160FA217F01607
-A8160FA217E07F161F6EEB3FC0A26EEB7F806E13FFDAF00313009138FC0FFE91B55A5E49
-5CD97E7F13C0D93C1F90C7FC90380003FC2C3980B730>I<ECFFE0010713FC011F7F017F
-7F90B612804815C048EB807F3907FC003F485A485A49EB1F804848EB0F004990C7FC127F
-90C9FCA25A5AA87E7EA27F003FEC07C06DEB0FE06C7E6D131F6C6C14C0D807FE133F9039
-FFC0FF806C90B5FCC615006D5B011F13F801075B01011380232A7AA830>I<913801FFE0
-4A7F5CA28080EC0007AAEB03FE90381FFF874913E790B6FC5A5A481303380FFC00D81FF0
-133F49131F485A150F4848130790C7FCA25AA25AA87E6C140FA27F003F141F6D133F6C7E
-6D137F390FF801FF2607FE07EBFFC06CB712E06C16F06C14F76D01C713E0011F010313C0
-D907FCC8FC2C397DB730>I<49B4FC010713E0011F13F8017F7F90B57E48804801811380
-3A07FC007FC04848133FD81FE0EB1FE0150F484814F0491307127F90C7FCED03F85A5AB7
-FCA516F048C9FC7E7EA27F003FEC01F06DEB03F86C7E6C7E6D1307D807FEEB1FF03A03FF
-C07FE06C90B5FC6C15C0013F14806DEBFE00010713F8010013C0252A7CA830>I<EDFF80
-020713E0021F13F05C4A13F891B5FC491387903803FE079138FC03F0903907F800C04A13
-00A8003FB612C04815E0B7FCA36C15C0260007F0C7FCB3A9003FB512FE4880B71280A26C
-15006C5C25397DB830>I<D903FC13FF90261FFF8713C04913DF90B712E05A5A2607FE07
-138F903AF801FE07C048486C6CC7FCA2497F001F8149133FA56D137F000F92C7FC6D5BA2
-6C6C485AEBFE0790B55A5D485C15C001DF5BD9C3FCC8FC01C0C9FCA37F7F6CB512F015FF
-6C15C04815F0488148813A3FE0001FFE0180130148C8127F007E8100FE168048151FA56C
-153F007FED7F006D5C6C6C495A01F013076CB4EB7FFC6C90B55A6C5D000115C06C6C91C7
-FC011F13FC010113C02B3E7DA730>I<EA3FFC487E12FFA2127F123F1200AAEC01FE9138
-0FFF80023F13E091B57E90B67EA29138FE07FCECF8039138E001FE14C0EC8000A291C7FC
-A25BB3A23B3FFFF81FFFF8486D4813FCB500FE14FEA26C01FC14FC6C496C13F82F3880B7
-30>I<14E0EB03F8A2497EA36D5AA2EB00E091C8FCA9381FFFF8487F5AA27E7EEA0001B3
-A9003FB612C04815E0B7FCA27E6C15C023397AB830>I<EA7FF8487EA4127F1200AB0203
-B512804A14C017E0A217C06E14809139001FE0004B5A4B5A4BC7FC4A5A4A5AEC0FF84A5A
-4A5A4A5A4A5A01FD7F90B57E8114F7ECE3F8ECC1FCEC81FEEC00FF497F496D7E6F7E826F
-7E15076F7E6F7E3B7FFFF81FFFE0B56C4813F017F8A217F06C496C13E02D387FB730>
-107 D<387FFFF8B57EA47EEA0001B3B3A8007FB612F0B712F8A46C15F025387BB730>I<
-02FC137E3B7FC3FF01FF80D8FFEF01877F90B500CF7F15DF92B57E6C010F13872607FE07
-EB03F801FC13FE9039F803FC01A201F013F8A301E013F0B3A23C7FFE0FFF07FF80B54801
-8F13C0A46C486C01071380322881A730>I<EC01FE3A3FFC0FFF80267FFE3F13E000FF90
-B57E90B67E7E6C9038FE07FCC6EBF8039138E001FE14C0EC8000A291C7FCA25BB3A23B3F
-FFF81FFFF8486D4813FCB500FE14FEA26C01FC14FC6C496C13F82F2880A730>I<49B4FC
-010F13E0013F13F8497F90B57E0003ECFF8014013A07FC007FC04848EB3FE0D81FE0EB0F
-F0A24848EB07F8491303007F15FC90C71201A300FEEC00FEA86C14016C15FCA26D130300
-3F15F86D13076D130F6C6CEB1FF06C6CEB3FE06D137F3A07FF01FFC06C90B512806C1500
-6C6C13FC6D5B010F13E0010190C7FC272A7CA830>I<EC03FE3A3FFC1FFF80267FFE7F13
-E000FF90B57E90B612FC6C816CEBFE07C69038F001FF4A6C13804A137F4AEB3FC091C712
-1F4915E0160FA217F01607A8160FA217E07F161F6EEB3FC0A26EEB7F806E13FFDAF00313
-009138FC0FFE91B55A5E495C6E13C0021F90C7FCEC03FC91C9FCAD383FFFF8487FB57EA2
-6C5B6C5B2C3C80A730>I<49B413F8010FEBC1FC013F13F14913FD48B6FC5A481381390F
-FC007F49131F4848130F491307485A491303127F90C7FC15015A5AA77E7E15037FA26C6C
-1307150F6C6C131F6C6C133F01FC137F3907FF01FF6C90B5FC6C14FD6C14F9013F13F101
-0F13C1903803FE0190C7FCAD92B512F84A14FCA46E14F82E3C7DA730>I<ED07F83A3FFF
-803FFF486DB51280B512C302CF14C06C13DF6C9038FFFC3FD8001F13E09238801F809238
-000F004A90C7FC5C5C5CA25CA45CAF003FB512FC4880B7FCA26C5C6C5C2A287EA730>I<
-90381FFC1E48B5129F000714FF5A5A5A387FF007EB800100FEC7FC4880A46C143E007F91
-C7FC13E06CB4FC6C13FC6CEBFF806C14E0000114F86C6C7F01037F9038000FFF02001380
-007C147F00FEEC1FC0A2150F7EA27F151F6DEB3F806D137F9039FC03FF0090B6FC5D5D00
-FC14F0D8F83F13C026780FFEC7FC222A79A830>I<EB0780497E131FA9003FB612E04815
-F0B7FCA36C15E026001FC0C7FCB216F8ED01FCA5ECE003010FEB07F814F09138FC1FF06D
-B512E06D14C016806D14009038007FFCEC1FF026337EB130>I<D83FFCEB3FFC486C497E
-00FF14FFA2007F147F003F143F00001400B3A41501A2150315076D130F903A7FC07FFFF8
-91B612FC6D15FE7F6D4913FC6D9038F87FF8010001C0C7FC2F2880A630>I<3B3FFFC07F
-FF80486DB512C0B515E0A26C16C06C496C13803B01F80003F000A26D130700005DA26D13
-0F017E5CA2017F131F6D5CA2EC803F011F91C7FCA26E5A010F137EA2ECE0FE01075BA214
-F101035BA3903801FBF0A314FF6D5BA36E5A6E5A2B277EA630>I<3B3FFFC01FFFE0486D
-4813F0B515F8A26C16F06C496C13E0D807E0C7EA3F00A26D5C0003157EA56D14FE00015D
-EC0F80EC1FC0EC3FE0A33A00FC7FF1F8A2147DA2ECFDF9017C5C14F8A3017E13FBA29039
-3FF07FE0A3ECE03FA2011F5C90390F800F802D277FA630>I<3A3FFF81FFFC4801C37FB5
-80A26C5D6C01815BC648C66CC7FC137FEC80FE90383F81FC90381FC3F8EB0FE3ECE7F06D
-B45A6D5B7F6D5B92C8FC147E147F5C497F81903803F7E0EB07E790380FE3F0ECC1F89038
-1F81FC90383F80FE90387F007E017E137F01FE6D7E48486D7E267FFF80B5FCB500C11480
-14E3A214C16C0180140029277DA630>I<3B3FFFC07FFF80486DB512C0B515E0A26C16C0
-6C496C13803B01FC0003F000A2000014076D5C137E150F017F5C7F151FD91F805BA214C0
-010F49C7FCA214E00107137EA2EB03F0157C15FCEB01F85DA2EB00F9ECFDF0147D147FA2
-6E5AA36E5AA35DA2143F92C8FCA25C147EA2000F13FE486C5AEA3FC1EBC3F81387EB8FF0
-EBFFE06C5B5C6C90C9FC6C5AEA01F02B3C7EA630>I<001FB612FC4815FE5AA316FC90C7
-EA0FF8ED1FF0ED3FE0ED7FC0EDFF80003E491300C7485A4A5A4A5A4A5A4A5A4A5A4A5A49
-90C7FC495A495A495A495A495A495A4948133E4890C7127F485A485A485A485A485A48B7
-FCB8FCA46C15FE28277DA630>I<ED3FF0913803FFF8140F5C147F16F09138FFF00092C7
-FC495A5CB3A21303495A133F383FFFF0B55A5C91C8FC14C080003F7F38003FF813076D7E
-1301B3A2806D7E15F091387FFFF016F8141F8014039138003FF025477BBE30>I<EA7FE0
-EAFFFE6D7E8014F07EC66C7E13076D7E1301B3A2806D7E15E091387FFFE06E13F8801407
-141F5C4A13E09138FFE00092C7FC495A5CB3A21303495A137F387FFFF0B5FC14C05C49C8
-FCEA7FE025477BBE30>125 D E
+7EB730>I<007FB612F0A2B712F8A36C15F0A225077B7D30>95 D<EB7FF80003B5FC4814
+C04880488048809038E01FFC9038C003FE14016E7E6C487F6CC77FC8123FA491B5FC130F
+137F48B6FC12075A48EB803F383FF800EA7FE0138048C7FC5AA4157F7E6C6C13FFEBC003
+263FF01FEBFF8090B712C07E6C14EF000314876CD9FE01138026003FE0C8FC2A2A7BA830
+>97 D<EA3FFC487E12FFA2127F123F1200AAEC03FE91381FFF80027F13E091B57E90B612
+FC82ECFE079138F001FF4A6C13804A137F4AEB3FC091C7121F17E049140FA217F01607A8
+160FA217E07F161F6EEB3FC0A26EEB7F806E13FFDAF00313009138FC0FFE91B55A5E495C
+D97E7F13C0D93C1F90C7FC90380003FC2C3980B730>I<ECFFE0010713FC011F7F017F7F
+90B612804815C048EB807F3907FC003F485A485A49EB1F804848EB0F004990C7FC127F90
+C9FCA25A5AA87E7EA27F003FEC07C06DEB0FE06C7E6D131F6C6C14C0D807FE133F9039FF
+C0FF806C90B5FCC615006D5B011F13F801075B01011380232A7AA830>I<913801FFE04A
+7F5CA28080EC0007AAEB03FE90381FFF874913E790B6FC5A5A481303380FFC00D81FF013
+3F49131F485A150F4848130790C7FCA25AA25AA87E6C140FA27F003F141F6D133F6C7E6D
+137F390FF801FF2607FE07EBFFC06CB712E06C16F06C14F76D01C713E0011F010313C0D9
+07FCC8FC2C397DB730>I<49B4FC010713E0011F13F8017F7F90B57E488048018113803A
+07FC007FC04848133FD81FE0EB1FE0150F484814F0491307127F90C7FCED03F85A5AB7FC
+A516F048C9FC7E7EA27F003FEC01F06DEB03F86C7E6C7E6D1307D807FEEB1FF03A03FFC0
+7FE06C90B5FC6C15C0013F14806DEBFE00010713F8010013C0252A7CA830>I<EDFF8002
+0713E0021F13F05C4A13F891B5FC491387903803FE079138FC03F0903907F800C04A1300
+A8003FB612C04815E0B7FCA36C15C0260007F0C7FCB3A9003FB512FE4880B71280A26C15
+006C5C25397DB830>I<D903FC13FF90261FFF8713C04913DF90B712E05A5A2607FE0713
+8F903AF801FE07C048486C6CC7FCA2497F001F8149133FA56D137F000F92C7FC6D5BA26C
+6C485AEBFE0790B55A5D485C15C001DF5BD9C3FCC8FC01C0C9FCA37F7F6CB512F015FF6C
+15C04815F0488148813A3FE0001FFE0180130148C8127F007E8100FE168048151FA56C15
+3F007FED7F006D5C6C6C495A01F013076CB4EB7FFC6C90B55A6C5D000115C06C6C91C7FC
+011F13FC010113C02B3E7DA730>I<EA3FFC487E12FFA2127F123F1200AAEC01FE91380F
+FF80023F13E091B57E90B67EA29138FE07FCECF8039138E001FE14C0EC8000A291C7FCA2
+5BB3A23B3FFFF81FFFF8486D4813FCB500FE14FEA26C01FC14FC6C496C13F82F3880B730
+>I<14E0EB03F8A2497EA36D5AA2EB00E091C8FCA9381FFFF8487F5AA27E7EEA0001B3A9
+003FB612C04815E0B7FCA27E6C15C023397AB830>I<EA7FF8487EA4127F1200AB0203B5
+12804A14C017E0A217C06E14809139001FE0004B5A4B5A4BC7FC4A5A4A5AEC0FF84A5A4A
+5A4A5A4A5A01FD7F90B57E8114F7ECE3F8ECC1FCEC81FEEC00FF497F496D7E6F7E826F7E
+15076F7E6F7E3B7FFFF81FFFE0B56C4813F017F8A217F06C496C13E02D387FB730>107
+D<387FFFF8B57EA47EEA0001B3B3A8007FB612F0B712F8A46C15F025387BB730>I<02FC
+137E3B7FC3FF01FF80D8FFEF01877F90B500CF7F15DF92B57E6C010F13872607FE07EB03
+F801FC13FE9039F803FC01A201F013F8A301E013F0B3A23C7FFE0FFF07FF80B548018F13
+C0A46C486C01071380322881A730>I<EC01FE3A3FFC0FFF80267FFE3F13E000FF90B57E
+90B67E7E6C9038FE07FCC6EBF8039138E001FE14C0EC8000A291C7FCA25BB3A23B3FFFF8
+1FFFF8486D4813FCB500FE14FEA26C01FC14FC6C496C13F82F2880A730>I<49B4FC010F
+13E0013F13F8497F90B57E0003ECFF8014013A07FC007FC04848EB3FE0D81FE0EB0FF0A2
+4848EB07F8491303007F15FC90C71201A300FEEC00FEA86C14016C15FCA26D1303003F15
+F86D13076D130F6C6CEB1FF06C6CEB3FE06D137F3A07FF01FFC06C90B512806C15006C6C
+13FC6D5B010F13E0010190C7FC272A7CA830>I<EC03FE3A3FFC1FFF80267FFE7F13E000
+FF90B57E90B612FC6C816CEBFE07C69038F001FF4A6C13804A137F4AEB3FC091C7121F17
+E049140FA217F01607A8160FA217E07F161F6EEB3FC0A26EEB7F806E13FFDAF003130091
+38FC0FFE91B55A5E495C6E13C0021F90C7FCEC03FC91C9FCAD383FFFF8487FB57EA26C5B
+6C5B2C3C80A730>I<49B413F8010FEBC1FC013F13F14913FD48B6FC5A481381390FFC00
+7F49131F4848130F491307485A491303127F90C7FC15015A5AA77E7E15037FA26C6C1307
+150F6C6C131F6C6C133F01FC137F3907FF01FF6C90B5FC6C14FD6C14F9013F13F1010F13
+C1903803FE0190C7FCAD92B512F84A14FCA46E14F82E3C7DA730>I<ED07F83A3FFF803F
+FF486DB51280B512C302CF14C06C13DF6C9038FFFC3FD8001F13E09238801F809238000F
+004A90C7FC5C5C5CA25CA45CAF003FB512FC4880B7FCA26C5C6C5C2A287EA730>I<9038
+1FFC1E48B5129F000714FF5A5A5A387FF007EB800100FEC7FC4880A46C143E007F91C7FC
+13E06CB4FC6C13FC6CEBFF806C14E0000114F86C6C7F01037F9038000FFF02001380007C
+147F00FEEC1FC0A2150F7EA27F151F6DEB3F806D137F9039FC03FF0090B6FC5D5D00FC14
+F0D8F83F13C026780FFEC7FC222A79A830>I<EB0780497E131FA9003FB612E04815F0B7
+FCA36C15E026001FC0C7FCB216F8ED01FCA5ECE003010FEB07F814F09138FC1FF06DB512
+E06D14C016806D14009038007FFCEC1FF026337EB130>I<D83FFCEB3FFC486C497E00FF
+14FFA2007F147F003F143F00001400B3A41501A2150315076D130F903A7FC07FFFF891B6
+12FC6D15FE7F6D4913FC6D9038F87FF8010001C0C7FC2F2880A630>I<3B3FFFC07FFF80
+486DB512C0B515E0A26C16C06C496C13803B01F80003F000A26D130700005DA26D130F01
+7E5CA2017F131F6D5CA2EC803F011F91C7FCA26E5A010F137EA2ECE0FE01075BA214F101
+035BA3903801FBF0A314FF6D5BA36E5A6E5A2B277EA630>I<3B3FFFC01FFFE0486D4813
+F0B515F8A26C16F06C496C13E0D807E0C7EA3F00A26D5C0003157EA56D14FE00015DEC0F
+80EC1FC0EC3FE0A33A00FC7FF1F8A2147DA2ECFDF9017C5C14F8A3017E13FBA290393FF0
+7FE0A3ECE03FA2011F5C90390F800F802D277FA630>I<3A3FFF81FFFC4801C37FB580A2
+6C5D6C01815BC648C66CC7FC137FEC80FE90383F81FC90381FC3F8EB0FE3ECE7F06DB45A
+6D5B7F6D5B92C8FC147E147F5C497F81903803F7E0EB07E790380FE3F0ECC1F890381F81
+FC90383F80FE90387F007E017E137F01FE6D7E48486D7E267FFF80B5FCB500C1148014E3
+A214C16C0180140029277DA630>I<3B3FFFC07FFF80486DB512C0B515E0A26C16C06C49
+6C13803B01FC0003F000A2000014076D5C137E150F017F5C7F151FD91F805BA214C0010F
+49C7FCA214E00107137EA2EB03F0157C15FCEB01F85DA2EB00F9ECFDF0147D147FA26E5A
+A36E5AA35DA2143F92C8FCA25C147EA2000F13FE486C5AEA3FC1EBC3F81387EB8FF0EBFF
+E06C5B5C6C90C9FC6C5AEA01F02B3C7EA630>I<001FB612FC4815FE5AA316FC90C7EA0F
+F8ED1FF0ED3FE0ED7FC0EDFF80003E491300C7485A4A5A4A5A4A5A4A5A4A5A4A5A4990C7
+FC495A495A495A495A495A495A4948133E4890C7127F485A485A485A485A485A48B7FCB8
+FCA46C15FE28277DA630>I<ED3FF0913803FFF8140F5C147F16F09138FFF00092C7FC49
+5A5CB3A21303495A133F383FFFF0B55A5C91C8FC14C080003F7F38003FF813076D7E1301
+B3A2806D7E15F091387FFFF016F8141F8014039138003FF025477BBE30>I<EA7FE0EAFF
+FE6D7E8014F07EC66C7E13076D7E1301B3A2806D7E15E091387FFFE06E13F8801407141F
+5C4A13E09138FFE00092C7FC495A5CB3A21303495A137F387FFFF0B5FC14C05C49C8FCEA
+7FE025477BBE30>125 D E
%EndDVIPSBitmapFont
%DVIPSBitmapFont: Fk cmbx12 14.4 49
/Fk 49 122 df<151E153E157E15FCEC01F8EC07F0EC0FE0EC1FC01580143FEC7F0014FE
@@ -1190,262 +1190,262 @@ E
/Fl 83 124 df<4AB4EB0FE0021F9038E03FFC913A7F00F8FC1ED901FC90383FF03FD907
F090397FE07F80494801FF13FF4948485BD93F805C137F0200ED7F00EF003E01FE6D91C7
FC82ADB97EA3C648C76CC8FCB3AE486C4A7E007FD9FC3FEBFF80A339407FBF35>11
-D<4AB4FC021F13C091387F01F0903901FC0078D907F0131C4948133E494813FF49485A13
-7F1400A213FE6F5A163893C7FCAA167FB8FCA33900FE00018182B3AC486CECFF80007FD9
-FC3F13FEA32F407FBF33>I<4AB47E021F13F791387F00FFEB01F8903807F001EB0FE0EB
-1FC0EB3F80137F14008101FE80AEB8FCA3C648C77EB3AE486CECFF80007FD9FC3F13FEA3
-2F407FBF33>I<001E130F397F803FC000FF137F01C013E0A201E013F0A3007F133F391E
-600F3000001300A401E01370491360A3000114E04913C00003130101001380481303000E
-EB070048130E0018130C0038131C003013181C1C7DBE2D>34 D<14E0A4EB07FC90383FFF
-8090B512E03901F8E3F03903E0E0FCD807C0133CD80F807FD81F007F003E80003C158000
-7C140316C00078141F00F8143F157FA47EED3F806CEC0E0092C7FC127F138013C0EA3FF0
-13FEEA1FFF6C13FC6C13FF6C14C06C806C6C13F8011F7F130301007FECE7FF14E102E013
-80157F153FED1FC0A2003E140F127FD8FF801307A5130000FC158000F0140F1270007815
-005D6C141E153E6C5C6C5C3907C0E1F03903F8EFE0C6B51280D93FFEC7FCEB0FF8EB00E0
-A422497BC32D>36 D<013F4C7ED9FFC04B7E2601E0E015072607C070150F48486C4B5A02
-3E4BC7FC48486C5D48D90FC0EB01FE003ED90EF0EB07FCDA0F3F133E007E903A070FFFF8
-F8007C0200EBC1F0EE000300FC6D6C495A604D5A171F95C8FC173E177E177C5F16015F00
-7C4948485A1607007E5E003E49495A020E131F003F93C9FC6C49133E260F803C137E0238
-137C6C6C485B3901E0E0016CB448485AD93F0049133F90C74848EBFFC0030F903801E0E0
-93398007C0704B4848487E4B153C033E90381F001C4B497F03FC133E4B150F4A48017E7F
-0203147C5D4A4801FCEB0380140F5D4AC7FC5C143E5C14FC5C495A13034948027CEB0700
-5C4948147E011F033E5B91C8140E013E153F017E6F5B017C92380F803C4917380001706C
-5A49923801E0E0496FB45A6C48043FC7FC41497BC34C>I<EC0FC0EC3FF0ECF878903801
-F01CEB03E049487E130FEC800F011F7FA2EB3F00A5EC800EA25DA25DA25D6D6C5AECC1C0
-A2ECC38002E7C7387FFFFCEB0FEE14FC4A020713C06D48913801FE006E5DEF00F06D7E4D
-5A496C5D010F1503D91DFF4A5A013893C7FC496C6C5B01E0150E48486C6C131E00036E13
-1C2607801F143C000F6E5B001F6D6C1370263F000714F06F485A48D903FE5B913801FF03
-486D495A0487C8FCED7FCFED3FFE6F4814386D6D5AA2007F6E6C14786D6D6C14704B6C14
-F06C6C496C6C13E0001F91393E3FC0016C6C903AFC1FF003C03D07FC07F007FC1F800001
-B5D8C001B512006C6C90C7EA7FFCD90FF8EC0FF03E437CC047>I<121EEA7F8012FF13C0
-A213E0A3127FEA1E601200A413E013C0A312011380120313005A120E5A1218123812300B
-1C79BE19>I<1430147014E0EB01C0EB03801307EB0F00131E133E133C5B13F85B12015B
-1203A2485AA2120F5BA2121F90C7FCA25AA3123E127EA6127C12FCB2127C127EA6123E12
-3FA37EA27F120FA27F1207A26C7EA212017F12007F13787F133E131E7FEB07801303EB01
-C0EB00E014701430145A77C323>I<12C07E12707E7E121E7E6C7E7F12036C7E7F12007F
-1378137CA27FA2133F7FA21480130FA214C0A3130714E0A6130314F0B214E01307A614C0
-130FA31480A2131F1400A25B133EA25BA2137813F85B12015B485A12075B48C7FC121E12
-1C5A5A5A5A145A7BC323>I<EB03C0A2805CA600F0140F00FC143F00FE147F00FF14FF39
-3FC3C3FC390FE187F03903F18FC03900FDBF00EB3FFCEB0FF0EB03C0EB0FF0EB3FFCEBFD
-BF3903F18FC0390FE187F0393FC3C3FC39FF03C0FF00FE147F00FC143F00F0140F000014
-00A6805CA220277AC32D>I<121EEA7F8012FF13C0A213E0A3127FEA1E601200A413E013
-C0A312011380120313005A120E5A1218123812300B1C798919>44
-D<B512FEA617067F961E>I<121EEA7F80A2EAFFC0A4EA7F80A2EA1E000A0A798919>I<ED
-0180ED03C01507A21680150FA216005DA2151E153EA2153C157CA2157815F8A25D1401A2
-5D1403A25D1407A25D140FA24AC7FCA2141E143EA2143C147CA2147814F8A25C1301A25C
-1303A25C1307A25C130FA291C8FC5BA2131E133EA25BA2137813F8A25B1201A25B1203A2
-5B1207A25B120FA290C9FC5AA2121E123EA2123C127CA2127812F8A25A1260225B7BC32D
->I<EB01FE90380FFFC090383F03F090387C00F849137C48487F48487F4848EB0F80A200
-0F15C04848EB07E0A3003F15F0A290C712034815F8A64815FCB3A26C15F8A56C6CEB07F0
-A3001F15E0A36C6CEB0FC0A26C6CEB1F80000315006C6C133E6C6C5B017C5B90383F03F0
-90380FFFC0D901FEC7FC263F7DBC2D>I<EB01C013031307131F137FEA07FFB5FC139FEA
-F81F1200B3B3ACEB7FF0B612F8A31D3D78BC2D>I<EB07FC90383FFF8090B512E03903F0
-1FF83907C007FC390F0001FE001E6D7E001C1580003CEC7FC05AED3FE01270B4FC6DEB1F
-F07FA56C5A6CC7FC120CC813E0153FA216C0157F168015FF16004A5A5D4A5A4A5A5D4A5A
-4A5A4AC7FC147E147C5C495A495A495A495A49C71270133E133C5B4914E0485A485A485A
-48C7120148B6FCA25A4815C0B7FCA3243D7CBC2D>I<EB07FC90383FFF809038F80FE039
-01E003F839078001FCD80F007F000E6D7E001E1580D81F80137F486C14C07FA27F5BA212
-1F6C5AC8138015FF1600A24A5AA24A5A5DEC07E04A5A023FC7FCEB1FFCECFF809038000F
-E0EC07F86E7E6E7E6E7E1680ED7FC0A216E0153FA216F0A2120C123F487E487EA316E0A2
-49137F6CC713C01278EDFF807E6C4913006C495A3907C007FC3903F80FF0C6B55A013F13
-80D907F8C7FC243F7CBC2D>I<150E151E153EA2157EA215FE1401A21403EC077E140614
-0E141CA214381470A214E0EB01C0A2EB0380EB0700A2130E5BA25B5BA25B5B1201485A90
-C7FC5A120E120C121C5AA25A5AB8FCA3C8EAFE00AC4A7E49B6FCA3283E7EBD2D>I<0006
-1403D80780131F01F813FE90B5FC5D5D5D15C092C7FC14FCEB3FE090C9FCACEB01FE9038
-0FFF8090383E03E090387001F8496C7E49137E497F90C713800006141FC813C0A216E015
-0FA316F0A3120C127F7F12FFA416E090C7121F12FC007015C012780038EC3F80123C6CEC
-7F00001F14FE6C6C485A6C6C485A3903F80FE0C6B55A013F90C7FCEB07F8243F7CBC2D>
-I<EC1FE0ECFFF8903803F03E90380FC00F90391F000780133E017EEB1FC049133F484813
-7F12035B12074848EB3F80ED1F00001F91C7FC5BA2123FA3485AA214FE903887FF8039FF
-8F07E090389C01F09038B800FC01B0137E13F0497F16804914C0A2ED1FE0A34914F0A512
-7FA6123F6D14E0A2121FED3FC0A26C6C1480A20007EC7F006C6C137E6C6C5B6C6C485A90
-387E07F06DB45A010F1380D903FCC7FC243F7CBC2D>I<1238123C123F90B612FCA316F8
-5A16F016E00078C712010070EC03C0ED078016005D48141E151C153C5DC8127015F04A5A
-5D14034A5A92C7FC5C141EA25CA2147C147814F8A213015C1303A31307A3130F5CA2131F
-A6133FAA6D5A0107C8FC26407BBD2D>I<EB03FC90381FFF8090387C07E09038F001F839
-01E0007C48487F48487F48C7FCED0F80121E16C0003E1407A4123FA26DEB0F807F6C6C13
-1F6D140001FC133E6C6C5B9038FF80786C6D5A6CEBF3E06CEBFF806C91C7FC133F6D13C0
-6D7F013F13F801787F48486C7E3903E01FFF48486C1380260F800313C048487E48903800
-7FE0003E143F007E141F007CEC0FF01507481403A31501A46C15E0007C1403A2007E15C0
-6C14076CEC0F806DEB1F006C6C133ED807F05B3901FC03F86CB512E0011F1380D903FCC7
-FC243F7CBC2D>I<EB03FCEB1FFF90387E07C09038FC03F048486C7E48486C7E4848137C
-000F147E4848137F81003F15805B007F15C0A2151F12FF16E0A516F0A5127F153FA36C7E
-A2001F147F120F6C6C13FF6D13DF000313013900F8039F90387E0F1FD91FFE13E0EB07F0
-90C7FCA2ED3FC0A41680157FD80F801400487E486C13FEA24A5A5D49485AEB8007391E00
-0FE0001F495A260FC07FC7FC3803FFFE6C13F838003FC0243F7CBC2D>I<121EEA7F80A2
-EAFFC0A4EA7F80A2EA1E00C7FCB3121EEA7F80A2EAFFC0A4EA7F80A2EA1E000A2779A619
->I<121EEA7F80A2EAFFC0A4EA7F80A2EA1E00C7FCB3121E127FEAFF80A213C0A4127F12
-1E1200A412011380A3120313005A1206120E120C121C5A1230A20A3979A619>I<EB1FF8
-90B5FC3903E01FC0390F0007F0001EEB03F848EB01FC4814FE140000FE14FF7E7FA46CC7
-FC123EC7EA01FEA2EC03FCEC07F815F0EC0FC0EC1F80EC3F00143E5C147814F85C13015C
-A2495AA25CAB91C7FC90C8FCA8EB0780EB1FE0A2497EA46D5AA2EB078020407BBF2B>63
-D<15074B7EA34B7EA34B7EA34B7EA34B7E15E7A2913801C7FC15C3A291380381FEA34AC6
-7EA3020E6D7EA34A6D7EA34A6D7EA34A6D7EA34A6D7EA349486D7E91B6FCA24981913880
-0001A249C87EA24982010E157FA2011E82011C153FA2013C820138151FA2017882170F13
-FC00034C7ED80FFF4B7EB500F0010FB512F8A33D417DC044>65 D<B712FCEEFF8017F000
-01903980000FF86C6CC7EA03FE707E701380EF7FC0EF3FE0A2EF1FF0A218F8A3170F171F
-A318F0A2EF3FE0177F18C0EFFF804C1300EE03FCEE0FF8EE7FE091B6C7FC17E091C7EA07
-FCEE01FE933800FF80EF7FC0EF3FE0EF1FF018F8170F18FC1707A218FEA718FC170FA2EF
-1FF818F0173FEF7FE0EFFFC00403138048486C90380FFE00B85A17E094C7FC373E7DBD40
->I<DB3FF01306912603FFFE130E020F9038FF801E913A3FF007E03E9139FF8000F8D903
-FEC7EA7C7ED907F8EC1EFE4948140FD93FE0140749481403495A91C81201484815001203
-4848167E5B000F173EA24848161EA2123F5B180E127FA349160012FFAC127F7F180EA212
-3FA27F001F171E181C6C7EA20007173C6D16386C6C1678000117706C6C16F06EEC01E06D
-6C15C06D6C1403D90FF0EC07806D6CEC1F00D903FE143E902600FF8013F891393FF007F0
-020FB512C0020391C7FC9138003FF037427BBF42>I<B712FCEEFF8017E000019039C000
-1FF86C6C48EB03FEEE00FF717E717EEF0FE084717E717E170184717EA21980187F19C0A3
-F03FE0A519F0AB19E0A5F07FC0A21980A218FF19004D5AA24D5A6017074D5A4D5AEF7FC0
-4DC7FCEE03FE48486CEB1FF8B85A178004FCC8FC3C3E7DBD45>I<B912E0A300019038C0
-00016C6C48EB001FEF0FF01703A217011700A31870A41838161CA41800A2163CA2167C16
-FC150391B5FCA3EC80031500167C163CA2161CA21807A3180E93C7FCA4181E181CA2183C
-A2187CA218F8170117031707171F48486CEB01FFB912F0A3383E7DBD3E>I<B91280A300
-019038C000036C6C48EB007FEF1FC0170F1707A21703A31701A4EF00E0A21638A31800A3
-1678A216F81501150791B5FCA3EC8007150115001678A21638A693C8FCAF3801FFE0B612
-F0A3333E7DBD3B>I<DB3FE0130C912603FFFE131C021F9038FF803C913A7FF00FC07C91
-39FF0001F0D903FC90380078FC4948143DD91FE0141F4948140F4948140701FF15034890
-C8FC491501485A000716005B000F177C5B001F173CA2485AA2181C127FA25B95C7FC12FF
-AB041FB512F0127FA26D9139000FFE00EF03FC123FA27F121FA26C7EA212077F12036C7E
-7F6C7F6D6C14076D7E6D6C140FD907F8141ED903FEEC3C7C902600FF80EBF83C913A7FF0
-07F01C021FB5EAC00C020391C8FC9138003FF03C427BBF47>I<B6D8C01FB512F8A30001
-01E0C7383FFC0026007F80EC0FF0B3A691B7FCA30280C7120FB3A92601FFE0EC3FFCB6D8
-C01FB512F8A33D3E7DBD44>I<B612F0A3C6EBF000EB3FC0B3B3B2EBFFF0B612F0A31C3E
-7EBD21>I<011FB512FCA3D9000713006E5A1401B3B3A6123FEA7F80EAFFC0A44A5A1380
-D87F005B007C130700385C003C495A6C495A6C495A2603E07EC7FC3800FFF8EB3FC02640
-7CBD2F>I<B600C090387FFFFCA3000101E0C7000F138026007F80913807FE0018F818E0
-604D5A4DC7FC173E5F5F4C5A4C5A4C5A4C5A4CC8FC163E5E5E4B5A4B5AED07804B7E151F
-4B7E4B7E15FF913881EFF8913883C7FCEC878791388F03FE91389E01FF14BCDAF8007F4A
-6D7E5C4A6D7E4A6D7EA2707E707EA2707E707EA2707F717E84173F717E717EA2717E8484
-19802601FFE04A13C0B600C090B6FCA3403E7DBD47>I<B612F8A3000101E0C9FC38007F
-80B3B0EF0380A517071800A45FA35FA25F5F5F4C5A160748486C133FB8FCA3313E7DBD39
->I<B500C093383FFFF0A300016D93387FF800D8007F18E0D977F016EFA3D973F8ED01CF
-A2D971FCED038FA3D970FEED070FA26E150E80A26E6C141CA36E6C1438A26E6C1470A36E
-6C14E0A26E6CEB01C0A36E6CEB0380A36E6CEB0700A2037F130EA36F6C5AA26F6C5AA36F
-6C5AA25FED07F0A2923803F9C0A36FB45AA26F90C7FCA213F8486C147ED807FFEF3FF8B5
-00F8013C011FB512F0A34C3E7DBD53>I<B56C91B512F88080D8007F030713006EEC01FC
-6E6E5A1870EB77FCEB73FEA2EB71FF01707FA26E7E6E7EA26E7E6E7EA26E7E6E7EA26E7E
-6E7FA26F7E6F7EA26F7E6F7EA26F7E6F7EA26F7E6F1380A2EE7FC0EE3FE0A2EE1FF0EE0F
-F8A2EE07FCEE03FEA2EE01FF7013F0A2177F173FA2171F170FA2170701F81503487ED807
-FF1501B500F81400A218703D3E7DBD44>I<ED7FE0913807FFFE91391FC03F8091397E00
-07E04948EB03F8D907F0EB00FE4948147F49486E7E49486E7E49C86C7E01FE6F7E000183
-49150300038348486F7EA248486F7EA2001F188049167F003F18C0A3007F18E049163FA3
-00FF18F0AC007F18E06D167FA4003F18C0A26C6CEEFF80A36C6C4B1300A26C6C4B5A0003
-5F6D150700015F6C6C4B5A6D5E6D6C4A5A6D6C4A5A6D6C4AC7FC6D6C14FED901FCEB03F8
-D9007FEB0FE091391FC03F80912607FFFEC8FC9138007FE03C427BBF47>I<B712F8EEFF
-8017E000019039C0003FF86C6C48EB07FCEE01FE707EEF7F80EF3FC018E0A2EF1FF0A218
-F8A818F0A2EF3FE0A218C0EF7F80EFFF004C5AEE07FCEE3FF091B612C04CC7FC0280C9FC
-B3A73801FFE0B612C0A3353E7DBD3E>I<B712C016FCEEFF800001D9C00013E06C6C48EB
-1FF0EE07FCEE01FE707E84717EA2717EA284A760177F606017FF95C7FCEE01FCEE07F8EE
-1FE0EEFF8091B500FCC8FC16F091388001FCED003FEE1FC0707E707E83160383160183A3
-83A484A4F0C004190EA28218E0057F131E2601FFE0161CB600C0EB3FF094381FF8380507
-1370CA3801FFE09438003F803F407DBD43>82 D<D907FC130C90391FFF801C017FEBF03C
-3901FC03F83A03F0007E7CD807C0EB1FFC4848130F001F140748C71203003E1401007E14
-00A2007C157C12FCA2163CA36C151CA27EA26C6C14007F7FEA3FF8EBFF806C13F86CEBFF
-806C14F06C14FC6C14FF6C15C0013F14E0010714F0EB007F020713F89138007FFC150FED
-07FE15031501ED00FFA200E0157FA3163FA27EA3163E7E167E6C157C6C15FC6C15F86D13
-016DEB03F06DEB07E0D8F9FCEB0FC03AF07F803F8090391FFFFE00D8E00713F839C0007F
-C028427BBF33>I<003FB91280A3903AF0007FE001018090393FC0003F48C7ED1FC0007E
-1707127C00781703A300701701A548EF00E0A5C81600B3B14B7E4B7E0107B612FEA33B3D
-7DBC42>I<B600C090B512F8A3000101E0C70007130026007F80EC01FC715A1870B3B3A4
-013F16F06E5DA21701011F5E80010F15036E4A5A010793C7FC6D6C5C6D6C141E6D6C5C02
-7F14F86E6C485A91390FF00FE00203B51280020049C8FCED1FF03D407DBD44>I<B69138
-0FFFFEA3000301E0020113E06C01809138007F806CEF3F00017F163E181C6E153C013F16
-38A26E1578011F1670A26D6C5DA26E140101075EA26E140301035EA26D6C4AC7FCA2806D
-150EA26F131E027F141CA26F133C023F1438A26E6C5BA26F13F0020F5CA2EDF80102075C
-A26E6C485AA2EDFE07020191C8FCA26F5A6E130EA2ED7F9CA216DCED3FF8A36F5AA36F5A
-A26F5AA36F5A3F407EBD44>I<B500FE017FB5D88007B5FCA3000301C0010101E0C713F8
-6C90C849EC3FE07148EC0F807E7215006E143F017F190E84A26D6C60A24D7E6D6C60A2EF
-E7F86D6C60A2933801C3FC6E18F001076104037F6E0281140101036104077F17006D6C4D
-5AA2040EEB7F806D6C4DC7FCA24CEB3FC0DA7F80160EA24CEB1FE003C0161E023F171C04
-7814F0DBE070010F133C021F173804F014F84C1307DA0FF05EA2DBF1C0EB03FCDA07F95E
-A2DBFB80EB01FEDA03FF6F5AA293C8FCA26E5FA24B157F020094C8FCA24B81037C153EA2
-0378151E0338151C58407EBD5D>I<B66C0103B51280A3000101F0C8EBF8006C6C48ED3F
-C0725A013F041EC7FC6D7E606D6C15386D6C1578606D6C5D6E14016D5E6D6D1303606E6C
-49C8FC6E6C5B170E6E6C131E171C6E6C5B6E6C137817706E6C13F06F5B6E13016EEB83C0
-5FED7FC7DB3FE7C9FC16EFED1FFE5E150F6F5AB3A4ED1FFC020FB512FCA3413E7FBD44>
-89 D<003FB712F8A391C7EA1FF013F801E0EC3FE00180EC7FC090C8FC003EEDFF80A200
-3C4A1300007C4A5A12784B5A4B5AA200704A5AA24B5A4B5AA2C8485A4A90C7FCA24A5A4A
-5AA24A5AA24A5A4A5AA24A5A4A5AA24990C8FCA2495A4948141CA2495A495AA2495A495A
-173C495AA24890C8FC485A1778485A484815F8A24848140116034848140F4848143FED01
-FFB8FCA32E3E7BBD38>I<EAFFFCA4EAF000B3B3B3B3ABEAFFFCA40E5B77C319>I<486C13
-C00003130101001380481303000EEB070048130E0018130C0038131C0030131800701338
-00601330A300E01370481360A400CFEB678039FFC07FE001E013F0A3007F133FA2003F13
-1F01C013E0390F0007801C1C73BE2D>I<EAFFFCA4EA003CB3B3B3B3ABEAFFFCA40E5B7F
-C319>I<EA0180120313005A120E5A12181238123012701260A312E05AA412CFEAFFC013
-E0A3127FA2123F13C0EA0F000B1C7ABE19>96 D<EB0FF8EBFFFE3903F01F8039078007E0
-000F6D7E9038E001F8D81FF07F6E7EA3157F6C5AEA0380C8FCA4EC1FFF0103B5FC90381F
-F87FEB7F803801FC00EA07F8EA0FE0485A485AA248C7FCEE038012FEA315FFA3007F5BEC
-03BF3B3F80071F8700261FC00E13CF3A07F03C0FFE3A01FFF807FC3A003FC001F0292A7D
-A82D>I<EA01FC12FFA3120712031201B1EC03FC91381FFF8091387C07E09039FDE001F0
-9039FFC000FC4A137E91C77E49158049141F17C0EE0FE0A217F0A2160717F8AA17F0A216
-0FA217E0161F17C06D1580EE3F006D5C6E13FE9039F3C001F89039F1E003F09039E0780F
-C09026C03FFFC7FCC7EA07F82D407EBE33>I<49B4FC010F13E090383F00F8017C131E48
-48131F4848137F0007ECFF80485A5B121FA24848EB7F00151C007F91C7FCA290C9FC5AAB
-6C7EA3003FEC01C07F001F140316806C6C13076C6C14000003140E6C6C131E6C6C137890
-383F01F090380FFFC0D901FEC7FC222A7DA828>I<ED01FC15FFA3150715031501B114FF
-010713E190381F80F990387E003D49131FD803F81307485A49130348481301121F123F5B
-127FA290C7FCA25AAA7E7FA2123FA26C7E000F14037F000714076C6C497E6C6C497ED800
-7C017913F890383F01F190380FFFC1903A01FE01FC002D407DBE33>I<EB01FE90380FFF
-C090383F03F09038FC01F848486C7E4848137E48487F000F158049131F001F15C0484813
-0FA2127F16E090C7FCA25AA290B6FCA290C9FCA67EA27F123F16E06C7E1501000F15C06C
-6C13036DEB07806C6C1400C66C131E017E5B90381F80F8903807FFE0010090C7FC232A7E
-A828>I<EC1FC0EC7FF8903801F83C903807E07E90380FC0FFEB1FC1EB3F811401137FEC
-00FE01FE137C1500AEB6FCA3C648C7FCB3AE487E007F13FFA320407EBF1C>I<167C9039
-03F801FF903A1FFF078F8090397E0FDE1F9038F803F83803F001A23B07E000FC0600000F
-6EC7FC49137E001F147FA8000F147E6D13FE00075C6C6C485AA23901F803E03903FE0FC0
-26071FFFC8FCEB03F80006CAFC120EA3120FA27F7F6CB512E015FE6C6E7E6C15E06C8100
-03813A0FC0001FFC48C7EA01FE003E140048157E825A82A46C5D007C153E007E157E6C5D
-6C6C495A6C6C495AD803F0EB0FC0D800FE017FC7FC90383FFFFC010313C0293D7EA82D>
-I<EA01FC12FFA3120712031201B1EC01FE913807FFC091381E07E091387803F09138E001
-F8D9FDC07F148001FF6D7E91C7FCA25BA25BB3A6486C497EB5D8F87F13FCA32E3F7DBE33
->I<EA01E0EA07F8A2487EA46C5AA2EA01E0C8FCACEA01FC127FA3120712031201B3AC48
-7EB512F0A3143E7DBD1A>I<1478EB01FEA2EB03FFA4EB01FEA2EB00781400AC147FEB7F
-FFA313017F147FB3B3A5123E127F38FF807E14FEA214FCEB81F8EA7F01387C03F0381E07
-C0380FFF803801FC00185185BD1C>I<EA01FC12FFA3120712031201B292B51280A39238
-3FFC0016E0168093C7FC153C5D5D4A5AEC07C04A5A4AC8FC143E147F4A7E13FD9038FFDF
-C0EC9FE0140F496C7E01FC7F496C7E1401816E7E81826F7E151F826F7EA282486C14FEB5
-39F07FFFE0A32B3F7EBE30>I<EA01FC12FFA3120712031201B3B3B1487EB512F8A3153F
-7DBE1A>I<2701F801FE14FF00FF902707FFC00313E0913B1E07E00F03F0913B7803F03C
-01F80007903BE001F87000FC2603F9C06D487F000101805C01FBD900FF147F91C75B13FF
-4992C7FCA2495CB3A6486C496CECFF80B5D8F87FD9FC3F13FEA347287DA74C>I<3901F8
-01FE00FF903807FFC091381E07E091387803F000079038E001F82603F9C07F0001138001
-FB6D7E91C7FC13FF5BA25BB3A6486C497EB5D8F87F13FCA32E287DA733>I<14FF010713
-E090381F81F890387E007E01F8131F4848EB0F804848EB07C04848EB03E0000F15F04848
-EB01F8A2003F15FCA248C812FEA44815FFA96C15FEA36C6CEB01FCA3001F15F86C6CEB03
-F0A26C6CEB07E06C6CEB0FC06C6CEB1F80D8007EEB7E0090383F81FC90380FFFF0010090
-C7FC282A7EA82D>I<3901FC03FC00FF90381FFF8091387C0FE09039FDE003F03A07FFC0
-01FC6C496C7E6C90C7127F49EC3F805BEE1FC017E0A2EE0FF0A3EE07F8AAEE0FF0A4EE1F
-E0A2EE3FC06D1580EE7F007F6E13FE9138C001F89039FDE007F09039FC780FC0DA3FFFC7
-FCEC07F891C9FCAD487EB512F8A32D3A7EA733>I<02FF131C0107EBC03C90381F80F090
-397F00387C01FC131CD803F8130E4848EB0FFC150748481303121F485A1501485AA448C7
-FCAA6C7EA36C7EA2001F14036C7E15076C6C130F6C7E6C6C133DD8007E137990383F81F1
-90380FFFC1903801FE0190C7FCAD4B7E92B512F8A32D3A7DA730>I<3901F807E000FFEB
-1FF8EC787CECE1FE3807F9C100031381EA01FB1401EC00FC01FF1330491300A35BB3A548
-7EB512FEA31F287EA724>I<90383FC0603901FFF8E03807C03F381F000F003E1307003C
-1303127C0078130112F81400A27E7E7E6D1300EA7FF8EBFFC06C13F86C13FE6C7F6C1480
-000114C0D8003F13E0010313F0EB001FEC0FF800E01303A214017E1400A27E15F07E1401
-6C14E06CEB03C0903880078039F3E01F0038E0FFFC38C01FE01D2A7DA824>I<131CA613
-3CA4137CA213FCA2120112031207001FB512C0B6FCA2D801FCC7FCB3A215E0A912009038
-FE01C0A2EB7F03013F138090381F8700EB07FEEB01F81B397EB723>I<D801FC14FE00FF
-147FA3000714030003140100011400B3A51501A31503120015076DEB06FF017E010E1380
-6D4913FC90381FC078903807FFE00100903880FE002E297DA733>I<B539E00FFFE0A327
-07FE000313006C48EB00FC5E00015D7F00005DA26D13016D5CA26D6C485AA2ECC007011F
-91C7FCA290380FE00EA2ECF01E0107131CA26D6C5AA2ECFC7801011370A2ECFEF001005B
-A2EC7FC0A36E5AA26EC8FCA3140E2B287EA630>I<B53BC3FFFE03FFF8A3290FFE003FE0
-0013C06C486D48EB3F806C4817006D010F141E00016F131C15076D163C00004A6C1338A2
-017F5E4B7E151DD93F805DED3DFC1538D91FC04A5AED78FE9238707E03D90FE0017F5BED
-E03F02F0140701070387C7FC9138F1C01F02F9148F010315CE9138FB800F02FF14DE6D15
-FCED00076D5DA24A1303027E5CA2027C1301023C5C023813003D287EA642>I<B539F01F
-FFE0A30003D9C00F1300C690388007F8D97F0013E002805BD93FC05B011F49C7FC90380F
-E00EECF01E6D6C5A01035B6D6C5A6E5AEB00FF6E5A6E5A81141F814A7E81147BECF1FC90
-3801E1FEECC0FF01037F49486C7ED90F007F011E6D7E013E130F496D7E01FC80486C8000
-0F4A7EB539803FFFF8A32D277FA630>I<B539E00FFFE0A32707FE000313006C48EB01FC
-6F5A00015D7F00005DA2017F495AA2EC8003013F5CA26D6C48C7FCA26E5A010F130EA26D
-6C5AA2ECF83C01031338A26D6C5AA2ECFEF001005BA2EC7FC0A36E5AA36EC8FCA2140EA2
-141E141C143C1438A2147800181370127EB45BA2495AA248485AD87E07C9FCEA780EEA3C
-3CEA1FF8EA07E02B3A7EA630>I<001FB61280A2EBE0000180140049485A001E495A121C
-4A5A003C495A141F00385C4A5A147F5D4AC7FCC6485AA2495A495A130F5C495A90393FC0
-0380A2EB7F80EBFF005A5B484813071207491400485A48485BA248485B4848137F00FF49
-5A90B6FCA221277EA628>I<B812F0A22C0280982D>I E
+D<EC03FE91383FFF809138FE03E0903903F800F0D90FE013384948137C90393F8001FE90
+387F00035B5BA2485A6F5AED007093C7FCAA16FEB7FCA33901FC000315011500B3AC486C
+497EB5D8F87F13FCA32E407EBF33>I<EC03FF023F13EE9138FE01FEEB03F090380FE003
+EB1FC0EB3F80EB7F005B5B150148481300AEB7FCA3D801FCC7FCB3AE486C497EB5D8F87F
+13FCA32E407EBF33>I<001E130F397F803FC000FF137F01C013E0A201E013F0A3007F13
+3F391E600F3000001300A401E01370491360A3000114E04913C000031301010013804813
+03000EEB070048130E0018130C0038131C003013181C1C7DBE2D>34
+D<14E0A4EB07FC90383FFF8090B512E03901F8E3F03903E0E0FCD807C0133CD80F807FD8
+1F007F003E80003C1580007C140316C00078141F00F8143F157FA47EED3F806CEC0E0092
+C7FC127F138013C0EA3FF013FEEA1FFF6C13FC6C13FF6C14C06C806C6C13F8011F7F1303
+01007FECE7FF14E102E01380157F153FED1FC0A2003E140F127FD8FF801307A5130000FC
+158000F0140F1270007815005D6C141E153E6C5C6C5C3907C0E1F03903F8EFE0C6B51280
+D93FFEC7FCEB0FF8EB00E0A422497BC32D>36 D<013F1603D9FFC04B7E2601E0E0150F26
+07C070151F48486C4BC7FC023E157E48486C15FE48D90FC0EB03FC003ED90EF0EB0FF8DA
+0F3F13FD007E903A070FFFF1F0007C0200EB03E0160000FC6D6C495A170F604DC8FC5F17
+3E5F17FC5F4C5A1603007CD907005B4C5A007E150F003E495C020E49C9FC003F5D6C4913
+3E260F803C5B023813FC6C6C485B3A01E0E001F03800FFC090273F0003E0133F90C70007
+ECFFC09339C001E0E0923A0F8007C070031F49487E0400143C033E90381F001C037E497F
+037C133E4B150F0201027E7F4B137C4A5A020702FCEB03805D4A5A141F92C7FC143E147E
+147C5CA2495A0103037CEB07005C4948147E010F033E5B4A160E49C8123F496F5B013E92
+380F803C49173801FC6F6C5A49923801E0E0496FB45A0160043FC7FC41497BC34C>I<EC
+0F80EC7FE0ECF870903803E0380107133CECC01CEB0F80011F131E150EA2EB3F00A55D14
+80A25D157815705D6D6C5A14C1ECC38002C7CAFC02EE91387FFFFCEB0FEC14FC4A020713
+C06D48913801FE006E5DEF00F06D7E01074B5A496C5D011D1503D939FF4A5A017093C7FC
+496D5B0001017F140E496C6C131E00036E131C2607801F143C000F6E5B001F6D6C137026
+3F000714F0486E485ADA03FE5B913801FF03486D495A0487C8FCED7FCFED3FFE6F481438
+6D5C150F007F6E6C14786D6D6C1470003F4A6C14F06D496C6C13E0001F91393E3FC0016C
+6C903AFC1FF003C03D07FC07F007FC1F800001B5D8C001B512006C6C90C7EA7FFCD90FF8
+EC0FF03E437CC047>I<121EEA7F8012FF13C0A213E0A3127FEA1E601200A413E013C0A3
+12011380120313005A120E5A1218123812300B1C79BE19>I<1430147014E0EB01C0EB03
+801307EB0F00131E133E133C5B13F85B12015B1203A2485AA2120F5BA2121F90C7FCA25A
+A3123E127EA6127C12FCB2127C127EA6123E123FA37EA27F120FA27F1207A26C7EA21201
+7F12007F13787F133E131E7FEB07801303EB01C0EB00E014701430145A77C323>I<12C0
+7E12707E7E121E7E6C7E7F12036C7E7F12007F1378137CA27FA2133F7FA21480130FA214
+C0A3130714E0A6130314F0B214E01307A614C0130FA31480A2131F1400A25B133EA25BA2
+137813F85B12015B485A12075B48C7FC121E121C5A5A5A5A145A7BC323>I<EB03C0A280
+5CA600F0140F00FC143F00FE147F00FF14FF393FC3C3FC390FE187F03903F18FC03900FD
+BF00EB3FFCEB0FF0EB03C0EB0FF0EB3FFCEBFDBF3903F18FC0390FE187F0393FC3C3FC39
+FF03C0FF00FE147F00FC143F00F0140F00001400A6805CA220277AC32D>I<121EEA7F80
+12FF13C0A213E0A3127FEA1E601200A413E013C0A312011380120313005A120E5A121812
+3812300B1C798919>44 D<B512FEA617067F961E>I<121EEA7F80A2EAFFC0A4EA7F80A2
+EA1E000A0A798919>I<ED0180ED03C01507A21680150FA216005DA2151E153EA2153C15
+7CA2157815F8A25D1401A25D1403A25D1407A25D140FA24AC7FCA2141E143EA2143C147C
+A2147814F8A25C1301A25C1303A25C1307A25C130FA291C8FC5BA2131E133EA25BA21378
+13F8A25B1201A25B1203A25B1207A25B120FA290C9FC5AA2121E123EA2123C127CA21278
+12F8A25A1260225B7BC32D>I<EB01FE90380FFFC090383F03F090387C00F849137C4848
+7F48487F4848EB0F80A2000F15C04848EB07E0A3003F15F0A290C712034815F8A64815FC
+B3A26C15F8A56C6CEB07F0A3001F15E0A36C6CEB0FC0A26C6CEB1F80000315006C6C133E
+6C6C5B017C5B90383F03F090380FFFC0D901FEC7FC263F7DBC2D>I<EB01C01303130713
+1F137FEA07FFB5FC139FEAF81F1200B3B3ACEB7FF0B612F8A31D3D78BC2D>I<EB07FC90
+383FFF8090B512E03903F01FF83907C007FC390F0001FE001E6D7E001C1580003CEC7FC0
+5AED3FE01270B4FC6DEB1FF07FA56C5A6CC7FC120CC813E0153FA216C0157F168015FF16
+004A5A5D4A5A4A5A5D4A5A4A5A4AC7FC147E147C5C495A495A495A495A49C71270133E13
+3C5B4914E0485A485A485A48C7120148B6FCA25A4815C0B7FCA3243D7CBC2D>I<EB07FC
+90383FFF809038F80FE03901E003F839078001FCD80F007F000E6D7E001E1580D81F8013
+7F486C14C07FA27F5BA2121F6C5AC8138015FF1600A24A5AA24A5A5DEC07E04A5A023FC7
+FCEB1FFCECFF809038000FE0EC07F86E7E6E7E6E7E1680ED7FC0A216E0153FA216F0A212
+0C123F487E487EA316E0A249137F6CC713C01278EDFF807E6C4913006C495A3907C007FC
+3903F80FF0C6B55A013F1380D907F8C7FC243F7CBC2D>I<150E151E153EA2157EA215FE
+1401A21403EC077E1406140E141CA214381470A214E0EB01C0A2EB0380EB0700A2130E5B
+A25B5BA25B5B1201485A90C7FC5A120E120C121C5AA25A5AB8FCA3C8EAFE00AC4A7E49B6
+FCA3283E7EBD2D>I<00061403D80780131F01F813FE90B5FC5D5D5D15C092C7FC14FCEB
+3FE090C9FCACEB01FE90380FFF8090383E03E090387001F8496C7E49137E497F90C71380
+0006141FC813C0A216E0150FA316F0A3120C127F7F12FFA416E090C7121F12FC007015C0
+12780038EC3F80123C6CEC7F00001F14FE6C6C485A6C6C485A3903F80FE0C6B55A013F90
+C7FCEB07F8243F7CBC2D>I<EC1FE0ECFFF8903803F03E90380FC00F90391F000780133E
+017EEB1FC049133F4848137F12035B12074848EB3F80ED1F00001F91C7FC5BA2123FA348
+5AA214FE903887FF8039FF8F07E090389C01F09038B800FC01B0137E13F0497F16804914
+C0A2ED1FE0A34914F0A5127FA6123F6D14E0A2121FED3FC0A26C6C1480A20007EC7F006C
+6C137E6C6C5B6C6C485A90387E07F06DB45A010F1380D903FCC7FC243F7CBC2D>I<1238
+123C123F90B612FCA316F85A16F016E00078C712010070EC03C0ED078016005D48141E15
+1C153C5DC8127015F04A5A5D14034A5A92C7FC5C141EA25CA2147C147814F8A213015C13
+03A31307A3130F5CA2131FA6133FAA6D5A0107C8FC26407BBD2D>I<EB03FC90381FFF80
+90387C07E09038F001F83901E0007C48487F48487F48C7FCED0F80121E16C0003E1407A4
+123FA26DEB0F807F6C6C131F6D140001FC133E6C6C5B9038FF80786C6D5A6CEBF3E06CEB
+FF806C91C7FC133F6D13C06D7F013F13F801787F48486C7E3903E01FFF48486C1380260F
+800313C048487E489038007FE0003E143F007E141F007CEC0FF01507481403A31501A46C
+15E0007C1403A2007E15C06C14076CEC0F806DEB1F006C6C133ED807F05B3901FC03F86C
+B512E0011F1380D903FCC7FC243F7CBC2D>I<EB03FCEB1FFF90387E07C09038FC03F048
+486C7E48486C7E4848137C000F147E4848137F81003F15805B007F15C0A2151F12FF16E0
+A516F0A5127F153FA36C7EA2001F147F120F6C6C13FF6D13DF000313013900F8039F9038
+7E0F1FD91FFE13E0EB07F090C7FCA2ED3FC0A41680157FD80F801400487E486C13FEA24A
+5A5D49485AEB8007391E000FE0001F495A260FC07FC7FC3803FFFE6C13F838003FC0243F
+7CBC2D>I<121EEA7F80A2EAFFC0A4EA7F80A2EA1E00C7FCB3121EEA7F80A2EAFFC0A4EA
+7F80A2EA1E000A2779A619>I<121EEA7F80A2EAFFC0A4EA7F80A2EA1E00C7FCB3121E12
+7FEAFF80A213C0A4127F121E1200A412011380A3120313005A1206120E120C121C5A1230
+A20A3979A619>I<EB1FF890B5FC3903E01FC0390F0007F0001EEB03F848EB01FC4814FE
+140000FE14FF7E7FA46CC7FC123EC7EA01FEA2EC03FCEC07F815F0EC0FC0EC1F80EC3F00
+143E5C147814F85C13015CA2495AA25CAB91C7FC90C8FCA8EB0780EB1FE0A2497EA46D5A
+A2EB078020407BBF2B>63 D<15074B7EA34B7EA34B7EA34B7EA34B7E15E7A2913801C7FC
+15C3A291380381FEA34AC67EA3020E6D7EA34A6D7EA34A6D7EA34A6D7EA34A6D7EA34948
+6D7E91B6FCA249819138800001A249C87EA24982010E157FA2011E82011C153FA2013C82
+0138151FA2017882170F13FC00034C7ED80FFF4B7EB500F0010FB512F8A33D417DC044>
+65 D<B712FCEEFF8017F00001903980000FF86C6CC7EA03FE707E701380EF7FC0EF3FE0
+A2EF1FF0A218F8A3170F171FA318F0A2EF3FE0177F18C0EFFF804C1300EE03FCEE0FF8EE
+7FE091B6C7FC17E091C7EA07FCEE01FE933800FF80EF7FC0EF3FE0EF1FF018F8170F18FC
+1707A218FEA718FC170FA2EF1FF818F0173FEF7FE0EFFFC00403138048486C90380FFE00
+B85A17E094C7FC373E7DBD40>I<DB3FF01306912603FFFE130E020F9038FF801E913A3F
+F007E03E9139FF8000F8D903FEC7EA7C7ED907F8EC1EFE4948140FD93FE0140749481403
+495A91C812014848150012034848167E5B000F173EA24848161EA2123F5B180E127FA349
+160012FFAC127F7F180EA2123FA27F001F171E181C6C7EA20007173C6D16386C6C167800
+0117706C6C16F06EEC01E06D6C15C06D6C1403D90FF0EC07806D6CEC1F00D903FE143E90
+2600FF8013F891393FF007F0020FB512C0020391C7FC9138003FF037427BBF42>I<B712
+FCEEFF8017E000019039C0001FF86C6C48EB03FEEE00FF717E717EEF0FE084717E717E17
+0184717EA21980187F19C0A3F03FE0A519F0AB19E0A5F07FC0A21980A218FF19004D5AA2
+4D5A6017074D5A4D5AEF7FC04DC7FCEE03FE48486CEB1FF8B85A178004FCC8FC3C3E7DBD
+45>I<B912E0A300019038C000016C6C48EB001FEF0FF01703A217011700A31870A41838
+1638A41800A21678A216F81501150791B5FCA3EC8007150115001678A21638A2180EA318
+1C93C7FCA4183C1838A21878A318F8EF01F0A21707170F173F48486CEB03FFB912E0A337
+3E7DBD3E>I<B91280A300019038C000036C6C48EB007FEF1FC0170F1707A21703A31701
+A4EF00E0A21638A31800A31678A216F81501150791B5FCA3EC8007150115001678A21638
+A693C8FCAF3801FFE0B612F0A3333E7DBD3B>I<DB3FE0130C912603FFFE131C021F9038
+FF803C913A7FF00FC07C9139FF0001F0D903FC90380078FC4948143DD91FE0141F494814
+0F4948140701FF15034890C8FC491501485A000716005B000F177C5B001F173CA2485AA2
+181C127FA25B95C7FC12FFAB041FB512F0127FA26D9139000FFE00EF03FC123FA27F121F
+A26C7EA212077F12036C7E7F6C7F6D6C14076D7E6D6C140FD907F8141ED903FEEC3C7C90
+2600FF80EBF83C913A7FF007F01C021FB5EAC00C020391C8FC9138003FF03C427BBF47>
+I<B6D8C01FB512F8A3000101E0C7383FFC0026007F80EC0FF0B3A691B7FCA30280C7120F
+B3A92601FFE0EC3FFCB6D8C01FB512F8A33D3E7DBD44>I<B612F0A3C6EBF000EB3FC0B3
+B3B2EBFFF0B612F0A31C3E7EBD21>I<011FB512FCA3D9000713006E5A1401B3B3A6123F
+EA7F80EAFFC0A44A5A1380D87F005B007C130700385C003C495A6C495A6C495A2603E07E
+C7FC3800FFF8EB3FC026407CBD2F>I<B600C090387FFFFCA3000101E0C7000F13802600
+7F80913807FE0018F818E0604D5A4DC7FC173E5F5F4C5A4C5A4C5A4C5A4CC8FC163E5E5E
+4B5A4B5AED07804B7E151F4B7E4B7E15FF913881EFF8913883C7FCEC878791388F03FE91
+389E01FF14BCDAF8007F4A6D7E5C4A6D7E4A6D7EA2707E707EA2707E707EA2707F717E84
+173F717E717EA2717E848419802601FFE04A13C0B600C090B6FCA3403E7DBD47>I<B612
+F8A3000101E0C9FC38007F80B3B0EF0380A517071800A45FA35FA25F5F5F4C5A16074848
+6C133FB8FCA3313E7DBD39>I<B500C093B512C0A300016D4BEBE000D8007F1880D977F0
+ED03BFA3D973F8ED073FA3D971FC150EA2D970FE151CA3027F1538A36E6C1470A36E6C14
+E0A26E6CEB01C0A36E6CEB0380A36E6CEB0700A26E6C130EA36E6C5BA3037F5BA26F6C5A
+A36F6C5AA392380FE1C0A3923807F380A26FB4C7FCA36F5AA213F8486C6D5AD807FFEFFF
+E0B500F80178017FEBFFC0A34A3E7CBD53>I<B56C91B512F88080D8007F030713006EEC
+01FC6E6E5A1870EB77FCEB73FEA2EB71FF01707FA26E7E6E7EA26E7E6E7EA26E7E6E7EA2
+6E7E6E7FA26F7E6F7EA26F7E6F7EA26F7E6F7EA26F7E6F1380A2EE7FC0EE3FE0A2EE1FF0
+EE0FF8A2EE07FCEE03FEA2EE01FF7013F0A2177F173FA2171F170FA2170701F81503487E
+D807FF1501B500F81400A218703D3E7DBD44>I<ED7FE0913807FFFE91391FC03F809139
+7E0007E04948EB03F8D907F0EB00FE4948147F49486E7E49486E7E49C86C7E01FE6F7E00
+018349150300038348486F7EA248486F7EA2001F188049167F003F18C0A3007F18E04916
+3FA300FF18F0AC007F18E06D167FA4003F18C0A26C6CEEFF80A36C6C4B1300A26C6C4B5A
+00035F6D150700015F6C6C4B5A6D5E6D6C4A5A6D6C4A5A6D6C4AC7FC6D6C14FED901FCEB
+03F8D9007FEB0FE091391FC03F80912607FFFEC8FC9138007FE03C427BBF47>I<B712F8
+EEFF8017E000019039C0003FF86C6C48EB07FCEE01FE707EEF7F80EF3FC018E0A2EF1FF0
+A218F8A818F0A2EF3FE0A218C0EF7F80EFFF004C5AEE07FCEE3FF091B612C04CC7FC0280
+C9FCB3A73801FFE0B612C0A3353E7DBD3E>I<B712C016FCEEFF800001D9C00013E06C6C
+48EB1FF0EE07FCEE01FE707E84717EA2717EA284A760177F606017FF95C7FCEE01FCEE07
+F8EE1FE0EEFF8091B500FCC8FC16F091388001FCED003FEE1FC0707E707E831603831601
+83A383A484A4F0C004190EA28218E0057F131E2601FFE0161CB600C0EB3FF094381FF838
+05071370CA3801FFE09438003F803F407DBD43>82 D<D907FC131890391FFF8038017FEB
+E0783901FC03F83A03F0007CF8D807C0133F4848130F001F140748C7FC003E1403007E14
+01A2007C140012FC1678A46C1538A27EA26C6C14007F7FEA3FF8EBFF806C13F86CEBFF80
+6C14F06C14FC6C14FF6C15C0013F14E0010714F0EB007F020713F89138007FFC150FED07
+FE15031501ED00FFA200E0157FA3163FA27EA3163E7E167E6C157C6C15FC6C15F86D1301
+6DEB03F06DEB07E0D8F9FCEB0FC03AF07F803F8090391FFFFE00D8E00713F839C0007FC0
+28427BBF33>I<003FB91280A3903AF0007FE001018090393FC0003F48C7ED1FC0007E17
+07127C00781703A300701701A548EF00E0A5C81600B3B14B7E4B7E0107B612FEA33B3D7D
+BC42>I<B600C090B512F8A3000101E0C70007130026007F80EC01FC715A1870B3B3A401
+3F16F06E5DA21701011F5E80010F15036E4A5A010793C7FC6D6C5C6D6C141E6D6C5C027F
+14F86E6C485A91390FF00FE00203B51280020049C8FCED1FF03D407DBD44>I<B691380F
+FFFEA3000301E0020113E06C01809138007F806CEF3F00017F163E181C6E153C013F1638
+A26E1578011F1670A26D6C5DA26E140101075EA26E140301035EA26D6C4AC7FCA2806D15
+0EA26F131E027F141CA26F133C023F1438A26E6C5BA26F13F0020F5CA2EDF80102075CA2
+6E6C485AA2EDFE07020191C8FCA26F5A6E130EA2ED7F9CA216DCED3FF8A36F5AA36F5AA2
+6F5AA36F5A3F407EBD44>I<B500FE017FB5D88007B5FCA3000301C0010101E0C713F86C
+90C849EC3FE07148EC0F807E7215006E143F017F190E84A26D6C60A24D7E6D6C60A2EFE7
+F86D6C60A2933801C3FC6E18F001076104037F6E0281140101036104077F17006D6C4D5A
+A2040EEB7F806D6C4DC7FCA24CEB3FC0DA7F80160EA24CEB1FE003C0161E023F171C0478
+14F0DBE070010F133C021F173804F014F84C1307DA0FF05EA2DBF1C0EB03FCDA07F95EA2
+DBFB80EB01FEDA03FF6F5AA293C8FCA26E5FA24B157F020094C8FCA24B81037C153EA203
+78151E0338151C58407EBD5D>I<B66C0103B51280A3000101F0C8EBF8006C6C48ED3FC0
+725A013F041EC7FC6D7E606D6C15386D6C1578606D6C5D6E14016D5E6D6D1303606E6C49
+C8FC6E6C5B170E6E6C131E171C6E6C5B6E6C137817706E6C13F06F5B6E13016EEB83C05F
+ED7FC7DB3FE7C9FC16EFED1FFE5E150F6F5AB3A4ED1FFC020FB512FCA3413E7FBD44>89
+D<003FB712F8A391C7EA1FF013F801E0EC3FE00180EC7FC090C8FC003EEDFF80A2003C4A
+1300007C4A5A12784B5A4B5AA200704A5AA24B5A4B5AA2C8485A4A90C7FCA24A5A4A5AA2
+4A5AA24A5A4A5AA24A5A4A5AA24990C8FCA2495A4948141CA2495A495AA2495A495A173C
+495AA24890C8FC485A1778485A484815F8A24848140116034848140F4848143FED01FFB8
+FCA32E3E7BBD38>I<EAFFFCA4EAF000B3B3B3B3ABEAFFFCA40E5B77C319>I<486C13C000
+03130101001380481303000EEB070048130E0018130C0038131C00301318007013380060
+1330A300E01370481360A400CFEB678039FFC07FE001E013F0A3007F133FA2003F131F01
+C013E0390F0007801C1C73BE2D>I<EAFFFCA4EA003CB3B3B3B3ABEAFFFCA40E5B7FC319>
+I<EA0180120313005A120E5A12181238123012701260A312E05AA412CFEAFFC013E0A312
+7FA2123F13C0EA0F000B1C7ABE19>96 D<EB0FF8EBFFFE3903F01F8039078007E0000F6D
+7E9038E001F8D81FF07F6E7EA3157F6C5AEA0380C8FCA4EC1FFF0103B5FC90381FF87FEB
+7F803801FC00EA07F8EA0FE0485A485AA248C7FCEE038012FEA315FFA3007F5BEC03BF3B
+3F80071F8700261FC00E13CF3A07F03C0FFE3A01FFF807FC3A003FC001F0292A7DA82D>
+I<EA01FC12FFA3120712031201B1EC03FC91381FFF8091387C07E09039FDE001F09039FF
+C000FC4A137E91C77E49158049141F17C0EE0FE0A217F0A2160717F8AA17F0A2160FA217
+E0161F17C06D1580EE3F006D5C6E13FE9039F3C001F89039F1E003F09039E0780FC09026
+C03FFFC7FCC7EA07F82D407EBE33>I<49B4FC010F13E090383F00F8017C131E4848131F
+4848137F0007ECFF80485A5B121FA24848EB7F00151C007F91C7FCA290C9FC5AAB6C7EA3
+003FEC01C07F001F140316806C6C13076C6C14000003140E6C6C131E6C6C137890383F01
+F090380FFFC0D901FEC7FC222A7DA828>I<ED01FC15FFA3150715031501B114FF010713
+E190381F80F990387E003D49131FD803F81307485A49130348481301121F123F5B127FA2
+90C7FCA25AAA7E7FA2123FA26C7E000F14037F000714076C6C497E6C6C497ED8007C0179
+13F890383F01F190380FFFC1903A01FE01FC002D407DBE33>I<EB01FE90380FFFC09038
+3F03F09038FC01F848486C7E4848137E48487F000F158049131F001F15C04848130FA212
+7F16E090C7FCA25AA290B6FCA290C9FCA67EA27F123F16E06C7E1501000F15C06C6C1303
+6DEB07806C6C1400C66C131E017E5B90381F80F8903807FFE0010090C7FC232A7EA828>
+I<EC1FC0EC7FF8903801F83C903807E07E90380FC0FFEB1FC1EB3F811401137FEC00FE01
+FE137C1500AEB6FCA3C648C7FCB3AE487E007F13FFA320407EBF1C>I<167C903903F801
+FF903A1FFF078F8090397E0FDE1F9038F803F83803F001A23B07E000FC0600000F6EC7FC
+49137E001F147FA8000F147E6D13FE00075C6C6C485AA23901F803E03903FE0FC026071F
+FFC8FCEB03F80006CAFC120EA3120FA27F7F6CB512E015FE6C6E7E6C15E06C810003813A
+0FC0001FFC48C7EA01FE003E140048157E825A82A46C5D007C153E007E157E6C5D6C6C49
+5A6C6C495AD803F0EB0FC0D800FE017FC7FC90383FFFFC010313C0293D7EA82D>I<EA01
+FC12FFA3120712031201B1EC01FE913807FFC091381E07E091387803F09138E001F8D9FD
+C07F148001FF6D7E91C7FCA25BA25BB3A6486C497EB5D8F87F13FCA32E3F7DBE33>I<EA
+01E0EA07F8A2487EA46C5AA2EA01E0C8FCACEA01FC127FA3120712031201B3AC487EB512
+F0A3143E7DBD1A>I<1478EB01FEA2EB03FFA4EB01FEA2EB00781400AC147FEB7FFFA313
+017F147FB3B3A5123E127F38FF807E14FEA214FCEB81F8EA7F01387C03F0381E07C0380F
+FF803801FC00185185BD1C>I<EA01FC12FFA3120712031201B292B51280A392383FFC00
+16E0168093C7FC153C5D5D4A5AEC07C04A5A4AC8FC143E147F4A7E13FD9038FFDFC0EC9F
+E0140F496C7E01FC7F496C7E1401816E7E81826F7E151F826F7EA282486C14FEB539F07F
+FFE0A32B3F7EBE30>I<EA01FC12FFA3120712031201B3B3B1487EB512F8A3153F7DBE1A>
+I<2701F801FE14FF00FF902707FFC00313E0913B1E07E00F03F0913B7803F03C01F80007
+903BE001F87000FC2603F9C06D487F000101805C01FBD900FF147F91C75B13FF4992C7FC
+A2495CB3A6486C496CECFF80B5D8F87FD9FC3F13FEA347287DA74C>I<3901F801FE00FF
+903807FFC091381E07E091387803F000079038E001F82603F9C07F0001138001FB6D7E91
+C7FC13FF5BA25BB3A6486C497EB5D8F87F13FCA32E287DA733>I<14FF010713E090381F
+81F890387E007E01F8131F4848EB0F804848EB07C04848EB03E0000F15F04848EB01F8A2
+003F15FCA248C812FEA44815FFA96C15FEA36C6CEB01FCA3001F15F86C6CEB03F0A26C6C
+EB07E06C6CEB0FC06C6CEB1F80D8007EEB7E0090383F81FC90380FFFF0010090C7FC282A
+7EA82D>I<3901FC03FC00FF90381FFF8091387C0FE09039FDE003F03A07FFC001FC6C49
+6C7E6C90C7127F49EC3F805BEE1FC017E0A2EE0FF0A3EE07F8AAEE0FF0A4EE1FE0A2EE3F
+C06D1580EE7F007F6E13FE9138C001F89039FDE007F09039FC780FC0DA3FFFC7FCEC07F8
+91C9FCAD487EB512F8A32D3A7EA733>I<02FF131C0107EBC03C90381F80F090397F0038
+7C01FC131CD803F8130E4848EB0FFC150748481303121F485A1501485AA448C7FCAA6C7E
+A36C7EA2001F14036C7E15076C6C130F6C7E6C6C133DD8007E137990383F81F190380FFF
+C1903801FE0190C7FCAD4B7E92B512F8A32D3A7DA730>I<3901F807E000FFEB1FF8EC78
+7CECE1FE3807F9C100031381EA01FB1401EC00FC01FF1330491300A35BB3A5487EB512FE
+A31F287EA724>I<90383FC0603901FFF8E03807C03F381F000F003E1307003C1303127C
+0078130112F81400A27E7E7E6D1300EA7FF8EBFFC06C13F86C13FE6C7F6C1480000114C0
+D8003F13E0010313F0EB001FEC0FF800E01303A214017E1400A27E15F07E14016C14E06C
+EB03C0903880078039F3E01F0038E0FFFC38C01FE01D2A7DA824>I<131CA6133CA4137C
+A213FCA2120112031207001FB512C0B6FCA2D801FCC7FCB3A215E0A912009038FE01C0A2
+EB7F03013F138090381F8700EB07FEEB01F81B397EB723>I<D801FC14FE00FF147FA300
+0714030003140100011400B3A51501A31503120015076DEB06FF017E010E13806D4913FC
+90381FC078903807FFE00100903880FE002E297DA733>I<B539E00FFFE0A32707FE0003
+13006C48EB00FC5E00015D7F00005DA26D13016D5CA26D6C485AA2ECC007011F91C7FCA2
+90380FE00EA2ECF01E0107131CA26D6C5AA2ECFC7801011370A2ECFEF001005BA2EC7FC0
+A36E5AA26EC8FCA3140E2B287EA630>I<B53BC3FFFE03FFF8A3290FFE003FE00013C06C
+486D48EB3F806C4817006D010F141E00016F131C15076D163C00004A6C1338A2017F5E4B
+7E151DD93F805DED3DFC1538D91FC04A5AED78FE9238707E03D90FE0017F5BEDE03F02F0
+140701070387C7FC9138F1C01F02F9148F010315CE9138FB800F02FF14DE6D15FCED0007
+6D5DA24A1303027E5CA2027C1301023C5C023813003D287EA642>I<B539F01FFFE0A300
+03D9C00F1300C690388007F8D97F0013E002805BD93FC05B011F49C7FC90380FE00EECF0
+1E6D6C5A01035B6D6C5A6E5AEB00FF6E5A6E5A81141F814A7E81147BECF1FC903801E1FE
+ECC0FF01037F49486C7ED90F007F011E6D7E013E130F496D7E01FC80486C80000F4A7EB5
+39803FFFF8A32D277FA630>I<B539E00FFFE0A32707FE000313006C48EB01FC6F5A0001
+5D7F00005DA2017F495AA2EC8003013F5CA26D6C48C7FCA26E5A010F130EA26D6C5AA2EC
+F83C01031338A26D6C5AA2ECFEF001005BA2EC7FC0A36E5AA36EC8FCA2140EA2141E141C
+143C1438A2147800181370127EB45BA2495AA248485AD87E07C9FCEA780EEA3C3CEA1FF8
+EA07E02B3A7EA630>I<001FB61280A2EBE0000180140049485A001E495A121C4A5A003C
+495A141F00385C4A5A147F5D4AC7FCC6485AA2495A495A130F5C495A90393FC00380A2EB
+7F80EBFF005A5B484813071207491400485A48485BA248485B4848137F00FF495A90B6FC
+A221277EA628>I<B812F0A22C0280982D>I E
%EndDVIPSBitmapFont
%DVIPSBitmapFont: Fm cmbx12 20.736 11
/Fm 11 115 df<137F3801FFC0000713F0487F487F487F487FA2B61280A96C1400A26C5B
diff --git a/glabels2/barcode-0.98/doc/barcodedoc.txt b/glabels2/barcode-0.98/doc/barcodedoc.txt
index 08eadee..2d242f9 100644
--- a/glabels2/barcode-0.98/doc/barcodedoc.txt
+++ b/glabels2/barcode-0.98/doc/barcodedoc.txt
@@ -1,6 +1,6 @@
-This is barcode.info, produced by makeinfo version 4.0 from
+This is barcode.info, produced by makeinfo version 4.0b from
barcode.texinfo.
This file is the User's Manual for the barcode library (version
@@ -716,18 +716,18 @@ and then bless the package as version 1.0.
-Tag Table:Node: Top153
- Node: Overview525
- Node: The Barcode Object1403
-Node: The Field List2820
-Node: The Intermediate Representation6585
-Node: Supported Flags8358
-Node: The API11342
-Node: The barcode Executable14028
-Node: The Command Line14457
-Node: Supported Encodings19556
-Node: PCL Output28996
-Node: Bugs and Pending Issues31315
+Tag Table:Node: Top154
+ Node: Overview526
+ Node: The Barcode Object1404
+Node: The Field List2821
+Node: The Intermediate Representation6586
+Node: Supported Flags8359
+Node: The API11343
+Node: The barcode Executable14029
+Node: The Command Line14458
+Node: Supported Encodings19557
+Node: PCL Output28997
+Node: Bugs and Pending Issues31316
diff --git a/glabels2/config.h.in b/glabels2/config.h.in
deleted file mode 100644
index bceba42..0000000
--- a/glabels2/config.h.in
+++ /dev/null
@@ -1,154 +0,0 @@
-/* config.h.in. Generated automatically from configure.in by autoheader. */
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-#undef PACKAGE
-#undef VERSION
-#undef HAVE_LIBSM
-#undef PACKAGE_LOCALE_DIR
-#undef PACKAGE_DATA_DIR
-#undef PACKAGE_SOURCE_DIR
-#undef GETTEXT_PACKAGE
-#undef HACKTEXT
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
- systems. This function is required for `alloca.c' support on those systems.
- */
-#undef CRAY_STACKSEG_END
-
-/* Define if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* always defined to indicate that i18n is enabled */
-#undef ENABLE_NLS
-
-/* Define if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
-#undef HAVE_ALLOCA_H
-
-/* Define if you have the <argz.h> header file. */
-#undef HAVE_ARGZ_H
-
-/* Define if you have the `dcgettext' function. */
-#undef HAVE_DCGETTEXT
-
-/* Define if you have the `getcwd' function. */
-#undef HAVE_GETCWD
-
-/* Define if you have the `getpagesize' function. */
-#undef HAVE_GETPAGESIZE
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
-
-/* Define if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
-
-/* Define if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
-/* Define if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
-
-/* Define if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
-/* Define if you have the `munmap' function. */
-#undef HAVE_MUNMAP
-
-/* Define if you have the <nl_types.h> header file. */
-#undef HAVE_NL_TYPES_H
-
-/* Define if you have the `putenv' function. */
-#undef HAVE_PUTENV
-
-/* Define if you have the `setenv' function. */
-#undef HAVE_SETENV
-
-/* Define if you have the `setlocale' function. */
-#undef HAVE_SETLOCALE
-
-/* Define if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
-/* Define if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
-/* Define if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define if you have the `__argz_count' function. */
-#undef HAVE___ARGZ_COUNT
-
-/* Define if you have the `__argz_next' function. */
-#undef HAVE___ARGZ_NEXT
-
-/* Define if you have the `__argz_stringify' function. */
-#undef HAVE___ARGZ_STRINGIFY
-
-/* Name of package */
-#undef PACKAGE
-
-/* If using the C implementation of alloca, define if you know the
- direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
- if it is not supported. */
-#undef inline
-
-/* Define to `long' if <sys/types.h> does not define. */
-#undef off_t
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-#undef size_t
diff --git a/glabels2/configure b/glabels2/configure
deleted file mode 100755
index d6f01dd..0000000
--- a/glabels2/configure
+++ /dev/null
@@ -1,6303 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52 for glabels 1.89.0.
-#
-# Report bugs to <http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116>.
-#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
-fi
-
-# Name of the executable.
-as_me=`echo "$0" |sed 's,.*[\\/],,'`
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- # We could just check for DJGPP; but this test a) works b) is more generic
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
- as_ln_s='cp -p'
- else
- as_ln_s='ln -s'
- fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-as_executable_p="test -f"
-
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
-# NLS nuisances.
-$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
-$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
-$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
-$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
-$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
-$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
-$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
-$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-cross_compiling=no
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete. It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-ac_unique_file="src/glabels.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
-#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-# include <memory.h>
-# endif
-# include <string.h>
-#endif
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-# include <stdint.h>
-# endif
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subdirs_all="$ac_subdirs_all barcode-0.98"
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Identity of this package.
-PACKAGE_NAME='glabels'
-PACKAGE_TARNAME='glabels'
-PACKAGE_VERSION='1.89.0'
-PACKAGE_STRING='glabels 1.89.0'
-PACKAGE_BUGREPORT='http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116'
-
-ac_prev=
-for ac_option
-do
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
- eval "$ac_prev=\$ac_option"
- ac_prev=
- continue
- fi
-
- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
- case $ac_option in
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
- bindir=$ac_optarg ;;
-
- -build | --build | --buil | --bui | --bu)
- ac_prev=build_alias ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=*)
- build_alias=$ac_optarg ;;
-
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
- cache_file=$ac_optarg ;;
-
- --config-cache | -C)
- cache_file=config.cache ;;
-
- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
- ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
- | --da=*)
- datadir=$ac_optarg ;;
-
- -disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
- eval "enable_$ac_feature=no" ;;
-
- -enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
- case $ac_option in
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
- eval "enable_$ac_feature='$ac_optarg'" ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
- | --exec | --exe | --ex)
- ac_prev=exec_prefix ;;
- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
- | --exec=* | --exe=* | --ex=*)
- exec_prefix=$ac_optarg ;;
-
- -gas | --gas | --ga | --g)
- # Obsolete; use --with-gas.
- with_gas=yes ;;
-
- -help | --help | --hel | --he | -h)
- ac_init_help=long ;;
- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
- ac_init_help=recursive ;;
- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
- ac_init_help=short ;;
-
- -host | --host | --hos | --ho)
- ac_prev=host_alias ;;
- -host=* | --host=* | --hos=* | --ho=*)
- host_alias=$ac_optarg ;;
-
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
- | --includ=* | --inclu=* | --incl=* | --inc=*)
- includedir=$ac_optarg ;;
-
- -infodir | --infodir | --infodi | --infod | --info | --inf)
- ac_prev=infodir ;;
- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
- infodir=$ac_optarg ;;
-
- -libdir | --libdir | --libdi | --libd)
- ac_prev=libdir ;;
- -libdir=* | --libdir=* | --libdi=* | --libd=*)
- libdir=$ac_optarg ;;
-
- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
- | --libexe | --libex | --libe)
- ac_prev=libexecdir ;;
- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
- | --libexe=* | --libex=* | --libe=*)
- libexecdir=$ac_optarg ;;
-
- -localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst \
- | --locals | --local | --loca | --loc | --lo)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
- localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
- ac_prev=mandir ;;
- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
- mandir=$ac_optarg ;;
-
- -nfp | --nfp | --nf)
- # Obsolete; use --without-fp.
- with_fp=no ;;
-
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c)
- no_create=yes ;;
-
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
- no_recursion=yes ;;
-
- -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
- | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
- | --oldin | --oldi | --old | --ol | --o)
- ac_prev=oldincludedir ;;
- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
- oldincludedir=$ac_optarg ;;
-
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- prefix=$ac_optarg ;;
-
- -program-prefix | --program-prefix | --program-prefi | --program-pref \
- | --program-pre | --program-pr | --program-p)
- ac_prev=program_prefix ;;
- -program-prefix=* | --program-prefix=* | --program-prefi=* \
- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
- program_prefix=$ac_optarg ;;
-
- -program-suffix | --program-suffix | --program-suffi | --program-suff \
- | --program-suf | --program-su | --program-s)
- ac_prev=program_suffix ;;
- -program-suffix=* | --program-suffix=* | --program-suffi=* \
- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
- program_suffix=$ac_optarg ;;
-
- -program-transform-name | --program-transform-name \
- | --program-transform-nam | --program-transform-na \
- | --program-transform-n | --program-transform- \
- | --program-transform | --program-transfor \
- | --program-transfo | --program-transf \
- | --program-trans | --program-tran \
- | --progr-tra | --program-tr | --program-t)
- ac_prev=program_transform_name ;;
- -program-transform-name=* | --program-transform-name=* \
- | --program-transform-nam=* | --program-transform-na=* \
- | --program-transform-n=* | --program-transform-=* \
- | --program-transform=* | --program-transfor=* \
- | --program-transfo=* | --program-transf=* \
- | --program-trans=* | --program-tran=* \
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name=$ac_optarg ;;
-
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-
- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
- | --sbi=* | --sb=*)
- sbindir=$ac_optarg ;;
-
- -sharedstatedir | --sharedstatedir | --sharedstatedi \
- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
- | --sharedst | --shareds | --shared | --share | --shar \
- | --sha | --sh)
- ac_prev=sharedstatedir ;;
- -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
- | --sha=* | --sh=*)
- sharedstatedir=$ac_optarg ;;
-
- -site | --site | --sit)
- ac_prev=site ;;
- -site=* | --site=* | --sit=*)
- site=$ac_optarg ;;
-
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- srcdir=$ac_optarg ;;
-
- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
- | --syscon | --sysco | --sysc | --sys | --sy)
- ac_prev=sysconfdir ;;
- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
- sysconfdir=$ac_optarg ;;
-
- -target | --target | --targe | --targ | --tar | --ta | --t)
- ac_prev=target_alias ;;
- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
- target_alias=$ac_optarg ;;
-
- -v | -verbose | --verbose | --verbos | --verbo | --verb)
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers | -V)
- ac_init_version=: ;;
-
- -with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package| sed 's/-/_/g'`
- case $ac_option in
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
- eval "with_$ac_package='$ac_optarg'" ;;
-
- -without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/-/_/g'`
- eval "with_$ac_package=no" ;;
-
- --x)
- # Obsolete; use --with-x.
- with_x=yes ;;
-
- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
- | --x-incl | --x-inc | --x-in | --x-i)
- ac_prev=x_includes ;;
- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
- x_includes=$ac_optarg ;;
-
- -x-libraries | --x-libraries | --x-librarie | --x-librari \
- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
- ac_prev=x_libraries ;;
- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries=$ac_optarg ;;
-
- -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
- ;;
-
- *=*)
- ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
- # Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
- eval "$ac_envvar='$ac_optarg'"
- export $ac_envvar ;;
-
- *)
- # FIXME: should be removed in autoconf 3.0.
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
- ;;
-
- esac
-done
-
-if test -n "$ac_prev"; then
- ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
- eval ac_val=$`echo $ac_var`
- case $ac_val in
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
- *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
- esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
-do
- eval ac_val=$`echo $ac_var`
- case $ac_val in
- [\\/$]* | ?:[\\/]* ) ;;
- *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
- esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: should be removed in autoconf 3.0.
-if test "x$host_alias" != x; then
- if test "x$build_alias" = x; then
- cross_compiling=maybe
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
- elif test "x$build_alias" != "x$host_alias"; then
- cross_compiling=yes
- fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
- # Try the directory containing this script, then its parent.
- ac_prog=$0
- ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
- srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
- srcdir=..
- fi
-else
- ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
- if test "$ac_srcdir_defaulted" = yes; then
- { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
- { (exit 1); exit 1; }; }
- else
- { echo "$as_me: error: cannot find sources in $srcdir" >&2
- { (exit 1); exit 1; }; }
- fi
-fi
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-
-#
-# Report the --help message.
-#
-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 <<EOF
-\`configure' configures glabels 1.89.0 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE. See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
- -h, --help display this help and exit
- --help=short display options specific to this package
- --help=recursive display the short help of all the included packages
- -V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking...' messages
- --cache-file=FILE cache test results in FILE [disabled]
- -C, --config-cache alias for \`--cache-file=config.cache'
- -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR [configure dir or \`..']
-
-EOF
-
- cat <<EOF
-Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --datadir=DIR read-only architecture-independent data [PREFIX/share]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --infodir=DIR info documentation [PREFIX/info]
- --mandir=DIR man documentation [PREFIX/man]
-EOF
-
- cat <<\EOF
-
-Program names:
- --program-prefix=PREFIX prepend PREFIX to installed program names
- --program-suffix=SUFFIX append SUFFIX to installed program names
- --program-transform-name=PROGRAM run sed PROGRAM on installed program names
-EOF
-fi
-
-if test -n "$ac_init_help"; then
- case $ac_init_help in
- short | recursive ) echo "Configuration of glabels 1.89.0:";;
- esac
- cat <<\EOF
-
-Optional Features:
- --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-platform-gnome-2 enable GNOME 2.x platform default=no
- --enable-compile-warnings=no/minimum/yes/maximum/error Turn on compiler warnings.
- --enable-iso-c Try to warn if code is not ISO C
-
-Some influential environment variables:
- CC C compiler command
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
- headers in a nonstandard directory <include dir>
- CPP C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116>.
-EOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
- ac_popdir=`pwd`
- for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
- cd $ac_subdir
- # A "../" for each directory in /$ac_subdir.
- ac_dots=`echo $ac_subdir |
- sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
-
- case $srcdir in
- .) # No --srcdir option. We are building in place.
- ac_sub_srcdir=$srcdir ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
- ac_sub_srcdir=$srcdir/$ac_subdir ;;
- *) # Relative path.
- ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
- esac
-
- # Check for guested configure; otherwise get Cygnus style configure.
- if test -f $ac_sub_srcdir/configure.gnu; then
- echo
- $SHELL $ac_sub_srcdir/configure.gnu --help=recursive
- elif test -f $ac_sub_srcdir/configure; then
- echo
- $SHELL $ac_sub_srcdir/configure --help=recursive
- elif test -f $ac_sub_srcdir/configure.ac ||
- test -f $ac_sub_srcdir/configure.in; then
- echo
- $ac_configure --help
- else
- echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
- fi
- cd $ac_popdir
- done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
- cat <<\EOF
-glabels configure 1.89.0
-generated by GNU Autoconf 2.52
-
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-EOF
- exit 0
-fi
-exec 5>config.log
-cat >&5 <<EOF
-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 1.89.0, which was
-generated by GNU Autoconf 2.52. Invocation command line was
-
- $ $0 $@
-
-EOF
-{
-cat <<_ASUNAME
-## ---------- ##
-## Platform. ##
-## ---------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
-
-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-
-PATH = $PATH
-
-_ASUNAME
-} >&5
-
-cat >&5 <<EOF
-## ------------ ##
-## Core tests. ##
-## ------------ ##
-
-EOF
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell meta-characters.
-ac_configure_args=
-ac_sep=
-for ac_arg
-do
- case $ac_arg in
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c) ;;
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
- ac_sep=" " ;;
- *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
- ac_sep=" " ;;
- esac
- # Get rid of the leading space.
-done
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log. We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
- echo >&5
- echo "## ----------------- ##" >&5
- echo "## Cache variables. ##" >&5
- echo "## ----------------- ##" >&5
- echo >&5
- # The following way of writing the cache mishandles newlines in values,
-{
- (set) 2>&1 |
- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
- sed -n \
- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
- ;;
- *)
- sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
- ;;
- esac;
-} >&5
- sed "/^$/d" confdefs.h >conftest.log
- if test -s conftest.log; then
- echo >&5
- echo "## ------------ ##" >&5
- echo "## confdefs.h. ##" >&5
- echo "## ------------ ##" >&5
- echo >&5
- cat conftest.log >&5
- fi
- (echo; echo) >&5
- test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal" >&5
- echo "$as_me: exit $exit_status" >&5
- rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
- exit $exit_status
- ' 0
-for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
- else
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
- fi
-fi
-for ac_site_file in $CONFIG_SITE; do
- if test -r "$ac_site_file"; then
- { echo "$as_me:878: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
- cat "$ac_site_file" >&5
- . "$ac_site_file"
- fi
-done
-
-if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
- { echo "$as_me:889: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
- [\\/]* | ?:[\\/]* ) . $cache_file;;
- *) . ./$cache_file;;
- esac
- fi
-else
- { echo "$as_me:897: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
- >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
- eval ac_new_val="\$ac_env_${ac_var}_value"
- case $ac_old_set,$ac_new_set in
- set,)
- { echo "$as_me:913: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,set)
- { echo "$as_me:917: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,);;
- *)
- if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:923: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:925: former value: $ac_old_val" >&5
-echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:927: current value: $ac_new_val" >&5
-echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
- fi;;
- esac
- # Pass precious variables to config.status. It doesn't matter if
- # we pass some twice (in addition to the command line arguments).
- if test "$ac_new_set" = set; then
- case $ac_new_val in
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
- ac_configure_args="$ac_configure_args '$ac_arg'"
- ;;
- *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val"
- ;;
- esac
- fi
-done
-if $ac_cache_corrupted; then
- { echo "$as_me:946: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:948: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
-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
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-echo "#! $SHELL" >conftest.sh
-echo "exit 0" >>conftest.sh
-chmod +x conftest.sh
-if { (echo "$as_me:968: PATH=\".;.\"; conftest.sh") >&5
- (PATH=".;."; conftest.sh) 2>&5
- ac_status=$?
- echo "$as_me:971: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- ac_path_separator=';'
-else
- ac_path_separator=:
-fi
-PATH_SEPARATOR="$ac_path_separator"
-rm -f conftest.sh
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
- if test -f $ac_dir/install-sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f $ac_dir/install.sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f $ac_dir/shtool; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- { { echo "$as_me:997: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
- { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:1017: checking for a BSD compatible install" >&5
-echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
- for ac_dir in $PATH; do
- IFS=$ac_save_IFS
- # Account for people who put trailing slashes in PATH elements.
- case $ac_dir/ in
- / | ./ | .// | /cC/* \
- | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
- | /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- if $as_executable_p "$ac_dir/$ac_prog"; then
- if test $ac_prog = install &&
- grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- ac_cv_path_install="$ac_dir/$ac_prog -c"
- break 2
- fi
- fi
- done
- ;;
- esac
- done
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. We don't cache a
- # path for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the path is relative.
- INSTALL=$ac_install_sh
- fi
-fi
-echo "$as_me:1066: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo "$as_me:1077: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# 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 conftestfile 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftestfile`
- fi
- if test "$*" != "X $srcdir/configure conftestfile" \
- && test "$*" != "X conftestfile $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".
- { { echo "$as_me:1100: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- test "$2" = conftestfile
- )
-then
- # Ok.
- :
-else
- { { echo "$as_me:1113: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
-fi
-rm -f conftest*
-echo "$as_me:1120: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-test "$program_prefix" != NONE &&
- program_transform_name="s,^,$program_prefix,;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
- program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-# Double any \ or $. echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
-
-echo "$as_me:1135: checking whether ${MAKE-make} sets \${MAKE}" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.make <<\EOF
-all:
- @echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
- eval ac_cv_prog_make_${ac_make}_set=yes
-else
- eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftest.make
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$as_me:1155: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- SET_MAKE=
-else
- echo "$as_me:1159: result: no" >&5
-echo "${ECHO_T}no" >&6
- SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-PACKAGE=glabels
-
-VERSION=1.89.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
- { { echo "$as_me:1169: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-cat >>confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >>confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo "$as_me:1183: checking for working aclocal" >&5
-echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf. Sigh.
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
- ACLOCAL=aclocal
- echo "$as_me:1190: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
- ACLOCAL="$missing_dir/missing aclocal"
- echo "$as_me:1194: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:1198: checking for working autoconf" >&5
-echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf. Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
- AUTOCONF=autoconf
- echo "$as_me:1205: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
- AUTOCONF="$missing_dir/missing autoconf"
- echo "$as_me:1209: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:1213: checking for working automake" >&5
-echo $ECHO_N "checking for working automake... $ECHO_C" >&6
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf. Sigh.
-if (automake --version) < /dev/null > /dev/null 2>&1; then
- AUTOMAKE=automake
- echo "$as_me:1220: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
- AUTOMAKE="$missing_dir/missing automake"
- echo "$as_me:1224: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:1228: checking for working autoheader" >&5
-echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf. Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
- AUTOHEADER=autoheader
- echo "$as_me:1235: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
- AUTOHEADER="$missing_dir/missing autoheader"
- echo "$as_me:1239: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:1243: checking for working makeinfo" >&5
-echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf. Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
- MAKEINFO=makeinfo
- echo "$as_me:1250: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
- MAKEINFO="$missing_dir/missing makeinfo"
- echo "$as_me:1254: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:1258: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
- enableval="$enable_maintainer_mode"
- USE_MAINTAINER_MODE=$enableval
-else
- USE_MAINTAINER_MODE=no
-fi;
- echo "$as_me:1267: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-
-if test $USE_MAINTAINER_MODE = yes; then
- MAINTAINER_MODE_TRUE=
- MAINTAINER_MODE_FALSE='#'
-else
- MAINTAINER_MODE_TRUE='#'
- MAINTAINER_MODE_FALSE=
-fi
- MAINT=$MAINTAINER_MODE_TRUE
-
-ac_config_headers="$ac_config_headers config.h"
-
-ac_config_commands="$ac_config_commands default-1"
-
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-echo "$as_me:1285: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- if $as_executable_p "$ac_dir/$ac_word"; then
- ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
- echo "$as_me:1302: found $ac_dir/$ac_word" >&5
- break
-fi
-done
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
-if test -n "$PKG_CONFIG"; then
- echo "$as_me:1313: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
-else
- echo "$as_me:1316: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- have_pkgconfig=no
- if test -x "$PKG_CONFIG" ; then
- have_pkgconfig=yes
- else
- PKG_CONFIG=
- fi
- echo "$as_me:1326: checking for pkg-config" >&5
-echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
- pkgconfig_required_version=0.8.0
- if test x$have_pkgconfig = xyes ; then
- $PKG_CONFIG --atleast-pkgconfig-version $pkgconfig_required_version
- if test $? -ne 0; then
- echo "*** Your version of pkg-config is too old. You need version $pkgconfig_required_version or newer."
- echo "*** See http://www.freedesktop.org/software/pkgconfig"
- have_pkgconfig=no
- fi
- fi
- if test x$have_pkgconfig = xyes ; then
- echo "$as_me:1338: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- PKG_CONFIG=
- echo "$as_me:1342: result: not found" >&5
-echo "${ECHO_T}not found" >&6
- if test xfail = xfail; then
- { { echo "$as_me:1345: error:
-*** You need the latest pkg-config (at least $pkgconfig_required_version).
-*** Get the latest version of pkg-config from
-*** http://www.freedesktop.org/software/pkgconfig." >&5
-echo "$as_me: error:
-*** You need the latest pkg-config (at least $pkgconfig_required_version).
-*** Get the latest version of pkg-config from
-*** http://www.freedesktop.org/software/pkgconfig." >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-
- if test xyes = xyes ; then
- platform_gnome_2_default=yes
- else
- platform_gnome_2_default=no
- fi
- if test xforce = xforce ; then
- platform_gnome_2="$platform_gnome_2_default";
- else
- # Check whether --enable-platform-gnome-2 or --disable-platform-gnome-2 was given.
-if test "${enable_platform_gnome_2+set}" = set; then
- enableval="$enable_platform_gnome_2"
- platform_gnome_2="$enableval"
-else
- platform_gnome_2="$platform_gnome_2_default"
-fi;
- fi
-
-if test $platform_gnome_2 = yes; then
- PLATFORM_GNOME_2_TRUE=
- PLATFORM_GNOME_2_FALSE='#'
-else
- PLATFORM_GNOME_2_TRUE='#'
- PLATFORM_GNOME_2_FALSE=
-fi
-
- echo "$as_me:1382: checking for GNOME Platform" >&5
-echo $ECHO_N "checking for GNOME Platform... $ECHO_C" >&6
- if test $platform_gnome_2 = yes; then
- echo "$as_me:1385: result: GNOME 2.x" >&5
-echo "${ECHO_T}GNOME 2.x" >&6
- GNOME_INTERFACE_VERSION=2
-
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-echo "$as_me:1391: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- if $as_executable_p "$ac_dir/$ac_word"; then
- ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
- echo "$as_me:1408: found $ac_dir/$ac_word" >&5
- break
-fi
-done
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
-if test -n "$PKG_CONFIG"; then
- echo "$as_me:1419: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
-else
- echo "$as_me:1422: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- have_pkgconfig=no
- if test -x "$PKG_CONFIG" ; then
- have_pkgconfig=yes
- else
- PKG_CONFIG=
- fi
- echo "$as_me:1432: checking for pkg-config" >&5
-echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
- pkgconfig_required_version=0.8.0
- if test x$have_pkgconfig = xyes ; then
- $PKG_CONFIG --atleast-pkgconfig-version $pkgconfig_required_version
- if test $? -ne 0; then
- echo "*** Your version of pkg-config is too old. You need version $pkgconfig_required_version or newer."
- echo "*** See http://www.freedesktop.org/software/pkgconfig"
- have_pkgconfig=no
- fi
- fi
- if test x$have_pkgconfig = xyes ; then
- echo "$as_me:1444: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- PKG_CONFIG=
- echo "$as_me:1448: result: not found" >&5
-echo "${ECHO_T}not found" >&6
- if test xfail = xfail; then
- { { echo "$as_me:1451: error:
-*** You need the latest pkg-config (at least $pkgconfig_required_version).
-*** Get the latest version of pkg-config from
-*** http://www.freedesktop.org/software/pkgconfig." >&5
-echo "$as_me: error:
-*** You need the latest pkg-config (at least $pkgconfig_required_version).
-*** Get the latest version of pkg-config from
-*** http://www.freedesktop.org/software/pkgconfig." >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-
- else
- echo "$as_me:1464: result: GNOME 1.x" >&5
-echo "${ECHO_T}GNOME 1.x" >&6
- GNOME_INTERFACE_VERSION=1
- 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
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1477: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1492: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- echo "$as_me:1500: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:1503: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:1512: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1527: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:1535: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
- echo "$as_me:1538: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1551: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1566: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- echo "$as_me:1574: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:1577: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:1586: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1601: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:1609: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
- echo "$as_me:1612: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
-
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:1625: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
-fi
-ac_cv_prog_CC="cc"
-echo "$as_me:1645: found $ac_dir/$ac_word" >&5
-break
-done
-
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- set dummy "$ac_dir/$ac_word" ${1+"$@"}
- shift
- ac_cv_prog_CC="$@"
- fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- echo "$as_me:1667: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:1670: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1681: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1696: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- echo "$as_me:1704: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:1707: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- test -n "$CC" && break
- done
-fi
-if test -z "$CC"; then
- ac_ct_CC=$CC
- for ac_prog in cl
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:1720: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1735: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:1743: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
- echo "$as_me:1746: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- test -n "$ac_ct_CC" && break
-done
-
- CC=$ac_ct_CC
-fi
-
-fi
-
-test -z "$CC" && { { echo "$as_me:1758: error: no acceptable cc found in \$PATH" >&5
-echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:1763:" \
- "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1766: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:1769: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (eval echo "$as_me:1771: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:1774: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (eval echo "$as_me:1776: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:1779: \$? = $ac_status" >&5
- (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-#line 1783 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-echo "$as_me:1799: checking for C compiler default output" >&5
-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1802: \"$ac_link_default\"") >&5
- (eval $ac_link_default) 2>&5
- ac_status=$?
- echo "$as_me:1805: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # Find the output, starting from the most likely. This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-for ac_file in `ls a.exe conftest.exe 2>/dev/null;
- ls a.out conftest 2>/dev/null;
- ls a.* conftest.* 2>/dev/null`; do
- case $ac_file in
- *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
- a.out ) # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
- export ac_cv_exeext
- break;;
- * ) break;;
- esac
-done
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-{ { echo "$as_me:1828: error: C compiler cannot create executables" >&5
-echo "$as_me: error: C compiler cannot create executables" >&2;}
- { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:1834: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:1839: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
- { (eval echo "$as_me:1845: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:1848: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
- { { echo "$as_me:1855: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'." >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-fi
-echo "$as_me:1863: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:1870: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1872: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:1875: checking for executable suffix" >&5
-echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1877: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:1880: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
- case $ac_file in
- *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- export ac_cv_exeext
- break;;
- * ) break;;
- esac
-done
-else
- { { echo "$as_me:1896: error: cannot compute EXEEXT: cannot compile and link" >&5
-echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:1902: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-echo "$as_me:1908: checking for object suffix" >&5
-echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 1914 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1926: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:1929: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
- break;;
- esac
-done
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-{ { echo "$as_me:1941: error: cannot compute OBJEXT: cannot compile" >&5
-echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:1948: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:1952: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 1958 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1973: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:1976: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1979: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:1982: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_compiler_gnu=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_compiler_gnu=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:1994: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:2000: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 2006 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2018: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2021: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2024: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2027: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_prog_cc_g=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:2037: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
-else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
-fi
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
- choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2064: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2067: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2070: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2073: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- for ac_declaration in \
- ''\
- '#include <stdlib.h>' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
-#line 2085 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-$ac_declaration
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2098: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2101: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2104: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2107: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-continue
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
-#line 2117 "configure"
-#include "confdefs.h"
-$ac_declaration
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2129: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2132: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2135: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2138: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
-fi
-
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-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
-
- echo "$as_me:2165: checking for strerror in -lcposix" >&5
-echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
-if test "${ac_cv_lib_cposix_strerror+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcposix $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 2173 "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char strerror ();
-int
-main ()
-{
-strerror ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2192: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:2195: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:2198: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2201: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_cposix_strerror=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_cposix_strerror=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:2212: result: $ac_cv_lib_cposix_strerror" >&5
-echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
-if test $ac_cv_lib_cposix_strerror = yes; then
- LIBS="$LIBS -lcposix"
-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
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:2226: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:2241: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- echo "$as_me:2249: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:2252: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:2261: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:2276: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:2284: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
- echo "$as_me:2287: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:2300: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:2315: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- echo "$as_me:2323: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:2326: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:2335: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:2350: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:2358: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
- echo "$as_me:2361: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
-
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:2374: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
-fi
-ac_cv_prog_CC="cc"
-echo "$as_me:2394: found $ac_dir/$ac_word" >&5
-break
-done
-
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- set dummy "$ac_dir/$ac_word" ${1+"$@"}
- shift
- ac_cv_prog_CC="$@"
- fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- echo "$as_me:2416: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:2419: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:2430: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:2445: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- echo "$as_me:2453: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:2456: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- test -n "$CC" && break
- done
-fi
-if test -z "$CC"; then
- ac_ct_CC=$CC
- for ac_prog in cl
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:2469: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:2484: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:2492: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
- echo "$as_me:2495: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- test -n "$ac_ct_CC" && break
-done
-
- CC=$ac_ct_CC
-fi
-
-fi
-
-test -z "$CC" && { { echo "$as_me:2507: error: no acceptable cc found in \$PATH" >&5
-echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:2512:" \
- "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:2515: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:2518: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (eval echo "$as_me:2520: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:2523: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (eval echo "$as_me:2525: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:2528: \$? = $ac_status" >&5
- (exit $ac_status); }
-
-echo "$as_me:2531: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 2537 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2552: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2555: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2558: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2561: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_compiler_gnu=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_compiler_gnu=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:2573: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:2579: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 2585 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2597: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2600: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2603: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2606: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_prog_cc_g=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:2616: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
-else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
-fi
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
- choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2643: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2646: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2649: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2652: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- for ac_declaration in \
- ''\
- '#include <stdlib.h>' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
-#line 2664 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-$ac_declaration
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2677: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2680: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2683: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2686: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-continue
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
-#line 2696 "configure"
-#include "confdefs.h"
-$ac_declaration
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2708: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2711: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2714: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2717: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
-fi
-
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-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
-
-echo "$as_me:2744: checking for ${CC-cc} option to accept ANSI C" >&5
-echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
-if test "${am_cv_prog_cc_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- am_cv_prog_cc_stdc=no
-ac_save_CC="$CC"
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- cat >conftest.$ac_ext <<_ACEOF
-#line 2761 "configure"
-#include "confdefs.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-
-int
-main ()
-{
-
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2803: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:2806: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2809: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:2812: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- am_cv_prog_cc_stdc="$ac_arg"; break
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-CC="$ac_save_CC"
-
-fi
-
-if test -z "$am_cv_prog_cc_stdc"; then
- echo "$as_me:2826: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6
-else
- echo "$as_me:2829: result: $am_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6
-fi
-case "x$am_cv_prog_cc_stdc" in
- x|xno) ;;
- *) CC="$CC $am_cv_prog_cc_stdc" ;;
-esac
-
-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
-echo "$as_me:2842: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-#line 2863 "configure"
-#include "confdefs.h"
-#include <assert.h>
- Syntax error
-_ACEOF
-if { (eval echo "$as_me:2868: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:2874: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- :
-else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether non-existent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-#line 2897 "configure"
-#include "confdefs.h"
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:2901: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:2907: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- # Broken: success on invalid input.
-continue
-else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- break
-fi
-
- done
- ac_cv_prog_CPP=$CPP
-
-fi
- CPP=$ac_cv_prog_CPP
-else
- ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:2944: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-#line 2954 "configure"
-#include "confdefs.h"
-#include <assert.h>
- Syntax error
-_ACEOF
-if { (eval echo "$as_me:2959: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:2965: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- :
-else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether non-existent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-#line 2988 "configure"
-#include "confdefs.h"
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:2992: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:2998: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- # Broken: success on invalid input.
-continue
-else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
-else
- { { echo "$as_me:3026: error: C preprocessor \"$CPP\" fails sanity check" >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
- { (exit 1); exit 1; }; }
-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
-
-echo "$as_me:3037: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 3043 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-_ACEOF
-if { (eval echo "$as_me:3051: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:3057: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_cv_header_stdc=yes
-else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-#line 3079 "configure"
-#include "confdefs.h"
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "memchr" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-#line 3097 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "free" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
- :
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 3118 "configure"
-#include "confdefs.h"
-#include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3144: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:3147: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:3149: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3152: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_header_stdc=no
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:3165: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\EOF
-#define STDC_HEADERS 1
-EOF
-
-fi
-
- if test -z "" ; then
- default_compile_warnings=no
- else
- default_compile_warnings=""
- fi
-
- # Check whether --enable-compile-warnings or --disable-compile-warnings was given.
-if test "${enable_compile_warnings+set}" = set; then
- enableval="$enable_compile_warnings"
- enable_compile_warnings="$enableval"
-else
- enable_compile_warnings="$default_compile_warnings"
-fi;
-
- warnCFLAGS=
- if test "x$GCC" != xyes; then
- enable_compile_warnings=no
- fi
-
- warning_flags=
- realsave_CFLAGS="$CFLAGS"
-
- case "$enable_compile_warnings" in
- no)
- warning_flags=
- ;;
- minimum)
- warning_flags="-Wall -Wunused"
- ;;
- yes)
- warning_flags="-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations"
- ;;
- maximum|error)
- warning_flags="-Wall -Wunused -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
- CFLAGS="$warning_flags $CFLAGS"
- for option in -Wsign-promo -Wno-sign-compare; do
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $option"
- echo "$as_me:3213: checking whether gcc understands $option" >&5
-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
-#line 3216 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3228: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3231: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3234: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3237: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- has_option=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-has_option=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$SAVE_CFLAGS"
- echo "$as_me:3247: result: $has_option" >&5
-echo "${ECHO_T}$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"
- fi
- ;;
- *)
- { { echo "$as_me:3261: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
-echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
- CFLAGS="$realsave_CFLAGS"
- echo "$as_me:3267: checking what warning flags to pass to the C compiler" >&5
-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6
- echo "$as_me:3269: result: $warning_flags" >&5
-echo "${ECHO_T}$warning_flags" >&6
-
- # Check whether --enable-iso-c or --disable-iso-c was given.
-if test "${enable_iso_c+set}" = set; then
- enableval="$enable_iso_c"
-
-else
- enable_iso_c=no
-fi;
-
- echo "$as_me:3280: checking what language compliance flags to pass to the C compiler" >&5
-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6
- complCFLAGS=
- if test "x$enable_iso_c" != "xno"; then
- if test "x$GCC" = "xyes"; then
- case " $CFLAGS " in
- *\ \ -ansi\ \ *) ;;
- *) complCFLAGS="$complCFLAGS -ansi" ;;
- esac
- case " $CFLAGS " in
- *\ \ -pedantic\ \ *) ;;
- *) complCFLAGS="$complCFLAGS -pedantic" ;;
- esac
- fi
- fi
- echo "$as_me:3295: result: $complCFLAGS" >&5
-echo "${ECHO_T}$complCFLAGS" >&6
-
- WARN_CFLAGS="$warning_flags $complCFLAGS"
-
-GNOME_X_CHECKS
-
-# Extract the first word of "glib-genmarshal", so it can be a program name with args.
-set dummy glib-genmarshal; ac_word=$2
-echo "$as_me:3304: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $GLIB_GENMARSHAL in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path.
- ;;
- *)
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- if $as_executable_p "$ac_dir/$ac_word"; then
- ac_cv_path_GLIB_GENMARSHAL="$ac_dir/$ac_word"
- echo "$as_me:3321: found $ac_dir/$ac_word" >&5
- break
-fi
-done
-
- ;;
-esac
-fi
-GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
-
-if test -n "$GLIB_GENMARSHAL"; then
- echo "$as_me:3332: result: $GLIB_GENMARSHAL" >&5
-echo "${ECHO_T}$GLIB_GENMARSHAL" >&6
-else
- echo "$as_me:3335: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-GTK_REQUIRED=2.0.5
-LIBGNOMEUI_REQUIRED=2.0.1
-LIBXML_REQUIRED=2.4.23
-LIBGNOMEPRINT_REQUIRED=1.115.0
-LIBGNOMEPRINTUI_REQUIRED=1.115.0
-LIBGNOMECANVAS_REQUIRED=2.0.1
-GDKPIXBUF_REQUIRED=2.0.5
-
- succeeded=no
-
- if test -z "$PKG_CONFIG"; then
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-echo "$as_me:3352: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- if $as_executable_p "$ac_dir/$ac_word"; then
- ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
- echo "$as_me:3369: found $ac_dir/$ac_word" >&5
- break
-fi
-done
-
- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
-if test -n "$PKG_CONFIG"; then
- echo "$as_me:3381: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
-else
- echo "$as_me:3384: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- fi
-
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** The pkg-config script could not be found. Make sure it is"
- echo "*** in your path, or set the PKG_CONFIG environment variable"
- echo "*** to the full path to pkg-config."
- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:3398: checking for gtk+-2.0 >= $GTK_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libxml-2.0 >= $LIBXML_REQUIRED
- libgnomeprint-2.0 >= $LIBGNOMEPRINT_REQUIRED
- libgnomeprintui-2.0 >= $LIBGNOMEPRINTUI_REQUIRED
- libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED
- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED" >&5
-echo $ECHO_N "checking for gtk+-2.0 >= $GTK_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libxml-2.0 >= $LIBXML_REQUIRED
- libgnomeprint-2.0 >= $LIBGNOMEPRINT_REQUIRED
- libgnomeprintui-2.0 >= $LIBGNOMEPRINTUI_REQUIRED
- libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED
- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED... $ECHO_C" >&6
-
- if $PKG_CONFIG --exists "gtk+-2.0 >= $GTK_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libxml-2.0 >= $LIBXML_REQUIRED
- libgnomeprint-2.0 >= $LIBGNOMEPRINT_REQUIRED
- libgnomeprintui-2.0 >= $LIBGNOMEPRINTUI_REQUIRED
- libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED
- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED" ; then
- echo "$as_me:3420: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- succeeded=yes
-
- echo "$as_me:3424: checking GLABELS_CFLAGS" >&5
-echo $ECHO_N "checking GLABELS_CFLAGS... $ECHO_C" >&6
- GLABELS_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libxml-2.0 >= $LIBXML_REQUIRED
- libgnomeprint-2.0 >= $LIBGNOMEPRINT_REQUIRED
- libgnomeprintui-2.0 >= $LIBGNOMEPRINTUI_REQUIRED
- libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED
- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED"`
- echo "$as_me:3433: result: $GLABELS_CFLAGS" >&5
-echo "${ECHO_T}$GLABELS_CFLAGS" >&6
-
- echo "$as_me:3436: checking GLABELS_LIBS" >&5
-echo $ECHO_N "checking GLABELS_LIBS... $ECHO_C" >&6
- GLABELS_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libxml-2.0 >= $LIBXML_REQUIRED
- libgnomeprint-2.0 >= $LIBGNOMEPRINT_REQUIRED
- libgnomeprintui-2.0 >= $LIBGNOMEPRINTUI_REQUIRED
- libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED
- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED"`
- echo "$as_me:3445: result: $GLABELS_LIBS" >&5
-echo "${ECHO_T}$GLABELS_LIBS" >&6
- else
- GLABELS_CFLAGS=""
- GLABELS_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
- GLABELS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libxml-2.0 >= $LIBXML_REQUIRED
- libgnomeprint-2.0 >= $LIBGNOMEPRINT_REQUIRED
- libgnomeprintui-2.0 >= $LIBGNOMEPRINTUI_REQUIRED
- libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED
- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED"`
- echo $GLABELS_PKG_ERRORS
- fi
-
- else
- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
- echo "*** See http://www.freedesktop.org/software/pkgconfig"
- fi
- fi
-
- if test $succeeded = yes; then
- :
- else
- { { echo "$as_me:3471: error: Library requirements (gtk+-2.0 >= $GTK_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libxml-2.0 >= $LIBXML_REQUIRED
- libgnomeprint-2.0 >= $LIBGNOMEPRINT_REQUIRED
- libgnomeprintui-2.0 >= $LIBGNOMEPRINTUI_REQUIRED
- libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED
- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-echo "$as_me: error: Library requirements (gtk+-2.0 >= $GTK_REQUIRED
- libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
- libxml-2.0 >= $LIBXML_REQUIRED
- libgnomeprint-2.0 >= $LIBGNOMEPRINT_REQUIRED
- libgnomeprintui-2.0 >= $LIBGNOMEPRINTUI_REQUIRED
- libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED
- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-GETTEXT_PACKAGE=glabels
-
-cat >>confdefs.h <<EOF
-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
-EOF
-
-ALL_LINGUAS="fr de ja pt_BR"
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:3498: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:3513: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
- echo "$as_me:3521: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
-else
- echo "$as_me:3524: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo "$as_me:3533: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_RANLIB"; then
- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:3548: found $ac_dir/$ac_word" >&5
-break
-done
-
- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
- echo "$as_me:3557: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
-else
- echo "$as_me:3560: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- RANLIB=$ac_ct_RANLIB
-else
- RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-echo "$as_me:3569: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-#line 3577 "configure"
-#include "confdefs.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
- ;
- return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX 10.20 and later -Ae
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3626: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3629: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3632: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3635: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_prog_cc_stdc=$ac_arg
-break
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
- x|xno)
- echo "$as_me:3652: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
- *)
- echo "$as_me:3655: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
- CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-echo "$as_me:3660: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-if test "${ac_cv_c_const+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 3666 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset[2];
- const charset x;
- /* SunOS 4.1.1 cc rejects this. */
- char const *const *ccp;
- char **p;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};
- static struct point const zero = {0,0};
- /* AIX XL C 1.02.0.0 rejects this.
- It does not let you subtract one const X* pointer from another in
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
- ccp = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
- ++ccp;
- p = (char**) ccp;
- ccp = (char const *const *) p;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-
- *t++ = 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
- const int *foo = &x[0];
- ++foo;
- }
- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
- typedef const int *iptr;
- iptr p = 0;
- ++p;
- }
- { /* AIX XL C 1.02.0.0 rejects this saying
- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
- }
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3724: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3727: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3730: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3733: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_c_const=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_c_const=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:3743: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
-if test $ac_cv_c_const = no; then
-
-cat >>confdefs.h <<\EOF
-#define const
-EOF
-
-fi
-
-echo "$as_me:3753: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
-if test "${ac_cv_c_inline+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
-#line 3761 "configure"
-#include "confdefs.h"
-#ifndef __cplusplus
-static $ac_kw int static_foo () {return 0; }
-$ac_kw int foo () {return 0; }
-#endif
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3770: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3773: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3776: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3779: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_c_inline=$ac_kw; break
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-
-fi
-echo "$as_me:3790: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
-case $ac_cv_c_inline in
- inline | yes) ;;
- no)
-cat >>confdefs.h <<\EOF
-#define inline
-EOF
- ;;
- *) cat >>confdefs.h <<EOF
-#define inline $ac_cv_c_inline
-EOF
- ;;
-esac
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3811: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 3817 "configure"
-#include "confdefs.h"
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3823: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3826: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3829: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3832: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_Header=yes"
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:3842: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-EOF
-
-fi
-done
-
-echo "$as_me:3852: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6
-if test "${ac_cv_type_off_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 3858 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-if ((off_t *) 0)
- return 0;
-if (sizeof (off_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3873: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3876: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3879: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3882: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_type_off_t=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_off_t=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:3892: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6
-if test $ac_cv_type_off_t = yes; then
- :
-else
-
-cat >>confdefs.h <<EOF
-#define off_t long
-EOF
-
-fi
-
-echo "$as_me:3904: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-if test "${ac_cv_type_size_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 3910 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-if ((size_t *) 0)
- return 0;
-if (sizeof (size_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3925: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:3928: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3931: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3934: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_type_size_t=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_size_t=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:3944: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
-if test $ac_cv_type_size_t = yes; then
- :
-else
-
-cat >>confdefs.h <<EOF
-#define size_t unsigned
-EOF
-
-fi
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments. Useless!
-echo "$as_me:3958: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
-if test "${ac_cv_working_alloca_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 3964 "configure"
-#include "confdefs.h"
-#include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3976: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:3979: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:3982: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:3985: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_working_alloca_h=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_working_alloca_h=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:3995: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
-if test $ac_cv_working_alloca_h = yes; then
-
-cat >>confdefs.h <<\EOF
-#define HAVE_ALLOCA_H 1
-EOF
-
-fi
-
-echo "$as_me:4005: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6
-if test "${ac_cv_func_alloca_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4011 "configure"
-#include "confdefs.h"
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-# else
-# if HAVE_ALLOCA_H
-# include <alloca.h>
-# else
-# ifdef _AIX
- #pragma alloca
-# else
-# ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-# endif
-# endif
-# endif
-# endif
-#endif
-
-int
-main ()
-{
-char *p = (char *) alloca (1);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4043: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:4046: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4049: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4052: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_alloca_works=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_func_alloca_works=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:4062: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
-
-if test $ac_cv_func_alloca_works = yes; then
-
-cat >>confdefs.h <<\EOF
-#define HAVE_ALLOCA 1
-EOF
-
-else
- # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble. Some versions do not even contain alloca or
-# contain a buggy version. If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
-
-ALLOCA=alloca.$ac_objext
-
-cat >>confdefs.h <<\EOF
-#define C_ALLOCA 1
-EOF
-
-echo "$as_me:4083: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
-if test "${ac_cv_os_cray+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4089 "configure"
-#include "confdefs.h"
-#if defined(CRAY) && ! defined(CRAY2)
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "webecray" >/dev/null 2>&1; then
- ac_cv_os_cray=yes
-else
- ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-echo "$as_me:4107: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6
-if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4112: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4118 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func ();
-char (*f) ();
-
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4149: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:4152: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4155: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4158: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:4168: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-
-cat >>confdefs.h <<EOF
-#define CRAY_STACKSEG_END $ac_func
-EOF
-
- break
-fi
-
- done
-fi
-
-echo "$as_me:4182: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
-if test "${ac_cv_c_stack_direction+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_c_stack_direction=0
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4191 "configure"
-#include "confdefs.h"
-int
-find_stack_direction ()
-{
- static char *addr = 0;
- auto char dummy;
- if (addr == 0)
- {
- addr = &dummy;
- return find_stack_direction ();
- }
- else
- return (&dummy > addr) ? 1 : -1;
-}
-
-int
-main ()
-{
- exit (find_stack_direction () < 0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4214: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:4217: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:4219: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4222: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_c_stack_direction=1
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_c_stack_direction=-1
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:4234: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
-
-cat >>confdefs.h <<EOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-EOF
-
-fi
-
-for ac_header in stdlib.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4246: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4252 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:4256: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:4262: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- eval "$as_ac_Header=yes"
-else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_ext
-fi
-echo "$as_me:4281: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-EOF
-
-fi
-done
-
-for ac_func in getpagesize
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4294: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4300 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func ();
-char (*f) ();
-
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4331: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:4334: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4337: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4340: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:4350: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-EOF
-
-fi
-done
-
-echo "$as_me:4360: checking for working mmap" >&5
-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_func_mmap_fixed_mapped=no
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4369 "configure"
-#include "confdefs.h"
-$ac_includes_default
-/* Thanks to Mike Haertel and Jim Avera for this test.
- Here is a matrix of mmap possibilities:
- mmap private not fixed
- mmap private fixed at somewhere currently unmapped
- mmap private fixed at somewhere already mapped
- mmap shared not fixed
- mmap shared fixed at somewhere currently unmapped
- mmap shared fixed at somewhere already mapped
- For private mappings, we should verify that changes cannot be read()
- back from the file, nor mmap's back from the file at a different
- address. (There have been systems where private was not correctly
- implemented like the infamous i386 svr4.0, and systems where the
- VM page cache was not coherent with the file system buffer cache
- like early versions of FreeBSD and possibly contemporary NetBSD.)
- For shared mappings, we should conversely verify that changes get
- propogated back to all the places they're supposed to be.
-
- Grep wants private fixed already mapped.
- The main things grep needs to know about mmap are:
- * does it exist and is it safe to write into the mmap'd area
- * how to use it (BSD variants) */
-
-#include <fcntl.h>
-#include <sys/mman.h>
-
-#if !STDC_HEADERS && !HAVE_STDLIB_H
-char *malloc ();
-#endif
-
-/* This mess was copied from the GNU getpagesize.h. */
-#if !HAVE_GETPAGESIZE
-/* Assume that all systems that can run configure have sys/param.h. */
-# if !HAVE_SYS_PARAM_H
-# define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-# define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-# if HAVE_SYS_PARAM_H
-# include <sys/param.h>
-# ifdef EXEC_PAGESIZE
-# define getpagesize() EXEC_PAGESIZE
-# else /* no EXEC_PAGESIZE */
-# ifdef NBPG
-# define getpagesize() NBPG * CLSIZE
-# ifndef CLSIZE
-# define CLSIZE 1
-# endif /* no CLSIZE */
-# else /* no NBPG */
-# ifdef NBPC
-# define getpagesize() NBPC
-# else /* no NBPC */
-# ifdef PAGESIZE
-# define getpagesize() PAGESIZE
-# endif /* PAGESIZE */
-# endif /* no NBPC */
-# endif /* no NBPG */
-# endif /* no EXEC_PAGESIZE */
-# else /* no HAVE_SYS_PARAM_H */
-# define getpagesize() 8192 /* punt totally */
-# endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
-
-int
-main ()
-{
- char *data, *data2, *data3;
- int i, pagesize;
- int fd;
-
- pagesize = getpagesize ();
-
- /* First, make a file with some known garbage in it. */
- data = (char *) malloc (pagesize);
- if (!data)
- exit (1);
- for (i = 0; i < pagesize; ++i)
- *(data + i) = rand ();
- umask (0);
- fd = creat ("conftest.mmap", 0600);
- if (fd < 0)
- exit (1);
- if (write (fd, data, pagesize) != pagesize)
- exit (1);
- close (fd);
-
- /* Next, try to mmap the file at a fixed address which already has
- something else allocated at it. If we can, also make sure that
- we see the same garbage. */
- fd = open ("conftest.mmap", O_RDWR);
- if (fd < 0)
- exit (1);
- data2 = (char *) malloc (2 * pagesize);
- if (!data2)
- exit (1);
- data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_FIXED, fd, 0L))
- exit (1);
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data2 + i))
- exit (1);
-
- /* Finally, make sure that changes to the mapped area do not
- percolate back to the file as seen by read(). (This is a bug on
- some variants of i386 svr4.0.) */
- for (i = 0; i < pagesize; ++i)
- *(data2 + i) = *(data2 + i) + 1;
- data3 = (char *) malloc (pagesize);
- if (!data3)
- exit (1);
- if (read (fd, data3, pagesize) != pagesize)
- exit (1);
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data3 + i))
- exit (1);
- close (fd);
- exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4496: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:4499: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:4501: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4504: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_mmap_fixed_mapped=yes
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_func_mmap_fixed_mapped=no
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:4516: result: $ac_cv_func_mmap_fixed_mapped" >&5
-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-
-cat >>confdefs.h <<\EOF
-#define HAVE_MMAP 1
-EOF
-
-fi
-rm -f conftest.mmap
-
-for ac_header in argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h sys/param.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4531: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4537 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:4541: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:4547: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- eval "$as_ac_Header=yes"
-else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_ext
-fi
-echo "$as_me:4566: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-EOF
-
-fi
-done
-
-for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \
-strdup __argz_count __argz_stringify __argz_next
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4580: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4586 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func ();
-char (*f) ();
-
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4617: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:4620: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4623: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4626: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:4636: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-EOF
-
-fi
-done
-
- if test $ac_cv_header_locale_h = yes; then
- echo "$as_me:4647: checking for LC_MESSAGES" >&5
-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4653 "configure"
-#include "confdefs.h"
-#include <locale.h>
-int
-main ()
-{
-return LC_MESSAGES
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4665: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:4668: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4671: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4674: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- am_cv_val_LC_MESSAGES=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-am_cv_val_LC_MESSAGES=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:4684: result: $am_cv_val_LC_MESSAGES" >&5
-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
- if test $am_cv_val_LC_MESSAGES = yes; then
-
-cat >>confdefs.h <<\EOF
-#define HAVE_LC_MESSAGES 1
-EOF
-
- fi
- fi
- USE_NLS=yes
-
- nls_cv_force_use_gnu_gettext="no"
-
- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
- nls_cv_header_intl=
- nls_cv_header_libgt=
- CATOBJEXT=NONE
-
- echo "$as_me:4704: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
-if test "${ac_cv_header_libintl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4710 "configure"
-#include "confdefs.h"
-#include <libintl.h>
-_ACEOF
-if { (eval echo "$as_me:4714: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:4720: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_cv_header_libintl_h=yes
-else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- ac_cv_header_libintl_h=no
-fi
-rm -f conftest.err conftest.$ac_ext
-fi
-echo "$as_me:4739: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
-if test $ac_cv_header_libintl_h = yes; then
- echo "$as_me:4742: checking for dgettext in libc" >&5
-echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6
-if test "${gt_cv_func_dgettext_libc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4748 "configure"
-#include "confdefs.h"
-#include <libintl.h>
-int
-main ()
-{
-return (int) dgettext ("","")
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4760: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:4763: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4766: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4769: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- gt_cv_func_dgettext_libc=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-gt_cv_func_dgettext_libc=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:4779: result: $gt_cv_func_dgettext_libc" >&5
-echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6
-
- if test "$gt_cv_func_dgettext_libc" != "yes"; then
- echo "$as_me:4783: checking for bindtextdomain in -lintl" >&5
-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 4791 "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char bindtextdomain ();
-int
-main ()
-{
-bindtextdomain ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4810: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:4813: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4816: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4819: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_intl_bindtextdomain=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_intl_bindtextdomain=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:4830: result: $ac_cv_lib_intl_bindtextdomain" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6
-if test $ac_cv_lib_intl_bindtextdomain = yes; then
- echo "$as_me:4833: checking for dgettext in libintl" >&5
-echo $ECHO_N "checking for dgettext in libintl... $ECHO_C" >&6
-if test "${gt_cv_func_dgettext_libintl+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- echo "$as_me:4838: checking for dgettext in -lintl" >&5
-echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 4846 "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dgettext ();
-int
-main ()
-{
-dgettext ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4865: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:4868: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4871: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4874: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_intl_dgettext=yes
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_intl_dgettext=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:4885: result: $ac_cv_lib_intl_dgettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6
-if test $ac_cv_lib_intl_dgettext = yes; then
- gt_cv_func_dgettext_libintl=yes
-else
- gt_cv_func_dgettext_libintl=no
-fi
-
-fi
-echo "$as_me:4894: result: $gt_cv_func_dgettext_libintl" >&5
-echo "${ECHO_T}$gt_cv_func_dgettext_libintl" >&6
-fi
-
- fi
-
- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
- LIBS="$LIBS -lintl";
- fi
-
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
-
-cat >>confdefs.h <<\EOF
-#define HAVE_GETTEXT 1
-EOF
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-echo "$as_me:4913: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_MSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case "$MSGFMT" in
- /*)
- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
- ac_cv_path_MSGFMT="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
- ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test -n "$MSGFMT"; then
- echo "$as_me:4940: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
-else
- echo "$as_me:4943: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
- if test "$MSGFMT" != "no"; then
-
-for ac_func in dcgettext
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4951: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 4957 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func ();
-char (*f) ();
-
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4988: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:4991: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4994: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:4997: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:5007: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-EOF
-
-fi
-done
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-echo "$as_me:5019: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $GMSGFMT in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
- ;;
- *)
- ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
- IFS=$ac_save_IFS
- test -z "$ac_dir" && ac_dir=.
- if $as_executable_p "$ac_dir/$ac_word"; then
- ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
- echo "$as_me:5036: found $ac_dir/$ac_word" >&5
- break
-fi
-done
-
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
- ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-
-if test -n "$GMSGFMT"; then
- echo "$as_me:5048: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
-else
- echo "$as_me:5051: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- # Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-echo "$as_me:5057: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case "$XGETTEXT" in
- /*)
- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
- ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test -n "$XGETTEXT"; then
- echo "$as_me:5084: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
-else
- echo "$as_me:5087: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- cat >conftest.$ac_ext <<_ACEOF
-#line 5092 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5105: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:5108: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5111: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:5114: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- CATOBJEXT=.gmo
- DATADIRNAME=share
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-CATOBJEXT=.mo
- DATADIRNAME=lib
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- INSTOBJEXT=.mo
- fi
- fi
-
- # Added by Martin Baulig 12/15/98 for libc5 systems
- if test "$gt_cv_func_dgettext_libc" != "yes" \
- && test "$gt_cv_func_dgettext_libintl" = "yes"; then
- INTLLIBS=-lintl
- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
- fi
-
-fi
-
- if test "$CATOBJEXT" = "NONE"; then
- nls_cv_use_gnu_gettext=yes
- fi
- fi
-
- if test "$nls_cv_use_gnu_gettext" != "yes"; then
-
-cat >>confdefs.h <<\EOF
-#define ENABLE_NLS 1
-EOF
-
- else
- CATOBJEXT=
- fi
-
- if test "$XGETTEXT" != ":"; then
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
- echo "$as_me:5157: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
- XGETTEXT=":"
- fi
- fi
-
- # We need to process the po/ directory.
- POSUB=po
-
- ac_config_commands="$ac_config_commands default-2"
-
- for lang in $ALL_LINGUAS; do
- GMOFILES="$GMOFILES $lang.gmo"
- POFILES="$POFILES $lang.po"
- done
-
- if test "x$CATOBJEXT" != "x"; then
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
- echo "$as_me:5177: checking for catalogs to be installed" >&5
-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
- NEW_LINGUAS=
- for lang in ${LINGUAS=$ALL_LINGUAS}; do
- case "$ALL_LINGUAS" in
- *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
- esac
- done
- LINGUAS=$NEW_LINGUAS
- echo "$as_me:5186: result: $LINGUAS" >&5
-echo "${ECHO_T}$LINGUAS" >&6
- fi
-
- if test -n "$LINGUAS"; then
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
- fi
- fi
-
- test -d po || mkdir po
- if test "$CATOBJEXT" = ".cat"; then
- echo "$as_me:5197: checking for linux/version.h" >&5
-echo $ECHO_N "checking for linux/version.h... $ECHO_C" >&6
-if test "${ac_cv_header_linux_version_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 5203 "configure"
-#include "confdefs.h"
-#include <linux/version.h>
-_ACEOF
-if { (eval echo "$as_me:5207: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:5213: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_cv_header_linux_version_h=yes
-else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- ac_cv_header_linux_version_h=no
-fi
-rm -f conftest.err conftest.$ac_ext
-fi
-echo "$as_me:5232: result: $ac_cv_header_linux_version_h" >&5
-echo "${ECHO_T}$ac_cv_header_linux_version_h" >&6
-if test $ac_cv_header_linux_version_h = yes; then
- msgformat=linux
-else
- msgformat=xopen
-fi
-
- sed -e '/^#/d' $srcdir/po/$msgformat-msg.sed > po/po2msg.sed
- fi
-
- MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
- fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- fi
-
- test -d po || mkdir po
- if test "x$srcdir" != "x."; then
- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
- posrcprefix="$srcdir/"
- else
- posrcprefix="../$srcdir/"
- fi
- else
- posrcprefix="../"
- fi
- rm -f po/POTFILES
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- < $srcdir/po/POTFILES.in > po/POTFILES
-
-if test "x${prefix}" = "xNONE"; then
- cat >>confdefs.h <<EOF
-#define PACKAGE_LOCALE_DIR "${ac_default_prefix}/${DATADIRNAME}/locale"
-EOF
-
- cat >>confdefs.h <<EOF
-#define PACKAGE_DATA_DIR "${ac_default_prefix}/${DATADIRNAME}"
-EOF
-
-else
- cat >>confdefs.h <<EOF
-#define PACKAGE_LOCALE_DIR "${prefix}/${DATADIRNAME}/locale"
-EOF
-
- cat >>confdefs.h <<EOF
-#define PACKAGE_DATA_DIR "${prefix}/${DATADIRNAME}"
-EOF
-
-fi
-
-subdirs="$subdirs barcode-0.98"
-
-ac_config_files="$ac_config_files Makefile src/Makefile src/pixmaps/Makefile src/stock-pixmaps/Makefile po/Makefile.in doc/Makefile doc/C/Makefile glabels.spec"
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems. If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overriden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
- (set) 2>&1 |
- case `(ac_space=' '; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
- sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
- ;;
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
- ;;
- esac;
-} |
- sed '
- t clear
- : clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
- t end
- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- : end' >>confcache
-if cmp -s $cache_file confcache; then :; else
- if test -w $cache_file; then
- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
- cat confcache >$cache_file
- else
- echo "not updating unwritable cache $cache_file"
- fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[ ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[ ]*$//;
-}'
-fi
-
-DEFS=-DHAVE_CONFIG_H
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:5367: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-ac_cs_invocation="\$0 \$@"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
-fi
-
-# Name of the executable.
-as_me=`echo "$0" |sed 's,.*[\\/],,'`
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- # We could just check for DJGPP; but this test a) works b) is more generic
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
- as_ln_s='cp -p'
- else
- as_ln_s='ln -s'
- fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-as_executable_p="test -f"
-
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
-# NLS nuisances.
-$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
-$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
-$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
-$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
-$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
-$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
-$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
-$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
-
-exec 6>&1
-
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\EOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
- -h, --help print this help, then exit
- -V, --version print version number, then exit
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
- --header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-EOF
-
-cat >>$CONFIG_STATUS <<EOF
-ac_cs_version="\\
-glabels config.status 1.89.0
-configured by $0, generated by GNU Autoconf 2.52,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
-EOF
-
-cat >>$CONFIG_STATUS <<\EOF
-# If no file are specified by the user, then we need to provide default
-# value. By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
- case $1 in
- --*=*)
- ac_option=`expr "x$1" : 'x\([^=]*\)='`
- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
- shift
- set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
- shift
- ;;
- -*);;
- *) # This is not an option, so the user has probably given explicit
- # arguments.
- ac_need_defaults=false;;
- esac
-
- case $1 in
- # Handling of the options.
-EOF
-cat >>$CONFIG_STATUS <<EOF
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
- exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
-EOF
-cat >>$CONFIG_STATUS <<\EOF
- --version | --vers* | -V )
- echo "$ac_cs_version"; exit 0 ;;
- --he | --h)
- # Conflict between --help and --header
- { { echo "$as_me:5543: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
- { (exit 1); exit 1; }; };;
- --help | --hel | -h )
- echo "$ac_cs_usage"; exit 0 ;;
- --debug | --d* | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- shift
- CONFIG_FILES="$CONFIG_FILES $1"
- ac_need_defaults=false;;
- --header | --heade | --head | --hea )
- shift
- CONFIG_HEADERS="$CONFIG_HEADERS $1"
- ac_need_defaults=false;;
-
- # This is an error.
- -*) { { echo "$as_me:5562: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
- { (exit 1); exit 1; }; } ;;
-
- *) ac_config_targets="$ac_config_targets $1" ;;
-
- esac
- shift
-done
-
-exec 5>>config.log
-cat >&5 << _ACEOF
-
-## ----------------------- ##
-## Running config.status. ##
-## ----------------------- ##
-
-This file was extended by $as_me (glabels 1.89.0) 2.52, executed with
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
- CONFIG_LINKS = $CONFIG_LINKS
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- > $ac_cs_invocation
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-
-_ACEOF
-EOF
-
-cat >>$CONFIG_STATUS <<EOF
-#
-# INIT-COMMANDS section.
-#
-
-EOF
-
-cat >>$CONFIG_STATUS <<\EOF
-for ac_config_target in $ac_config_targets
-do
- case "$ac_config_target" in
- # Handling of arguments.
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
- "src/pixmaps/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/pixmaps/Makefile" ;;
- "src/stock-pixmaps/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/stock-pixmaps/Makefile" ;;
- "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
- "doc/C/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/C/Makefile" ;;
- "glabels.spec" ) CONFIG_FILES="$CONFIG_FILES glabels.spec" ;;
- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
- "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- *) { { echo "$as_me:5615: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
- esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used. Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
- test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-: ${TMPDIR=/tmp}
-{
- tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
-} ||
-{
- tmp=$TMPDIR/cs$$-$RANDOM
- (umask 077 && mkdir $tmp)
-} ||
-{
- echo "$me: cannot create a temporary directory in $TMPDIR" >&2
- { (exit 1); exit 1; }
-}
-
-EOF
-
-cat >>$CONFIG_STATUS <<EOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
- # Protect against being on the right side of a sed subst in config.status.
- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@DEFS@,$DEFS,;t t
-s,@LIBS@,$LIBS,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
-s,@ACLOCAL@,$ACLOCAL,;t t
-s,@AUTOCONF@,$AUTOCONF,;t t
-s,@AUTOMAKE@,$AUTOMAKE,;t t
-s,@AUTOHEADER@,$AUTOHEADER,;t t
-s,@MAKEINFO@,$MAKEINFO,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s,@MAINT@,$MAINT,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@PLATFORM_GNOME_2_TRUE@,$PLATFORM_GNOME_2_TRUE,;t t
-s,@PLATFORM_GNOME_2_FALSE@,$PLATFORM_GNOME_2_FALSE,;t t
-s,@GNOME_INTERFACE_VERSION@,$GNOME_INTERFACE_VERSION,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@CPP@,$CPP,;t t
-s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
-s,@GLIB_GENMARSHAL@,$GLIB_GENMARSHAL,;t t
-s,@GLABELS_CFLAGS@,$GLABELS_CFLAGS,;t t
-s,@GLABELS_LIBS@,$GLABELS_LIBS,;t t
-s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@ALLOCA@,$ALLOCA,;t t
-s,@USE_NLS@,$USE_NLS,;t t
-s,@MSGFMT@,$MSGFMT,;t t
-s,@GMSGFMT@,$GMSGFMT,;t t
-s,@XGETTEXT@,$XGETTEXT,;t t
-s,@CATALOGS@,$CATALOGS,;t t
-s,@CATOBJEXT@,$CATOBJEXT,;t t
-s,@DATADIRNAME@,$DATADIRNAME,;t t
-s,@GMOFILES@,$GMOFILES,;t t
-s,@INSTOBJEXT@,$INSTOBJEXT,;t t
-s,@INTLDEPS@,$INTLDEPS,;t t
-s,@INTLLIBS@,$INTLLIBS,;t t
-s,@INTLOBJS@,$INTLOBJS,;t t
-s,@POFILES@,$POFILES,;t t
-s,@POSUB@,$POSUB,;t t
-s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
-s,@subdirs@,$subdirs,;t t
-CEOF
-
-EOF
-
- cat >>$CONFIG_STATUS <<\EOF
- # Split the substitutions into bite-sized pieces for seds with
- # small command number limits, like on Digital OSF/1 and HP-UX.
- ac_max_sed_lines=48
- ac_sed_frag=1 # Number of current file.
- ac_beg=1 # First line for current file.
- ac_end=$ac_max_sed_lines # Line after last line for current file.
- ac_more_lines=:
- ac_sed_cmds=
- while $ac_more_lines; do
- if test $ac_beg -gt 1; then
- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
- else
- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
- fi
- if test ! -s $tmp/subs.frag; then
- ac_more_lines=false
- else
- # The purpose of the label and of the branching condition is to
- # speed up the sed processing (if there are no `@' at all, there
- # is no need to browse any of the substitutions).
- # These are the two extra sed commands mentioned above.
- (echo ':t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
- else
- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
- fi
- ac_sed_frag=`expr $ac_sed_frag + 1`
- ac_beg=$ac_end
- ac_end=`expr $ac_end + $ac_max_sed_lines`
- fi
- done
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds=cat
- fi
-fi # test -n "$CONFIG_FILES"
-
-EOF
-cat >>$CONFIG_STATUS <<\EOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
- case $ac_file in
- - | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
- esac
-
- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
- ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
- { case "$ac_dir" in
- [\\/]* | ?:[\\/]* ) as_incr_dir=;;
- *) as_incr_dir=.;;
-esac
-as_dummy="$ac_dir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
- case $as_mkdir_dir in
- # Skip DOS drivespec
- ?:) as_incr_dir=$as_mkdir_dir ;;
- *)
- as_incr_dir=$as_incr_dir/$as_mkdir_dir
- test -d "$as_incr_dir" || mkdir "$as_incr_dir"
- ;;
- esac
-done; }
-
- ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
- # A "../" for each directory in $ac_dir_suffix.
- ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
- else
- ac_dir_suffix= ac_dots=
- fi
-
- case $srcdir in
- .) ac_srcdir=.
- if test -z "$ac_dots"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* )
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
- *) # Relative path.
- ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_dots$srcdir ;;
- esac
-
- case $INSTALL in
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
- *) ac_INSTALL=$ac_dots$INSTALL ;;
- esac
-
- if test x"$ac_file" != x-; then
- { echo "$as_me:5861: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated automatically by config.status. */
- configure_input="Generated automatically from `echo $ac_file_in |
- sed 's,.*/,,'` by configure."
-
- # First look for the input files in the build tree, otherwise in the
- # src tree.
- ac_file_inputs=`IFS=:
- for f in $ac_file_in; do
- case $f in
- -) echo $tmp/stdin ;;
- [\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:5879: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- echo $f;;
- *) # Relative
- if test -f "$f"; then
- # Build tree
- echo $f
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo $srcdir/$f
- else
- # /dev/null tree
- { { echo "$as_me:5892: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- fi;;
- esac
- done` || { (exit 1); exit 1; }
-EOF
-cat >>$CONFIG_STATUS <<EOF
- sed "$ac_vpsub
-$extrasub
-EOF
-cat >>$CONFIG_STATUS <<\EOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
- rm -f $tmp/stdin
- if test x"$ac_file" != x-; then
- mv $tmp/out $ac_file
- else
- cat $tmp/out
- rm -f $tmp/out
- fi
-
-done
-EOF
-cat >>$CONFIG_STATUS <<\EOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-ac_dB='[ ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
- case $ac_file in
- - | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
- esac
-
- test x"$ac_file" != x- && { echo "$as_me:5953: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
- # First look for the input files in the build tree, otherwise in the
- # src tree.
- ac_file_inputs=`IFS=:
- for f in $ac_file_in; do
- case $f in
- -) echo $tmp/stdin ;;
- [\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:5964: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- echo $f;;
- *) # Relative
- if test -f "$f"; then
- # Build tree
- echo $f
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo $srcdir/$f
- else
- # /dev/null tree
- { { echo "$as_me:5977: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- fi;;
- esac
- done` || { (exit 1); exit 1; }
- # Remove the trailing spaces.
- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
-
-EOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h. The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status. Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\EOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp
-t end
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-EOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless. Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments. This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\EOF
-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-EOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo ' :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
- # Write a limited-size here document to $tmp/defines.sed.
- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
- # Speed up: don't consider the non `#define' lines.
- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
- # Work around the forget-to-reset-the-flag bug.
- echo 't clr' >>$CONFIG_STATUS
- echo ': clr' >>$CONFIG_STATUS
- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
- echo 'CEOF
- sed -f $tmp/defines.sed $tmp/in >$tmp/out
- rm -f $tmp/in
- mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
- rm -f conftest.defines
- mv conftest.tail conftest.defines
-done
-rm -f conftest.defines
-echo ' fi # egrep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
- # Write a limited-size here document to $tmp/undefs.sed.
- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
- # Speed up: don't consider the non `#undef'
- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
- # Work around the forget-to-reset-the-flag bug.
- echo 't clr' >>$CONFIG_STATUS
- echo ': clr' >>$CONFIG_STATUS
- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
- echo 'CEOF
- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
- rm -f $tmp/in
- mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
- rm -f conftest.undefs
- mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
-
-cat >>$CONFIG_STATUS <<\EOF
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated automatically by config.status. */
- if test x"$ac_file" = x-; then
- echo "/* Generated automatically by configure. */" >$tmp/config.h
- else
- echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h
- fi
- cat $tmp/in >>$tmp/config.h
- rm -f $tmp/in
- if test x"$ac_file" != x-; then
- if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
- { echo "$as_me:6094: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
- else
- ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
- { case "$ac_dir" in
- [\\/]* | ?:[\\/]* ) as_incr_dir=;;
- *) as_incr_dir=.;;
-esac
-as_dummy="$ac_dir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
- case $as_mkdir_dir in
- # Skip DOS drivespec
- ?:) as_incr_dir=$as_mkdir_dir ;;
- *)
- as_incr_dir=$as_incr_dir/$as_mkdir_dir
- test -d "$as_incr_dir" || mkdir "$as_incr_dir"
- ;;
- esac
-done; }
-
- fi
- rm -f $ac_file
- mv $tmp/config.h $ac_file
- fi
- else
- cat $tmp/config.h
- rm -f $tmp/config.h
- fi
-done
-EOF
-cat >>$CONFIG_STATUS <<\EOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-
- case $ac_dest in
- default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;;
- default-2 ) case "$CONFIG_FILES" in *po/Makefile.in*)
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
- esac ;;
- esac
-done
-EOF
-
-cat >>$CONFIG_STATUS <<\EOF
-
-{ (exit 0); exit 0; }
-EOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded. So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status. When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
- ac_cs_success=:
- exec 5>/dev/null
- $SHELL $CONFIG_STATUS || ac_cs_success=false
- exec 5>>config.log
- # Use ||, not &&, to avoid exiting from the if with $? = 1, which
- # would make configure fail if this is the last instruction.
- $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-if test "$no_recursion" != yes; then
-
- # Remove --cache-file and --srcdir arguments so they do not pile up.
- ac_sub_configure_args=
- ac_prev=
- for ac_arg in $ac_configure_args; do
- if test -n "$ac_prev"; then
- ac_prev=
- continue
- fi
- case $ac_arg in
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
- | --c=*)
- ;;
- --config-cache | -C)
- ;;
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- ;;
- *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
- esac
- done
-
- for ac_subdir in : $subdirs; do test "x$ac_subdir" = x: && continue
-
- # Do not complain, so a configure script can configure whichever
- # parts of a large source tree are present.
- test -d $srcdir/$ac_subdir || continue
-
- { echo "$as_me:6215: configuring in $ac_subdir" >&5
-echo "$as_me: configuring in $ac_subdir" >&6;}
- case $srcdir in
- .) ;;
- *) { case "./$ac_subdir" in
- [\\/]* | ?:[\\/]* ) as_incr_dir=;;
- *) as_incr_dir=.;;
-esac
-as_dummy="./$ac_subdir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
- case $as_mkdir_dir in
- # Skip DOS drivespec
- ?:) as_incr_dir=$as_mkdir_dir ;;
- *)
- as_incr_dir=$as_incr_dir/$as_mkdir_dir
- test -d "$as_incr_dir" || mkdir "$as_incr_dir"
- ;;
- esac
-done; }
-
- if test -d ./$ac_subdir; then :;
- else
- { { echo "$as_me:6237: error: cannot create \`pwd\`/$ac_subdir" >&5
-echo "$as_me: error: cannot create \`pwd\`/$ac_subdir" >&2;}
- { (exit 1); exit 1; }; }
- fi
- ;;
- esac
-
- ac_popdir=`pwd`
- cd $ac_subdir
-
- # A "../" for each directory in /$ac_subdir.
- ac_dots=`echo $ac_subdir |
- sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
-
- case $srcdir in
- .) # No --srcdir option. We are building in place.
- ac_sub_srcdir=$srcdir ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
- ac_sub_srcdir=$srcdir/$ac_subdir ;;
- *) # Relative path.
- ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
- esac
-
- # Check for guested configure; otherwise get Cygnus style configure.
- if test -f $ac_sub_srcdir/configure.gnu; then
- ac_sub_configure="$SHELL '$ac_sub_srcdir/configure.gnu'"
- elif test -f $ac_sub_srcdir/configure; then
- ac_sub_configure="$SHELL '$ac_sub_srcdir/configure'"
- elif test -f $ac_sub_srcdir/configure.in; then
- ac_sub_configure=$ac_configure
- else
- { echo "$as_me:6268: WARNING: no configuration information is in $ac_subdir" >&5
-echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2;}
- ac_sub_configure=
- fi
-
- # The recursion is here.
- if test -n "$ac_sub_configure"; then
- # Make the cache file name correct relative to the subdirectory.
- case $cache_file in
- [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
- *) # Relative path.
- ac_sub_cache_file=$ac_dots$cache_file ;;
- esac
-
- { echo "$as_me:6282: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&5
-echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&6;}
- # The eval makes quoting arguments work.
- eval $ac_sub_configure $ac_sub_configure_args \
- --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir ||
- { { echo "$as_me:6287: error: $ac_sub_configure failed for $ac_subdir" >&5
-echo "$as_me: error: $ac_sub_configure failed for $ac_subdir" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- cd $ac_popdir
- done
-fi
-
-echo "
-
-Configuration:
-
- Source code location: ${srcdir}
- Compiler: ${CC}
-
-"
diff --git a/glabels2/configure.in b/glabels2/configure.in
index 3938d7b..9116875 100644
--- a/glabels2/configure.in
+++ b/glabels2/configure.in
@@ -1,5 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.52)
+
AC_INIT(glabels, 1.89.0, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116)
AC_CONFIG_SRCDIR(src/glabels.c)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
@@ -7,6 +9,8 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
+AC_PROG_INTLTOOL([0.21])
+
GNOME_PLATFORM_GNOME_2(yes, force)
AC_ISC_POSIX
@@ -49,7 +53,7 @@ dnl Add the languages which your application supports here.
GETTEXT_PACKAGE=glabels
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
-ALL_LINGUAS="fr de ja pt_BR"
+ALL_LINGUAS="fr de ja pt_BR es ru zh_TW.Big5 pl"
AM_GLIB_GNU_GETTEXT
diff --git a/glabels2/cvswrappers b/glabels2/cvswrappers
deleted file mode 100644
index 755951d..0000000
--- a/glabels2/cvswrappers
+++ /dev/null
@@ -1 +0,0 @@
-*.png -k 'b'
diff --git a/glabels2/data/predefined-labels.template b/glabels2/data/predefined-labels.template
index 5ada010..41aa803 100644
--- a/glabels2/data/predefined-labels.template
+++ b/glabels2/data/predefined-labels.template
@@ -133,6 +133,16 @@
</Sheet>
<!-- =================================================================== -->
+ <!-- Avery 5261 family: Mailing Labels, 1'' x 4'', 20 per sheet * -->
+ <!-- =================================================================== -->
+ <Sheet name="Avery 5261" size="US-Letter" description="Mailing Labels">
+ <Label id="0" style="rectangle" width="288" height="72" round="5">
+ <Markup type="margin" size="5"/>
+ <Layout nx="2" ny="10" x0="11.5" y0="36" dx="303" dy="72"/>
+ </Label>
+ </Sheet>
+
+ <!-- =================================================================== -->
<!-- Avery 5371 family: Business Cards, 2'' x 3_1/2'', 10 per sheet * -->
<!-- =================================================================== -->
<Sheet name="Avery 5371" size="US-Letter" description="Business Cards">
@@ -251,8 +261,7 @@
<!-- Avery 8165 family: Full-page label, 8_1/2'' x 11'', 1 per sheet * -->
<!-- =================================================================== -->
<Sheet name="Avery 8165" size="US-Letter" description="Full-page">
- <Label id="0" style="rectangle" width="612" height="792"
- round="0">
+ <Label id="0" style="rectangle" width="612" height="792" round="0">
<Markup type="margin" size="5"/>
<Layout nx="1" ny="1" x0="0" y0="0" dx="0" dy="0"/>
</Label>
@@ -416,15 +425,65 @@
</Sheet>
<!-- =================================================================== -->
+ <!-- Zweckform 3659: Rectangular Labels, 97 x 42.125 mm, 12 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Zweckform 3659" size="A4" description="Mailing Labels -- 12">
+ <Label id="0" style="rectangle" width="274" height="120.5" round="0">
+ <Markup type="margin" size="5"/>
+ <Layout nx="2" ny="6" x0="22.68" y0="60" dx="274" dy="120.5"/>
+ </Label>
+ </Sheet>
+
+ <!-- =================================================================== -->
<!-- Zweckform 3669: Rectangular Labels, 70 x 50.8mm, 15 per sheet -->
<!-- =================================================================== -->
<Sheet name="Zweckform 3669" size="A4" description="QSL-Karten Etiketten 70mm x 50,8mm">
<Label id="0" style="rectangle" width="198.425" height="144" round="0">
<Markup type="margin" size="5"/>
- <Layout nx="3" ny="5" x0="0" y0="61" dx="198.425" dy="144"/>
+ <Layout nx="3" ny="5" x0="0" y0="61" dx="198.425" dy="144"/>
</Label>
</Sheet>
+ <!-- =================================================================== -->
+ <!-- Zweckform 4746: Video Labels, 147,32 x 20 mm, 13 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Zweckform 4746" size="A4" description="Video Labels (back)">
+ <Label id="0" style="rectangle" width="416.6" height="56.6929" round="5">
+ <Markup type="margin" size="5"/>
+ <Layout nx="1" ny="13" x0="88.8377" y0="52.2425" dx="416.6" dy="56.6929"/>
+ </Label>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- Zweckform 4780: Allround Labels, 48,5 x 25,4 mm, 40 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Zweckform 4780" size="A4" description="Allround Labels">
+ <Label id="0" style="rectangle" width="137.48" height="72" round="0">
+ <Markup type="margin" size="5"/>
+ <Layout nx="4" ny="10" x0="23" y0="68" dx="137.48" dy="72"/>
+ </Label>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- Zweckform 3490: Rectangular Labels, 70 x 36 mm, 24 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Zweckform 3490" size="A4" description="Rectangular Copier Labels">
+ <Label id="0" style="rectangle" width="198.425" height="102.047" round="0">
+ <Markup type="margin" size="5"/>
+ <Layout nx="3" ny="8" x0="" y0="12.557" dx="198.425" dy="102.047"/>
+ </Label>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- Zweckform 4781: Rectangular Labels, 97 x 42.3 mm, 12 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Zweckform 4781" size="A4" description="Rectangular Copier Labels">
+ <Label id="0" style="rectangle" width="274.960" height="119.905" round="0">
+ <Markup type="margin" size="5"/>
+ <Layout nx="2" ny="6" x0="22.677" y0="61.030" dx="274.960" dy="119.905"/>
+ </Label>
+ </Sheet>
+
<!-- ******************************************************************** -->
@@ -441,6 +500,95 @@
</Label>
</Sheet>
+ <!-- =================================================================== -->
+ <!-- Memorex CD Labels 2 Pass * -->
+ <!-- =================================================================== -->
+ <Sheet name="Memorex CD Labels" size="US-Letter"
+ description="CD/DVD Labels (2 Pass)">
+ <Label id="0" style="cd" radius="166.5" hole="58.5">
+ <Markup type="margin" size="5"/>
+ <Layout nx="1" ny="1" x0="40.5" y0="414" dx="0" dy="0"/>
+ </Label>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- Neato CLP-192328/26: HandiCD-R 50MB, 3" x 2_1/8'', 9 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Neato HandiCD-R" size="US-Letter"
+ description="Business Card CD">
+ <Label id="0" style="rectangle" height="216" width="171" round="75">
+ <Markup type="margin" size="5"/>
+ <Layout nx="3" ny="3" x0="36.5" y0="54" dx="184.5" dy="234"/>
+ </Label>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- CD STOMPER PRO CD Label Refills, (Face Only), 2 per sheet * -->
+ <!-- =================================================================== -->
+ <Sheet name="Stomper PRO CD" size="US-Letter"
+ description="PRO CD Labels 2-up (face only, 2 Pass)">
+ <Label id="0" style="cd" radius="166.5" hole="58.5">
+ <Markup type="margin" size="5"/>
+ <Layout nx="1" ny="1" x0="34" y0="416" dx="0" dy="0"/>
+ </Label>
+ </Sheet>
+
+ <Sheet name="Stomper PRO Zip" size="US-Letter"
+ description="PRO CD Labels 2-up (Face only, 2 Pass)">
+ <Label id="0" style="rectangle" width="168" height="142" round="0">
+ <Markup type="margin" size="5"/>
+ <Layout nx="1" ny="2" x0="407" y0="440" dx="0" dy="142"/>
+ </Label>
+ </Sheet>
+
+ <Sheet name="Stomper PRO Spine" size="US-Letter"
+ description="PRO CD Labels 2-up (CD spine only)">
+ <Label id="0" style="rectangle" width="288" height="20" round="0">
+ <Markup type="margin" size="2"/>
+ <Layout nx="2" ny="1" x0="18" y0="387" dx="288" dy="0"/>
+ </Label>
+ </Sheet>
+
+ <!-- ===================================================================-->
+ <!-- Meritline Mini CD/DVD Labels (face only), 5 per sheet -->
+ <!-- ===================================================================-->
+ <Sheet name="Meritline Mini-CD 4" size="US-Letter"
+ description="Mini-CD Labels, outer 4">
+ <Label id="0" style="cd" radius="110.5" hole="57.5">
+ <Markup type="margin" size="5"/>
+ <Layout nx="2" ny="2" x0="48.4" y0="41.9" dx="299.5" dy="481.5"/>
+ </Label>
+ </Sheet>
+ <!-- y0=47 is probably about right, but changing it isn't helping! -->
+
+ <Sheet name="Meritline Mini-CD 1" size="US-Letter"
+ description="Mini-CD Labels, center 1">
+ <Label id="0" style="cd" radius="110.5" hole="57.5">
+ <Markup type="margin" size="5"/>
+ <Layout nx="1" ny="1" x0="197.3" y0="281.5" dx="0" dy="0"/>
+ </Label>
+ </Sheet>
+
+ <!-- ===================================================================-->
+ <!-- Neato Slimline CD Jewel Case Insert, 2 per sheet. -->
+ <!-- Left margin area is CD spine; ignore other margins. -->
+ <!-- To write text on spine, use "upside down" template, "rotated", -->
+ <!-- spine is bottom margin, print label sheet BOTTOM FIRST. -->
+ <!-- ===================================================================-->
+ <Sheet name="Neato Slimline CD Case" size="US-Letter"
+ description="Slimline CD Case (rightside up)">
+ <Label id="0" style="rectangle" width="394.5" height="342.5" round="0">
+ <Markup type="margin" size="7.5"/>
+ <Layout nx="1" ny="2" x0="130" y0="44.6" dx="0" dy="363"/>
+ </Label>
+ </Sheet>
+ <Sheet name="Neato Slimline CD Case, spine" size="US-Letter"
+ description="Slimline CD Case (upside down)">
+ <Label id="0" style="rectangle" width="394.5" height="342.5" round="0">
+ <Markup type="margin" size="7.5"/>
+ <Layout nx="1" ny="2" x0="96.5" y0="44.6" dx="0" dy="363"/>
+ </Label>
+ </Sheet>
<!-- ******************************************************************** -->
@@ -488,6 +636,202 @@
</Label>
</Sheet>
+ <!-- =================================================================== -->
+ <!-- Herma 4620: Mailing Labels - 2 columns, 107 x 37 mm, 16 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Herma 4620" size="A4" description="Mailing Labels-2 columns">
+ <Label id="0" style="rectangle" width="298" height="105" round="0">
+ <Markup type="margin" size="5"/>
+ <Layout nx="2" ny="8" x0="0" y0="0" dx="298" dy="105"/>
+ </Label>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- Herma 4464: Mailing Labels - 3 columns, 70 x 37.125 mm, 24 per sheet-->
+ <!-- =================================================================== -->
+ <Sheet name="Herma 4464" size="A4" description="Mailing Labels-3 columns">
+ <Label id="0" style="rectangle" width="199" height="105" round="0">
+ <Markup type="margin" size="5"/>
+ <Layout nx="3" ny="8" x0="0" y0="0" dx="199" dy="105"/>
+ </Label>
+ </Sheet>
+
+ <!-- ===================================================================-->
+ <!-- Neato brand CD/DVD Labels (face only), 2 per sheet -->
+ <!-- ===================================================================-->
+ <Sheet name="Neato A4 CD" size="A4" description="CD/DVD Labels (face only)">
+ <Label id="0" style="cd" radius="166.5" hole="58.5">
+ <Markup type="margin" size="5"/>
+ <Layout nx="1" ny="2" x0="125" y0="80" dx="0" dy="360"/>
+ </Label>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- EPSON Photo Stickers, 17 x 24 mm, 16 per sheet (Actually A6) -->
+ <!-- =================================================================== -->
+ <Sheet name="Epson S041144" size="A4" description="EPSON Photo Stickers 16">
+ <Label id="0" style="rectangle" width="48" height="68" round="7">
+ <Markup type="margin" size="5"/>
+ <Layout nx="4" ny="4" x0="33" y0="59" dx="59.5" dy="79.5"/>
+ </Label>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- DATA BECKER: Business Cards, 50 x 90 mm, 10 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="DataBecker" size="A4" description="Business Cards">
+ <Label id="0" style="rectangle" width="255" height="142" round="0">
+ <Markup type="margin" size="5"/>
+ <Layout nx="2" ny="5" x0="36" y0="62" dx="255" dy="142"/>
+ </Label>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- Hema Etiketten: 65 x 38 mm, 21 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Hema Etiketten" size="A4" description="Rectangular Labels">
+ <Label id="0" style="rectangle" width="178" height="108" round="5">
+ <Markup type="margin" size="5"/>
+ <Layout nx="3" ny="7" x0="20" y0="42" dx="187" dy="107"/>
+ </Label>
+ </Sheet>
+
+ <!-- ====================================================== -->
+ <!-- Alpi 02793: Business Cards, 50,8 x 90 mm, 10 per sheet -->
+ <!-- ====================================================== -->
+ <Sheet name="Alpi 02793" size="A4" description="Alpi 02793: Business Cards">
+ <Label id="0" style="rectangle" width="255.118" height="144" round="0">
+ <Markup type="margin" size="5"/>
+ <Layout nx="2" ny="5" x0="42.5197" y0="62.3622" dx="255.118" dy="144"/>
+ </Label>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- Data Becker Etiketten Paket: Ordnerrucken, 192 x 61,5 mm, 4 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Herma 4284" size="A4" description="Arch File Labels (large)">
+ <Label id="0" style="rectangle" width="544.252" height="174.331" round="5">
+ <Markup type="margin" size="5"/>
+ <Layout nx="1" ny="4" x0="25.5118" y0="38.2677" dx="544.252" dy="197.008"/>
+ </Label>
+ <Alias name="Herma 5095"/>
+ <Alias name="Herma 5096"/>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- Data Becker Etiketten Paket: Ordnerrucken, 192 x 39 mm, 6 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Herma 4283" size="A4" description="Arch File Labels (small)">
+ <Label id="0" style="rectangle" width="544.252" height="110.551" round="5">
+ <Markup type="margin" size="5"/>
+ <Layout nx="1" ny="6" x0="25.5118" y0="32.5984" dx="544.252" dy="133.228"/>
+ </Label>
+ <Alias name="Herma 5090"/>
+ <Alias name="Herma 5091"/>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- Data Becker Etiketten Paket: Video Etiketten, 78,7 x 46,5 mm, 12 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Herma 4828" size="A4" description="Video Labels (face only)">
+ <Label id="0" style="rectangle" width="223.086" height="131.811" round="5">
+ <Markup type="margin" size="5"/>
+ <Layout nx="2" ny="6" x0="38.5512" y0="24.9449" dx="295.086" dy="131.811"/>
+ </Label>
+ <Alias name="Herma 5070"/>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- Data Becker Etiketten Paket: Disketten Etiketten, 70 x 50,8 mm, 10 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Herma 8803" size="A4" description="Diskette Labels (face only)">
+ <Label id="0" style="rectangle" width="198.425" height="144" round="5">
+ <Markup type="margin" size="5"/>
+ <Layout nx="2" ny="5" x0="60.9448" y0="60.9448" dx="270.425" dy="144"/>
+ </Label>
+ <Alias name="Herma 8839"/>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- Otto Versand: Allzweck Etiketten, 38 x 21,2 mm, 65 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Herma 4606" size="A4" description="Allround Labels --65">
+ <Label id="0" style="rectangle" width="107.716" height="60.0945" round="0">
+ <Markup type="margin" size="5"/>
+ <Layout nx="5" ny="13" x0="26.9291" y0="29.7638" dx="107.716" dy="60.0945"/>
+ </Label>
+ <Alias name="Herma 4270"/>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- Herma Musteretiketten: Allzweck Etiketten, 48,3 x 16,9 mm, 64 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Herma 4607" size="A4" description="Allround Labels --64">
+ <Label id="0" style="rectangle" width="136.913" height="47.9055" round="0">
+ <Markup type="margin" size="5"/>
+ <Layout nx="4" ny="16" x0="24.0945" y0="35.7165" dx="136.913" dy="47.9055"/>
+ </Label>
+ <Alias name="Herma 4271"/>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- Herma Musteretiketten: Allzweck Etiketten, 48,3 x 25,4 mm, 44 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Herma 4608" size="A4" description="Allround Labels --44">
+ <Label id="0" style="rectangle" width="136.913" height="72" round="0">
+ <Markup type="margin" size="5"/>
+ <Layout nx="4" ny="11" x0="24.0945" y0="24.0945" dx="136.913" dy="72"/>
+ </Label>
+ <Alias name="Herma 4272"/>
+ <Alias name="Herma 5051"/>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- Herma Musteretiketten: Allzweck Etiketten, 66 x 33,8 mm, 24 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Herma 4614" size="A4" description="Allround Labels --24">
+ <Label id="0" style="rectangle" width="187.086" height="95.811" round="0">
+ <Markup type="margin" size="5"/>
+ <Layout nx="3" ny="8" x0="16.1575" y0="36.8504" dx="187.086" dy="95.811"/>
+ </Label>
+ <Alias name="Herma 4670"/>
+ <Alias name="Herma 5053"/>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- Herma Musteretiketten: Adress Etiketten, 105 x 42,3 mm, 24 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Herma 4625" size="A4" description="Mailing Labels --14">
+ <Label id="0" style="rectangle" width="297.638" height="119.905" round="0">
+ <Markup type="margin" size="5"/>
+ <Layout nx="2" ny="7" x0="0" y0="0" dx="297.638" dy="119.905"/>
+ </Label>
+ <Alias name="Herma 4674"/>
+ <Alias name="Herma 5057"/>
+ </Sheet>
+
+ <!-- =================================================================== -->
+ <!-- Herma Musteretiketten: Ordnerrucken, 192 x 38 mm, 7 per sheet -->
+ <!-- =================================================================== -->
+ <Sheet name="Herma 4293" size="A4" description="Arch File Labels">
+ <Label id="0" style="rectangle" width="544.252" height="107.716" round="5">
+ <Markup type="margin" size="5"/>
+ <Layout nx="1" ny="7" x0="25.5118" y0="42.5197" dx="544.252" dy="107.716"/>
+ </Label>
+ <Alias name="Herma 5092"/>
+ </Sheet>
+
+ <!-- ===================================================================-->
+ <!-- Data Becker CD/DVD Labels (face only), 2 per sheet -->
+ <!-- ===================================================================-->
+ <Sheet name="DataBecker 0335" size="A4" description="CD/DVD Labels Standard Format (face only)">
+ <Label id="0" style="cd" radius="164.409" hole="58.1102">
+ <Markup type="margin" size="5"/>
+ <Layout nx="1" ny="2" x0="133.228" y0="46.7716" dx="0" dy="419.527"/>
+ </Label>
+ <Alias name="DataBecker 0368"/>
+ </Sheet>
+
</GLabels-templates>
diff --git a/glabels2/install-sh b/glabels2/install-sh
deleted file mode 100755
index e9de238..0000000
--- a/glabels2/install-sh
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission. M.I.T. makes no representations about the
-# suitability of this software for any purpose. It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `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
-# from scratch. It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
- case $1 in
- -c) instcmd="$cpprog"
- shift
- continue;;
-
- -d) dir_arg=true
- shift
- continue;;
-
- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
-
- -o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
-
- -g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
-
- -s) stripcmd="$stripprog"
- shift
- continue;;
-
- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
- shift
- continue;;
-
- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
- shift
- continue;;
-
- *) if [ x"$src" = x ]
- then
- src=$1
- else
- # this colon is to work around a 386BSD /bin/sh bug
- :
- dst=$1
- fi
- shift
- continue;;
- esac
-done
-
-if [ x"$src" = x ]
-then
- echo "install: no input file specified"
- exit 1
-else
- true
-fi
-
-if [ x"$dir_arg" != x ]; then
- dst=$src
- src=""
-
- if [ -d $dst ]; then
- instcmd=:
- chmodcmd=""
- else
- instcmd=mkdir
- fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
-
- if [ -f $src -o -d $src ]
- then
- true
- else
- echo "install: $src does not exist"
- exit 1
- fi
-
- if [ x"$dst" = x ]
- then
- echo "install: no destination specified"
- exit 1
- else
- true
- fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
- if [ -d $dst ]
- then
- dst="$dst"/`basename $src`
- else
- true
- fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-# this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
- pathcomp="${pathcomp}${1}"
- shift
-
- if [ ! -d "${pathcomp}" ] ;
- then
- $mkdirprog "${pathcomp}"
- else
- true
- fi
-
- pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
- $doit $instcmd $dst &&
-
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
- if [ x"$transformarg" = x ]
- then
- dstfile=`basename $dst`
- else
- dstfile=`basename $dst $transformbasename |
- sed $transformarg`$transformbasename
- fi
-
-# don't allow the sed command to completely eliminate the filename
-
- if [ x"$dstfile" = x ]
- then
- dstfile=`basename $dst`
- else
- true
- fi
-
-# Make a temp file name in the proper directory.
-
- dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
- $doit $instcmd $src $dsttmp &&
-
- trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing. If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
- $doit $rmcmd -f $dstdir/$dstfile &&
- $doit $mvcmd $dsttmp $dstdir/$dstfile
-
-fi &&
-
-
-exit 0
diff --git a/glabels2/macros/Makefile.am b/glabels2/macros/Makefile.am
new file mode 100644
index 0000000..f9a0e2b
--- /dev/null
+++ b/glabels2/macros/Makefile.am
@@ -0,0 +1,43 @@
+## Please update this variable if any new macros are created
+
+MACROS= \
+ aclocal-include.m4 \
+ compiler-flags.m4 \
+ curses.m4 \
+ gnome-bonobo-check.m4 \
+ gnome-fileutils.m4 \
+ gnome-ghttp-check.m4 \
+ gnome-gnorba-check.m4 \
+ gnome-guile-checks.m4 \
+ gnome-libgtop-check.m4 \
+ gnome-objc-checks.m4 \
+ gnome-orbit-check.m4 \
+ gnome-pilot.m4 \
+ gnome-print-check.m4 \
+ gnome-pthread-check.m4 \
+ gnome-support.m4 \
+ gnome-undelfs.m4 \
+ gnome-vfs.m4 \
+ gnome-x-checks.m4 \
+ gnome-xml-check.m4 \
+ gnome.m4 \
+ gperf-check.m4 \
+ linger.m4 \
+ need-declaration.m4
+
+EXTRA_DIST=$(MACROS) gnome-common.m4 gnome-gettext.m4 autogen.sh
+MAINTAINERCLEANFILES=macros.dep
+
+@MAINT@macros.dep: Makefile.am
+@MAINT@ @echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=macros/%)' > $@
+
+if INSIDE_GNOME_COMMON
+gnome_aclocaldir = $(datadir)/aclocal/gnome-macros
+
+gnome-macros.dep: Makefile.am
+ @echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=$(gnome_aclocaldir)/%)' > $@
+
+gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 \
+ gnome-gettext.m4 autogen.sh
+
+endif
diff --git a/glabels2/macros/aclocal-include.m4 b/glabels2/macros/aclocal-include.m4
new file mode 100644
index 0000000..43f9dbc
--- /dev/null
+++ b/glabels2/macros/aclocal-include.m4
@@ -0,0 +1,16 @@
+# aclocal-include.m4
+#
+# This macro adds the name macrodir to the set of directories
+# that `aclocal' searches for macros.
+
+# serial 1
+
+dnl AM_ACLOCAL_INCLUDE(macrodir)
+AC_DEFUN([AM_ACLOCAL_INCLUDE],
+[
+ AM_CONDITIONAL(INSIDE_GNOME_COMMON, false)
+
+ test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
+ for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done
+])
diff --git a/glabels2/macros/autogen.sh b/glabels2/macros/autogen.sh
new file mode 100644
index 0000000..71f7dfc
--- /dev/null
+++ b/glabels2/macros/autogen.sh
@@ -0,0 +1,207 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+DIE=0
+
+if [ -n "$GNOME2_PATH" ]; then
+ ACLOCAL_FLAGS="-I $GNOME2_PATH/share/aclocal $ACLOCAL_FLAGS"
+ PATH="$GNOME2_PATH/bin:$PATH"
+ export PATH
+fi
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`autoconf' installed to compile $PKG_NAME."
+ echo "Download the appropriate package for your distribution,"
+ echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+ DIE=1
+}
+
+(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
+ (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
+ echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
+ echo "(or a newer version if it is available)"
+ DIE=1
+ }
+}
+
+(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && {
+ (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`xml-i18n-toolize' installed to compile $PKG_NAME."
+ echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/xml-i18n-tools/xml-i18n-tools-0.9.tar.gz"
+ echo "(or a newer version of xml-i18n-tools or intltool if it is available)"
+ DIE=1
+ }
+}
+
+(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+ (libtool --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`libtool' installed to compile $PKG_NAME."
+ echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
+ echo "(or a newer version if it is available)"
+ DIE=1
+ }
+}
+
+#grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
+# grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
+# (gettext --version) < /dev/null > /dev/null 2>&1 || {
+# echo
+# echo "**Error**: You must have \`gettext' installed to compile $PKG_NAME."
+# echo "Get ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.10.39.tar.gz"
+# echo "(or a newer version if it is available)"
+# DIE=1
+# }
+#}
+
+#grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && {
+# grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
+# (gettext --version) < /dev/null > /dev/null 2>&1 || {
+# echo
+# echo "**Error**: You must have \`gettext' installed to compile $PKG_NAME."
+# echo "Get ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.10.39.tar.gz"
+# echo "(or a newer version if it is available)"
+# DIE=1
+# }
+#}
+
+(automake --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`automake' installed to compile $PKG_NAME."
+ echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+ echo "(or a newer version if it is available)"
+ DIE=1
+ NO_AUTOMAKE=yes
+}
+
+
+# if no automake, don't bother testing for aclocal
+test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: Missing \`aclocal'. The version of \`automake'"
+ echo "installed doesn't appear recent enough."
+ echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+ echo "(or a newer version if it is available)"
+ DIE=1
+}
+
+if test "$DIE" -eq 1; then
+ exit 1
+fi
+
+if test -z "$*"; then
+ echo "**Warning**: I am going to run \`configure' with no arguments."
+ echo "If you wish to pass any to it, please specify them on the"
+ echo \`$0\'" command line."
+ echo
+fi
+
+case $CC in
+xlc )
+ am_opt=--include-deps;;
+esac
+
+for coin in `find $srcdir -name configure.in -print`
+do
+ dr=`dirname $coin`
+ if test -f $dr/NO-AUTO-GEN; then
+ echo skipping $dr -- flagged as no auto-gen
+ else
+ echo processing $dr
+ macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin`
+ ( cd $dr
+ macrosdir=`find . -name macros -print`
+ for i in $macrodirs; do
+ if test -f $i/gnome-gettext.m4; then
+ DELETEFILES="$DELETEFILES $i/gnome-gettext.m4"
+ fi
+ done
+
+ echo "deletefiles is $DELETEFILES"
+ aclocalinclude="$ACLOCAL_FLAGS"
+ for k in $aclocalinclude; do
+ if test -d $k; then
+ if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1" ]; then
+ rm -f $DELETEFILES
+ fi
+ fi
+ done
+ for k in $macrodirs; do
+ if test -d $k; then
+ aclocalinclude="$aclocalinclude -I $k"
+ if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1" ]; then
+ rm -f $DELETEFILES
+ fi
+ fi
+ done
+ if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then
+ if grep "sed.*POTFILES" configure.in >/dev/null; then
+ : do nothing -- we still have an old unmodified configure.in
+ else
+ echo "Creating $dr/aclocal.m4 ..."
+ test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
+ echo "Running gettextize... Ignore non-fatal messages."
+ echo "no" | gettextize --force --copy
+ echo "Making $dr/aclocal.m4 writable ..."
+ test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
+ fi
+ fi
+ if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then
+ echo "Creating $dr/aclocal.m4 ..."
+ test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
+ echo "Running gettextize... Ignore non-fatal messages."
+ echo "no" | gettextize --force --copy
+ echo "Making $dr/aclocal.m4 writable ..."
+ test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
+ fi
+ if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
+ echo "Running intltoolize..."
+ intltoolize --copy --force --automake
+ fi
+ if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
+ echo "Running xml-i18n-toolize..."
+ xml-i18n-toolize --copy --force --automake
+ fi
+ if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+ if test -z "$NO_LIBTOOLIZE" ; then
+ echo "Running libtoolize..."
+ libtoolize --force --copy
+ fi
+ fi
+ echo "Running aclocal $aclocalinclude ..."
+ aclocal $aclocalinclude || {
+ echo
+ echo "**Error**: aclocal failed. This may mean that you have not"
+ echo "installed all of the packages you need, or you may need to"
+ echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\""
+ echo "for the prefix where you installed the packages whose"
+ echo "macros were not found"
+ exit 1
+ }
+
+ if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+ echo "Running autoheader..."
+ autoheader || { echo "**Error**: autoheader failed."; exit 1; }
+ fi
+ echo "Running automake --gnu $am_opt ..."
+ automake --add-missing --gnu $am_opt ||
+ { echo "**Error**: automake failed."; exit 1; }
+ echo "Running autoconf ..."
+ autoconf || { echo "**Error**: autoconf failed."; exit 1; }
+ ) || exit 1
+ fi
+done
+
+conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
+
+if test x$NOCONFIGURE = x; then
+ echo Running $srcdir/configure $conf_flags "$@" ...
+ $srcdir/configure $conf_flags "$@" \
+ && echo Now type \`make\' to compile $PKG_NAME || exit 1
+else
+ echo Skipping configure process.
+fi
diff --git a/glabels2/macros/compiler-flags.m4 b/glabels2/macros/compiler-flags.m4
new file mode 100644
index 0000000..63f8e2e
--- /dev/null
+++ b/glabels2/macros/compiler-flags.m4
@@ -0,0 +1,109 @@
+dnl GNOME_COMPILE_WARNINGS
+dnl Turn on many useful compiler warnings
+dnl For now, only works on GCC
+AC_DEFUN([GNOME_COMPILE_WARNINGS],[
+ AC_ARG_ENABLE(compile-warnings,
+ [ --enable-compile-warnings=[no/minimum/yes] Turn on compiler warnings.],,enable_compile_warnings=minimum)
+
+ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+ warnCFLAGS=
+ if test "x$GCC" != xyes; then
+ enable_compile_warnings=no
+ fi
+
+ if test "x$enable_compile_warnings" != "xno"; then
+ if test "x$GCC" = "xyes"; then
+ case " $CFLAGS " in
+ *[\ \ ]-Wall[\ \ ]*) ;;
+ *) warnCFLAGS="-Wall -Wunused" ;;
+ esac
+
+ ## -W is not all that useful. And it cannot be controlled
+ ## with individual -Wno-xxx flags, unlike -Wall
+ if test "x$enable_compile_warnings" = "xyes"; then
+ warnCFLAGS="$warnCFLAGS -Wmissing-prototypes -Wmissing-declarations"
+ fi
+ fi
+ fi
+ AC_MSG_RESULT($warnCFLAGS)
+
+ AC_ARG_ENABLE(iso-c,
+ [ --enable-iso-c Try to warn if code is not ISO C ],,
+ enable_iso_c=no)
+
+ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
+ complCFLAGS=
+ if test "x$enable_iso_c" != "xno"; then
+ if test "x$GCC" = "xyes"; then
+ case " $CFLAGS " in
+ *[\ \ ]-ansi[\ \ ]*) ;;
+ *) complCFLAGS="$complCFLAGS -ansi" ;;
+ esac
+
+ case " $CFLAGS " in
+ *[\ \ ]-pedantic[\ \ ]*) ;;
+ *) complCFLAGS="$complCFLAGS -pedantic" ;;
+ esac
+ fi
+ fi
+ AC_MSG_RESULT($complCFLAGS)
+ if test "x$cflags_set" != "xyes"; then
+ CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS"
+ cflags_set=yes
+ AC_SUBST(cflags_set)
+ fi
+])
+
+dnl For C++, do basically the same thing.
+
+AC_DEFUN([GNOME_CXX_WARNINGS],[
+ AC_ARG_ENABLE(cxx-warnings,
+ [ --enable-cxx-warnings=[no/minimum/yes] Turn on compiler warnings.],,enable_cxx_warnings=minimum)
+
+ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
+ warnCXXFLAGS=
+ if test "x$GCC" != xyes; then
+ enable_compile_warnings=no
+ fi
+ if test "x$enable_cxx_warnings" != "xno"; then
+ if test "x$GCC" = "xyes"; then
+ case " $CXXFLAGS " in
+ *[\ \ ]-Wall[\ \ ]*) ;;
+ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
+ esac
+
+ ## -W is not all that useful. And it cannot be controlled
+ ## with individual -Wno-xxx flags, unlike -Wall
+ if test "x$enable_cxx_warnings" = "xyes"; then
+ warnCXXFLAGS="$warnCXXFLAGS -Wmissing-prototypes -Wmissing-declarations -Wshadow -Woverloaded-virtual"
+ fi
+ fi
+ fi
+ AC_MSG_RESULT($warnCXXFLAGS)
+
+ AC_ARG_ENABLE(iso-cxx,
+ [ --enable-iso-cxx Try to warn if code is not ISO C++ ],,
+ enable_iso_cxx=no)
+
+ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
+ complCXXFLAGS=
+ if test "x$enable_iso_cxx" != "xno"; then
+ if test "x$GCC" = "xyes"; then
+ case " $CXXFLAGS " in
+ *[\ \ ]-ansi[\ \ ]*) ;;
+ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
+ esac
+
+ case " $CXXFLAGS " in
+ *[\ \ ]-pedantic[\ \ ]*) ;;
+ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
+ esac
+ fi
+ fi
+ AC_MSG_RESULT($complCXXFLAGS)
+ if test "x$cxxflags_set" != "xyes"; then
+ CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+ cxxflags_set=yes
+ AC_SUBST(cxxflags_set)
+ fi
+])
diff --git a/glabels2/macros/curses.m4 b/glabels2/macros/curses.m4
new file mode 100644
index 0000000..5307e13
--- /dev/null
+++ b/glabels2/macros/curses.m4
@@ -0,0 +1,318 @@
+dnl Curses detection: Munged from Midnight Commander's configure.in
+dnl
+dnl What it does:
+dnl =============
+dnl
+dnl - Determine which version of curses is installed on your system
+dnl and set the -I/-L/-l compiler entries and add a few preprocessor
+dnl symbols
+dnl - Do an AC_SUBST on the CURSES_INCLUDEDIR and CURSES_LIBS so that
+dnl @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in
+dnl Makefile.in's
+dnl - Modify the following configure variables (these are the only
+dnl curses.m4 variables you can access from within configure.in)
+dnl CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if
+dnl an ncurses.h that's been renamed to curses.h
+dnl is found.
+dnl CURSES_LIBS - sets -L and -l's appropriately
+dnl CFLAGS - if --with-sco, add -D_SVID3
+dnl has_curses - exports result of tests to rest of configure
+dnl
+dnl Usage:
+dnl ======
+dnl 1) Add lines indicated below to acconfig.h
+dnl 2) call AC_CHECK_CURSES after AC_PROG_CC in your configure.in
+dnl 3) Instead of #include <curses.h> you should use the following to
+dnl properly locate ncurses or curses header file
+dnl
+dnl #if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
+dnl #include <ncurses.h>
+dnl #else
+dnl #include <curses.h>
+dnl #endif
+dnl
+dnl 4) Make sure to add @CURSES_INCLUDEDIR@ to your preprocessor flags
+dnl 5) Make sure to add @CURSES_LIBS@ to your linker flags or LIBS
+dnl
+dnl Notes with automake:
+dnl - call AM_CONDITIONAL(HAS_CURSES, test "$has_curses" = true) from
+dnl configure.in
+dnl - your Makefile.am can look something like this
+dnl -----------------------------------------------
+dnl INCLUDES= blah blah blah $(CURSES_INCLUDEDIR)
+dnl if HAS_CURSES
+dnl CURSES_TARGETS=name_of_curses_prog
+dnl endif
+dnl bin_PROGRAMS = other_programs $(CURSES_TARGETS)
+dnl other_programs_SOURCES = blah blah blah
+dnl name_of_curses_prog_SOURCES = blah blah blah
+dnl other_programs_LDADD = blah
+dnl name_of_curses_prog_LDADD = blah $(CURSES_LIBS)
+dnl -----------------------------------------------
+dnl
+dnl
+dnl The following lines should be added to acconfig.h:
+dnl ==================================================
+dnl
+dnl /*=== Curses version detection defines ===*/
+dnl /* Found some version of curses that we're going to use */
+dnl #undef HAS_CURSES
+dnl
+dnl /* Use SunOS SysV curses? */
+dnl #undef USE_SUNOS_CURSES
+dnl
+dnl /* Use old BSD curses - not used right now */
+dnl #undef USE_BSD_CURSES
+dnl
+dnl /* Use SystemV curses? */
+dnl #undef USE_SYSV_CURSES
+dnl
+dnl /* Use Ncurses? */
+dnl #undef USE_NCURSES
+dnl
+dnl /* If you Curses does not have color define this one */
+dnl #undef NO_COLOR_CURSES
+dnl
+dnl /* Define if you want to turn on SCO-specific code */
+dnl #undef SCO_FLAVOR
+dnl
+dnl /* Set to reflect version of ncurses *
+dnl * 0 = version 1.*
+dnl * 1 = version 1.9.9g
+dnl * 2 = version 4.0/4.1 */
+dnl #undef NCURSES_970530
+dnl
+dnl /*=== End new stuff for acconfig.h ===*/
+dnl
+
+
+AC_DEFUN([AC_CHECK_CURSES],[
+ search_ncurses=true
+ screen_manager=""
+ has_curses=false
+
+ CFLAGS=${CFLAGS--O}
+
+ AC_SUBST(CURSES_LIBS)
+ AC_SUBST(CURSES_INCLUDEDIR)
+
+ AC_ARG_WITH(sco,
+ [ --with-sco Use this to turn on SCO-specific code],[
+ if test x$withval = xyes; then
+ AC_DEFINE(SCO_FLAVOR)
+ CFLAGS="$CFLAGS -D_SVID3"
+ fi
+ ])
+
+ AC_ARG_WITH(sunos-curses,
+ [ --with-sunos-curses Used to force SunOS 4.x curses],[
+ if test x$withval = xyes; then
+ AC_USE_SUNOS_CURSES
+ fi
+ ])
+
+ AC_ARG_WITH(osf1-curses,
+ [ --with-osf1-curses Used to force OSF/1 curses],[
+ if test x$withval = xyes; then
+ AC_USE_OSF1_CURSES
+ fi
+ ])
+
+ AC_ARG_WITH(vcurses,
+ [ --with-vcurses[=incdir] Used to force SysV curses],
+ if test x$withval != xyes; then
+ CURSES_INCLUDEDIR="-I$withval"
+ fi
+ AC_USE_SYSV_CURSES
+ )
+
+ AC_ARG_WITH(ncurses,
+ [ --with-ncurses[=dir] Compile with ncurses/locate base dir],
+ if test x$withval = xno ; then
+ search_ncurses=false
+ elif test x$withval != xyes ; then
+ CURSES_LIBS="$LIBS -L$withval/lib -lncurses"
+ CURSES_INCLUDEDIR="-I$withval/include"
+ search_ncurses=false
+ screen_manager="ncurses"
+ AC_DEFINE(USE_NCURSES)
+ AC_DEFINE(HAS_CURSES)
+ has_curses=true
+ fi
+ )
+
+ if $search_ncurses
+ then
+ AC_SEARCH_NCURSES()
+ fi
+
+
+])
+
+
+AC_DEFUN([AC_USE_SUNOS_CURSES], [
+ search_ncurses=false
+ screen_manager="SunOS 4.x /usr/5include curses"
+ AC_MSG_RESULT(Using SunOS 4.x /usr/5include curses)
+ AC_DEFINE(USE_SUNOS_CURSES)
+ AC_DEFINE(HAS_CURSES)
+ has_curses=true
+ AC_DEFINE(NO_COLOR_CURSES)
+ AC_DEFINE(USE_SYSV_CURSES)
+ CURSES_INCLUDEDIR="-I/usr/5include"
+ CURSES_LIBS="/usr/5lib/libcurses.a /usr/5lib/libtermcap.a"
+ AC_MSG_RESULT(Please note that some screen refreshs may fail)
+])
+
+AC_DEFUN([AC_USE_OSF1_CURSES], [
+ AC_MSG_RESULT(Using OSF1 curses)
+ search_ncurses=false
+ screen_manager="OSF1 curses"
+ AC_DEFINE(HAS_CURSES)
+ has_curses=true
+ AC_DEFINE(NO_COLOR_CURSES)
+ AC_DEFINE(USE_SYSV_CURSES)
+ CURSES_LIBS="-lcurses"
+])
+
+AC_DEFUN([AC_USE_SYSV_CURSES], [
+ AC_MSG_RESULT(Using SysV curses)
+ AC_DEFINE(HAS_CURSES)
+ has_curses=true
+ AC_DEFINE(USE_SYSV_CURSES)
+ search_ncurses=false
+ screen_manager="SysV/curses"
+ CURSES_LIBS="-lcurses"
+])
+
+dnl AC_ARG_WITH(bsd-curses,
+dnl [--with-bsd-curses Used to compile with bsd curses, not very fancy],
+dnl search_ncurses=false
+dnl screen_manager="Ultrix/cursesX"
+dnl if test $system = ULTRIX
+dnl then
+dnl THIS_CURSES=cursesX
+dnl else
+dnl THIS_CURSES=curses
+dnl fi
+dnl
+dnl CURSES_LIBS="-l$THIS_CURSES -ltermcap"
+dnl AC_DEFINE(HAS_CURSES)
+dnl has_curses=true
+dnl AC_DEFINE(USE_BSD_CURSES)
+dnl AC_MSG_RESULT(Please note that some screen refreshs may fail)
+dnl AC_MSG_WARN(Use of the bsdcurses extension has some)
+dnl AC_MSG_WARN(display/input problems.)
+dnl AC_MSG_WARN(Reconsider using xcurses)
+dnl)
+
+
+dnl
+dnl Parameters: directory filename cureses_LIBS curses_INCLUDEDIR nicename
+dnl
+AC_DEFUN([AC_NCURSES], [
+ if $search_ncurses
+ then
+ if test -f $1/$2
+ then
+ AC_MSG_RESULT(Found ncurses on $1/$2)
+ CURSES_LIBS="$3"
+ CURSES_INCLUDEDIR="$4"
+ search_ncurses=false
+ screen_manager=$5
+ AC_DEFINE(HAS_CURSES)
+ has_curses=true
+ AC_DEFINE(USE_NCURSES)
+ fi
+ fi
+])
+
+AC_DEFUN([AC_SEARCH_NCURSES], [
+ AC_CHECKING("location of ncurses.h file")
+
+ AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include")
+ AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
+ AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include, "ncurses on /usr/local")
+ AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses -lncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
+
+ AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
+
+ AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
+
+ dnl
+ dnl We couldn't find ncurses, try SysV curses
+ dnl
+ if $search_ncurses
+ then
+ AC_EGREP_HEADER(init_color, /usr/include/curses.h,
+ AC_USE_SYSV_CURSES)
+ AC_EGREP_CPP(USE_NCURSES,[
+#include <curses.h>
+#ifdef __NCURSES_H
+#undef USE_NCURSES
+USE_NCURSES
+#endif
+],[
+ CURSES_INCLUDEDIR="$CURSES_INCLUDEDIR -DRENAMED_NCURSES"
+ AC_DEFINE(HAS_CURSES)
+ has_curses=true
+ AC_DEFINE(USE_NCURSES)
+ search_ncurses=false
+ screen_manager="ncurses installed as curses"
+])
+ fi
+
+ dnl
+ dnl Try SunOS 4.x /usr/5{lib,include} ncurses
+ dnl The flags USE_SUNOS_CURSES, USE_BSD_CURSES and BUGGY_CURSES
+ dnl should be replaced by a more fine grained selection routine
+ dnl
+ if $search_ncurses
+ then
+ if test -f /usr/5include/curses.h
+ then
+ AC_USE_SUNOS_CURSES
+ fi
+ else
+ # check for ncurses version, to properly ifdef mouse-fix
+ AC_MSG_CHECKING(for ncurses version)
+ ncurses_version=unknown
+cat > conftest.$ac_ext <<EOF
+[#]line __oline__ "configure"
+#include "confdefs.h"
+#ifdef RENAMED_NCURSES
+#include <curses.h>
+#else
+#include <ncurses.h>
+#endif
+#undef VERSION
+VERSION:NCURSES_VERSION
+EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC |
+ egrep "VERSION:" >conftest.out 2>&1; then
+changequote(,)dnl
+ ncurses_version=`cat conftest.out|sed -e 's/^[^"]*"//' -e 's/".*//'`
+changequote([,])dnl
+ fi
+ rm -rf conftest*
+ AC_MSG_RESULT($ncurses_version)
+ case "$ncurses_version" in
+changequote(,)dnl
+ 4.[01])
+changequote([,])dnl
+ AC_DEFINE(NCURSES_970530,2)
+ ;;
+ 1.9.9g)
+ AC_DEFINE(NCURSES_970530,1)
+ ;;
+ 1*)
+ AC_DEFINE(NCURSES_970530,0)
+ ;;
+ esac
+ fi
+])
+
+
+
+
+
diff --git a/glabels2/macros/gnome-bonobo-check.m4 b/glabels2/macros/gnome-bonobo-check.m4
new file mode 100644
index 0000000..daa109c
--- /dev/null
+++ b/glabels2/macros/gnome-bonobo-check.m4
@@ -0,0 +1,166 @@
+# Configure paths for Bonobo
+# Miguel de Icaza, 99-04-12
+# Stolen from Chris Lahey 99-2-5
+# stolen from Manish Singh again
+# stolen back from Frank Belew
+# stolen from Manish Singh
+# Shamelessly stolen from Owen Taylor
+
+dnl AM_PATH_BONOBO ([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for Bonobo, and define BONOBO_CFLAGS and BONOBO_LIBS
+dnl
+AC_DEFUN([AM_PATH_BONOBO],
+[
+dnl
+dnl Get the cflags and libraries from the gnome-config script
+dnl
+AC_ARG_WITH(bonobo-prefix,[ --with-bonobo-prefix=PFX Prefix where Bonobo is installed (optional)],
+ bonobo_prefix="$withval", bonobo_prefix="")
+AC_ARG_WITH(bonobo-exec-prefix,[ --with-bonobo-exec-prefix=PFX Exec prefix where Bonobo is installed (optional)],
+ bonobo_exec_prefix="$withval", bonobo_exec_prefix="")
+AC_ARG_ENABLE(bonobotest, [ --disable-bonobotest Do not try to compile and run a test Bonobo program],
+ , enable_bonobotest=yes)
+
+ if test x$bonobo_exec_prefix != x ; then
+ bonobo_args="$bonobo_args --exec-prefix=$bonobo_exec_prefix"
+ if test x${GNOME_CONFIG+set} != xset ; then
+ GNOME_CONFIG=$bonobo_exec_prefix/bin/gnome-config
+ fi
+ fi
+ if test x$bonobo_prefix != x ; then
+ bonobo_args="$bonobo_args --prefix=$bonobo_prefix"
+ if test x${GNOME_CONFIG+set} != xset ; then
+ GNOME_CONFIG=$bonobo_prefix/bin/gnome-config
+ fi
+ fi
+
+ AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
+ min_bonobo_version=ifelse([$1], ,0.1.0,$1)
+ AC_MSG_CHECKING(for BONOBO - version >= $min_bonobo_version)
+ no_bonobo=""
+ if test "$GNOME_CONFIG" = "no" ; then
+ no_bonobo=yes
+ else
+ BONOBO_CFLAGS=`$GNOME_CONFIG $bonoboconf_args --cflags bonobo bonobox`
+ BONOBO_LIBS=`$GNOME_CONFIG $bonoboconf_args --libs bonobo bonobox`
+
+ bonobo_major_version=`$GNOME_CONFIG $bonobo_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ bonobo_minor_version=`$GNOME_CONFIG $bonobo_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ bonobo_micro_version=`$GNOME_CONFIG $bonobo_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ if test "x$enable_bonobotest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $BONOBO_CFLAGS"
+ LIBS="$LIBS $BONOBO_LIBS"
+dnl
+dnl Now check if the installed BONOBO is sufficiently new. (Also sanity
+dnl checks the results of gnome-config to some extent
+dnl
+ rm -f conf.bonobotest
+ AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <bonobo.h>
+
+static char*
+my_strdup (char *str)
+{
+ char *new_str;
+
+ if (str)
+ {
+ new_str = malloc ((strlen (str) + 1) * sizeof(char));
+ strcpy (new_str, str);
+ }
+ else
+ new_str = NULL;
+
+ return new_str;
+}
+
+int main ()
+{
+ int major, minor, micro;
+ char *tmp_version;
+
+ system ("touch conf.bonobotest");
+ bonobo_object_get_type ();
+ return 0;
+}
+
+],, no_bonobo=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ if test "x$no_bonobo" = x ; then
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
+ else
+ AC_MSG_RESULT(no)
+ if test "$GNOME_CONFIG" = "no" ; then
+ echo "*** The gnome-config script installed by GNOME-LIBS could not be found"
+ echo "*** If BONOBO was installed in PREFIX, make sure PREFIX/bin is in"
+ echo "*** your path, or set the GNOME_CONFIG environment variable to the"
+ echo "*** full path to gnome-config."
+ else
+ if test -f conf.bonobotest ; then
+ :
+ else
+ echo "*** Could not run BONOBO test program, checking why..."
+ CFLAGS="$CFLAGS $BONOBO_CFLAGS"
+ LIBS="$LIBS $BONOBO_LIBS"
+ AC_TRY_LINK([
+#include <stdio.h>
+#include <bonobo/gnome-object.h>
+], [ return 0; ],
+ [ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding BONOBO or finding the wrong"
+ echo "*** version of BONOBO. If it is not finding BONOBO, you'll need to set your"
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
+ echo "*** is required on your system"
+ echo "***"
+ echo "*** If you have an old version installed, it is best to remove it, although"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** exact error that occured. This usually means BONOBO was incorrectly installed"
+ echo "*** or that you have moved BONOBO since it was installed. In the latter case, you"
+ echo "*** may want to edit the gnome-config script: $GNOME_CONFIG" ])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ BONOBO_CFLAGS=""
+ BONOBO_LIBS=""
+ ifelse([$3], , :, [$3])
+ fi
+ AC_SUBST(BONOBO_CFLAGS)
+ AC_SUBST(BONOBO_LIBS)
+ rm -f conf.bonobotest
+])
+
+AC_DEFUN([BONOBO_CHECK], [
+ AM_PATH_BONOBO(0.1.0,,[AC_MSG_ERROR(BONOBO not found)])
+])
+
+AC_DEFUN([AM_BONOBO_USES_OAF],
+[
+ AC_REQUIRE([AM_PATH_BONOBO])
+
+ AC_MSG_CHECKING(if Bonobo uses OAF)
+ if ( gnome-config --libs bonobo | grep oaf ) > /dev/null 2>&1 ; then
+ using_oaf="yes"
+ AC_DEFINE(BONOBO_USES_OAF)
+ else
+ using_oaf="no"
+ fi
+
+ AC_MSG_RESULT("$using_oaf")
+
+ AM_CONDITIONAL(BONOBO_USES_OAF, test x"using_oaf" = "xyes")
+])
diff --git a/glabels2/macros/gnome-common.m4 b/glabels2/macros/gnome-common.m4
new file mode 100644
index 0000000..83bb00d
--- /dev/null
+++ b/glabels2/macros/gnome-common.m4
@@ -0,0 +1,14 @@
+# gnome-common.m4
+#
+# This only for packages that are not in the GNOME CVS tree.
+
+dnl GNOME_COMMON_INIT
+
+AC_DEFUN([GNOME_COMMON_INIT],
+[
+ GNOME_ACLOCAL_DIR="$GNOME_COMMON_MACROS_DIR"
+ AC_SUBST(GNOME_ACLOCAL_DIR)
+
+ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+])
+
diff --git a/glabels2/macros/gnome-cxx-check.m4 b/glabels2/macros/gnome-cxx-check.m4
new file mode 100644
index 0000000..3c54d62
--- /dev/null
+++ b/glabels2/macros/gnome-cxx-check.m4
@@ -0,0 +1,10 @@
+dnl GNOME_CHECK_CXX(not_found_string)
+AC_DEFUN([GNOME_CHECK_CXX],
+[
+ # see if a C++ compiler exists and works
+ AC_REQUIRE([AC_PROG_CXX])dnl
+ if test "x$ac_cv_prog_cxx_works" = xno; then
+ AC_MSG_WARN(ifelse([$1], , "No C++ compiler", [$1]))
+ fi
+ AM_CONDITIONAL(CXX_PRESENT, test "x$ac_cv_prog_cxx_works" != xno)
+])
diff --git a/glabels2/macros/gnome-fileutils.m4 b/glabels2/macros/gnome-fileutils.m4
new file mode 100644
index 0000000..a8456f2
--- /dev/null
+++ b/glabels2/macros/gnome-fileutils.m4
@@ -0,0 +1,414 @@
+dnl
+dnl GNOME_FILEUTILS_CHECKS
+dnl
+dnl checks that are needed for the diskusage applet.
+dnl
+
+AC_DEFUN([GNOME_FILEUTILS_CHECKS],
+[
+AC_CHECK_HEADERS(fcntl.h sys/param.h sys/statfs.h sys/fstyp.h \
+mnttab.h mntent.h sys/statvfs.h sys/vfs.h sys/mount.h \
+sys/filsys.h sys/fs_types.h sys/fs/s5param.h)
+
+AC_CHECK_FUNCS(bcopy endgrent endpwent fchdir ftime ftruncate \
+getcwd getmntinfo gettimeofday isascii lchown \
+listmntent memcpy mkfifo strchr strerror strrchr vprintf)
+
+dnl Set some defaults when cross-compiling
+
+if test x$cross_compiling = xyes ; then
+ case "$host_os" in
+ linux*)
+ fu_cv_sys_mounted_getmntent1=yes
+ fu_cv_sys_stat_statfs2_bsize=yes
+ ;;
+ sunos*)
+ fu_cv_sys_stat_statfs4=yes
+ ;;
+ freebsd*)
+ fu_cv_sys_stat_statfs2_bsize=yes
+ ;;
+ osf*)
+ fu_cv_sys_stat_statfs3_osf1=yes
+ ;;
+ esac
+fi
+
+# Determine how to get the list of mounted filesystems.
+list_mounted_fs=
+
+# If the getmntent function is available but not in the standard library,
+# make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX).
+AC_FUNC_GETMNTENT
+
+# This test must precede the ones for getmntent because Unicos-9 is
+# reported to have the getmntent function, but its support is incompatible
+# with other getmntent implementations.
+
+# NOTE: Normally, I wouldn't use a check for system type as I've done for
+# `CRAY' below since that goes against the whole autoconf philosophy. But
+# I think there is too great a chance that some non-Cray system has a
+# function named listmntent to risk the false positive.
+
+if test -z "$list_mounted_fs"; then
+# Cray UNICOS 9
+AC_MSG_CHECKING([for listmntent of Cray/Unicos-9])
+AC_CACHE_VAL(fu_cv_sys_mounted_cray_listmntent,
+[fu_cv_sys_mounted_cray_listmntent=no
+AC_EGREP_CPP(yes,
+[#ifdef _CRAY
+yes
+#endif
+], [test $ac_cv_func_listmntent = yes \
+&& fu_cv_sys_mounted_cray_listmntent=yes]
+)
+]
+)
+AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent)
+if test $fu_cv_sys_mounted_cray_listmntent = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_LISTMNTENT)
+fi
+fi
+
+if test $ac_cv_func_getmntent = yes; then
+
+# This system has the getmntent function.
+# Determine whether it's the one-argument variant or the two-argument one.
+
+if test -z "$list_mounted_fs"; then
+# 4.3BSD, SunOS, HP-UX, Dynix, Irix
+AC_MSG_CHECKING([for one-argument getmntent function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1,
+[test $ac_cv_header_mntent_h = yes \
+&& fu_cv_sys_mounted_getmntent1=yes \
+|| fu_cv_sys_mounted_getmntent1=no])
+AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1)
+if test $fu_cv_sys_mounted_getmntent1 = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_GETMNTENT1)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+# SVR4
+AC_MSG_CHECKING([for two-argument getmntent function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2,
+[AC_EGREP_HEADER(getmntent, sys/mnttab.h,
+fu_cv_sys_mounted_getmntent2=yes,
+fu_cv_sys_mounted_getmntent2=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2)
+if test $fu_cv_sys_mounted_getmntent2 = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_GETMNTENT2)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
+fi
+
+fi
+
+if test -z "$list_mounted_fs"; then
+# DEC Alpha running OSF/1.
+AC_MSG_CHECKING([for getfsstat function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getsstat,
+[AC_TRY_LINK([
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fs_types.h>],
+[struct statfs *stats;
+int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ],
+fu_cv_sys_mounted_getsstat=yes,
+fu_cv_sys_mounted_getsstat=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_getsstat)
+if test $fu_cv_sys_mounted_getsstat = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_GETFSSTAT)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+# AIX.
+AC_MSG_CHECKING([for mntctl function and struct vmount])
+AC_CACHE_VAL(fu_cv_sys_mounted_vmount,
+[AC_TRY_CPP([#include <fshelp.h>],
+fu_cv_sys_mounted_vmount=yes,
+fu_cv_sys_mounted_vmount=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_vmount)
+if test $fu_cv_sys_mounted_vmount = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_VMOUNT)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+# SVR3
+AC_MSG_CHECKING([for FIXME existence of three headers])
+AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp,
+[AC_TRY_CPP([
+#include <sys/statfs.h>
+#include <sys/fstyp.h>
+#include <mnttab.h>],
+fu_cv_sys_mounted_fread_fstyp=yes,
+fu_cv_sys_mounted_fread_fstyp=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp)
+if test $fu_cv_sys_mounted_fread_fstyp = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_FREAD_FSTYP)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+# 4.4BSD and DEC OSF/1.
+AC_MSG_CHECKING([for getmntinfo function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo,
+[
+ok=
+if test $ac_cv_func_getmntinfo = yes; then
+AC_EGREP_HEADER(f_type;, sys/mount.h,
+ok=yes)
+fi
+test -n "$ok" \
+&& fu_cv_sys_mounted_getmntinfo=yes \
+|| fu_cv_sys_mounted_getmntinfo=no
+])
+AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo)
+if test $fu_cv_sys_mounted_getmntinfo = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_GETMNTINFO)
+fi
+fi
+
+# FIXME: add a test for netbsd-1.1 here
+
+if test -z "$list_mounted_fs"; then
+# Ultrix
+AC_MSG_CHECKING([for getmnt function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getmnt,
+[AC_TRY_CPP([
+#include <sys/fs_types.h>
+#include <sys/mount.h>],
+fu_cv_sys_mounted_getmnt=yes,
+fu_cv_sys_mounted_getmnt=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_getmnt)
+if test $fu_cv_sys_mounted_getmnt = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_GETMNT)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+# SVR2
+AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab])
+AC_CACHE_VAL(fu_cv_sys_mounted_fread,
+[AC_TRY_CPP([#include <mnttab.h>],
+fu_cv_sys_mounted_fread=yes,
+fu_cv_sys_mounted_fread=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_fread)
+if test $fu_cv_sys_mounted_fread = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_FREAD)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
+# FIXME -- no need to abort building the whole package
+# Cannot build mountlist.c or anything that needs its functions
+fi
+
+AC_CHECKING(how to get filesystem space usage)
+space=no
+
+# Perform only the link test since it seems there are no variants of the
+# statvfs function. This check is more than just AC_CHECK_FUNCS(statvfs)
+# because that got a false positive on SCO OSR5. Adding the declaration
+# of a `struct statvfs' causes this test to fail (as it should) on such
+# systems. That system is reported to work fine with STAT_STATFS4 which
+# is what it gets when this test fails.
+if test $space = no; then
+# SVR4
+AC_CACHE_CHECK([statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
+[AC_TRY_LINK([#include <sys/types.h>
+#include <sys/statvfs.h>],
+[struct statvfs fsd; statvfs (0, &fsd);],
+fu_cv_sys_stat_statvfs=yes,
+fu_cv_sys_stat_statvfs=no)])
+if test $fu_cv_sys_stat_statvfs = yes; then
+space=yes
+AC_DEFINE(STAT_STATVFS)
+fi
+fi
+
+if test $space = no; then
+# DEC Alpha running OSF/1
+AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
+AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1,
+[AC_TRY_RUN([
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+int main ()
+{
+struct statfs fsd;
+fsd.f_fsize = 0;
+return (statfs (".", &fsd, sizeof (struct statfs)));
+}],
+fu_cv_sys_stat_statfs3_osf1=yes,
+fu_cv_sys_stat_statfs3_osf1=no,
+fu_cv_sys_stat_statfs3_osf1=no)])
+AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
+if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
+space=yes
+AC_DEFINE(STAT_STATFS3_OSF1)
+fi
+fi
+
+if test $space = no; then
+# AIX
+AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl
+member (AIX, 4.3BSD)])
+AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize,
+[AC_TRY_RUN([
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_VFS_H
+#include <sys/vfs.h>
+#endif
+int main ()
+{
+struct statfs fsd;
+fsd.f_bsize = 0;
+return (statfs (".", &fsd));
+}],
+fu_cv_sys_stat_statfs2_bsize=yes,
+fu_cv_sys_stat_statfs2_bsize=no,
+fu_cv_sys_stat_statfs2_bsize=no)])
+AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
+if test $fu_cv_sys_stat_statfs2_bsize = yes; then
+space=yes
+AC_DEFINE(STAT_STATFS2_BSIZE)
+fi
+fi
+
+if test $space = no; then
+# SVR3
+AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)])
+AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
+[AC_TRY_RUN([#include <sys/types.h>
+#include <sys/statfs.h>
+int main ()
+{
+struct statfs fsd;
+return (statfs (".", &fsd, sizeof fsd, 0));
+}],
+fu_cv_sys_stat_statfs4=yes,
+fu_cv_sys_stat_statfs4=no,
+fu_cv_sys_stat_statfs4=no)])
+AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
+if test $fu_cv_sys_stat_statfs4 = yes; then
+space=yes
+AC_DEFINE(STAT_STATFS4)
+fi
+fi
+
+if test $space = no; then
+# 4.4BSD and NetBSD
+AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl
+member (4.4BSD and NetBSD)])
+AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize,
+[AC_TRY_RUN([#include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+int main ()
+{
+struct statfs fsd;
+fsd.f_fsize = 0;
+return (statfs (".", &fsd));
+}],
+fu_cv_sys_stat_statfs2_fsize=yes,
+fu_cv_sys_stat_statfs2_fsize=no,
+fu_cv_sys_stat_statfs2_fsize=no)])
+AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
+if test $fu_cv_sys_stat_statfs2_fsize = yes; then
+space=yes
+AC_DEFINE(STAT_STATFS2_FSIZE)
+fi
+fi
+
+if test $space = no; then
+# Ultrix
+AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)])
+AC_CACHE_VAL(fu_cv_sys_stat_fs_data,
+[AC_TRY_RUN([#include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_FS_TYPES_H
+#include <sys/fs_types.h>
+#endif
+int main ()
+{
+struct fs_data fsd;
+/* Ultrix's statfs returns 1 for success,
+0 for not mounted, -1 for failure. */
+return (statfs (".", &fsd) != 1);
+}],
+fu_cv_sys_stat_fs_data=yes,
+fu_cv_sys_stat_fs_data=no,
+fu_cv_sys_stat_fs_data=no)])
+AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
+if test $fu_cv_sys_stat_fs_data = yes; then
+space=yes
+AC_DEFINE(STAT_STATFS2_FS_DATA)
+fi
+fi
+
+if test $space = no; then
+# SVR2
+AC_TRY_CPP([#include <sys/filsys.h>],
+AC_DEFINE(STAT_READ_FILSYS) space=yes)
+fi
+
+if test -n "$list_mounted_fs" && test $space != no; then
+DF_PROG="df"
+# LIBOBJS="$LIBOBJS fsusage.o"
+# LIBOBJS="$LIBOBJS mountlist.o"
+fi
+
+# Check for SunOS statfs brokenness wrt partitions 2GB and larger.
+# If <sys/vfs.h> exists and struct statfs has a member named f_spare,
+# enable the work-around code in fsusage.c.
+AC_MSG_CHECKING([for statfs that truncates block counts])
+AC_CACHE_VAL(fu_cv_sys_truncating_statfs,
+[AC_TRY_COMPILE([
+#if !defined(sun) && !defined(__sun)
+choke -- this is a workaround for a Sun-specific problem
+#endif
+#include <sys/types.h>
+#include <sys/vfs.h>],
+[struct statfs t; long c = *(t.f_spare);],
+fu_cv_sys_truncating_statfs=yes,
+fu_cv_sys_truncating_statfs=no,
+)])
+if test $fu_cv_sys_truncating_statfs = yes; then
+AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS)
+fi
+AC_MSG_RESULT($fu_cv_sys_truncating_statfs)
+
+AC_CHECKING(for AFS)
+test -d /afs && AC_DEFINE(AFS)
+])
diff --git a/glabels2/macros/gnome-gettext.m4 b/glabels2/macros/gnome-gettext.m4
new file mode 100644
index 0000000..5b173b7
--- /dev/null
+++ b/glabels2/macros/gnome-gettext.m4
@@ -0,0 +1,338 @@
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# Modified to never use included libintl.
+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
+#
+#
+# This file can be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 5
+
+AC_DEFUN([AM_GNOME_WITH_NLS],
+ [AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+ AC_ARG_ENABLE(nls,
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+ AC_MSG_RESULT($USE_NLS)
+ AC_SUBST(USE_NLS)
+
+ BUILD_INCLUDED_LIBINTL=no
+ USE_INCLUDED_LIBINTL=no
+
+ dnl If we use NLS figure out what method
+ if test "$USE_NLS" = "yes"; then
+# AC_DEFINE(ENABLE_NLS)
+# AC_MSG_CHECKING([whether included gettext is requested])
+# AC_ARG_WITH(included-gettext,
+# [ --with-included-gettext use the GNU gettext library included here],
+# nls_cv_force_use_gnu_gettext=$withval,
+# nls_cv_force_use_gnu_gettext=no)
+# AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+ nls_cv_force_use_gnu_gettext="no"
+
+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+ dnl User does not insist on using GNU NLS library. Figure out what
+ dnl to use. If gettext or catgets are available (in this order) we
+ dnl use this. Else we have to fall back to GNU NLS library.
+ dnl catgets is only used if permitted by option --with-catgets.
+ nls_cv_header_intl=
+ nls_cv_header_libgt=
+ CATOBJEXT=NONE
+
+ AC_CHECK_HEADER(libintl.h,
+ [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
+ [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
+ gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
+
+ if test "$gt_cv_func_gettext_libc" != "yes"; then
+ AC_CHECK_LIB(intl, bindtextdomain,
+ [AC_CACHE_CHECK([for gettext in libintl],
+ gt_cv_func_gettext_libintl,
+ [AC_CHECK_LIB(intl, gettext,
+ gt_cv_func_gettext_libintl=yes,
+ gt_cv_func_gettext_libintl=no)],
+ gt_cv_func_gettext_libintl=no)])
+ fi
+
+ if test "$gt_cv_func_gettext_libc" = "yes" \
+ || test "$gt_cv_func_gettext_libintl" = "yes"; then
+ AC_DEFINE(HAVE_GETTEXT)
+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+ if test "$MSGFMT" != "no"; then
+ AC_CHECK_FUNCS(dcgettext)
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr],
+ [CATOBJEXT=.gmo
+ DATADIRNAME=share],
+ [CATOBJEXT=.mo
+ DATADIRNAME=lib])
+ INSTOBJEXT=.mo
+ fi
+ fi
+
+ # Added by Martin Baulig 12/15/98 for libc5 systems
+ if test "$gt_cv_func_gettext_libc" != "yes" \
+ && test "$gt_cv_func_gettext_libintl" = "yes"; then
+ INTLLIBS=-lintl
+ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ fi
+ ])
+
+ if test "$CATOBJEXT" = "NONE"; then
+ AC_MSG_CHECKING([whether catgets can be used])
+ AC_ARG_WITH(catgets,
+ [ --with-catgets use catgets functions if available],
+ nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
+ AC_MSG_RESULT($nls_cv_use_catgets)
+
+ if test "$nls_cv_use_catgets" = "yes"; then
+ dnl No gettext in C library. Try catgets next.
+ AC_CHECK_LIB(i, main)
+ AC_CHECK_FUNC(catgets,
+ [AC_DEFINE(HAVE_CATGETS)
+ INTLOBJS="\$(CATOBJS)"
+ AC_PATH_PROG(GENCAT, gencat, no)dnl
+# if test "$GENCAT" != "no"; then
+# AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
+# if test "$GMSGFMT" = "no"; then
+# AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
+# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
+# fi
+# AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+# USE_INCLUDED_LIBINTL=yes
+# CATOBJEXT=.cat
+# INSTOBJEXT=.cat
+# DATADIRNAME=lib
+# INTLDEPS='$(top_builddir)/intl/libintl.a'
+# INTLLIBS=$INTLDEPS
+# LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+# nls_cv_header_intl=intl/libintl.h
+# nls_cv_header_libgt=intl/libgettext.h
+# fi
+ ])
+ fi
+ fi
+
+ if test "$CATOBJEXT" = "NONE"; then
+ dnl Neither gettext nor catgets in included in the C library.
+ dnl Fall back on GNU gettext library.
+ nls_cv_use_gnu_gettext=yes
+ fi
+ fi
+
+ if test "$nls_cv_use_gnu_gettext" != "yes"; then
+ AC_DEFINE(ENABLE_NLS)
+ else
+ # Unset this variable since we use the non-zero value as a flag.
+ CATOBJEXT=
+# dnl Mark actions used to generate GNU NLS library.
+# INTLOBJS="\$(GETTOBJS)"
+# AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
+# AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+# AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+# AC_SUBST(MSGFMT)
+# USE_INCLUDED_LIBINTL=yes
+# CATOBJEXT=.gmo
+# INSTOBJEXT=.mo
+# DATADIRNAME=share
+# INTLDEPS='$(top_builddir)/intl/libintl.a'
+# INTLLIBS=$INTLDEPS
+# LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+# nls_cv_header_intl=intl/libintl.h
+# nls_cv_header_libgt=intl/libgettext.h
+ fi
+
+ dnl Test whether we really found GNU xgettext.
+ if test "$XGETTEXT" != ":"; then
+ dnl If it is no GNU xgettext we define it as : so that the
+ dnl Makefiles still can work.
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ : ;
+ else
+ AC_MSG_RESULT(
+ [found xgettext program is not GNU xgettext; ignore it])
+ XGETTEXT=":"
+ fi
+ fi
+
+ # We need to process the po/ directory.
+ POSUB=po
+ else
+ DATADIRNAME=share
+ nls_cv_header_intl=intl/libintl.h
+ nls_cv_header_libgt=intl/libgettext.h
+ fi
+ AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+ AC_OUTPUT_COMMANDS(
+ [case "$CONFIG_FILES" in *po/Makefile.in*)
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ esac])
+
+
+# # If this is used in GNU gettext we have to set USE_NLS to `yes'
+# # because some of the sources are only built for this goal.
+# if test "$PACKAGE" = gettext; then
+# USE_NLS=yes
+# USE_INCLUDED_LIBINTL=yes
+# fi
+
+ dnl These rules are solely for the distribution goal. While doing this
+ dnl we only have to keep exactly one list of the available catalogs
+ dnl in configure.in.
+ for lang in $ALL_LINGUAS; do
+ GMOFILES="$GMOFILES $lang.gmo"
+ POFILES="$POFILES $lang.po"
+ done
+
+ dnl Make all variables we use known to autoconf.
+ AC_SUBST(BUILD_INCLUDED_LIBINTL)
+ AC_SUBST(USE_INCLUDED_LIBINTL)
+ AC_SUBST(CATALOGS)
+ AC_SUBST(CATOBJEXT)
+ AC_SUBST(DATADIRNAME)
+ AC_SUBST(GMOFILES)
+ AC_SUBST(INSTOBJEXT)
+ AC_SUBST(INTLDEPS)
+ AC_SUBST(INTLLIBS)
+ AC_SUBST(INTLOBJS)
+ AC_SUBST(POFILES)
+ AC_SUBST(POSUB)
+ ])
+
+AC_DEFUN([AM_GNOME_GETTEXT],
+ [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_PROG_RANLIB])dnl
+ AC_REQUIRE([AC_ISC_POSIX])dnl
+ AC_REQUIRE([AC_HEADER_STDC])dnl
+ AC_REQUIRE([AC_C_CONST])dnl
+ AC_REQUIRE([AC_C_INLINE])dnl
+ AC_REQUIRE([AC_TYPE_OFF_T])dnl
+ AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+ AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+ AC_REQUIRE([AC_FUNC_MMAP])dnl
+
+ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
+unistd.h sys/param.h])
+ AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
+strdup __argz_count __argz_stringify __argz_next])
+
+ if test "${ac_cv_func_stpcpy+set}" != "set"; then
+ AC_CHECK_FUNCS(stpcpy)
+ fi
+ if test "${ac_cv_func_stpcpy}" = "yes"; then
+ AC_DEFINE(HAVE_STPCPY)
+ fi
+
+ AM_LC_MESSAGES
+ AM_GNOME_WITH_NLS
+
+ if test "x$CATOBJEXT" != "x"; then
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
+ else
+ AC_MSG_CHECKING(for catalogs to be installed)
+ NEW_LINGUAS=
+ if test "x$LINGUAS" = "x"; then
+ LINGUAS=$ALL_LINGUAS
+ fi
+ for lang in $LINGUAS; do
+ case "$ALL_LINGUAS" in
+ *\ $lang\ *|$lang\ *|*\ $lang) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+ esac
+ done
+ LINGUAS=$NEW_LINGUAS
+ AC_MSG_RESULT($LINGUAS)
+ fi
+
+ dnl Construct list of names of catalog files to be constructed.
+ if test -n "$LINGUAS"; then
+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+ fi
+ fi
+
+ dnl The reference to <locale.h> in the installed <libintl.h> file
+ dnl must be resolved because we cannot expect the users of this
+ dnl to define HAVE_LOCALE_H.
+ if test $ac_cv_header_locale_h = yes; then
+ INCLUDE_LOCALE_H="#include <locale.h>"
+ else
+ INCLUDE_LOCALE_H="\
+/* The system does not provide the header <locale.h>. Take care yourself. */"
+ fi
+ AC_SUBST(INCLUDE_LOCALE_H)
+
+ dnl Determine which catalog format we have (if any is needed)
+ dnl For now we know about two different formats:
+ dnl Linux libc-5 and the normal X/Open format
+ test -d intl || mkdir intl
+ if test "$CATOBJEXT" = ".cat"; then
+ AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
+
+ dnl Transform the SED scripts while copying because some dumb SEDs
+ dnl cannot handle comments.
+ sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
+ fi
+ dnl po2tbl.sed is always needed.
+ sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
+ $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
+
+ dnl In the intl/Makefile.in we have a special dependency which makes
+ dnl only sense for gettext. We comment this out for non-gettext
+ dnl packages.
+ if test "$PACKAGE" = "gettext"; then
+ GT_NO="#NO#"
+ GT_YES=
+ else
+ GT_NO=
+ GT_YES="#YES#"
+ fi
+ AC_SUBST(GT_NO)
+ AC_SUBST(GT_YES)
+
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+ dnl Try to locate is.
+ MKINSTALLDIRS=
+ if test -n "$ac_aux_dir"; then
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+ fi
+ if test -z "$MKINSTALLDIRS"; then
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
+ AC_SUBST(MKINSTALLDIRS)
+
+ dnl *** For now the libtool support in intl/Makefile is not for real.
+ l=
+ AC_SUBST(l)
+
+ dnl Generate list of files to be processed by xgettext which will
+ dnl be included in po/Makefile.
+ test -d po || mkdir po
+ if test "x$srcdir" != "x."; then
+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+ posrcprefix="$srcdir/"
+ else
+ posrcprefix="../$srcdir/"
+ fi
+ else
+ posrcprefix="../"
+ fi
+ rm -f po/POTFILES
+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ < $srcdir/po/POTFILES.in > po/POTFILES
+ ])
+
diff --git a/glabels2/macros/gnome-ghttp-check.m4 b/glabels2/macros/gnome-ghttp-check.m4
new file mode 100644
index 0000000..0ecacaa
--- /dev/null
+++ b/glabels2/macros/gnome-ghttp-check.m4
@@ -0,0 +1,14 @@
+AC_DEFUN([GNOME_GHTTP_CHECK],[
+ AC_REQUIRE([GNOME_INIT_HOOK])
+ GHTTP_LIB=
+ AC_CHECK_FUNC(connect,,[
+ AC_CHECK_LIB(socket,connect,
+ GHTTP_LIB="-lsocket $GHTTP_LIB",,$GHTTP_LIB)])
+ AC_CHECK_FUNC(gethostbyname,,[
+ AC_CHECK_LIB(nsl,gethostbyname,
+ GHTTP_LIB="-lnsl $GHTTP_LIB",,$GHTTP_LIB)])
+ AC_CHECK_LIB(ghttp, ghttp_request_new,
+ GHTTP_LIB="-lghttp $GHTTP_LIB",GHTTP_LIB="",-L$gnome_prefix $GHTTP_LIB)
+ AC_SUBST(GHTTP_LIB)
+ AC_PROVIDE([GNOME_GHTTP_CHECK])
+])
diff --git a/glabels2/macros/gnome-gnorba-check.m4 b/glabels2/macros/gnome-gnorba-check.m4
new file mode 100644
index 0000000..dbac0a6
--- /dev/null
+++ b/glabels2/macros/gnome-gnorba-check.m4
@@ -0,0 +1,35 @@
+dnl
+dnl GNOME_GNORBA_HOOK (script-if-gnorba-found, failflag)
+dnl
+dnl if failflag is "failure" it aborts if gnorba is not found.
+dnl
+
+AC_DEFUN([GNOME_GNORBA_HOOK],[
+ GNOME_ORBIT_HOOK([],$2)
+ AC_CACHE_CHECK([for gnorba libraries],gnome_cv_gnorba_found,[
+ gnome_cv_gnorba_found=no
+ if test x$gnome_cv_orbit_found = xyes; then
+ GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
+ GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
+ if test -n "$GNORBA_LIBS"; then
+ gnome_cv_gnorba_found=yes
+ fi
+ fi
+ ])
+ AM_CONDITIONAL(HAVE_GNORBA, test x$gnome_cv_gnorba_found = xyes)
+ if test x$gnome_cv_orbit_found = xyes; then
+ $1
+ GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
+ GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
+ AC_SUBST(GNORBA_CFLAGS)
+ AC_SUBST(GNORBA_LIBS)
+ else
+ if test x$2 = xfailure; then
+ AC_MSG_ERROR(gnorba library not installed or installation problem)
+ fi
+ fi
+])
+
+AC_DEFUN([GNOME_GNORBA_CHECK], [
+ GNOME_GNORBA_HOOK([],failure)
+])
diff --git a/glabels2/macros/gnome-guile-checks.m4 b/glabels2/macros/gnome-guile-checks.m4
new file mode 100644
index 0000000..102351c
--- /dev/null
+++ b/glabels2/macros/gnome-guile-checks.m4
@@ -0,0 +1,134 @@
+dnl
+dnl GNOME_CHECK_GUILE (failflag)
+dnl
+dnl if failflag is "fail" then GNOME_CHECK_GUILE will abort if guile is not found.
+dnl
+
+AC_DEFUN([GNOME_CHECK_GUILE],
+[
+dnl AC_MSG_WARN([Withval is: $withval])
+ guile_msg = 'Huh?'
+if test x$withval = xno ; then
+ guile_msg = 'disabled'
+ GUILE_LIBS=
+ GUILE_INCS=
+ AC_SUBST(GUILE_LIBS)
+ AC_SUBST(GUILE_INCS)
+ AM_CONDITIONAL(GUILE, /bin/false)
+else
+ guile_msg="no"
+
+ saved_ldflags="$LDFLAGS"
+ saved_cppflags="$CPPFLAGS"
+ LDFLAGS="$LDFLAGS $GNOME_LIBDIR"
+
+ AC_CHECK_LIB(qthreads,qt_null,[
+ QTTHREADS_LIB="-lqthreads"
+ ],[
+ AC_CHECK_LIB(qt, qt_null, QTTHREADS_LIB="-lqt")
+ ],$LIBS)
+ AC_SUBST(QTTHREADS_LIB)
+
+ AC_CHECK_LIB(termcap,main,TERMCAP_LIB="-ltermcap")
+ AC_CHECK_LIB(readline,main,READLINE_LIB="-lreadline",,$TERMCAP_LIB)
+
+ AC_SUBST(TERMCAP_LIB)
+ AC_SUBST(READLINE_LIB)
+
+ if test "x$cross_compiling" = "xyes" ; then
+ name_build_guile="$target_alias-guile-config"
+ else
+ name_build_guile="guile-config"
+ fi
+
+ AC_CHECK_PROG(BUILD_GUILE, $name_build_guile, yes, no)
+
+ if test "x$BUILD_GUILE" = "xyes"; then
+ AC_MSG_CHECKING(whether $name_build_guile works)
+ if test x`$name_build_guile --version >/dev/null 2>&1 || \
+ echo no` = xno; then
+ BUILD_GUILE=no
+ fi
+ AC_MSG_RESULT($BUILD_GUILE)
+ else
+
+ if test "x$cross_compiling" = "xyes" ; then
+ name_build_guile="$target_alias-build-guile"
+ else
+ name_build_guile="build-guile"
+ fi
+
+ AC_CHECK_PROG(BUILD_GUILE, $name_build_guile, yes, no)
+
+ if test "x$BUILD_GUILE" = "xyes"; then
+ AC_MSG_CHECKING(whether $name_build_guile works)
+ if test x`$name_build_guile --version >/dev/null 2>&1 || \
+ echo no` = xno; then
+ BUILD_GUILE=no
+ fi
+ AC_MSG_RESULT($BUILD_GUILE)
+ fi
+ fi
+
+ AC_CHECK_LIB(m, sin)
+
+ if test "x$BUILD_GUILE" = "xyes"; then
+ AC_MSG_CHECKING(for guile libraries)
+ GUILE_LIBS="`$name_build_guile link`"
+ AC_MSG_RESULT($GUILE_LIBS)
+ AC_MSG_CHECKING(for guile headers)
+ GUILE_INCS="`$name_build_guile compile`"
+ AC_MSG_RESULT($GUILE_INCS)
+ else
+ GUILE_LIBS="$GNOME_LIBDIR"
+ GUILE_INCS="$GNOME_INCLUDEDIR"
+ AC_CHECK_LIB(rx, main, GUILE_LIBS="-lrx $GUILE_LIBS")
+ AC_CHECK_LIB(qt, qt_null, GUILE_LIBS="-lqt $GUILE_LIBS")
+ AC_CHECK_LIB(dl, dlopen, GUILE_LIBS="-ldl $GUILE_LIBS")
+ AC_CHECK_LIB(nsl, t_accept, GUILE_LIBS="$GUILE_LIBS -lnsl")
+ AC_CHECK_LIB(socket, socket, GUILE_LIBS="$GUILE_LIBS -lsocket")
+ GUILE_LIBS="-lguile $GUILE_LIBS $QTTHREADS_LIB $READLINE_LIB $TERMCAP_LIB"
+ fi
+
+ AC_SUBST(GUILE_LIBS)
+ AC_SUBST(GUILE_INCS)
+
+ saved_LIBS="$LIBS"
+ LIBS="$LIBS $GUILE_LIBS"
+ CPPFLAGS="$saved_cppflags $GUILE_INCS"
+
+ AC_MSG_CHECKING(whether guile works)
+ AC_TRY_LINK([
+ #include <libguile.h>
+ #include <guile/gh.h>
+ ],[
+ gh_eval_str("(newline)");
+ scm_boot_guile(0,NULL,NULL,NULL);
+ ],[
+ ac_cv_guile_found=yes
+ AC_DEFINE(HAVE_GUILE)
+ ],[
+ ac_cv_guile_found=no
+ ])
+ AC_MSG_RESULT($ac_cv_guile_found)
+
+ guile_msg=$ac_cv_guile_found
+
+ if test x$ac_cv_guile_found = xno ; then
+ if test x$1 = xfail ; then
+ AC_MSG_ERROR(Can not find Guile on this system)
+ else
+ AC_MSG_WARN(Can not find Guile on this system)
+ fi
+ ac_cv_guile_found=no
+ GUILE_LIBS= GUILE_INCS=
+ fi
+
+ LIBS="$saved_LIBS"
+ LDFLAGS="$saved_ldflags"
+ CPPFLAGS="$saved_cppflags"
+
+ AC_SUBST(GUILE_LIBS)
+ AM_CONDITIONAL(GUILE, test x$ac_cv_guile_found = xyes)
+fi
+])
diff --git a/glabels2/macros/gnome-libgtop-check.m4 b/glabels2/macros/gnome-libgtop-check.m4
new file mode 100644
index 0000000..1b4e174
--- /dev/null
+++ b/glabels2/macros/gnome-libgtop-check.m4
@@ -0,0 +1,217 @@
+dnl
+dnl LIBGTOP_CHECK_TYPE
+dnl
+dnl Improved version of AC_CHECK_TYPE which takes into account
+dnl that we need to #include some other header files on some
+dnl systems to get some types.
+
+dnl AC_LIBGTOP_CHECK_TYPE(TYPE, DEFAULT)
+AC_DEFUN([AC_LIBGTOP_CHECK_TYPE],
+[AC_REQUIRE([AC_HEADER_STDC])dnl
+AC_MSG_CHECKING(for $1)
+AC_CACHE_VAL(ac_cv_type_$1,
+[AC_EGREP_CPP(dnl
+changequote(<<,>>)dnl
+<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl
+changequote([,]), [#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+
+/* For Tru64 */
+#ifdef HAVE_SYS_BITYPES_H
+#include <sys/bitypes.h>
+#endif
+], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
+AC_MSG_RESULT($ac_cv_type_$1)
+if test $ac_cv_type_$1 = no; then
+ AC_DEFINE($1, $2)
+fi
+])
+
+dnl
+dnl GNOME_LIBGTOP_TYPES
+dnl
+dnl some typechecks for libgtop.
+dnl
+
+AC_DEFUN([GNOME_LIBGTOP_TYPES],
+[
+ AC_CHECK_HEADERS(sys/bitypes.h)
+ AC_LIBGTOP_CHECK_TYPE(u_int64_t, unsigned long long int)
+ AC_LIBGTOP_CHECK_TYPE(int64_t, signed long long int)
+])
+
+dnl
+dnl GNOME_LIBGTOP_HOOK (minversion, script-if-libgtop-enabled, failflag)
+dnl
+dnl if failflag is "fail" then GNOME_LIBGTOP_HOOK will abort if LibGTop
+dnl is not found.
+dnl
+
+AC_DEFUN([GNOME_LIBGTOP_HOOK],
+[
+ AC_REQUIRE([GNOME_LIBGTOP_TYPES])
+
+ AC_SUBST(LIBGTOP_LIBDIR)
+ AC_SUBST(LIBGTOP_INCLUDEDIR)
+ AC_SUBST(LIBGTOP_EXTRA_LIBS)
+ AC_SUBST(LIBGTOP_LIBS)
+ AC_SUBST(LIBGTOP_INCS)
+ AC_SUBST(LIBGTOP_NAMES_LIBS)
+ AC_SUBST(LIBGTOP_NAMES_INCS)
+ AC_SUBST(LIBGTOP_MAJOR_VERSION)
+ AC_SUBST(LIBGTOP_MINOR_VERSION)
+ AC_SUBST(LIBGTOP_MICRO_VERSION)
+ AC_SUBST(LIBGTOP_VERSION)
+ AC_SUBST(LIBGTOP_VERSION_CODE)
+ AC_SUBST(LIBGTOP_SERVER_VERSION)
+ AC_SUBST(LIBGTOP_INTERFACE_AGE)
+ AC_SUBST(LIBGTOP_BINARY_AGE)
+ AC_SUBST(LIBGTOP_BINDIR)
+ AC_SUBST(LIBGTOP_SERVER)
+
+ dnl Get the cflags and libraries from the libgtop-config script
+ dnl
+ AC_ARG_WITH(libgtop,
+ [ --with-libgtop=PFX Prefix where LIBGTOP is installed (optional)],
+ libgtop_config_prefix="$withval", libgtop_config_prefix="")
+ AC_ARG_WITH(libgtop-exec,
+ [ --with-libgtop-exec=PFX Exec prefix where LIBGTOP is installed (optional)],
+ libgtop_config_exec_prefix="$withval", libgtop_config_exec_prefix="")
+
+ if test x$libgtop_config_exec_prefix != x ; then
+ libgtop_config_args="$libgtop_config_args --exec-prefix=$libgtop_config_exec_prefix"
+ if test x${LIBGTOP_CONFIG+set} != xset ; then
+ LIBGTOP_CONFIG=$libgtop_config_exec_prefix/bin/libgtop-config
+ fi
+ fi
+ if test x$libgtop_config_prefix != x ; then
+ libgtop_config_args="$libgtop_config_args --prefix=$libgtop_config_prefix"
+ if test x${LIBGTOP_CONFIG+set} != xset ; then
+ LIBGTOP_CONFIG=$libgtop_config_prefix/bin/libgtop-config
+ fi
+ fi
+
+ AC_PATH_PROG(LIBGTOP_CONFIG, libgtop-config, no)
+ dnl IMPORTANT NOTICE:
+ dnl If you increase this number here, this means that *ALL*
+ dnl modules will require the new version, even if they explicitly
+ dnl give a lower number in their `configure.in' !!!
+ real_min_libgtop_version=1.0.0
+ min_libgtop_version=ifelse([$1], ,$real_min_libgtop_version,$1)
+ dnl I know, the following code looks really ugly, but if you want
+ dnl to make changes, please test it with a brain-dead /bin/sh and
+ dnl with a brain-dead /bin/test (not all shells/tests support the
+ dnl `<' operator to compare strings, that's why I convert everything
+ dnl into numbers and test them).
+ min_libgtop_major=`echo $min_libgtop_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ min_libgtop_minor=`echo $min_libgtop_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ min_libgtop_micro=`echo $min_libgtop_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ test x$min_libgtop_micro = x && min_libgtop_micro=0
+ real_min_libgtop_major=`echo $real_min_libgtop_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ real_min_libgtop_minor=`echo $real_min_libgtop_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ real_min_libgtop_micro=`echo $real_min_libgtop_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ test x$real_min_libgtop_micro = x && real_min_libgtop_micro=0
+ dnl You cannot require a version less then $real_min_libgtop_version,
+ dnl so you don't need to update each `configure.in' when it's increased.
+ if test $real_min_libgtop_major -gt $min_libgtop_major ; then
+ min_libgtop_major=$real_min_libgtop_major
+ min_libgtop_minor=$real_min_libgtop_minor
+ min_libgtop_micro=$real_min_libgtop_micro
+ elif test $real_min_libgtop_major = $min_libgtop_major ; then
+ if test $real_min_libgtop_minor -gt $min_libgtop_minor ; then
+ min_libgtop_minor=$real_min_libgtop_minor
+ min_libgtop_micro=$real_min_libgtop_micro
+ elif test $real_min_libgtop_minor = $min_libgtop_minor ; then
+ if test $real_min_libgtop_micro -gt $min_libgtop_micro ; then
+ min_libgtop_micro=$real_min_libgtop_micro
+ fi
+ fi
+ fi
+ min_libgtop_version="$min_libgtop_major.$min_libgtop_minor.$min_libgtop_micro"
+ AC_MSG_CHECKING(for libgtop - version >= $min_libgtop_version)
+ no_libgtop=""
+ if test "$LIBGTOP_CONFIG" = "no" ; then
+ no_libgtop=yes
+ else
+ configfile=`$LIBGTOP_CONFIG --config`
+ libgtop_major_version=`$LIBGTOP_CONFIG --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ libgtop_minor_version=`$LIBGTOP_CONFIG --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ libgtop_micro_version=`$LIBGTOP_CONFIG --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ if test $libgtop_major_version != $min_libgtop_major ; then
+ no_libgtop=mismatch
+ else
+ test $libgtop_minor_version -lt $min_libgtop_minor && no_libgtop=yes
+ if test $libgtop_minor_version = $min_libgtop_minor ; then
+ test $libgtop_micro_version -lt $min_libgtop_micro && no_libgtop=yes
+ fi
+ fi
+ . $configfile
+ fi
+ if test x$no_libgtop = x ; then
+ AC_DEFINE(HAVE_LIBGTOP)
+ AC_DEFINE_UNQUOTED(LIBGTOP_VERSION, "$LIBGTOP_VERSION")
+ AC_DEFINE_UNQUOTED(LIBGTOP_VERSION_CODE, $LIBGTOP_VERSION_CODE)
+ AC_DEFINE_UNQUOTED(LIBGTOP_MAJOR_VERSION, $LIBGTOP_MAJOR_VERSION)
+ AC_DEFINE_UNQUOTED(LIBGTOP_MINOR_VERSION, $LIBGTOP_MINOR_VERSION)
+ AC_DEFINE_UNQUOTED(LIBGTOP_MICRO_VERSION, $LIBGTOP_MICRO_VERSION)
+ AC_DEFINE_UNQUOTED(LIBGTOP_SERVER_VERSION, $LIBGTOP_SERVER_VERSION)
+ AC_MSG_RESULT(yes)
+ dnl Note that an empty true branch is not valid sh syntax.
+ ifelse([$2], [], :, [$2])
+ else
+ AC_MSG_RESULT(no)
+ if test "$no_libgtop"x = mismatchx; then
+ AC_MSG_ERROR(LibGTop major version mismatch $libgtop_major_version != $min_libgtop_major)
+ fi
+ if test "x$3" = "xfail"; then
+ AC_MSG_ERROR(LibGTop >= $min_libgtop_version not found)
+ else
+ AC_MSG_WARN(LibGTop >= $min_libgtop_version not found)
+ fi
+ fi
+
+ AM_CONDITIONAL(HAVE_LIBGTOP, test x$no_libgtop != xyes)
+])
+
+AC_DEFUN([GNOME_INIT_LIBGTOP],[
+ GNOME_LIBGTOP_HOOK($1,[ifelse([$3], [], :, [$3])],$2)
+])
+
+dnl
+dnl GNOME_LIBGTOP_DOCU
+dnl
+dnl checks whether the documentation of LibGTop is installed
+dnl
+
+AC_DEFUN([GNOME_LIBGTOP_DOCU],
+[
+ AC_REQUIRE([GNOME_LIBGTOP_HOOK])
+
+ helpdir="$LIBGTOP_DATADIR/gnome/help/libgtop"
+
+ AC_MSG_CHECKING(whether you have the LibGTop Documentation)
+
+ if test -f "$helpdir/C/topic.dat" ; then
+ have_libgtop_docu=yes
+ AC_DEFINE(HAVE_LIBGTOP_DOCU)
+ else
+ have_libgtop_docu=no
+ fi
+
+ AC_MSG_RESULT($have_libgtop_docu)
+
+ AM_CONDITIONAL(HAVE_LIBGTOP_DOCU, test x$have_libgtop_docu = xyes)
+])
+
diff --git a/glabels2/macros/gnome-objc-checks.m4 b/glabels2/macros/gnome-objc-checks.m4
new file mode 100644
index 0000000..c69acb0
--- /dev/null
+++ b/glabels2/macros/gnome-objc-checks.m4
@@ -0,0 +1,83 @@
+AC_DEFUN([GNOME_CHECK_OBJC],
+[
+dnl Look for an ObjC compiler.
+dnl FIXME: extend list of possible names of ObjC compilers.
+ AC_CHECK_PROGS(OBJC, $OBJC egcs, "")
+ if test "x$OBJC" = "x" ; then
+ AC_CHECK_PROGS(OBJC, $OBJC egcc, "")
+ if test "x$OBJC" = "x" ; then
+ AC_CHECK_PROGS(OBJC, $OBJC gcc, "")
+ fi
+ fi
+
+ AC_REQUIRE([GNOME_PTHREAD_CHECK])
+
+ OBJC_LIBS="-lobjc $PTHREAD_LIB"
+ AC_CHECK_FUNC(sched_yield,,[
+ AC_CHECK_LIB(rt,sched_yield,
+ OBJC_LIBS="$OBJC_LIBS -lrt",[
+ AC_CHECK_LIB(posix4,sched_yield,
+ OBJC_LIBS="$OBJC_LIBS -lposix4",,
+ $OBJC_LIBS)],
+ $OBJC_LIBS)])
+ AC_SUBST(OBJC_LIBS)
+
+ AC_CACHE_CHECK([if Objective C compiler ($OBJC) works],
+ ac_cv_prog_objc_works, [
+ if test -n "$OBJC"; then
+ cat > conftest.m <<EOF
+#include <objc/Object.h>
+@interface myRandomObj : Object
+{
+}
+@end
+@implementation myRandomObj
+@end
+int main () {
+ /* No, you are not seeing double. Remember that square brackets
+ are the autoconf m4 quotes. */
+ id myid = [[myRandomObj alloc]];
+ [[myid free]];
+ return 0;
+}
+EOF
+
+ $OBJC $CFLAGS -o conftest $LDFLAGS conftest.m $OBJC_LIBS 1>&AC_FD_CC 2>&1
+ result=$?
+ rm -f conftest*
+
+ if test $result -eq 0; then
+ ac_cv_prog_objc_works=yes
+ fi
+ else
+ ac_cv_prog_objc_works=no
+ fi
+ ])
+
+ AM_CONDITIONAL(OBJECTIVE_C, test x$ac_cv_prog_objc_works = xyes)
+ dnl Also set the shell variable OBJECTIVE_C to "yes" or "no".
+ OBJECTIVE_C=$ac_cv_prog_objc_works
+])
+
+AC_DEFUN([GNOME_INIT_OBJC],
+[
+ AC_MSG_CHECKING(for an obGnomeConf.sh)
+ my_gnome_libdir=`$GNOME_CONFIG --libdir`
+ if test -f $my_gnome_libdir/obGnomeConf.sh; then
+ . $my_gnome_libdir/obGnomeConf.sh
+ AC_MSG_RESULT(found $my_gnome_libdir)
+ ac_cv_have_gnome_objc=yes
+ else
+ AC_MSG_RESULT(not found)
+ AC_MSG_WARN(Could not find the obGnomeConf.sh file that is generated by gnome-objc install)
+ ac_cv_have_gnome_objc=no
+ fi
+
+ dnl Add a conditional on whether or not we have gnome-objc
+ AM_CONDITIONAL(HAVE_GNOME_OBJC, test x$ac_cv_have_gnome_objc = xyes)
+ HAVE_GNOME_OBJC=$ac_cv_have_gnome_objc
+
+ AC_SUBST(OBGNOME_INCLUDEDIR)
+ AC_SUBST(OBGNOME_LIBS)
+ AC_SUBST(OBGTK_LIBS)
+])
diff --git a/glabels2/macros/gnome-orbit-check.m4 b/glabels2/macros/gnome-orbit-check.m4
new file mode 100644
index 0000000..54bf33a
--- /dev/null
+++ b/glabels2/macros/gnome-orbit-check.m4
@@ -0,0 +1,33 @@
+dnl
+dnl GNOME_ORBIT_HOOK (script-if-orbit-found, failflag)
+dnl
+dnl if failflag is "failure" it aborts if orbit is not found.
+dnl
+
+AC_DEFUN([GNOME_ORBIT_HOOK],[
+ AC_PATH_PROG(ORBIT_CONFIG,orbit-config,no)
+ AC_PATH_PROG(ORBIT_IDL,orbit-idl,no)
+ AC_CACHE_CHECK([for working ORBit environment],gnome_cv_orbit_found,[
+ if test x$ORBIT_CONFIG = xno -o x$ORBIT_IDL = xno; then
+ gnome_cv_orbit_found=no
+ else
+ gnome_cv_orbit_found=yes
+ fi
+ ])
+ AM_CONDITIONAL(HAVE_ORBIT, test x$gnome_cv_orbit_found = xyes)
+ if test x$gnome_cv_orbit_found = xyes; then
+ $1
+ ORBIT_CFLAGS=`orbit-config --cflags client server`
+ ORBIT_LIBS=`orbit-config --use-service=name --libs client server`
+ AC_SUBST(ORBIT_CFLAGS)
+ AC_SUBST(ORBIT_LIBS)
+ else
+ if test x$2 = xfailure; then
+ AC_MSG_ERROR(ORBit not installed or installation problem)
+ fi
+ fi
+])
+
+AC_DEFUN([GNOME_ORBIT_CHECK], [
+ GNOME_ORBIT_HOOK([],failure)
+])
diff --git a/glabels2/macros/gnome-pilot.m4 b/glabels2/macros/gnome-pilot.m4
new file mode 100644
index 0000000..7f5b0f3
--- /dev/null
+++ b/glabels2/macros/gnome-pilot.m4
@@ -0,0 +1,213 @@
+dnl
+dnl GNOME_PILOT_HOOK(script if found, fail)
+dnl if fail = "failure", abort if gnome-pilot not found
+dnl
+
+dnl
+dnl
+
+GNOME_PILOT_CFLAGS=
+GNOME_PILOT_LIBS=
+PISOCK_CFLAGS=
+PISOCK_LIBS=
+
+AC_SUBST(GNOME_PILOT_CFLAGS)
+AC_SUBST(GNOME_PILOT_LIBS)
+AC_SUBST(PISOCK_CFLAGS)
+AC_SUBST(PISOCK_LIBS)
+
+AC_DEFUN([PILOT_LINK_HOOK],[
+ AC_ARG_WITH(pisock,
+ [ --with-pisock Specify prefix for pisock files],[
+ if test x$withval = xyes; then
+ dnl Note that an empty true branch is not valid sh syntax.
+ ifelse([$1], [], :, [$1])
+ else
+ PISOCK_CFLAGS="-I$withval/include"
+ incdir="$withval/include"
+ PISOCK_LIBS="-L$withval/lib -lpisock"
+ AC_MSG_CHECKING("for existance of $withval/lib/libpisock.so")
+ if test -r $withval/lib/libpisock.so; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_ERROR([Unable to find libpisock. Try http://www.pilot-link.org.])
+ fi
+ fi
+ ])
+
+ if test x$PISOCK_CFLAGS = x; then
+ AC_CHECK_HEADER(pi-version.h, [incdir="/usr/include"], [
+ AC_CHECK_HEADER(libpisock/pi-version.h, [PISOCK_CFLAGS="-I/usr/include/libpisock"
+ piversion_include="libpisock/pi-version.h"
+ incdir="/usr/include/libpisock"
+ ], [
+ AC_CHECK_HEADER($prefix/include/pi-version.h, [PISOCK_CFLAGS="-I$prefix/include/libpisock"
+ piversion_include="$prefix/include/pi-version.h"
+ if test x$PISOCK_LIBDIR = x; then
+ incdir="$prefix/include"
+ PISOCK_LIBS="-L$prefix/lib -lpisock"
+ fi ],
+ AC_MSG_ERROR([Unable to find pi-version.h]))
+ ])
+ ])
+ fi
+
+ if test "x$PISOCK_LIBS" = "x"; then
+ AC_CHECK_LIB(pisock, pi_accept, [ PISOCK_LIBS=-lpisock ],
+ [ AC_MSG_ERROR([Unable to find libpisock. Try http://www.pilot-link.org.]) ])
+ fi
+
+ AC_ARG_ENABLE(pilotlinktest,
+ [ --enable-pilotlinktest Test for correct version of pilot-link],
+ [testplversion=$enableval],
+ [ testplversion=yes ]
+ )
+
+ if test x$piversion_include = x; then
+ piversion_include="pi-version.h"
+ fi
+
+ pi_version=`cat $incdir/pi-version.h|grep PILOT_LINK_VERSION|sed 's/#define PILOT_LINK_VERSION \([[0-9]]*\)/\1/'`
+ pi_major=`cat $incdir/pi-version.h|grep PILOT_LINK_MAJOR|sed 's/#define PILOT_LINK_MAJOR \([[0-9]]*\)/\1/'`
+ pi_minor=`cat $incdir/pi-version.h|grep PILOT_LINK_MINOR|sed 's/#define PILOT_LINK_MINOR \([[0-9]]*\)/\1/'`
+ pi_patch=`cat $incdir/pi-version.h|grep PILOT_LINK_PATCH|sed 's/#define PILOT_LINK_PATCH \"\(.*\)\"/\1/'`
+
+ PILOT_LINK_VERSION="$pi_version.$pi_major.$pi_minor$pi_patch"
+
+ if test x$testplversion = xyes; then
+ AC_MSG_CHECKING([for pilot-link version >= $1])
+ pl_ve=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ pl_ma=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ pl_mi=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ CFLAGS_save="$CFLAGS"
+ CFLAGS="$CFLAGS $PISOCK_CFLAGS"
+ AC_TRY_RUN(
+ [
+ #include <$piversion_include>
+ int main(int argc,char *argv[]) {
+ if (PILOT_LINK_VERSION == $pl_ve) {
+ if (PILOT_LINK_MAJOR == $pl_ma) {
+ if (PILOT_LINK_MINOR >= $pl_mi) {
+ return 0;
+ }
+ } else if (PILOT_LINK_MAJOR > $pl_ma) {
+ return 0;
+ }
+ } else if (PILOT_LINK_VERSION > $pl_ve) {
+ return 0;
+ }
+ return 1;
+ }
+ ],
+ [AC_MSG_RESULT([yes (found $PILOT_LINK_VERSION)])],
+ [AC_MSG_ERROR([pilot-link >= $1 required])],
+ [AC_MSG_WARN([No action taken for crosscompile])]
+ )
+ CFLAGS="$CFLAGS_save"
+ fi
+
+ unset piversion_include
+ unset pi_verion
+ unset pi_major
+ unset pi_minor
+ unset pi_patch
+ unset incdir
+ unset pl_mi
+ unset pl_ma
+ unset pl_ve
+])
+
+AC_DEFUN([PILOT_LINK_CHECK],[
+ PILOT_LINK_HOOK($1,[],nofailure)
+])
+
+AC_DEFUN([GNOME_PILOT_HOOK],[
+ AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
+ AC_CACHE_CHECK([for gnome-pilot environment],gnome_cv_pilot_found,[
+ if test "x$GNOME_CONFIG" = "xno"; then
+ gnome_cv_pilot_found=no
+ else
+ # gnome-config doesn't return a useful error status,
+ # so we check if it outputs anything to stderr
+ if test "x`$GNOME_CONFIG gpilot 2>&1 > /dev/null`" = "x"; then
+ gnome_cv_pilot_found=yes
+ else
+ gnome_cv_pilot_found=no
+ fi
+ fi
+ ])
+ if test x$gnome_cv_pilot_found = xyes; then
+ if test x$1 != x; then
+ gpv_pre_found=`$GNOME_CONFIG --modversion gpilot`
+ gpv_found=`echo $gpv_pre_found | sed 's/gnome-pilot-\(.*\)/\1/'`
+ AC_MSG_CHECKING([gnome-pilot version ($1)])
+ gpv_major=`echo $gpv_found | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ gpv_minor=`echo $gpv_found | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ gpv_patch=`echo $gpv_found | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ gpv_ma=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ gpv_mi=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ gpv_pa=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+ if test $gpv_major -eq $gpv_ma; then
+ if test $gpv_minor -eq $gpv_mi; then
+ if test $gpv_patch -ge $gpv_pa; then
+ AC_MSG_RESULT([yes (found $gpv_found)])
+ else
+ AC_MSG_RESULT([too old (found $gpv_found)])
+ gnome_cv_pilot_found=no
+ fi
+ elif test $gpv_minor -gt $gpv_mi; then
+ AC_MSG_RESULT([yes (found $gpv_found)])
+ else
+ AC_MSG_RESULT([too old (found $gpv_found)])
+ gnome_cv_pilot_found=no
+ fi
+ else
+ AC_MSG_RESULT([major version mismatch (found $gpv_found)])
+ gnome_cv_pilot_found=no
+ fi
+ unset gpv_pre_found
+ unset gpv_found
+ unset gpv_major
+ unset gpv_minor
+ unset gpv_patch
+ unset gpv_ma
+ unset gpv_mi
+ unset gpv_pa
+ fi
+ fi
+
+ AM_CONDITIONAL(HAVE_GNOME_PILOT,test x$gnome_cv_pilot_found = xyes)
+ if test x$gnome_cv_pilot_found = xyes; then
+ PILOT_LINK_CHECK($2)
+ GNOME_PILOT_CFLAGS=`gnome-config --cflags gpilot`
+ GNOME_PILOT_LIBS=`gnome-config --libs gpilot`
+ else
+ if test x$3 = xfail; then
+ AC_MSG_ERROR([gnome-pilot development package not installed or installation problem])
+ else
+ AC_MSG_WARN([gnome-pilot development package not installed or installation problem])
+ fi
+ fi
+])
+
+AC_DEFUN([GNOME_PILOT_CHECK],[
+ if test x$1 = x; then
+ gpv=[]
+ else
+ gpv=$1
+ fi
+ if test x$2 = x; then
+ plv=0.9.5
+ else
+ plv=$2
+ fi
+ if test x$3 = x; then
+ good=[]
+ else
+ good=$3
+ fi
+
+ GNOME_PILOT_HOOK($gpv, $plv, $good)
+])
+
diff --git a/glabels2/macros/gnome-print-check.m4 b/glabels2/macros/gnome-print-check.m4
new file mode 100644
index 0000000..968fcc0
--- /dev/null
+++ b/glabels2/macros/gnome-print-check.m4
@@ -0,0 +1,63 @@
+# Configure paths for GNOME-PRINT
+# Chris Lahey 99-2-5
+# stolen from Manish Singh again
+# stolen back from Frank Belew
+# stolen from Manish Singh
+# Shamelessly stolen from Owen Taylor
+
+dnl AM_PATH_GNOME_PRINT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for GNOME-PRINT, and define GNOME_PRINT_CFLAGS and GNOME_PRINT_LIBS
+dnl
+AC_DEFUN([AM_PATH_GNOME_PRINT],
+[
+ min_version=ifelse([$1],,0.21,$1)
+
+ gnome_print_ok=""
+
+ AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
+ if test "$GNOME_CONFIG" = "no" ; then
+ AC_MSG_RESULT(gnome-config is missing, check your gnome installation)
+ else
+ AC_MSG_CHECKING(for GNOME-PRINT - version >= $min_version)
+ if `$GNOME_CONFIG --libs print > /dev/null 2>&1`; then
+ rqmajor=`echo "$min_version" | sed -e 's/cvs-//' | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+ rqminor=`echo "$min_version" | sed -e 's/cvs-//' | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+ major=`$GNOME_CONFIG --modversion print | sed -e 's/gnome-print-//' | sed -e 's/cvs-//' | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+ minor=`$GNOME_CONFIG --modversion print | sed -e 's/gnome-print-//' | sed -e 's/cvs-//' | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+ if test "$major" -ge "$rqmajor"; then
+ if test "$major" -gt "$rqmajor"; then
+ AC_MSG_RESULT("found $major.$minor")
+ gnome_print_ok="yes"
+ else
+ if test "$minor" -ge "$rqminor"; then
+ AC_MSG_RESULT("found $major.$minor")
+ gnome_print_ok="yes"
+ else
+ AC_MSG_RESULT("you have $major.$minor")
+ fi
+ fi
+ else
+ AC_MSG_RESULT("you have $major.$minor")
+ fi
+ else
+ AC_MSG_RESULT("did not find any version")
+ fi
+ fi
+
+ if test "x$gnome_print_ok" != "x" ; then
+ GNOME_PRINT_CFLAGS=`$GNOME_CONFIG --cflags print`
+ GNOME_PRINT_LIBS=`$GNOME_CONFIG --libs print`
+ ifelse([$2], , :, [$2])
+ else
+ GNOME_PRINT_CFLAGS=""
+ GNOME_PRINT_LIBS=""
+ ifelse([$3], , :, [$3])
+ fi
+
+ AC_SUBST(GNOME_PRINT_CFLAGS)
+ AC_SUBST(GNOME_PRINT_LIBS)
+])
+
+AC_DEFUN([GNOME_PRINT_CHECK], [
+ AM_PATH_GNOME_PRINT($1,,[AC_MSG_ERROR(GNOME-PRINT not found or wrong version)])
+])
diff --git a/glabels2/macros/gnome-pthread-check.m4 b/glabels2/macros/gnome-pthread-check.m4
new file mode 100644
index 0000000..5a1afee
--- /dev/null
+++ b/glabels2/macros/gnome-pthread-check.m4
@@ -0,0 +1,18 @@
+dnl
+dnl And better, use gthreads instead...
+dnl
+
+AC_DEFUN([GNOME_PTHREAD_CHECK],[
+ PTHREAD_LIB=""
+ AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread",
+ [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads",
+ [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r",
+ [AC_CHECK_LIB(pthread, __pthread_attr_init_system, PTHREAD_LIB="-lpthread",
+ [AC_CHECK_FUNC(pthread_create)]
+ )]
+ )]
+ )]
+ )
+ AC_SUBST(PTHREAD_LIB)
+ AC_PROVIDE([GNOME_PTHREAD_CHECK])
+])
diff --git a/glabels2/macros/gnome-support.m4 b/glabels2/macros/gnome-support.m4
new file mode 100644
index 0000000..2c1d049
--- /dev/null
+++ b/glabels2/macros/gnome-support.m4
@@ -0,0 +1,68 @@
+dnl GNOME_SUPPORT_CHECKS
+dnl Check for various support functions needed by the standard
+dnl Gnome libraries. Sets LIBOBJS, might define some macros.
+dnl This should only be used when building the Gnome libs;
+dnl Gnome clients should not need this macro.
+AC_DEFUN([GNOME_SUPPORT_CHECKS],[
+ # we need an `awk' to build `gnomesupport.h'
+ AC_REQUIRE([AC_PROG_AWK])
+
+ # this should go away soon
+ need_gnome_support=yes
+
+ save_LIBOBJS="$LIBOBJS"
+ LIBOBJS=
+
+ AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o")
+
+ # for `scandir'
+ AC_HEADER_DIRENT
+
+ # copied from `configure.in' of `libiberty'
+ vars="program_invocation_short_name program_invocation_name sys_errlist"
+ for v in $vars; do
+ AC_MSG_CHECKING([for $v])
+ AC_CACHE_VAL(gnome_cv_var_$v,
+ [AC_TRY_LINK([int *p;], [extern int $v; p = &$v;],
+ [eval "gnome_cv_var_$v=yes"],
+ [eval "gnome_cv_var_$v=no"])])
+ if eval "test \"`echo '$gnome_cv_var_'$v`\" = yes"; then
+ AC_MSG_RESULT(yes)
+ n=HAVE_`echo $v | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ AC_DEFINE_UNQUOTED($n)
+ else
+ AC_MSG_RESULT(no)
+ fi
+ done
+
+ AC_REPLACE_FUNCS(memmove mkstemp scandir strcasecmp strerror strndup strnlen)
+ AC_REPLACE_FUNCS(strtok_r strtod strtol strtoul vasprintf vsnprintf)
+
+ AC_CHECK_FUNCS(realpath,,LIBOBJS="$LIBOBJS canonicalize.o")
+
+ # to include `error.c' error.c has some HAVE_* checks
+ AC_CHECK_FUNCS(vprintf doprnt strerror_r)
+ AM_FUNC_ERROR_AT_LINE
+
+ # This is required if we declare setreuid () and setregid ().
+ AC_TYPE_UID_T
+
+ # see if we need to declare some functions. Solaris is notorious for
+ # putting functions into the `libc' but not listing them in the headers
+ AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h dirent.h)
+ GCC_NEED_DECLARATIONS(gethostname setreuid setregid getpagesize)
+ GCC_NEED_DECLARATION(scandir,[
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+])
+
+ # Turn our LIBOBJS into libtool objects. This is gross, but it
+ # requires changes to autoconf before it goes away.
+ LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
+ AC_SUBST(need_gnome_support)
+ AC_SUBST(LTLIBOBJS)
+
+ LIBOBJS="$save_LIBOBJS"
+ AM_CONDITIONAL(BUILD_GNOME_SUPPORT, test "$need_gnome_support" = yes)
+])
diff --git a/glabels2/macros/gnome-undelfs.m4 b/glabels2/macros/gnome-undelfs.m4
new file mode 100644
index 0000000..fe031cd
--- /dev/null
+++ b/glabels2/macros/gnome-undelfs.m4
@@ -0,0 +1,22 @@
+dnl GNOME_UNDELFS_CHECKS
+dnl Check for ext2fs undel support.
+dnl Set shell variable ext2fs_undel to "yes" if we have it,
+dnl "no" otherwise. May define USE_EXT2FSLIB for cpp.
+dnl Will set EXT2FS_UNDEL_LIBS to required libraries.
+
+AC_DEFUN([GNOME_UNDELFS_CHECKS], [
+ ext2fs_undel=no
+ EXT2FS_UNDEL_LIBS=
+ AC_CHECK_HEADERS(linux/ext2_fs.h)
+ if test x$ac_cv_header_linux_ext2_fs_h = xyes
+ then
+ AC_CHECK_HEADERS(ext2fs/ext2fs.h, , , [#include <stdio.h>
+#include <linux/ext2_fs.h>])
+ if test x$ac_cv_header_ext2fs_ext2fs_h = xyes
+ then
+ AC_DEFINE(USE_EXT2FSLIB)
+ ext2fs_undel=yes
+ EXT2FS_UNDEL_LIBS="-lext2fs -lcom_err"
+ fi
+ fi
+])
diff --git a/glabels2/macros/gnome-vfs.m4 b/glabels2/macros/gnome-vfs.m4
new file mode 100644
index 0000000..6dce307
--- /dev/null
+++ b/glabels2/macros/gnome-vfs.m4
@@ -0,0 +1,126 @@
+dnl GNOME_VFS_CHECKS
+dnl Check for various functions needed by libvfs.
+dnl This has various effects:
+dnl Sets GNOME_VFS_LIBS to libraries required
+dnl Sets termnet to true or false depending on whether it is required.
+dnl If yes, defines USE_TERMNET.
+dnl Sets vfs_flags to "pretty" list of vfs implementations we include.
+dnl Sets shell variable use_vfs to yes (default, --with-vfs) or
+dnl "no" (--without-vfs).
+dnl Calls AC_SUBST(mcserv), which is either empty or "mcserv".
+
+dnl Private define
+AC_DEFUN([GNOME_WITH_VFS],[
+ dnl FIXME: network checks should probably be in their own macro.
+ AC_CHECK_LIB(nsl, t_accept)
+ AC_CHECK_LIB(socket, socket)
+
+ have_socket=no
+ AC_CHECK_FUNCS(socket, have_socket=yes)
+ if test $have_socket = no; then
+ # socket is not in the default libraries. See if it's in some other.
+ for lib in bsd socket inet; do
+ AC_CHECK_LIB($lib, socket, [
+ LIBS="$LIBS -l$lib"
+ have_socket=yes
+ AC_DEFINE(HAVE_SOCKET)
+ break])
+ done
+ fi
+
+ have_gethostbyname=no
+ AC_CHECK_FUNC(gethostbyname, have_gethostbyname=yes)
+ if test $have_gethostbyname = no; then
+ # gethostbyname is not in the default libraries. See if it's in some other.
+ for lib in bsd socket inet; do
+ AC_CHECK_LIB($lib, gethostbyname, [LIBS="$LIBS -l$lib"; have_gethostbyname=yes; break])
+ done
+ fi
+
+ vfs_flags="tarfs"
+ use_net_code=false
+ if test $have_socket = yes; then
+ AC_STRUCT_LINGER
+ AC_CHECK_FUNCS(pmap_set, , [
+ AC_CHECK_LIB(rpc, pmap_set, [
+ LIBS="-lrpc $LIBS"
+ AC_DEFINE(HAVE_PMAP_SET)
+ ])])
+ AC_CHECK_FUNCS(pmap_getport pmap_getmaps rresvport)
+ dnl add for source routing support setsockopt
+ AC_CHECK_HEADERS(rpc/pmap_clnt.h, , , [
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <rpc/rpc.h>
+#include <rpc/pmap_prot.h>
+ ])
+ vfs_flags="$vfs_flags, mcfs, ftpfs, fish"
+ use_net_code=true
+ fi
+
+ dnl
+ dnl Samba support
+ dnl
+ smbfs=""
+ SAMBAFILES=""
+ AC_ARG_WITH(samba,
+ [--with-samba Support smb virtual file system],[
+ if test "x$withval" != "xno"; then
+ AC_DEFINE(WITH_SMBFS)
+ vfs_flags="$vfs_flags, smbfs"
+ smbfs="smbfs.o"
+ SAMBAFILES="\$(SAMBAFILES)"
+ fi
+ ])
+ AC_SUBST(smbfs)
+ AC_SUBST(SAMBAFILES)
+
+ dnl
+ dnl The termnet support
+ dnl
+ termnet=false
+ AC_ARG_WITH(termnet,
+ [--with-termnet If you want a termified net support],[
+ if test x$withval = xyes; then
+ AC_DEFINE(USE_TERMNET)
+ termnet=true
+ fi
+ ])
+
+ TERMNET=""
+ AC_DEFINE(USE_VFS)
+ if $use_net_code; then
+ AC_DEFINE(USE_NETCODE)
+ fi
+ mcserv=
+ if test $have_socket = yes; then
+ mcserv="mcserv"
+ if $termnet; then
+ TERMNET="-ltermnet"
+ fi
+ fi
+
+ AC_SUBST(TERMNET)
+ AC_SUBST(mcserv)
+
+dnl FIXME:
+dnl GNOME_VFS_LIBS=
+
+])
+
+AC_DEFUN([GNOME_VFS_CHECKS],[
+ use_vfs=yes
+ AC_ARG_WITH(vfs,
+ [--with-vfs Compile with the VFS code],
+ use_vfs=$withval
+ )
+ case $use_vfs in
+ yes) GNOME_WITH_VFS;;
+ no) use_vfs=no;;
+ *) use_vfs=no;;
+ dnl Should we issue a warning?
+ esac
+])
+
+
diff --git a/glabels2/macros/gnome-x-checks.m4 b/glabels2/macros/gnome-x-checks.m4
new file mode 100644
index 0000000..1e397ef
--- /dev/null
+++ b/glabels2/macros/gnome-x-checks.m4
@@ -0,0 +1,80 @@
+dnl GNOME_X_CHECKS
+dnl
+dnl Basic X11 related checks for X11. At the end, the following will be
+dnl defined/changed:
+dnl GTK_{CFLAGS,LIBS} From AM_PATH_GTK
+dnl CPPFLAGS Will include $X_CFLAGS
+dnl GNOME_HAVE_SM `true' or `false' depending on whether session
+dnl management is available. It is available if
+dnl both -lSM and X11/SM/SMlib.h exist. (Some
+dnl Solaris boxes have the library but not the header)
+dnl XPM_LIBS -lXpm if Xpm library is present, otherwise ""
+dnl
+dnl The following configure cache variables are defined (but not used):
+dnl gnome_cv_passdown_{x_libs,X_LIBS,X_CFLAGS}
+dnl
+AC_DEFUN([GNOME_X_CHECKS],
+[
+ AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(GTK not installed, or gtk-config not in path))
+ dnl Hope that GTK_CFLAGS have only -I and -D. Otherwise, we could
+ dnl test -z "$x_includes" || CPPFLAGS="$CPPFLAGS -I$x_includes"
+ dnl
+ dnl Use CPPFLAGS instead of CFLAGS because AC_CHECK_HEADERS uses
+ dnl CPPFLAGS, not CFLAGS
+ CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
+
+ saved_ldflags="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $GTK_LIBS"
+
+ gnome_cv_passdown_x_libs="$GTK_LIBS"
+ gnome_cv_passdown_X_LIBS="$GTK_LIBS"
+ gnome_cv_passdown_X_CFLAGS="$GTK_CFLAGS"
+ gnome_cv_passdown_GTK_LIBS="$GTK_LIBS"
+
+ LDFLAGS="$saved_ldflags $GTK_LIBS"
+
+dnl We are requiring GTK >= 1.1.1, which means this will be fine anyhow.
+ USE_DEVGTK=true
+
+dnl AC_MSG_CHECKING([whether to use features from (unstable) GTK+ 1.1.x])
+dnl AC_EGREP_CPP(answer_affirmatively,
+dnl [#include <gtk/gtkfeatures.h>
+dnl #ifdef GTK_HAVE_FEATURES_1_1_0
+dnl answer_affirmatively
+dnl #endif
+dnl ], dev_gtk=yes, dev_gtk=no)
+dnl if test "$dev_gtk" = "yes"; then
+dnl USE_DEVGTK=true
+dnl fi
+dnl AC_MSG_RESULT("$dev_gtk")
+
+ GNOME_HAVE_SM=true
+ case "$GTK_LIBS" in
+ *-lSM*)
+ dnl Already found it.
+ ;;
+ *)
+ dnl Assume that if we have -lSM then we also have -lICE.
+ AC_CHECK_LIB(SM, SmcSaveYourselfDone,
+ [GTK_LIBS="-lSM -lICE $GTK_LIBS"],GNOME_HAVE_SM=false,
+ $x_libs -lICE)
+ ;;
+ esac
+
+ if test "$GNOME_HAVE_SM" = true; then
+ AC_CHECK_HEADERS(X11/SM/SMlib.h,,GNOME_HAVE_SM=false)
+ fi
+
+ if test "$GNOME_HAVE_SM" = true; then
+ AC_DEFINE(HAVE_LIBSM)
+ fi
+
+ XPM_LIBS=""
+ AC_CHECK_LIB(Xpm, XpmFreeXpmImage, [XPM_LIBS="-lXpm"], , $x_libs)
+ AC_SUBST(XPM_LIBS)
+
+ AC_REQUIRE([GNOME_PTHREAD_CHECK])
+ LDFLAGS="$saved_ldflags"
+
+ AC_PROVIDE([GNOME_X_CHECKS])
+])
diff --git a/glabels2/macros/gnome-xml-check.m4 b/glabels2/macros/gnome-xml-check.m4
new file mode 100644
index 0000000..1caad10
--- /dev/null
+++ b/glabels2/macros/gnome-xml-check.m4
@@ -0,0 +1,32 @@
+dnl
+dnl GNOME_XML_HOOK (script-if-xml-found, failflag)
+dnl
+dnl If failflag is "failure", script aborts due to lack of XML
+dnl
+dnl Check for availability of the libxml library
+dnl the XML parser uses libz if available too
+dnl
+
+AC_DEFUN([GNOME_XML_HOOK],[
+ AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
+ if test "$GNOME_CONFIG" = no; then
+ if test x$2 = xfailure; then
+ AC_MSG_ERROR(Could not find gnome-config)
+ fi
+ fi
+ GNOME_XML_CFLAGS=`$GNOME_CONFIG --cflags xml`
+ AC_SUBST(GNOME_XML_CFLAGS)
+ AC_CHECK_LIB(xml, xmlNewDoc, [
+ $1
+ GNOME_XML_LIB=`$GNOME_CONFIG --libs xml`
+ ], [
+ if test x$2 = xfailure; then
+ AC_MSG_ERROR(Could not link sample xml program)
+ fi
+ ], `$GNOME_CONFIG --libs xml`)
+ AC_SUBST(GNOME_XML_LIB)
+])
+
+AC_DEFUN([GNOME_XML_CHECK], [
+ GNOME_XML_HOOK([],failure)
+])
diff --git a/glabels2/macros/gnome.m4 b/glabels2/macros/gnome.m4
new file mode 100644
index 0000000..2d23de8
--- /dev/null
+++ b/glabels2/macros/gnome.m4
@@ -0,0 +1,130 @@
+dnl
+dnl GNOME_INIT_HOOK (script-if-gnome-enabled, [failflag], [additional-inits])
+dnl
+dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh
+dnl is not found.
+dnl
+
+AC_DEFUN([GNOME_INIT_HOOK],[
+ AC_SUBST(GNOME_LIBS)
+ AC_SUBST(GNOMEUI_LIBS)
+ AC_SUBST(GNOMEGNORBA_LIBS)
+ AC_SUBST(GTKXMHTML_LIBS)
+ AC_SUBST(ZVT_LIBS)
+ AC_SUBST(GNOME_LIBDIR)
+ AC_SUBST(GNOME_INCLUDEDIR)
+
+ AC_ARG_WITH(gnome-includes,
+ [ --with-gnome-includes Specify location of GNOME headers],[
+ CFLAGS="$CFLAGS -I$withval"
+ ])
+
+ AC_ARG_WITH(gnome-libs,
+ [ --with-gnome-libs Specify location of GNOME libs],[
+ LDFLAGS="$LDFLAGS -L$withval"
+ gnome_prefix=$withval
+ ])
+
+ AC_ARG_WITH(gnome,
+ [ --with-gnome Specify prefix for GNOME files],
+ if test x$withval = xyes; then
+ want_gnome=yes
+ dnl Note that an empty true branch is not
+ dnl valid sh syntax.
+ ifelse([$1], [], :, [$1])
+ else
+ if test "x$withval" = xno; then
+ want_gnome=no
+ else
+ want_gnome=yes
+ LDFLAGS="$LDFLAGS -L$withval/lib"
+ CFLAGS="$CFLAGS -I$withval/include"
+ gnome_prefix=$withval/lib
+ fi
+ fi,
+ want_gnome=yes)
+
+ if test "x$want_gnome" = xyes; then
+
+ AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
+ if test "$GNOME_CONFIG" = "no"; then
+ no_gnome_config="yes"
+ else
+ AC_MSG_CHECKING(if $GNOME_CONFIG works)
+ if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
+ AC_MSG_RESULT(yes)
+ GNOME_GNORBA_HOOK([],$2)
+ GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`"
+ GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`"
+ GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`"
+ GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`"
+ ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`"
+ GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`"
+ GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`"
+ $1
+ else
+ AC_MSG_RESULT(no)
+ no_gnome_config="yes"
+ fi
+ fi
+
+ if test x$exec_prefix = xNONE; then
+ if test x$prefix = xNONE; then
+ gnome_prefix=$ac_default_prefix/lib
+ else
+ gnome_prefix=$prefix/lib
+ fi
+ else
+ gnome_prefix=`eval echo \`echo $libdir\``
+ fi
+
+ if test "$no_gnome_config" = "yes"; then
+ AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix)
+ if test -f $gnome_prefix/gnomeConf.sh; then
+ AC_MSG_RESULT(found)
+ echo "loading gnome configuration from" \
+ "$gnome_prefix/gnomeConf.sh"
+ . $gnome_prefix/gnomeConf.sh
+ $1
+ else
+ AC_MSG_RESULT(not found)
+ if test x$2 = xfail; then
+ AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install)
+ fi
+ fi
+ fi
+ fi
+
+ if test -n "$3"; then
+ n="$3"
+ for i in $n; do
+ AC_MSG_CHECKING(extra library \"$i\")
+ case $i in
+ applets)
+ AC_SUBST(GNOME_APPLETS_LIBS)
+ GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets`
+ AC_MSG_RESULT($GNOME_APPLETS_LIBS);;
+ docklets)
+ AC_SUBST(GNOME_DOCKLETS_LIBS)
+ GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets`
+ AC_MSG_RESULT($GNOME_DOCKLETS_LIBS);;
+ capplet)
+ AC_SUBST(GNOME_CAPPLET_LIBS)
+ GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet`
+ AC_MSG_RESULT($GNOME_CAPPLET_LIBS);;
+ *)
+ AC_MSG_RESULT(unknown library)
+ esac
+ EXTRA_INCLUDEDIR=`$GNOME_CONFIG --cflags $i`
+ GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR $EXTRA_INCLUDEDIR"
+ done
+ fi
+])
+
+dnl
+dnl GNOME_INIT ([additional-inits])
+dnl
+
+AC_DEFUN([GNOME_INIT],[
+ GNOME_INIT_HOOK([],fail,$1)
+])
diff --git a/glabels2/macros/gperf-check.m4 b/glabels2/macros/gperf-check.m4
new file mode 100644
index 0000000..3869459
--- /dev/null
+++ b/glabels2/macros/gperf-check.m4
@@ -0,0 +1,79 @@
+dnl
+dnl AC_PROG_GPERF (MINIMUM-VERSION)
+dnl
+dnl Check for availability of gperf.
+dnl Abort if not found or if current version is not up to par.
+dnl
+
+AC_DEFUN([AC_PROG_GPERF],[
+ AC_PATH_PROG(GPERF, gperf, no)
+ if test "$GPERF" = no; then
+ AC_MSG_ERROR(Could not find gperf)
+ fi
+ min_gperf_version=ifelse([$1], ,2.7,$1)
+ AC_MSG_CHECKING(for gperf - version >= $min_gperf_version)
+ gperf_major_version=`$GPERF --version | \
+ sed 's/GNU gperf \([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ gperf_minor_version=`$GPERF --version | \
+ sed 's/GNU gperf \([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ no_gperf=""
+dnl
+dnl Now check if the installed gperf is sufficiently new.
+dnl
+ AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static char*
+my_strdup (char *str)
+{
+ char *new_str;
+
+ if (str)
+ {
+ new_str = malloc ((strlen (str) + 1) * sizeof(char));
+ strcpy (new_str, str);
+ }
+ else
+ new_str = NULL;
+
+ return new_str;
+}
+
+int
+main ()
+{
+ char *tmp_version;
+
+ int major;
+ int minor;
+
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
+ tmp_version = my_strdup("$min_gperf_version");
+ if (sscanf(tmp_version, "%d.%d", &major, &minor) != 2) {
+ printf ("%s, bad version string\n", "$min_gperf_version");
+ return 1;
+ }
+
+ if (($gperf_major_version > major) ||
+ (($gperf_major_version == major) && ($gperf_minor_version >= minor))) {
+ return 0;
+ } else {
+ printf ("\n");
+ printf ("*** An old version of gperf ($gperf_major_version.$gperf_minor_version) was found.\n");
+ printf ("*** You need a version of gperf newer than %d.%d.%d. The latest version of\n",
+ major, minor);
+ printf ("*** gperf is always available from ftp://ftp.gnu.org.\n");
+ printf ("***\n");
+ return 1;
+ }
+}
+],,no_gperf=yes,[/bin/true])
+ if test "x$no_gperf" = x ; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+
+])
diff --git a/glabels2/macros/linger.m4 b/glabels2/macros/linger.m4
new file mode 100644
index 0000000..f1c7060
--- /dev/null
+++ b/glabels2/macros/linger.m4
@@ -0,0 +1,28 @@
+dnl
+dnl Check for struct linger
+dnl
+AC_DEFUN([AC_STRUCT_LINGER], [
+av_struct_linger=no
+AC_MSG_CHECKING(struct linger is available)
+AC_TRY_RUN([
+#include <sys/types.h>
+#include <sys/socket.h>
+
+struct linger li;
+
+int main ()
+{
+ li.l_onoff = 1;
+ li.l_linger = 120;
+ return 0;
+}
+],[
+AC_DEFINE(HAVE_STRUCT_LINGER)
+av_struct_linger=yes
+],[
+av_struct_linger=no
+],[
+av_struct_linger=no
+])
+AC_MSG_RESULT($av_struct_linger)
+])
diff --git a/glabels2/macros/need-declaration.m4 b/glabels2/macros/need-declaration.m4
new file mode 100644
index 0000000..8a217b8
--- /dev/null
+++ b/glabels2/macros/need-declaration.m4
@@ -0,0 +1,42 @@
+dnl See whether we need a declaration for a function.
+dnl GCC_NEED_DECLARATION(FUNCTION [, EXTRA-HEADER-FILES])
+AC_DEFUN([GCC_NEED_DECLARATION],
+[AC_MSG_CHECKING([whether $1 must be declared])
+AC_CACHE_VAL(gcc_cv_decl_needed_$1,
+[AC_TRY_COMPILE([
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+$2],
+[char *(*pfn) = (char *(*)) $1],
+eval "gcc_cv_decl_needed_$1=no", eval "gcc_cv_decl_needed_$1=yes")])
+if eval "test \"`echo '$gcc_cv_decl_needed_'$1`\" = yes"; then
+ AC_MSG_RESULT(yes)
+ gcc_need_declarations="$gcc_need_declarations $1"
+ gcc_tr_decl=NEED_DECLARATION_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ AC_DEFINE_UNQUOTED($gcc_tr_decl)
+else
+ AC_MSG_RESULT(no)
+fi
+])dnl
+
+dnl Check multiple functions to see whether each needs a declaration.
+dnl GCC_NEED_DECLARATIONS(FUNCTION... [, EXTRA-HEADER-FILES])
+AC_DEFUN([GCC_NEED_DECLARATIONS],
+[for ac_func in $1
+do
+GCC_NEED_DECLARATION($ac_func, $2)
+done
+]
+)
diff --git a/glabels2/macros/psiconv.m4 b/glabels2/macros/psiconv.m4
new file mode 100644
index 0000000..eaf56f4
--- /dev/null
+++ b/glabels2/macros/psiconv.m4
@@ -0,0 +1,53 @@
+dnl
+dnl PSICONV_INIT
+dnl
+
+AC_DEFUN([PSICONV_INIT],[
+ AC_SUBST(PSICONV_LIBS)
+ AC_SUBST(PSICONV_CFLAGS)
+
+ AC_ARG_WITH(psiconv-includes,
+ [ --with-psiconv-includes Specify location of Psiconv headers],[
+ psiconv_cflags="-I$withval"
+ ])
+
+ AC_ARG_WITH(psiconv-libs,
+ [ --with-psiconv-libs Specify location of Psiconv libs],[
+ psiconv_libs="-L$withval"
+ ])
+
+ AC_ARG_WITH(psiconv,
+ [ --with-psiconv Enable/disable Psiconv support],
+ if test x$withval = xyes; then
+ want_psiconv=yes
+ else
+ if test "x$withval" = xno; then
+ want_psiconv=no
+ else
+ want_psiconv=yes
+ fi
+ fi,
+ want_psiconv=yes)
+
+
+ if test "$want_psiconv" = "yes"; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $psiconv_cflags"
+ LIBS="$LIBS $psiconv_libs"
+ AC_CHECK_LIB(psiconv,psiconv_parse,want_psiconv=yes,want_psiconv=no)
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+
+ if test "$want_psiconv" = "yes"; then
+ PSICONV_LIBS="${psiconv_libs} -lpsiconv"
+ PSICONV_CFLAGS="$psiconv_cflags"
+ with_psiconv=true
+ else
+ PSICONV_LIBS=""
+ PSICONV_CFLAGS=""
+ with_psiconv=false
+ fi
+ AM_CONDITIONAL(WITH_PSICONV,$with_psiconv)
+])
diff --git a/glabels2/po/Makefile.in.in b/glabels2/po/Makefile.in.in
deleted file mode 100644
index 20ccd41..0000000
--- a/glabels2/po/Makefile.in.in
+++ /dev/null
@@ -1,243 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-#
-# This file file be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-#
-# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-# instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob@ximian.com> to install
-# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
-localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/glib-2.0/gettext/po
-subdir = po
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
-
-CC = @CC@
-GENCAT = @GENCAT@
-GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
-MSGMERGE = PATH=../src:$$PATH msgmerge
-
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-SOURCES =
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
-$(POFILES) $(GMOFILES) $(SOURCES)
-
-POTFILES = \
-
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
-
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-
-.c.o:
- $(COMPILE) $<
-
-.po.pox:
- $(MAKE) $(GETTEXT_PACKAGE).pot
- $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
- $(MSGFMT) -o $@ $<
-
-.po.gmo:
- file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
- sed -f ../intl/po2msg.sed < $< > $*.msg \
- && rm -f $@ && $(GENCAT) $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
- $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
- --add-comments --keyword=_ --keyword=N_ \
- --files-from=$(srcdir)/POTFILES.in \
- && test ! -f $(GETTEXT_PACKAGE).po \
- || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
- && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
-
-install: install-exec install-data
-install-exec:
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
- if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- fi
- @catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- case "$$cat" in \
- *.gmo) destdir=$(gnulocaledir);; \
- *) destdir=$(localedir);; \
- esac; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
- if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $$dir; \
- else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
- fi; \
- if test -r $$cat; then \
- $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
- else \
- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
- fi; \
- if test -r $$cat.m; then \
- $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
- else \
- if test -r $(srcdir)/$$cat.m ; then \
- $(INSTALL_DATA) $(srcdir)/$$cat.m \
- $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
- else \
- true; \
- fi; \
- fi; \
- done
- if test "$(PACKAGE)" = "glib"; then \
- if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
- else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
- fi; \
- $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- else \
- : ; \
- fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
- catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- done
- rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
-
-check: all
-
-dvi info tags TAGS ID:
-
-mostlyclean:
- rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
- rm -fr *.o
-
-clean: mostlyclean
-
-distclean: clean
- rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
-
-maintainer-clean: distclean
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
- rm -f $(GMOFILES)
-
-distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
- dists="$(DISTFILES)"; \
- for file in $$dists; do \
- ln $(srcdir)/$$file $(distdir) 2> /dev/null \
- || cp -p $(srcdir)/$$file $(distdir); \
- done
-
-update-po: Makefile
- $(MAKE) $(GETTEXT_PACKAGE).pot
- PATH=`pwd`/../src:$$PATH; \
- cd $(srcdir); \
- catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- mv $$lang.po $$lang.old.po; \
- echo "$$lang:"; \
- if $(MSGMERGE) $$lang.old.po $(GETTEXT_PACKAGE).pot -o $$lang.po; then \
- rm -f $$lang.old.po; \
- else \
- echo "msgmerge for $$cat failed!"; \
- rm -f $$lang.po; \
- mv $$lang.old.po $$lang.po; \
- fi; \
- done
-
-# POTFILES is created from POTFILES.in by stripping comments, empty lines
-# and Intltool tags (enclosed in square brackets), and appending a full
-# relative path to them
-POTFILES: POTFILES.in
- ( if test 'x$(srcdir)' != 'x.'; then \
- posrcprefix='$(top_srcdir)/'; \
- else \
- posrcprefix="../"; \
- fi; \
- rm -f $@-t $@ \
- && (sed -e '/^#/d' \
- -e "s/^\[.*\] +//" \
- -e '/^[ ]*$$/d' \
- -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
- | sed -e '$$s/\\$$//') > $@-t \
- && chmod a-w $@-t \
- && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../config.status POTFILES
- cd .. \
- && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
- $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/glabels2/po/POTFILES.in b/glabels2/po/POTFILES.in
index 68b42a5..7f8634a 100644
--- a/glabels2/po/POTFILES.in
+++ b/glabels2/po/POTFILES.in
@@ -1,5 +1,6 @@
# List of source files containing translatable strings.
+src/glabels-ui.xml
src/glabels.c
src/glabels.h
src/glabels-batch.c
diff --git a/glabels2/po/de.po b/glabels2/po/de.po
index c1e3142..60c51fe 100644
--- a/glabels2/po/de.po
+++ b/glabels2/po/de.po
@@ -2,11 +2,10 @@
# Copyright (C) 2001 Jim Evins <evins@snaught.com>
# Marcus Bauer <m@7n7.de>, 2001.
#
-#: src/commands.c:384
msgid ""
msgstr ""
"Project-Id-Version: glabels 0.2.0\n"
-"POT-Creation-Date: 2002-08-20 21:43-0400\n"
+"POT-Creation-Date: 2002-08-24 22:30-0400\n"
"PO-Revision-Date: 2001-10-15 15:31+0200\n"
"Last-Translator: Marcus Bauer <m@7n7.de>\n"
"Language-Team: German <>\n"
@@ -14,863 +13,724 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/glabels.c:59
-msgid "Show view debugging messages."
-msgstr ""
-
-#: src/glabels.c:62
-msgid "Show item debugging messages."
-msgstr ""
-
-#: src/glabels.c:65
-msgid "Show printing debugging messages."
-msgstr ""
-
-#: src/glabels.c:68
-msgid "Show prefs debugging messages."
-msgstr ""
-
-#: src/glabels.c:71
-msgid "Show file debugging messages."
-msgstr ""
-
-#: src/glabels.c:74
-msgid "Show document debugging messages."
-msgstr ""
-
-#: src/glabels.c:77
-msgid "Show template debugging messages."
-msgstr ""
-
-#: src/glabels.c:80
-msgid "Show xml debugging messages."
-msgstr ""
-
-#: src/glabels.c:83
-msgid "Show document merge debugging messages."
-msgstr ""
-
-#: src/glabels.c:86
-msgid "Show commands debugging messages."
-msgstr ""
-
-#: src/glabels.c:89
-msgid "Show undo debugging messages."
-msgstr ""
-
-#: src/glabels.c:92
-msgid "Show recent debugging messages."
-msgstr ""
-
-#: src/glabels.c:95
-msgid "Show mdi debugging messages."
-msgstr ""
-
-#: src/glabels.c:98
-msgid "Show media select widget debugging messages."
-msgstr ""
-
-#: src/glabels.c:101
-msgid "Show mini preview widget debugging messages."
-msgstr ""
-
-#: src/glabels.c:104
-msgid "Show widget debugging messages."
-msgstr ""
-
-#: src/glabels.c:107
-msgid "Turn on all debugging messages."
-msgstr ""
-
-#: src/glabels-batch.c:47
+#: src/glabels_batch.c:49
msgid "print this message"
msgstr ""
-#: src/glabels-batch.c:49
+#: src/glabels_batch.c:51
msgid "print the version of glabels-batch being used"
msgstr ""
-#: src/glabels-batch.c:51
+#: src/glabels_batch.c:53
msgid "set output filename (default=\"output.ps\")"
msgstr ""
-#: src/glabels-batch.c:51
+#: src/glabels_batch.c:53
msgid "filename"
msgstr ""
-#: src/glabels-batch.c:53
+#: src/glabels_batch.c:55
msgid "number of sheets (default=1)"
msgstr ""
-#: src/glabels-batch.c:53
+#: src/glabels_batch.c:55
#, fuzzy
msgid "sheets"
msgstr "Seiten:"
-#: src/glabels-batch.c:55
+#: src/glabels_batch.c:57
msgid "number of copies (default=1)"
msgstr ""
-#: src/glabels-batch.c:55
+#: src/glabels_batch.c:57
#, fuzzy
msgid "copies"
msgstr "Kopien"
-#: src/glabels-batch.c:57 src/print-dialog.c:205
+#: src/glabels_batch.c:59 src/print_dialog.c:152
msgid "print outlines (to test printer alignment)"
msgstr "Begrenzungen drucken (um Druckausrichtung zu testen)"
-#: src/glabels-batch.c:59 src/print-dialog.c:214
+#: src/glabels_batch.c:61 src/print_dialog.c:160
msgid "print in reverse (i.e. a mirror image)"
msgstr "Spiegelbildlich drucken"
-#: src/glabels-batch.c:90
+#: src/glabels_batch.c:92
msgid "[OPTION...] GLABELS_FILE..."
msgstr ""
-#: src/glabels-batch.c:109
+#: src/glabels_batch.c:111
msgid "missing glabels file\n"
msgstr ""
-#: src/glabels-batch.c:140
+#: src/glabels_batch.c:139
#, fuzzy, c-format
msgid "cannot open glabels file %s\n"
msgstr "Datei kann nicht geöffnet werden"
-#: src/mdi.c:579
+#: src/mdi.c:169
#, c-format
-msgid ""
-"Do you want to save the changes you made to the document \"%s\"? \n"
-"\n"
-"Your changes will be lost if you don't save them."
-msgstr ""
-
-#: src/mdi.c:584
-#, fuzzy
-msgid "Do_n't save"
-msgstr "Nicht speichern."
+msgid "Revert to saved copy of %s?"
+msgstr "Gespeicherte Kopie von %s wiederherstellen?"
-#: src/mdi.c:604
-msgid "_Don't quit"
-msgstr ""
-
-#: src/mdi.c:609
-#, fuzzy
-msgid "_Don't close"
-msgstr "Nicht speichern."
+#: src/mdi.c:207
+msgid "Unknown media type. Using default."
+msgstr "Unbekannter Medientyp. Nehme daher Standardeinstellung."
-#: src/mdi.c:706
-msgid "(modified)"
-msgstr ""
-
-#: src/commands.c:359
+#: src/mdi.c:455
+#, c-format
msgid ""
-"A label and business card creation program for GNOME.\n"
-" \n"
-"Glabels is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version.\n"
-" \n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-msgstr ""
-"Ein GNOME-Programm zur Erstellung von Etiketten und Visitenkarten.\n"
-" \n"
-"Glabels ist freie Software; Sie können sie weiterverteilen und/oder ändern "
-"unter den Bedingungen der GNU General Public License, veröffentlicht von der "
-"Free Software Foundation, entweder Version 2 der Lizenz oder (optional) "
-"jeder späteren Version.\n"
-" \n"
-"Dieses Programm wird verteilt in der Hoffnung, dass es nützlich ist, aber "
-"OHNE JEDE GARANTIE; Weitere Details in der GNU General Public License.\n"
-
-#: src/commands.c:371
-#, fuzzy
-msgid "Author:"
-msgstr "bis:"
-
-#: src/commands.c:374
-msgid "See the file AUTHORS for additional acknowledgments,"
-msgstr ""
-
-#: src/commands.c:375
-msgid "or visit http://snaught.com/glabels"
+"``%s'' has been modified.\n"
+"\n"
+"Do you wish to save it?"
msgstr ""
+"``%s'' wurde geändert \n"
+"\n"
+"Wollen Sie speichern?"
-#: src/commands.c:397
-#, fuzzy
-msgid "glabels"
-msgstr "Labels"
-
-#: src/file.c:82
-msgid "New Label or Card"
-msgstr "Neues Etikett oder neue Karte"
-
-#: src/file.c:109
-msgid "Media Type"
-msgstr "Medien Typ"
+#: src/mdi.c:459
+msgid "Don't save"
+msgstr "Nicht speichern."
-#: src/file.c:119
-#, fuzzy
-msgid "Label orientation"
-msgstr "Ausrichtung ändern"
+#: src/mdi.c:601 src/file.c:288
+msgid "Cannot save file"
+msgstr "Kann Datei nicht speichern"
-#: src/file.c:248
-msgid "Open"
-msgstr "Öffnen"
+#: src/mdi.c:623 src/file.c:311
+msgid "Save As"
+msgstr "Speichern unter..."
-#: src/file.c:250
-msgid "Open label"
-msgstr "Öffnen Etikett"
+#: src/mdi.c:626
+msgid "Close / Save label as"
+msgstr "Schließen / Speichern des Etikett als"
-#: src/file.c:338
-#, fuzzy, c-format
-msgid "Cannot open file '%s'"
-msgstr "Datei kann nicht geöffnet werden"
+#: src/mdi.c:680 src/file.c:352
+msgid "Label no longer valid!"
+msgstr "Etikett nicht mehr gültig!"
-#: src/file.c:429
-#, fuzzy, c-format
-msgid "Error saving file '%s'"
-msgstr "Fehler beim Schreiben der Datei"
-
-#: src/file.c:468
-msgid "Save label as"
-msgstr "Datei speichern unter"
-
-#: src/file.c:550
+#: src/mdi.c:693 src/file.c:362
msgid "Must supply file name"
msgstr "Dateinamen angeben"
-#: src/file.c:569
-#, fuzzy, c-format
-msgid "Error writing file '%s'"
+#: src/mdi.c:705 src/file.c:374
+msgid "Error writing file"
msgstr "Fehler beim Schreiben der Datei"
-#. Should not happen
-#: src/prefs.c:625 src/prefs.c:632 src/wdgt-line.c:186
-#, fuzzy
-msgid "points"
-msgstr "Punkt"
-
-#: src/prefs.c:627
-msgid "inches"
-msgstr "Inch"
-
-#: src/prefs.c:629
-msgid "mm"
-msgstr "mm"
-
-#: src/prefs-dialog.c:220
-#, fuzzy
-msgid "Locale"
-msgstr "Skalierung"
-
-#: src/prefs-dialog.c:224
-msgid "Object defaults"
-msgstr ""
-
-#: src/prefs-dialog.c:232
-#, fuzzy
-msgid "Preferences"
-msgstr "Glabels : Einstellungen"
-
-#: src/prefs-dialog.c:272
-msgid "Select locale specific behavior."
-msgstr ""
-
-#. ----- Display Units Frame ------------------------------------
-#: src/prefs-dialog.c:279
-msgid "Display units"
-msgstr "Anzeige Einheiten"
-
-#: src/prefs-dialog.c:289
-#, fuzzy
-msgid "Points"
-msgstr "Punkt"
-
-#: src/prefs-dialog.c:296
-msgid "Inches"
-msgstr "Inch"
-
-#: src/prefs-dialog.c:303
-msgid "Millimeters"
-msgstr "Millimeter"
-
-#. ----- Page Size Frame ------------------------------------
-#: src/prefs-dialog.c:310
-msgid "Default page size"
-msgstr "Standard Papierformat"
-
-#: src/prefs-dialog.c:364
-msgid "Select default properties for new objects."
-msgstr ""
-
-#. ------ Line box ------
-#: src/prefs-dialog.c:377
-msgid "Line"
-msgstr "Linie"
-
-#. ------ Fill box ------
-#: src/prefs-dialog.c:382 src/view-box.c:325 src/view-ellipse.c:325
-msgid "Fill"
-msgstr "Füllen"
-
-#: src/view-object.c:406 src/view.c:1520
+#: src/display.c:1250 src/display.c:1298
msgid "Delete"
msgstr "Löschen"
-#: src/view-object.c:416 src/view.c:1530
+#: src/display.c:1260 src/display.c:1308
msgid "Bring to front"
msgstr "Ganz nach vorne"
-#: src/view-object.c:423 src/view.c:1536
+#: src/display.c:1266 src/display.c:1314
msgid "Send to back"
msgstr "Ganz nach hinten"
-#: src/view-object.c:395
+#: src/display.c:1287
msgid "Edit properties..."
msgstr "Einstellungen ändern..."
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-box.c:293
-msgid "Edit box object properties"
-msgstr "Rechteck bearbeiten..."
+#: src/item_text.c:450
+msgid "Edit text object properties"
+msgstr "Text Objekt bearbeiten"
+
+#: src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100
+msgid "Text"
+msgstr "Text"
-#: src/view-barcode.c:313 src/view-box.c:312 src/view-ellipse.c:312
-#: src/view-line.c:309 src/view-text.c:311
+#: src/item_text.c:479 src/item_line.c:253 src/item_box.c:245
+#: src/item_ellipse.c:247 src/item_barcode.c:317
msgid "Appearance"
msgstr "Erscheinungsbild"
-#. ------ Line box ------
-#: src/view-box.c:315 src/view-ellipse.c:315 src/view-line.c:312
-msgid "Outline"
-msgstr "Outline"
-
-#: src/view-box.c:340 src/view-ellipse.c:340 src/view-image.c:337
-#: src/view-line.c:328
-msgid "Position/Size"
-msgstr "Position/Breite"
+#. ------ Begin Text Properties box ------
+#: src/item_text.c:482
+#, fuzzy
+msgid "Text Properties"
+msgstr "Text Einstellungen"
#. ------ Position Frame ------
-#: src/view-barcode.c:345 src/view-barcode.c:349 src/view-box.c:343
-#: src/view-ellipse.c:343 src/view-image.c:340 src/view-line.c:331
-#: src/view-text.c:334 src/view-text.c:338
+#: src/item_text.c:500 src/item_text.c:503 src/item_line.c:274
+#: src/item_box.c:275 src/item_ellipse.c:277 src/item_image.c:318
+#: src/item_barcode.c:345 src/item_barcode.c:348
msgid "Position"
msgstr "Position"
+#: src/item_line.c:243
+msgid "Edit line object properties"
+msgstr "Linienobjekt bearbeiten..."
+
+#. ------ Begin Line box ------
+#: src/item_line.c:256 src/menu.c:106
+msgid "Line"
+msgstr "Linie"
+
+#: src/item_line.c:271 src/item_box.c:272 src/item_ellipse.c:274
+#: src/item_image.c:315
+msgid "Position/Size"
+msgstr "Position/Breite"
+
#. ------ Size Frame ------
-#: src/view-box.c:354 src/view-ellipse.c:356 src/view-image.c:353
-#: src/view-line.c:344
+#: src/item_line.c:285 src/item_box.c:286 src/item_ellipse.c:288
+#: src/item_image.c:329
msgid "Size"
msgstr "Breite"
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-ellipse.c:293
+#: src/item_box.c:235
+msgid "Edit box object properties"
+msgstr "Rechteck bearbeiten..."
+
+#. ------ Line box ------
+#: src/item_box.c:248 src/item_ellipse.c:250
+msgid "Outline"
+msgstr "Outline"
+
+#. ------ Fill box ------
+#: src/item_box.c:258 src/item_ellipse.c:260
+msgid "Fill"
+msgstr "Füllen"
+
+#: src/item_ellipse.c:237
msgid "Edit ellipse object properties"
msgstr "Ellipse bearbeiten..."
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-line.c:290
-msgid "Edit line object properties"
-msgstr "Linienobjekt bearbeiten..."
-
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-image.c:281
+#: src/item_image.c:257
msgid "Edit image object properties"
msgstr "Bildeinstellungen bearbeiten..."
-#: src/view-image.c:300
+#: src/item_image.c:268 src/menu.c:113
msgid "Image"
msgstr "Bild"
#. ------ Size Reset Button ------
-#: src/view-image.c:364
+#: src/item_image.c:342
msgid "Reset image size"
msgstr "Reset Bildgröße"
-#: src/view-text.c:265
-msgid "Edit text object properties"
-msgstr "Text Objekt bearbeiten"
+#: src/item_image.c:389 src/item_image.c:454
+msgid "Image format not currently supported"
+msgstr "Bildformat wird zur Zeit nicht unterstützt"
-#: src/view-text.c:285 src/view-text.c:605
-msgid "Text"
-msgstr "Text"
-
-#: src/view-barcode.c:267
+#: src/item_barcode.c:287
msgid "Edit barcode object properties"
msgstr "Barcode bearbeiten..."
-#: src/view-barcode.c:287
+#: src/item_barcode.c:297
msgid "Data"
msgstr "Wert"
-#: src/view-barcode.c:292
+#: src/item_barcode.c:299
#, fuzzy
msgid "Barcode data"
msgstr "Barcode Wert"
-#: src/view-barcode.c:318
-#, fuzzy
-msgid "Barcode Properties"
-msgstr "Text Einstellungen"
+#. ------ Begin Barcode Properties Frame ------
+#: src/item_barcode.c:320 src/prefs.c:215
+msgid "General"
+msgstr "Allgemeine Einstellungen"
#. ------ Barcode Style Frame ------
-#: src/view-barcode.c:328
+#: src/item_barcode.c:330
msgid "Style"
msgstr "Stil"
-#: src/print.c:814 src/view-barcode.c:758
+#: src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:631
msgid "Invalid barcode"
msgstr "Ungültiger Barcode-Wert"
-#: src/merge-properties.c:84
+#. W Label
+#: src/prop_size.c:182 src/prop_line.c:169
#, fuzzy
-msgid "Edit document-merge properties"
-msgstr "Dokumenten Mischerei bearbeiten..."
+msgid "Width:"
+msgstr "Länge der Linie"
-#: src/merge-properties.c:130
-msgid "Source"
-msgstr "Quelle"
+#. H label
+#: src/prop_size.c:198
+msgid "Height:"
+msgstr "Höhe"
-#: src/merge-properties.c:142
+#: src/prop_size.c:222
#, fuzzy
-msgid "Format:"
-msgstr "Font"
+msgid "Maintain current aspect ratio"
+msgstr "Seitenverhältnis beibehalten"
-#: src/merge-properties.c:157
-msgid "Location:"
-msgstr "Ort:"
+#. X label
+#: src/prop_position.c:173
+msgid "X:"
+msgstr "X:"
-#: src/merge-properties.c:167
-msgid "Fields"
-msgstr "Felder"
+#. Y label
+#: src/prop_position.c:191
+msgid "Y:"
+msgstr "Y:"
-#. ----- Contstruct basic print dialog with notebook -----
-#: src/print-dialog.c:102
-msgid "Print"
-msgstr "Drucken"
+#. Line Width units
+#: src/prop_line.c:183 src/prefs.c:448 src/prefs.c:455
+#, fuzzy
+msgid "points"
+msgstr "Punkt"
-#: src/print-dialog.c:124
-msgid "_Job"
-msgstr ""
+#. Line Color Label
+#: src/prop_line.c:189 src/prop_fill.c:166 src/prop_text.c:234
+#: src/prop_bc.c:188
+#, fuzzy
+msgid "Color:"
+msgstr "Farbe"
-#: src/print-dialog.c:129
+#. Font label
+#: src/prop_text.c:181
#, fuzzy
-msgid "P_rinter"
-msgstr "Drucken"
+msgid "Font:"
+msgstr "Font:"
-#. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:158
-msgid "Copies"
-msgstr "Kopien"
+#. Alignment label
+#: src/prop_text.c:248
+#, fuzzy
+msgid "Alignment:"
+msgstr "Textanordnung:"
-#. ------- Otherwise add merge control widget ------------
-#: src/print-dialog.c:174
-msgid "Document merge control"
-msgstr "Kontrolle der Mischung mit Datenquelle (Serienfunktion)"
+#. Insert merge field label
+#: src/prop_text_entry.c:180 src/prop_bc_data.c:196
+msgid "Key:"
+msgstr "Key:"
-#. ----------- Add custom print options area ------------
-#: src/print-dialog.c:195
-msgid "Options"
-msgstr "Optionen"
+#: src/prop_text_entry.c:196
+msgid "Insert merge field"
+msgstr "Datenfeld einfügen"
-#: src/print-dialog.c:345 src/print-dialog.c:384
-msgid "Print preview"
-msgstr "Druckvorschau"
+#. Length label
+#: src/prop_vector.c:183
+#, fuzzy
+msgid "Length:"
+msgstr "Länge"
-#: src/label.c:535
-#, c-format
-msgid "%s %d"
-msgstr ""
+#. Angle label
+#: src/prop_vector.c:207
+#, fuzzy
+msgid "Angle:"
+msgstr "Winkel"
-#: src/label.c:535
-msgid "Untitled"
-msgstr ""
+#. Angle units label
+#: src/prop_vector.c:224
+msgid "degrees"
+msgstr "Grad"
-#: src/template.c:346
-msgid "No template files found!"
-msgstr "Keine Dateivorlagen gefunden!"
+#. Scale Label
+#: src/prop_bc.c:168
+#, fuzzy
+msgid "Scale:"
+msgstr "Skalierung"
+
+#. % Label
+#: src/prop_bc.c:182
+msgid "%"
+msgstr "%"
+
+#: src/prop_bc_style.c:313
+msgid "Show text with barcode"
+msgstr "Zeige Text mit Barcode"
+
+#: src/prop_bc_data.c:176
+msgid "Literal:"
+msgstr "Literale:"
-#: src/xml-label.c:108 src/xml-label.c:139
+#: src/label.c:173 src/label.c:197
msgid "xmlParseFile error"
msgstr "Fehler: xmlParseFile error"
-#: src/xml-label.c:174
+#: src/label.c:228
msgid "No document root"
msgstr "Kein document root"
-#: src/xml-label.c:186
-msgid "Importing from glabels 0.1 format"
-msgstr ""
-
-#: src/xml-label.c:194
-msgid "Importing from glabels 0.4 format"
-msgstr ""
-
-#: src/xml-label.c:198
-#, fuzzy
-msgid "bad document, unknown glabels Namespace"
+#: src/label.c:239
+msgid "document of the wrong type, glabels Namespace not found"
msgstr "Fehlerhafter Dokument-Typ, glabels Namespace nicht gefunden"
-#: src/xml-label.c:226
+#: src/label.c:244
#, c-format
msgid "Bad root node = \"%s\""
msgstr "Fehlerhafter root node = \"%s\""
-#: src/xml-label.c:249 src/xml-label.c:281
+#: src/label.c:291
#, c-format
msgid "bad node = \"%s\""
msgstr "fehlerhafter node = \"%s\""
-#: src/xml-label.c:656
+#: src/label.c:606
msgid "Problem saving xml file."
msgstr "Problem beim Speichern der xml-Datei."
-#: src/merge.c:80
+#: src/template.c:224
+msgid "No template files found!"
+msgstr "Keine Dateivorlagen gefunden!"
+
+#: src/merge_properties.c:82
+#, fuzzy
+msgid "Edit document-merge properties"
+msgstr "Dokumenten Mischerei bearbeiten..."
+
+#: src/merge_properties.c:131
+msgid "Source"
+msgstr "Quelle"
+
+#: src/merge_properties.c:143
+#, fuzzy
+msgid "Format:"
+msgstr "Font"
+
+#: src/merge_properties.c:158
+msgid "Location:"
+msgstr "Ort:"
+
+#: src/merge_properties.c:168
+msgid "Fields"
+msgstr "Felder"
+
+#: src/merge.c:78
msgid "None"
msgstr "Keine"
-#: src/merge.c:88
+#: src/merge.c:86
msgid "Text with tab separators"
msgstr "Text mit Tabulatoren als Trennern"
-#: src/merge.c:96
-msgid "Text with comma separators"
+#: src/merge.c:94
+#, fuzzy
+msgid "Text with comma separators (CSV)"
msgstr "Text mit Kommata als Separatoren"
-#: src/merge.c:104
+#: src/merge.c:102
msgid "Text with colon separators"
msgstr "Text mit Doppelpunkten als Separatoren"
-#: src/merge-ui.c:223 src/merge-ui.c:265 src/merge-ui.c:435 src/merge-ui.c:483
+#: src/merge_ui.c:207 src/merge_ui.c:242 src/merge_ui.c:387 src/merge_ui.c:428
msgid "N/A"
msgstr "Nicht verfügbar"
-#: src/merge-ui-text.c:172
+#: src/merge_ui_text.c:170
msgid "Select merge-database source"
msgstr "Wählen Sie die einzumischende Datenquelle"
-#: src/merge-ui-text.c:330
+#: src/merge_ui_text.c:330
msgid "Column"
msgstr "Spalte"
-#: src/merge-ui-text.c:334
+#: src/merge_ui_text.c:334
msgid "Custom field key"
msgstr "Benutzerdefinierter Feldschlüssel"
-#: src/merge-ui-text.c:338
+#: src/merge_ui_text.c:338
msgid "Sample data"
msgstr "Beispiel Daten"
-#. Font label
-#: src/wdgt-text-props.c:184
-#, fuzzy
-msgid "Font:"
-msgstr "Font:"
+#: src/menu.c:50
+msgid "_New"
+msgstr "_Neu"
-#. Text Color Label
-#: src/wdgt-bc-props.c:190 src/wdgt-fill.c:169 src/wdgt-line.c:192
-#: src/wdgt-text-props.c:237
-#, fuzzy
-msgid "Color:"
-msgstr "Farbe"
+#: src/menu.c:51
+msgid "Make a new, empty label"
+msgstr "Erzeuge neues, leeres Etikett"
-#. Alignment label
-#: src/wdgt-text-props.c:251
+#: src/menu.c:85
+msgid "U_nselect All "
+msgstr "A_uswahl aufheben"
+
+#: src/menu.c:86
+msgid "Remove all selections"
+msgstr "Alle Auswahlen aufheben"
+
+#: src/menu.c:94
#, fuzzy
-msgid "Alignment:"
-msgstr "Textanordnung:"
+msgid "Select"
+msgstr "Löschen"
-#. Insert merge field label
-#: src/wdgt-bc-data.c:199 src/wdgt-text-entry.c:201
-msgid "Key:"
-msgstr "Key:"
+#: src/menu.c:95 src/menu.c:186
+msgid "Select, move and modify objects"
+msgstr "Objekte auswählen, bewegen, ändern"
-#: src/wdgt-text-entry.c:217
-msgid "Insert merge field"
-msgstr "Datenfeld einfügen"
+#: src/menu.c:100 src/menu.c:191
+msgid "Create text object"
+msgstr "Textobjekt erzeugen"
-#. X label
-#: src/wdgt-position.c:182
-msgid "X:"
-msgstr "X:"
+#: src/menu.c:103
+msgid "Box"
+msgstr "Box"
-#. Y label
-#: src/wdgt-position.c:200
-msgid "Y:"
-msgstr "Y:"
+#: src/menu.c:103 src/menu.c:194
+msgid "Create box/rectangle object"
+msgstr "Rechteck-Objekt erzeugen"
-#. W Label
-#: src/wdgt-line.c:172 src/wdgt-size.c:184
-#, fuzzy
-msgid "Width:"
-msgstr "Länge der Linie"
+#: src/menu.c:106 src/menu.c:197
+msgid "Create line object"
+msgstr "Linienobjekt erzeugen"
-#. H label
-#: src/wdgt-size.c:200
-msgid "Height:"
-msgstr "Höhe"
+#: src/menu.c:109
+msgid "Ellipse"
+msgstr "Ellipse"
+
+#: src/menu.c:110 src/menu.c:200
+msgid "Create ellipse/circle object"
+msgstr "Ellipsenobjekt erzeugen"
-#: src/wdgt-size.c:224
+#: src/menu.c:113 src/menu.c:203
+msgid "Create image object"
+msgstr "Bildobjekt erzeugen"
+
+#: src/menu.c:116
#, fuzzy
-msgid "Maintain current aspect ratio"
-msgstr "Seitenverhältnis beibehalten"
+msgid "Barcode"
+msgstr "Barcode Wert"
-#. Length label
-#: src/wdgt-vector.c:186
+#: src/menu.c:116 src/menu.c:206
+msgid "Create barcode object"
+msgstr "Barcodeobjekt erzeugen"
+
+#: src/menu.c:121 src/menu.c:211
+msgid "Zoom in"
+msgstr "vergrößern"
+
+#: src/menu.c:124 src/menu.c:214
+msgid "Zoom out"
+msgstr "verkleinern"
+
+#: src/menu.c:127
+msgid "Zoom 1:1"
+msgstr "Zoom 1:1"
+
+#: src/menu.c:127 src/menu.c:217
+msgid "Zoom to 1:1"
+msgstr "Maßstab auf 1:1 einstellen"
+
+#: src/menu.c:132 src/menu.c:223
#, fuzzy
-msgid "Length:"
-msgstr "Länge"
+msgid "Merge properties"
+msgstr "Einstellungen ändern..."
-#. Angle label
-#: src/wdgt-vector.c:210
+#: src/menu.c:133
#, fuzzy
-msgid "Angle:"
-msgstr "Winkel"
+msgid "Edit merge properties"
+msgstr "Bildeinstellungen bearbeiten..."
-#. Angle units label
-#: src/wdgt-vector.c:227
-msgid "degrees"
-msgstr "Grad"
+#: src/menu.c:157
+msgid "_Tools"
+msgstr "_Werkzeuge"
-#. Scale Label
-#: src/wdgt-bc-props.c:170
-#, fuzzy
-msgid "Scale:"
-msgstr "Skalierung"
+#: src/menu.c:168
+msgid " New "
+msgstr " Neu "
-#. % Label
-#: src/wdgt-bc-props.c:184
-#, c-format
-msgid "%"
-msgstr "%"
+#: src/menu.c:168
+msgid "New Label/Card"
+msgstr "Neues Etikett/Neue Karte"
-#: src/wdgt-bc-style.c:316
-msgid "Show text with barcode"
-msgstr "Zeige Text mit Barcode"
+#: src/menu.c:170
+msgid " Open "
+msgstr " Öffnen "
-#: src/wdgt-bc-data.c:179
-msgid "Literal:"
-msgstr "Literale:"
+#: src/menu.c:170
+msgid "Open a file"
+msgstr "Datei öffnen"
-#: src/wdgt-print-copies.c:178
-msgid "Sheets:"
-msgstr "Seiten:"
+#: src/menu.c:172
+msgid " Save "
+msgstr " Speichern "
-#: src/wdgt-print-copies.c:195
-msgid "Labels"
-msgstr "Labels"
+#: src/menu.c:172
+msgid "Save current file"
+msgstr "Aktuelle Datei speichern"
-#: src/wdgt-print-copies.c:198
-msgid "from:"
-msgstr "von:"
+#: src/menu.c:175
+msgid " Print "
+msgstr " Drucken "
-#: src/wdgt-print-copies.c:206
-msgid "to:"
-msgstr "bis:"
+#: src/menu.c:175
+msgid "Print current file"
+msgstr "Aktuelle Datei drucken"
-#: src/wdgt-print-merge.c:177
-msgid "Start on label"
-msgstr "Start bei Etikett"
+#: src/menu.c:290
+msgid ""
+"A label and business card creation program for GNOME.\n"
+" \n"
+"Glabels is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+" \n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+msgstr ""
+"Ein GNOME-Programm zur Erstellung von Etiketten und Visitenkarten.\n"
+" \n"
+"Glabels ist freie Software; Sie können sie weiterverteilen und/oder ändern "
+"unter den Bedingungen der GNU General Public License, veröffentlicht von der "
+"Free Software Foundation, entweder Version 2 der Lizenz oder (optional) "
+"jeder späteren Version.\n"
+" \n"
+"Dieses Programm wird verteilt in der Hoffnung, dass es nützlich ist, aber "
+"OHNE JEDE GARANTIE; Weitere Details in der GNU General Public License.\n"
-#: src/wdgt-print-merge.c:186
-msgid "on 1st sheet"
-msgstr "auf erster Seite"
+#: src/menu.c:326
+msgid "Function is not implemented!"
+msgstr "Funktion noch nicht implementiert!"
-#: src/wdgt-print-merge.c:197
-msgid "Collate"
-msgstr "Zuordnen"
+#: src/file.c:72
+msgid "New Label or Card"
+msgstr "Neues Etikett oder neue Karte"
-#: src/wdgt-print-merge.c:204
-msgid "Copies:"
-msgstr "Kopien:"
+#: src/file.c:98
+msgid "Media Type"
+msgstr "Medien Typ"
-#: src/wdgt-media-select.c:252
+#: src/file.c:109
+#, fuzzy
+msgid "Label orientation"
+msgstr "Ausrichtung ändern"
+
+#: src/file.c:211
+msgid "Open"
+msgstr "Öffnen"
+
+#: src/file.c:213
+msgid "Open label"
+msgstr "Öffnen Etikett"
+
+#: src/file.c:249
+msgid "Cannot open file"
+msgstr "Datei kann nicht geöffnet werden"
+
+#: src/file.c:316
+msgid "Save label as"
+msgstr "Datei speichern unter"
+
+#: src/media_select.c:222
#, fuzzy
msgid "Description:"
msgstr "Position"
-#: src/wdgt-media-select.c:257
+#: src/media_select.c:227
msgid "Page size:"
msgstr "Seiten Format:"
-#: src/wdgt-media-select.c:262
+#: src/media_select.c:232
msgid "Label size:"
msgstr "Etikett Format:"
-#: src/wdgt-media-select.c:267
+#: src/media_select.c:237
msgid "Layout:"
msgstr "Layout:"
-#: src/wdgt-media-select.c:408
+#: src/media_select.c:353
#, c-format
msgid "%d x %d (%d per sheet)"
msgstr "%d x %d (%d pro Seite)"
-#: src/wdgt-media-select.c:422
+#: src/media_select.c:367
#, c-format
msgid "%s x %s %s"
msgstr "%s x %s %s"
-#: src/wdgt-media-select.c:427
+#: src/media_select.c:372
#, c-format
msgid "%.5g x %.5g %s"
msgstr "%.5g x %.5g %s"
-#: src/wdgt-rotate-label.c:176
+#: src/rotate_select.c:169
msgid "Rotate"
msgstr "Rotieren"
-#: src/bonobo-mdi.c:522 src/bonobo-mdi.c:612 src/bonobo-mdi.c:1850
-#, c-format
-msgid "Activate %s"
-msgstr ""
-
-#: src/gnome-recent-view-bonobo.c:189
-#, fuzzy, c-format
-msgid "Open %s"
-msgstr "Öffnen"
-
-#~ msgid "Revert to saved copy of %s?"
-#~ msgstr "Gespeicherte Kopie von %s wiederherstellen?"
-
-#~ msgid "Unknown media type. Using default."
-#~ msgstr "Unbekannter Medientyp. Nehme daher Standardeinstellung."
-
-#~ msgid ""
-#~ "``%s'' has been modified.\n"
-#~ "\n"
-#~ "Do you wish to save it?"
-#~ msgstr ""
-#~ "``%s'' wurde geändert \n"
-#~ "\n"
-#~ "Wollen Sie speichern?"
-
-#~ msgid "Cannot save file"
-#~ msgstr "Kann Datei nicht speichern"
-
-#~ msgid "Save As"
-#~ msgstr "Speichern unter..."
-
-#~ msgid "Close / Save label as"
-#~ msgstr "Schließen / Speichern des Etikett als"
-
-#~ msgid "Label no longer valid!"
-#~ msgstr "Etikett nicht mehr gültig!"
-
-#~ msgid "Image format not currently supported"
-#~ msgstr "Bildformat wird zur Zeit nicht unterstützt"
-
-#~ msgid "General"
-#~ msgstr "Allgemeine Einstellungen"
-
-#~ msgid "_New"
-#~ msgstr "_Neu"
-
-#~ msgid "Make a new, empty label"
-#~ msgstr "Erzeuge neues, leeres Etikett"
-
-#~ msgid "U_nselect All "
-#~ msgstr "A_uswahl aufheben"
-
-#~ msgid "Remove all selections"
-#~ msgstr "Alle Auswahlen aufheben"
-
-#, fuzzy
-#~ msgid "Select"
-#~ msgstr "Löschen"
-
-#~ msgid "Select, move and modify objects"
-#~ msgstr "Objekte auswählen, bewegen, ändern"
+#: src/print_dialog.c:99
+msgid "Print"
+msgstr "Drucken"
-#~ msgid "Create text object"
-#~ msgstr "Textobjekt erzeugen"
+#. ----------- Add simple-copies widget ------------
+#: src/print_dialog.c:104
+msgid "Copies"
+msgstr "Kopien"
-#~ msgid "Box"
-#~ msgstr "Box"
+#. -------Otherwise add merge control widget ------------
+#: src/print_dialog.c:121
+msgid "Document merge control"
+msgstr "Kontrolle der Mischung mit Datenquelle (Serienfunktion)"
-#~ msgid "Create box/rectangle object"
-#~ msgstr "Rechteck-Objekt erzeugen"
+#. ----------- Add custom print options area ------------
+#: src/print_dialog.c:141
+msgid "Options"
+msgstr "Optionen"
-#~ msgid "Create line object"
-#~ msgstr "Linienobjekt erzeugen"
+#: src/print_dialog.c:241 src/print_dialog.c:280
+msgid "Print preview"
+msgstr "Druckvorschau"
-#~ msgid "Ellipse"
-#~ msgstr "Ellipse"
+#: src/print_copies.c:170
+msgid "Sheets:"
+msgstr "Seiten:"
-#~ msgid "Create ellipse/circle object"
-#~ msgstr "Ellipsenobjekt erzeugen"
+#: src/print_copies.c:187
+msgid "Labels"
+msgstr "Labels"
-#~ msgid "Create image object"
-#~ msgstr "Bildobjekt erzeugen"
+#: src/print_copies.c:190
+msgid "from:"
+msgstr "von:"
-#, fuzzy
-#~ msgid "Barcode"
-#~ msgstr "Barcode Wert"
+#: src/print_copies.c:198
+msgid "to:"
+msgstr "bis:"
-#~ msgid "Create barcode object"
-#~ msgstr "Barcodeobjekt erzeugen"
+#: src/print_merge.c:170
+msgid "Start on label"
+msgstr "Start bei Etikett"
-#~ msgid "Zoom in"
-#~ msgstr "vergrößern"
+#: src/print_merge.c:179
+msgid "on 1st sheet"
+msgstr "auf erster Seite"
-#~ msgid "Zoom out"
-#~ msgstr "verkleinern"
+#: src/print_merge.c:188
+msgid "Collate"
+msgstr "Zuordnen"
-#~ msgid "Zoom 1:1"
-#~ msgstr "Zoom 1:1"
+#: src/print_merge.c:195
+msgid "Copies:"
+msgstr "Kopien:"
-#~ msgid "Zoom to 1:1"
-#~ msgstr "Maßstab auf 1:1 einstellen"
+#: src/prefs.c:86
+msgid "Glabels: Preferences"
+msgstr "Glabels : Einstellungen"
-#, fuzzy
-#~ msgid "Merge properties"
-#~ msgstr "Einstellungen ändern..."
+#. ----- Display Units Frame ------------------------------------
+#: src/prefs.c:220
+msgid "Display units"
+msgstr "Anzeige Einheiten"
+#: src/prefs.c:231
#, fuzzy
-#~ msgid "Edit merge properties"
-#~ msgstr "Bildeinstellungen bearbeiten..."
-
-#~ msgid "_Tools"
-#~ msgstr "_Werkzeuge"
-
-#~ msgid " New "
-#~ msgstr " Neu "
-
-#~ msgid "New Label/Card"
-#~ msgstr "Neues Etikett/Neue Karte"
-
-#~ msgid " Open "
-#~ msgstr " Öffnen "
-
-#~ msgid "Open a file"
-#~ msgstr "Datei öffnen"
+msgid "Points"
+msgstr "Punkt"
-#~ msgid " Save "
-#~ msgstr " Speichern "
+#: src/prefs.c:237
+msgid "Inches"
+msgstr "Inch"
-#~ msgid "Save current file"
-#~ msgstr "Aktuelle Datei speichern"
+#: src/prefs.c:244
+msgid "Millimeters"
+msgstr "Millimeter"
-#~ msgid " Print "
-#~ msgstr " Drucken "
+#. ----- Display Units Frame ------------------------------------
+#: src/prefs.c:249
+msgid "Default page size"
+msgstr "Standard Papierformat"
-#~ msgid "Print current file"
-#~ msgstr "Aktuelle Datei drucken"
+#: src/prefs.c:450
+msgid "inches"
+msgstr "Inch"
-#~ msgid "Function is not implemented!"
-#~ msgstr "Funktion noch nicht implementiert!"
+#: src/prefs.c:452
+msgid "mm"
+msgstr "mm"
#~ msgid "Function is not yet implemented!"
#~ msgstr "Funktion noch nicht implementiert!"
diff --git a/glabels2/po/es.po b/glabels2/po/es.po
new file mode 100644
index 0000000..44f00dd
--- /dev/null
+++ b/glabels2/po/es.po
@@ -0,0 +1,704 @@
+# LANGUAGE translation of glabels.
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# victor <victor@pasmao.net>, 2002.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: glabels 0.2.0\n"
+"POT-Creation-Date: 2002-08-24 22:30-0400\n"
+"PO-Revision-Date: 2002-04-16 12:19+0200\n"
+"Last-Translator: victor <victor@pasmao.net>\n"
+"Language-Team: Spanish/Spain <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/glabels_batch.c:49
+msgid "print this message"
+msgstr ""
+
+#: src/glabels_batch.c:51
+msgid "print the version of glabels-batch being used"
+msgstr ""
+
+#: src/glabels_batch.c:53
+msgid "set output filename (default=\"output.ps\")"
+msgstr ""
+
+#: src/glabels_batch.c:53
+msgid "filename"
+msgstr ""
+
+#: src/glabels_batch.c:55
+msgid "number of sheets (default=1)"
+msgstr ""
+
+#: src/glabels_batch.c:55
+#, fuzzy
+msgid "sheets"
+msgstr "Hojas:"
+
+#: src/glabels_batch.c:57
+msgid "number of copies (default=1)"
+msgstr ""
+
+#: src/glabels_batch.c:57
+#, fuzzy
+msgid "copies"
+msgstr "Copias"
+
+#: src/glabels_batch.c:59 src/print_dialog.c:152
+msgid "print outlines (to test printer alignment)"
+msgstr "Imprimir un esbozo (para verificar la alineación de la impresora)"
+
+#: src/glabels_batch.c:61 src/print_dialog.c:160
+msgid "print in reverse (i.e. a mirror image)"
+msgstr "Impresión invertida (imagen espejo)"
+
+#: src/glabels_batch.c:92
+msgid "[OPTION...] GLABELS_FILE..."
+msgstr ""
+
+#: src/glabels_batch.c:111
+msgid "missing glabels file\n"
+msgstr ""
+
+#: src/glabels_batch.c:139
+#, fuzzy, c-format
+msgid "cannot open glabels file %s\n"
+msgstr "No puedo abrir el archivo"
+
+#: src/mdi.c:169
+#, c-format
+msgid "Revert to saved copy of %s?"
+msgstr "ż Recuperar la copia salvada de %s ?"
+
+#: src/mdi.c:207
+msgid "Unknown media type. Using default."
+msgstr "Tipo de papel desconocido. Utilizando el tipo por omisión."
+
+#: src/mdi.c:455
+#, c-format
+msgid ""
+"``%s'' has been modified.\n"
+"\n"
+"Do you wish to save it?"
+msgstr ""
+"\"%s\" ha sido modificado.\n"
+"\n"
+"ż Desea salvarlo ?"
+
+#: src/mdi.c:459
+msgid "Don't save"
+msgstr "No salvar"
+
+#: src/mdi.c:601 src/file.c:288
+msgid "Cannot save file"
+msgstr "No puedo salvar el archivo"
+
+#: src/mdi.c:623 src/file.c:311
+msgid "Save As"
+msgstr "Salva como"
+
+#: src/mdi.c:626
+msgid "Close / Save label as"
+msgstr "Cerrar / Salvar etiqueta como"
+
+#: src/mdi.c:680 src/file.c:352
+msgid "Label no longer valid!"
+msgstr "ˇ La etiqueta ya no es válida !"
+
+#: src/mdi.c:693 src/file.c:362
+msgid "Must supply file name"
+msgstr "Debe proporcionar un nombre de archivo"
+
+#: src/mdi.c:705 src/file.c:374
+msgid "Error writing file"
+msgstr "Error salvando el archivo"
+
+#: src/display.c:1250 src/display.c:1298
+msgid "Delete"
+msgstr "Borrar"
+
+#: src/display.c:1260 src/display.c:1308
+msgid "Bring to front"
+msgstr "Traer al frente"
+
+#: src/display.c:1266 src/display.c:1314
+msgid "Send to back"
+msgstr "Enviar al fondo"
+
+#: src/display.c:1287
+msgid "Edit properties..."
+msgstr "Modificar propiedades"
+
+#: src/item_text.c:450
+msgid "Edit text object properties"
+msgstr "Modificar las propiedades del objeto texto"
+
+#: src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100
+msgid "Text"
+msgstr "Texto"
+
+#: src/item_text.c:479 src/item_line.c:253 src/item_box.c:245
+#: src/item_ellipse.c:247 src/item_barcode.c:317
+msgid "Appearance"
+msgstr "Apariencia"
+
+#. ------ Begin Text Properties box ------
+#: src/item_text.c:482
+msgid "Text Properties"
+msgstr "Propiedades del texto"
+
+#. ------ Position Frame ------
+#: src/item_text.c:500 src/item_text.c:503 src/item_line.c:274
+#: src/item_box.c:275 src/item_ellipse.c:277 src/item_image.c:318
+#: src/item_barcode.c:345 src/item_barcode.c:348
+msgid "Position"
+msgstr "Posición"
+
+#: src/item_line.c:243
+msgid "Edit line object properties"
+msgstr "Modificar las propiedades del objeto línea"
+
+#. ------ Begin Line box ------
+#: src/item_line.c:256 src/menu.c:106
+msgid "Line"
+msgstr "Línea"
+
+#: src/item_line.c:271 src/item_box.c:272 src/item_ellipse.c:274
+#: src/item_image.c:315
+msgid "Position/Size"
+msgstr "Posición/Tamańo"
+
+#. ------ Size Frame ------
+#: src/item_line.c:285 src/item_box.c:286 src/item_ellipse.c:288
+#: src/item_image.c:329
+msgid "Size"
+msgstr "Tamańo"
+
+#: src/item_box.c:235
+msgid "Edit box object properties"
+msgstr "Modificar propiedades del objeto caja"
+
+#. ------ Line box ------
+#: src/item_box.c:248 src/item_ellipse.c:250
+msgid "Outline"
+msgstr "Contorno"
+
+#. ------ Fill box ------
+#: src/item_box.c:258 src/item_ellipse.c:260
+msgid "Fill"
+msgstr "Relleno"
+
+#: src/item_ellipse.c:237
+msgid "Edit ellipse object properties"
+msgstr "Modificar las propiedades del objeto elipse"
+
+#: src/item_image.c:257
+msgid "Edit image object properties"
+msgstr "Modificar las propiedades del objeto imagen"
+
+#: src/item_image.c:268 src/menu.c:113
+msgid "Image"
+msgstr "Imagen"
+
+#. ------ Size Reset Button ------
+#: src/item_image.c:342
+msgid "Reset image size"
+msgstr "Restablecer el tamańo de la imagen"
+
+#: src/item_image.c:389 src/item_image.c:454
+msgid "Image format not currently supported"
+msgstr "Formato de imagen no soportado actualmente"
+
+#: src/item_barcode.c:287
+msgid "Edit barcode object properties"
+msgstr "Modificar las propiedades del objeto código de barras"
+
+#: src/item_barcode.c:297
+msgid "Data"
+msgstr "Datos"
+
+#: src/item_barcode.c:299
+msgid "Barcode data"
+msgstr "Datos del código de barras"
+
+#. ------ Begin Barcode Properties Frame ------
+#: src/item_barcode.c:320 src/prefs.c:215
+msgid "General"
+msgstr "General"
+
+#. ------ Barcode Style Frame ------
+#: src/item_barcode.c:330
+msgid "Style"
+msgstr "Estilo"
+
+#: src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:631
+msgid "Invalid barcode"
+msgstr "Código de barras no válido"
+
+#. W Label
+#: src/prop_size.c:182 src/prop_line.c:169
+msgid "Width:"
+msgstr "Ancho"
+
+#. H label
+#: src/prop_size.c:198
+msgid "Height:"
+msgstr "Alto"
+
+#: src/prop_size.c:222
+msgid "Maintain current aspect ratio"
+msgstr "Mantener la proporción actual del aspecto"
+
+#. X label
+#: src/prop_position.c:173
+msgid "X:"
+msgstr "X:"
+
+#. Y label
+#: src/prop_position.c:191
+msgid "Y:"
+msgstr "Y:"
+
+#. Line Width units
+#: src/prop_line.c:183 src/prefs.c:448 src/prefs.c:455
+msgid "points"
+msgstr "puntos"
+
+#. Line Color Label
+#: src/prop_line.c:189 src/prop_fill.c:166 src/prop_text.c:234
+#: src/prop_bc.c:188
+msgid "Color:"
+msgstr "Color"
+
+#. Font label
+#: src/prop_text.c:181
+msgid "Font:"
+msgstr "Fuente:"
+
+#. Alignment label
+#: src/prop_text.c:248
+msgid "Alignment:"
+msgstr "Alineación:"
+
+#. Insert merge field label
+#: src/prop_text_entry.c:180 src/prop_bc_data.c:196
+msgid "Key:"
+msgstr "Clave:"
+
+#: src/prop_text_entry.c:196
+msgid "Insert merge field"
+msgstr "Insertar campo para fusionar"
+
+#. Length label
+#: src/prop_vector.c:183
+msgid "Length:"
+msgstr "Longitud:"
+
+#. Angle label
+#: src/prop_vector.c:207
+msgid "Angle:"
+msgstr "Ángulo:"
+
+#. Angle units label
+#: src/prop_vector.c:224
+msgid "degrees"
+msgstr "grados"
+
+#. Scale Label
+#: src/prop_bc.c:168
+msgid "Scale:"
+msgstr "Escala:"
+
+#. % Label
+#: src/prop_bc.c:182
+msgid "%"
+msgstr "%"
+
+#: src/prop_bc_style.c:313
+msgid "Show text with barcode"
+msgstr "Mostrar texto con código de barras"
+
+#: src/prop_bc_data.c:176
+msgid "Literal:"
+msgstr "Literal:"
+
+#: src/label.c:173 src/label.c:197
+msgid "xmlParseFile error"
+msgstr "error xmlParseFile"
+
+#: src/label.c:228
+msgid "No document root"
+msgstr "No hay documento raíz"
+
+#: src/label.c:239
+msgid "document of the wrong type, glabels Namespace not found"
+msgstr "documento de tipo erróneo, glabels Espacio de nombres no encontrado"
+
+#: src/label.c:244
+#, c-format
+msgid "Bad root node = \"%s\""
+msgstr "Nodo raíz erróneo = \"%s\""
+
+#: src/label.c:291
+#, c-format
+msgid "bad node = \"%s\""
+msgstr "Nodo erróneo = \"%s\""
+
+#: src/label.c:606
+msgid "Problem saving xml file."
+msgstr "Problemas salvando archivo xml"
+
+#: src/template.c:224
+msgid "No template files found!"
+msgstr "No he encontrado archivos de plantilla"
+
+#: src/merge_properties.c:82
+msgid "Edit document-merge properties"
+msgstr "Modificar las propiedades del documento de fusión"
+
+#: src/merge_properties.c:131
+msgid "Source"
+msgstr "Fuente"
+
+#: src/merge_properties.c:143
+msgid "Format:"
+msgstr "Formato:"
+
+#: src/merge_properties.c:158
+msgid "Location:"
+msgstr "Localización:"
+
+#: src/merge_properties.c:168
+msgid "Fields"
+msgstr "Campos"
+
+#: src/merge.c:78
+msgid "None"
+msgstr "Ninguno"
+
+#: src/merge.c:86
+msgid "Text with tab separators"
+msgstr "Texto separado con tabuladores"
+
+#: src/merge.c:94
+#, fuzzy
+msgid "Text with comma separators (CSV)"
+msgstr "Texto separado con commas"
+
+#: src/merge.c:102
+msgid "Text with colon separators"
+msgstr "Texto separado con caracteres dos puntos"
+
+#: src/merge_ui.c:207 src/merge_ui.c:242 src/merge_ui.c:387 src/merge_ui.c:428
+msgid "N/A"
+msgstr "N/A"
+
+#: src/merge_ui_text.c:170
+msgid "Select merge-database source"
+msgstr "Seleccione la fuente de datos para fusionar"
+
+#: src/merge_ui_text.c:330
+msgid "Column"
+msgstr "Columna"
+
+#: src/merge_ui_text.c:334
+msgid "Custom field key"
+msgstr "Campo clave personalizable"
+
+#: src/merge_ui_text.c:338
+msgid "Sample data"
+msgstr "Datos de ejemplo"
+
+#: src/menu.c:50
+msgid "_New"
+msgstr "_Nuevo"
+
+#: src/menu.c:51
+msgid "Make a new, empty label"
+msgstr "Crear una etiqueta vacía nueva"
+
+#: src/menu.c:85
+msgid "U_nselect All "
+msgstr "_Deseleccionar todo"
+
+#: src/menu.c:86
+msgid "Remove all selections"
+msgstr "Eliminar todas las selecciones"
+
+#: src/menu.c:94
+msgid "Select"
+msgstr "Seleccionar"
+
+#: src/menu.c:95 src/menu.c:186
+msgid "Select, move and modify objects"
+msgstr "Seleccionar, mover y modificar objetos"
+
+#: src/menu.c:100 src/menu.c:191
+msgid "Create text object"
+msgstr "Crear un objeto de texto"
+
+#: src/menu.c:103
+msgid "Box"
+msgstr "Caja"
+
+#: src/menu.c:103 src/menu.c:194
+msgid "Create box/rectangle object"
+msgstr "Crear un objeto tipo caja/rectángulo"
+
+#: src/menu.c:106 src/menu.c:197
+msgid "Create line object"
+msgstr "Crear un objeto línea"
+
+#: src/menu.c:109
+msgid "Ellipse"
+msgstr "Elipse"
+
+#: src/menu.c:110 src/menu.c:200
+msgid "Create ellipse/circle object"
+msgstr "Crear un objeto circular/elíptico"
+
+#: src/menu.c:113 src/menu.c:203
+msgid "Create image object"
+msgstr "Crear un objeto imagen"
+
+#: src/menu.c:116
+msgid "Barcode"
+msgstr "Código de barras"
+
+#: src/menu.c:116 src/menu.c:206
+msgid "Create barcode object"
+msgstr "Crear un objeto código de barras"
+
+#: src/menu.c:121 src/menu.c:211
+msgid "Zoom in"
+msgstr "Agrandar "
+
+#: src/menu.c:124 src/menu.c:214
+msgid "Zoom out"
+msgstr "Reducir"
+
+#: src/menu.c:127
+msgid "Zoom 1:1"
+msgstr "Vista 1:1"
+
+#: src/menu.c:127 src/menu.c:217
+msgid "Zoom to 1:1"
+msgstr "Vista a 1:1"
+
+#: src/menu.c:132 src/menu.c:223
+msgid "Merge properties"
+msgstr "Propiedades de fusión de datos"
+
+#: src/menu.c:133
+msgid "Edit merge properties"
+msgstr "Modificar propiedades de fusión de datos"
+
+#: src/menu.c:157
+msgid "_Tools"
+msgstr "_Herramientas"
+
+#: src/menu.c:168
+msgid " New "
+msgstr "Nuevo"
+
+#: src/menu.c:168
+msgid "New Label/Card"
+msgstr "Nueva tarjeta/etiqueta"
+
+#: src/menu.c:170
+msgid " Open "
+msgstr " Abrir "
+
+#: src/menu.c:170
+msgid "Open a file"
+msgstr "Abrir un archivo"
+
+#: src/menu.c:172
+msgid " Save "
+msgstr " Guardar "
+
+#: src/menu.c:172
+msgid "Save current file"
+msgstr "Guardar el archivo en uso"
+
+#: src/menu.c:175
+msgid " Print "
+msgstr " Imprimir "
+
+#: src/menu.c:175
+msgid "Print current file"
+msgstr "Imprimir el archivo en uso"
+
+#: src/menu.c:290
+msgid ""
+"A label and business card creation program for GNOME.\n"
+" \n"
+"Glabels is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+" \n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+msgstr ""
+
+#: src/menu.c:326
+msgid "Function is not implemented!"
+msgstr "ˇ La funcionalidad no está aún implementada !"
+
+#: src/file.c:72
+msgid "New Label or Card"
+msgstr "Nueva etiqueta o tarjeta"
+
+#: src/file.c:98
+msgid "Media Type"
+msgstr "Tipo de papel"
+
+#: src/file.c:109
+msgid "Label orientation"
+msgstr "Orientación de la etiqueta"
+
+#: src/file.c:211
+msgid "Open"
+msgstr "Abrir"
+
+#: src/file.c:213
+msgid "Open label"
+msgstr "Abrir etiqueta"
+
+#: src/file.c:249
+msgid "Cannot open file"
+msgstr "No puedo abrir el archivo"
+
+#: src/file.c:316
+msgid "Save label as"
+msgstr "Guardar la etiqueta como"
+
+#: src/media_select.c:222
+msgid "Description:"
+msgstr "Descripción:"
+
+#: src/media_select.c:227
+msgid "Page size:"
+msgstr "Tamańo de la página:"
+
+#: src/media_select.c:232
+msgid "Label size:"
+msgstr "Tamańo de la etiqueta:"
+
+#: src/media_select.c:237
+msgid "Layout:"
+msgstr "Disposición:"
+
+#: src/media_select.c:353
+#, c-format
+msgid "%d x %d (%d per sheet)"
+msgstr "%d x %d (%d por hoja)"
+
+#: src/media_select.c:367
+#, c-format
+msgid "%s x %s %s"
+msgstr "%s x %s %s"
+
+#: src/media_select.c:372
+#, c-format
+msgid "%.5g x %.5g %s"
+msgstr "%.5g x %.5g %s"
+
+#: src/rotate_select.c:169
+msgid "Rotate"
+msgstr "Rotar"
+
+#: src/print_dialog.c:99
+msgid "Print"
+msgstr "Imprimir"
+
+#. ----------- Add simple-copies widget ------------
+#: src/print_dialog.c:104
+msgid "Copies"
+msgstr "Copias"
+
+#. -------Otherwise add merge control widget ------------
+#: src/print_dialog.c:121
+msgid "Document merge control"
+msgstr "Control de la fusión de documentos"
+
+#. ----------- Add custom print options area ------------
+#: src/print_dialog.c:141
+msgid "Options"
+msgstr "Opciones"
+
+#: src/print_dialog.c:241 src/print_dialog.c:280
+msgid "Print preview"
+msgstr "Previsualizar la impresión"
+
+#: src/print_copies.c:170
+msgid "Sheets:"
+msgstr "Hojas:"
+
+#: src/print_copies.c:187
+msgid "Labels"
+msgstr "Etiquetas"
+
+#: src/print_copies.c:190
+msgid "from:"
+msgstr "desde:"
+
+#: src/print_copies.c:198
+msgid "to:"
+msgstr "hasta:"
+
+#: src/print_merge.c:170
+msgid "Start on label"
+msgstr "Comenzar en la etiqueta"
+
+#: src/print_merge.c:179
+msgid "on 1st sheet"
+msgstr "en la primera hoja"
+
+#: src/print_merge.c:188
+msgid "Collate"
+msgstr ""
+
+#: src/print_merge.c:195
+msgid "Copies:"
+msgstr "Copias:"
+
+#: src/prefs.c:86
+msgid "Glabels: Preferences"
+msgstr "Glabels: Preferencias"
+
+#. ----- Display Units Frame ------------------------------------
+#: src/prefs.c:220
+msgid "Display units"
+msgstr "Mostrar unidades de medida"
+
+#: src/prefs.c:231
+msgid "Points"
+msgstr "Puntos"
+
+#: src/prefs.c:237
+msgid "Inches"
+msgstr "Pulgadas"
+
+#: src/prefs.c:244
+msgid "Millimeters"
+msgstr "Milímetros"
+
+#. ----- Display Units Frame ------------------------------------
+#: src/prefs.c:249
+msgid "Default page size"
+msgstr "Tamańo de página por omisión"
+
+#: src/prefs.c:450
+msgid "inches"
+msgstr "pulgadas"
+
+#: src/prefs.c:452
+msgid "mm"
+msgstr "mm"
diff --git a/glabels2/po/fr.po b/glabels2/po/fr.po
index 0427321..bcceafa 100644
--- a/glabels2/po/fr.po
+++ b/glabels2/po/fr.po
@@ -1,24 +1,11 @@
# French translation of glabels.
-
-
-
# Copyright (C) 2001 Jim Evins <evins@snaught.com>
-
-
-
# Olivier Berger <oberger@gnu.org>, 2001.
-
-
-
#
-
-
-
-#: src/commands.c:384
msgid ""
msgstr ""
-"Project-Id-Version: glabels 0.2.0\n"
-"POT-Creation-Date: 2002-08-20 21:43-0400\n"
+"Project-Id-Version: glabels 0.4.4\n"
+"POT-Creation-Date: 2002-08-24 22:30-0400\n"
"PO-Revision-Date: 2001-10-15 15:31+0200\n"
"Last-Translator: Olivier Berger <oberger@gnu.org>\n"
"Language-Team: French <gnomefr@traduc.org>\n"
@@ -26,2460 +13,1297 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/glabels.c:59
-msgid "Show view debugging messages."
-msgstr ""
-
-#: src/glabels.c:62
-msgid "Show item debugging messages."
-msgstr ""
-
-#: src/glabels.c:65
-msgid "Show printing debugging messages."
-msgstr ""
-
-#: src/glabels.c:68
-msgid "Show prefs debugging messages."
-msgstr ""
-
-#: src/glabels.c:71
-msgid "Show file debugging messages."
-msgstr ""
-
-#: src/glabels.c:74
-msgid "Show document debugging messages."
-msgstr ""
-
-#: src/glabels.c:77
-msgid "Show template debugging messages."
-msgstr ""
-
-#: src/glabels.c:80
-msgid "Show xml debugging messages."
-msgstr ""
-
-#: src/glabels.c:83
-msgid "Show document merge debugging messages."
-msgstr ""
-
-#: src/glabels.c:86
-msgid "Show commands debugging messages."
-msgstr ""
-
-#: src/glabels.c:89
-msgid "Show undo debugging messages."
-msgstr ""
-
-#: src/glabels.c:92
-msgid "Show recent debugging messages."
-msgstr ""
-
-#: src/glabels.c:95
-msgid "Show mdi debugging messages."
-msgstr ""
-
-#: src/glabels.c:98
-msgid "Show media select widget debugging messages."
-msgstr ""
-
-#: src/glabels.c:101
-msgid "Show mini preview widget debugging messages."
-msgstr ""
-
-#: src/glabels.c:104
-msgid "Show widget debugging messages."
-msgstr ""
-
-#: src/glabels.c:107
-msgid "Turn on all debugging messages."
-msgstr ""
-
-#: src/glabels-batch.c:47
+#: src/glabels_batch.c:49
msgid "print this message"
-msgstr ""
+msgstr "imprimer ce message"
-#: src/glabels-batch.c:49
+#: src/glabels_batch.c:51
msgid "print the version of glabels-batch being used"
-msgstr ""
+msgstr "imprimer la version de glabels-batch utilisée"
-#: src/glabels-batch.c:51
+#: src/glabels_batch.c:53
msgid "set output filename (default=\"output.ps\")"
-msgstr ""
+msgstr "définit le fichier de sortie (défaut=\"output.ps\")"
-#: src/glabels-batch.c:51
+#: src/glabels_batch.c:53
msgid "filename"
-msgstr ""
+msgstr "nom de fichier"
-#: src/glabels-batch.c:53
+#: src/glabels_batch.c:55
msgid "number of sheets (default=1)"
-msgstr ""
+msgstr "nombre de pages (défaut=1)"
# src/print_copies.c:193
-
-
-
# src/print_copies.c:193
-
-
-
# src/print_copies.c:171
-
# src/print_copies.c:170
-#: src/glabels-batch.c:53
-#, fuzzy
+#: src/glabels_batch.c:55
msgid "sheets"
-msgstr "Feuilles :"
+msgstr "feuilles"
-#: src/glabels-batch.c:55
+#: src/glabels_batch.c:57
msgid "number of copies (default=1)"
-msgstr ""
+msgstr "nombre de copies (défaut=1)"
# src/print.c:153
-
-
-
# src/print.c:153
-
-
-
# src/print.c:146
-
# src/print_dialog.c:104
-#: src/glabels-batch.c:55
-#, fuzzy
+#: src/glabels_batch.c:57
msgid "copies"
-msgstr "Copies"
+msgstr "copies"
# src/print.c:180
-
-
-
# src/print.c:180
-
-
-
# src/print.c:196
-
# src/print_dialog.c:152
-#: src/glabels-batch.c:57 src/print-dialog.c:205
+#: src/glabels_batch.c:59 src/print_dialog.c:152
msgid "print outlines (to test printer alignment)"
msgstr "imprimer des bordures (pour tester l'alignement de l'imprimante)"
# src/print_dialog.c:160
-#: src/glabels-batch.c:59 src/print-dialog.c:214
+#: src/glabels_batch.c:61 src/print_dialog.c:160
msgid "print in reverse (i.e. a mirror image)"
msgstr "imprimer ŕ l'envers (i.e. une image miroir)"
-#: src/glabels-batch.c:90
+#: src/glabels_batch.c:92
msgid "[OPTION...] GLABELS_FILE..."
-msgstr ""
+msgstr "[OPTION...] FICHIER_GLABELS..."
-#: src/glabels-batch.c:109
+#: src/glabels_batch.c:111
msgid "missing glabels file\n"
-msgstr ""
+msgstr "fichier glabels manquant\n"
# src/file.c:214
-
-
-
# src/file.c:214
-
-
-
# src/file.c:249
-
# src/file.c:249
-#: src/glabels-batch.c:140
-#, fuzzy, c-format
+#: src/glabels_batch.c:139
+#, c-format
msgid "cannot open glabels file %s\n"
-msgstr "Impossible d'ouvrir le fichier"
+msgstr "impossible d'ouvrir le fichier glabels %s\n"
-#: src/mdi.c:579
+# src/mdi.c:190
+# src/mdi.c:189
+# src/mdi.c:169
+# src/mdi.c:169
+#: src/mdi.c:169
#, c-format
-msgid ""
-"Do you want to save the changes you made to the document \"%s\"? \n"
-"\n"
-"Your changes will be lost if you don't save them."
-msgstr ""
-
-# src/mdi.c:482
-
-
-
-# src/mdi.c:488
+msgid "Revert to saved copy of %s?"
+msgstr "Rétablir la version sauvegardée de %s ?"
+# src/mdi.c:219
+# src/mdi.c:207
+# src/mdi.c:207
+#: src/mdi.c:207
+msgid "Unknown media type. Using default."
+msgstr "Type de media inconnu. Utilisation de celui par défaut."
-
-# src/mdi.c:459
-
-# src/mdi.c:459
-#: src/mdi.c:584
-#, fuzzy
-msgid "Do_n't save"
-msgstr "Ne pas sauver"
-
-#: src/mdi.c:604
-msgid "_Don't quit"
+# src/mdi.c:477
+# src/mdi.c:483
+# src/mdi.c:455
+# src/mdi.c:455
+#: src/mdi.c:455
+#, c-format
+msgid ""
+"``%s'' has been modified.\n"
+"\n"
+"Do you wish to save it?"
msgstr ""
+"``%s'' a été modifié \n"
+"\n"
+"Voulez-vous l'enregistrer ?"
# src/mdi.c:482
-
-
-
# src/mdi.c:488
-
-
-
# src/mdi.c:459
-
# src/mdi.c:459
-#: src/mdi.c:609
-#, fuzzy
-msgid "_Don't close"
+#: src/mdi.c:459
+msgid "Don't save"
msgstr "Ne pas sauver"
-#: src/mdi.c:706
-msgid "(modified)"
-msgstr ""
-
-# src/menu.c:185
-
-
-
-# src/menu.c:185
-
-
-
-# src/menu.c:290
-
-# src/menu.c:290
-#: src/commands.c:359
-msgid ""
-"A label and business card creation program for GNOME.\n"
-" \n"
-"Glabels is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version.\n"
-" \n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-msgstr ""
-"Un programme de création d'étiquettes et de cartes de visite pour GNOME.\n"
-" \n"
-"Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le "
-"modifier conformément aux dispositions de la Licence Publique Générale GNU, "
-"telle que publiée par la Free Software Foundation ; version 2 de la licence, "
-"ou encore (ŕ votre choix) toute version ultérieure.\n"
-" \n"
-"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE "
-"GARANTIE ; sans męme la garantie implicite de COMMERCIALISATION ou "
-"D'ADAPTATION A UN OBJET PARTICULIER. Pour plus de détail, voir la Licence "
-"Publique Générale GNU.\n"
-
-# src/print_copies.c:221
-
-
-
-# src/print_copies.c:221
-
-
-
-# src/print_copies.c:199
-
-# src/print_copies.c:198
-#: src/commands.c:371
-#, fuzzy
-msgid "Author:"
-msgstr "ŕ :"
-
-#: src/commands.c:374
-msgid "See the file AUTHORS for additional acknowledgments,"
-msgstr ""
-
-#: src/commands.c:375
-msgid "or visit http://snaught.com/glabels"
-msgstr ""
-
-# src/print_copies.c:210
-
-
-
-# src/print_copies.c:210
-
-
-
-# src/print_copies.c:188
-
-# src/print_copies.c:187
-#: src/commands.c:397
-#, fuzzy
-msgid "glabels"
-msgstr "Etiquettes"
-
-# src/file.c:59
-
-
-
-# src/file.c:59
-
-
-
-# src/file.c:72
-
-# src/file.c:72
-#: src/file.c:82
-msgid "New Label or Card"
-msgstr "Nouvelle étiquette ou carte"
-
-# src/file.c:87
-
-
-
-# src/file.c:87
-
-
-
-# src/file.c:98
-
-# src/file.c:98
-#: src/file.c:109
-msgid "Media Type"
-msgstr "Type de média"
-
-# src/file.c:98
-
-
-
-# src/file.c:98
-
-
-
-# src/file.c:109
-
-# src/file.c:109
-#: src/file.c:119
-msgid "Label orientation"
-msgstr "Orientation de l'étiquette"
-
-# src/file.c:178
-
-
-
-# src/file.c:178
-
-
-
-# src/file.c:211
-
-# src/file.c:211
-#: src/file.c:248
-msgid "Open"
-msgstr "Ouvrir"
-
-# src/file.c:183
-
-
-
-# src/file.c:183
-
-
-
-# src/file.c:213
-
-# src/file.c:213
-#: src/file.c:250
-msgid "Open label"
-msgstr "Ouvrir une étiquette"
-
-# src/file.c:214
-
-
-
-# src/file.c:214
-
-
-
-# src/file.c:249
-
-# src/file.c:249
-#: src/file.c:338
-#, fuzzy, c-format
-msgid "Cannot open file '%s'"
-msgstr "Impossible d'ouvrir le fichier"
-
-# src/file.c:330 src/mdi.c:740
-
-
-
-# src/file.c:330 src/mdi.c:746
-
-
-
-# src/file.c:374 src/mdi.c:705
-
-# src/file.c:374 src/mdi.c:705
-#: src/file.c:429
-#, fuzzy, c-format
-msgid "Error saving file '%s'"
-msgstr "Erreur d'écriture du fichier"
-
-# src/file.c:278
-
-
-
-# src/file.c:278
-
+# src/file.c:248 src/mdi.c:635
+# src/file.c:248 src/mdi.c:641
+# src/file.c:288 src/mdi.c:601
+# src/file.c:288 src/mdi.c:601
+#: src/mdi.c:601 src/file.c:288
+msgid "Cannot save file"
+msgstr "Impossible d'enregistrer le fichier"
+# src/file.c:271 src/mdi.c:660
+# src/file.c:271 src/mdi.c:666
+# src/file.c:311 src/mdi.c:623
+# src/file.c:311 src/mdi.c:623
+#: src/mdi.c:623 src/file.c:311
+msgid "Save As"
+msgstr "Enregistrer sous"
-# src/file.c:316
+# src/mdi.c:663
+# src/mdi.c:669
+# src/mdi.c:626
+# src/mdi.c:626
+#: src/mdi.c:626
+msgid "Close / Save label as"
+msgstr "Fermer / Enregistrer l'étiquette sous"
-# src/file.c:316
-#: src/file.c:468
-msgid "Save label as"
-msgstr "Enregistrer l'étiquette sous"
+# src/file.c:309 src/mdi.c:716
+# src/file.c:309 src/mdi.c:722
+# src/file.c:352 src/mdi.c:680
+# src/file.c:352 src/mdi.c:680
+#: src/mdi.c:680 src/file.c:352
+msgid "Label no longer valid!"
+msgstr "Etiquette plus valide !"
# src/file.c:319 src/mdi.c:729
-
-
-
# src/file.c:319 src/mdi.c:735
-
-
-
# src/file.c:362 src/mdi.c:693
-
# src/file.c:362 src/mdi.c:693
-#: src/file.c:550
+#: src/mdi.c:693 src/file.c:362
msgid "Must supply file name"
msgstr "Vous devez donner un nom de fichier"
# src/file.c:330 src/mdi.c:740
-
-
-
# src/file.c:330 src/mdi.c:746
-
-
-
# src/file.c:374 src/mdi.c:705
-
# src/file.c:374 src/mdi.c:705
-#: src/file.c:569
-#, fuzzy, c-format
-msgid "Error writing file '%s'"
+#: src/mdi.c:705 src/file.c:374
+msgid "Error writing file"
msgstr "Erreur d'écriture du fichier"
-# src/print.c:171
-
-
-
-# src/prefs.c:463 src/prefs.c:470 src/prop_line.c:202
-
-
-
-# src/prefs.c:445 src/prefs.c:452 src/prop_line.c:183
-
-# src/prefs.c:448 src/prefs.c:455 src/prop_line.c:183
-#. Should not happen
-#: src/prefs.c:625 src/prefs.c:632 src/wdgt-line.c:186
-msgid "points"
-msgstr "points"
-
-# src/item_line.c:271
-
-
-
-# src/prefs.c:465
-
-
-
-# src/prefs.c:447
-
-# src/prefs.c:450
-#: src/prefs.c:627
-msgid "inches"
-msgstr "pouces"
-
-# src/prefs.c:467
-
-
-
-# src/prefs.c:449
-
-# src/prefs.c:452
-#: src/prefs.c:629
-msgid "mm"
-msgstr "mm"
-
-# src/prop_bc.c:189
-
-
-
-# src/prop_bc.c:187
-
-
-
-# src/prop_bc.c:168
-
-# src/prop_bc.c:168
-#: src/prefs-dialog.c:220
-#, fuzzy
-msgid "Locale"
-msgstr "Echelle :"
-
-#: src/prefs-dialog.c:224
-msgid "Object defaults"
-msgstr ""
-
-# src/preferences.c:92
-
-
-
-# src/prefs.c:101
-
-
-
-# src/prefs.c:92
-
-# src/prefs.c:86
-#: src/prefs-dialog.c:232
-#, fuzzy
-msgid "Preferences"
-msgstr "Glabels : Préférences"
-
-#: src/prefs-dialog.c:272
-msgid "Select locale specific behavior."
-msgstr ""
-
-# src/prefs.c:248
-
-
-
-# src/prefs.c:226
-
-# src/prefs.c:220
-#. ----- Display Units Frame ------------------------------------
-#: src/prefs-dialog.c:279
-msgid "Display units"
-msgstr "Unités d'affichage"
-
-# src/print.c:149
-
-
-
-# src/prefs.c:259
-
-
-
-# src/prefs.c:237
-
-# src/prefs.c:231
-#: src/prefs-dialog.c:289
-msgid "Points"
-msgstr "Points"
-
-# src/prefs.c:265
-
-
-
-# src/prefs.c:243
-
-# src/prefs.c:237
-#: src/prefs-dialog.c:296
-msgid "Inches"
-msgstr "Pouces"
-
-# src/prefs.c:271
-
-
-
-# src/prefs.c:250
-
-# src/prefs.c:244
-#: src/prefs-dialog.c:303
-msgid "Millimeters"
-msgstr "Milimčtres"
-
-# src/item_image.c:341
-
-
-
-# src/prefs.c:278
-
-
-
-# src/prefs.c:255
-
-# src/prefs.c:249
-#. ----- Page Size Frame ------------------------------------
-#: src/prefs-dialog.c:310
-msgid "Default page size"
-msgstr "Taille de page par défaut"
-
-#: src/prefs-dialog.c:364
-msgid "Select default properties for new objects."
-msgstr ""
-
-# src/item_line.c:271
-
-
-
-# src/item_line.c:271
-
-
-
-# src/item_line.c:256 src/menu.c:106
-
-# src/item_line.c:256 src/menu.c:106
-#. ------ Line box ------
-#: src/prefs-dialog.c:377
-msgid "Line"
-msgstr "Ligne"
-
-# src/item_box.c:274 src/item_ellipse.c:279
-
-
-
-# src/item_box.c:274 src/item_ellipse.c:279
-
-
-
-# src/item_box.c:258 src/item_ellipse.c:260
-
-# src/item_box.c:258 src/item_ellipse.c:260
-#. ------ Fill box ------
-#: src/prefs-dialog.c:382 src/view-box.c:325 src/view-ellipse.c:325
-msgid "Fill"
-msgstr "Remplissage"
-
# src/display.c:1157 src/display.c:1205
-
-
-
# src/display.c:1160 src/display.c:1208
-
-
-
# src/display.c:1171 src/display.c:1219
-
# src/display.c:1186 src/display.c:1234
-#: src/view-object.c:406 src/view.c:1520
+#: src/display.c:1250 src/display.c:1298
msgid "Delete"
msgstr "Supprimer"
# src/display.c:1167 src/display.c:1215
-
-
-
# src/display.c:1170 src/display.c:1218
-
-
-
# src/display.c:1181 src/display.c:1229
-
# src/display.c:1196 src/display.c:1244
-#: src/view-object.c:416 src/view.c:1530
+#: src/display.c:1260 src/display.c:1308
msgid "Bring to front"
msgstr "Avancer au premier plan"
# src/display.c:1173 src/display.c:1221
-
-
-
# src/display.c:1176 src/display.c:1224
-
-
-
# src/display.c:1187 src/display.c:1235
-
# src/display.c:1202 src/display.c:1250
-#: src/view-object.c:423 src/view.c:1536
+#: src/display.c:1266 src/display.c:1314
msgid "Send to back"
msgstr "Reculer ŕ l'arričre-plan"
# src/display.c:1194
-
-
-
# src/display.c:1197
-
-
-
# src/display.c:1208
-
# src/display.c:1223
-#: src/view-object.c:395
+#: src/display.c:1287
msgid "Edit properties..."
msgstr "Editer les propriétés..."
-# src/item_box.c:251
-
-
-
-# src/item_box.c:251
-
-
-
-# src/item_box.c:235
+# src/item_text.c:432
+# src/item_text.c:432
+# src/item_text.c:450
+# src/item_text.c:450
+#: src/item_text.c:450
+msgid "Edit text object properties"
+msgstr "Editer les propriétés de l'objet texte..."
-# src/item_box.c:235
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-box.c:293
-msgid "Edit box object properties"
-msgstr "Editer les propriétés de l'objet boîte..."
+# src/item_text.c:442 src/item_text.c:627
+# src/item_text.c:442 src/item_text.c:627
+# src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100
+# src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100
+#: src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100
+msgid "Text"
+msgstr "Texte"
# src/item_barcode.c:334 src/item_box.c:261 src/item_ellipse.c:266
-
-
-
# src/item_line.c:268 src/item_text.c:464
-
-
-
# src/item_barcode.c:340 src/item_box.c:261 src/item_ellipse.c:266
-
-
-
# src/item_line.c:268 src/item_text.c:464
-
-
-
# src/item_barcode.c:317 src/item_box.c:245 src/item_ellipse.c:247
-
# src/item_line.c:253 src/item_text.c:479
-
# src/item_barcode.c:317 src/item_box.c:245 src/item_ellipse.c:247
# src/item_line.c:253 src/item_text.c:479
-#: src/view-barcode.c:313 src/view-box.c:312 src/view-ellipse.c:312
-#: src/view-line.c:309 src/view-text.c:311
+#: src/item_text.c:479 src/item_line.c:253 src/item_box.c:245
+#: src/item_ellipse.c:247 src/item_barcode.c:317
msgid "Appearance"
msgstr "Apparence"
-# src/item_box.c:264 src/item_ellipse.c:269
-
-
-
-# src/item_box.c:264 src/item_ellipse.c:269
-
-
-
-# src/item_box.c:248 src/item_ellipse.c:250
-
-# src/item_box.c:248 src/item_ellipse.c:250
-#. ------ Line box ------
-#: src/view-box.c:315 src/view-ellipse.c:315 src/view-line.c:312
-msgid "Outline"
-msgstr "Bordure"
-
-# src/item_box.c:288 src/item_ellipse.c:293 src/item_image.c:312
-
-
-
-# src/item_line.c:286
-
-
-
-# src/item_box.c:288 src/item_ellipse.c:293 src/item_image.c:312
-
-
-
-# src/item_line.c:286
-
-
-
-# src/item_box.c:272 src/item_ellipse.c:274 src/item_image.c:315
-
-# src/item_line.c:271
-
-# src/item_box.c:272 src/item_ellipse.c:274 src/item_image.c:315
-# src/item_line.c:271
-#: src/view-box.c:340 src/view-ellipse.c:340 src/view-image.c:337
-#: src/view-line.c:328
-msgid "Position/Size"
-msgstr "Position/Taille"
+# src/item_text.c:467
+# src/item_text.c:467
+# src/item_text.c:482
+# src/item_text.c:482
+#. ------ Begin Text Properties box ------
+#: src/item_text.c:482
+msgid "Text Properties"
+msgstr "Propriétés du texte"
# src/item_barcode.c:362 src/item_barcode.c:365 src/item_box.c:291
-
-
-
# src/item_ellipse.c:296 src/item_image.c:315 src/item_line.c:289
-
-
-
# src/item_text.c:487 src/item_text.c:490
-
-
-
# src/item_barcode.c:368 src/item_barcode.c:371 src/item_box.c:291
-
-
-
# src/item_ellipse.c:296 src/item_image.c:315 src/item_line.c:289
-
-
-
# src/item_text.c:487 src/item_text.c:490
-
-
-
# src/item_barcode.c:345 src/item_barcode.c:348 src/item_box.c:275
-
# src/item_ellipse.c:277 src/item_image.c:318 src/item_line.c:274
-
# src/item_text.c:500 src/item_text.c:503
-
# src/item_barcode.c:345 src/item_barcode.c:348 src/item_box.c:275
# src/item_ellipse.c:277 src/item_image.c:318 src/item_line.c:274
# src/item_text.c:500 src/item_text.c:503
#. ------ Position Frame ------
-#: src/view-barcode.c:345 src/view-barcode.c:349 src/view-box.c:343
-#: src/view-ellipse.c:343 src/view-image.c:340 src/view-line.c:331
-#: src/view-text.c:334 src/view-text.c:338
+#: src/item_text.c:500 src/item_text.c:503 src/item_line.c:274
+#: src/item_box.c:275 src/item_ellipse.c:277 src/item_image.c:318
+#: src/item_barcode.c:345 src/item_barcode.c:348
msgid "Position"
msgstr "Position"
-# src/item_box.c:302 src/item_ellipse.c:307 src/item_image.c:326
+# src/item_line.c:258
+# src/item_line.c:258
+# src/item_line.c:243
+# src/item_line.c:243
+#: src/item_line.c:243
+msgid "Edit line object properties"
+msgstr "Editer les propriétés de l'objet ligne..."
+# src/item_line.c:271
+# src/item_line.c:271
+# src/item_line.c:256 src/menu.c:106
+# src/item_line.c:256 src/menu.c:106
+#. ------ Begin Line box ------
+#: src/item_line.c:256 src/menu.c:106
+msgid "Line"
+msgstr "Ligne"
+# src/item_box.c:288 src/item_ellipse.c:293 src/item_image.c:312
+# src/item_line.c:286
+# src/item_box.c:288 src/item_ellipse.c:293 src/item_image.c:312
+# src/item_line.c:286
+# src/item_box.c:272 src/item_ellipse.c:274 src/item_image.c:315
+# src/item_line.c:271
+# src/item_box.c:272 src/item_ellipse.c:274 src/item_image.c:315
+# src/item_line.c:271
+#: src/item_line.c:271 src/item_box.c:272 src/item_ellipse.c:274
+#: src/item_image.c:315
+msgid "Position/Size"
+msgstr "Position/Taille"
+# src/item_box.c:302 src/item_ellipse.c:307 src/item_image.c:326
# src/item_line.c:300
-
-
-
# src/item_box.c:302 src/item_ellipse.c:307 src/item_image.c:326
-
-
-
# src/item_line.c:300
-
-
-
# src/item_box.c:286 src/item_ellipse.c:288 src/item_image.c:329
-
# src/item_line.c:285
-
# src/item_box.c:286 src/item_ellipse.c:288 src/item_image.c:329
# src/item_line.c:285
#. ------ Size Frame ------
-#: src/view-box.c:354 src/view-ellipse.c:356 src/view-image.c:353
-#: src/view-line.c:344
+#: src/item_line.c:285 src/item_box.c:286 src/item_ellipse.c:288
+#: src/item_image.c:329
msgid "Size"
msgstr "Taille"
-# src/item_ellipse.c:256
+# src/item_box.c:251
+# src/item_box.c:251
+# src/item_box.c:235
+# src/item_box.c:235
+#: src/item_box.c:235
+msgid "Edit box object properties"
+msgstr "Editer les propriétés de l'objet boîte..."
+# src/item_box.c:264 src/item_ellipse.c:269
+# src/item_box.c:264 src/item_ellipse.c:269
+# src/item_box.c:248 src/item_ellipse.c:250
+# src/item_box.c:248 src/item_ellipse.c:250
+#. ------ Line box ------
+#: src/item_box.c:248 src/item_ellipse.c:250
+msgid "Outline"
+msgstr "Bordure"
+# src/item_box.c:274 src/item_ellipse.c:279
+# src/item_box.c:274 src/item_ellipse.c:279
+# src/item_box.c:258 src/item_ellipse.c:260
+# src/item_box.c:258 src/item_ellipse.c:260
+#. ------ Fill box ------
+#: src/item_box.c:258 src/item_ellipse.c:260
+msgid "Fill"
+msgstr "Remplissage"
# src/item_ellipse.c:256
-
-
-
+# src/item_ellipse.c:256
# src/item_ellipse.c:237
-
# src/item_ellipse.c:237
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-ellipse.c:293
+#: src/item_ellipse.c:237
msgid "Edit ellipse object properties"
msgstr "Editer les propriétés de l'objet ellipse..."
-# src/item_line.c:258
-
-
-
-# src/item_line.c:258
-
-
-
-# src/item_line.c:243
-
-# src/item_line.c:243
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-line.c:290
-msgid "Edit line object properties"
-msgstr "Editer les propriétés de l'objet ligne..."
-
# src/item_image.c:272
-
-
-
# src/item_image.c:272
-
-
-
# src/item_image.c:257
-
# src/item_image.c:257
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-image.c:281
+#: src/item_image.c:257
msgid "Edit image object properties"
msgstr "Editer les propriétés de l'objet image..."
# src/item_image.c:283
-
-
-
# src/item_image.c:283
-
-
-
# src/item_image.c:268 src/menu.c:113
-
# src/item_image.c:268 src/menu.c:113
-#: src/view-image.c:300
+#: src/item_image.c:268 src/menu.c:113
msgid "Image"
msgstr "Image"
# src/item_image.c:341
-
-
-
# src/item_image.c:340
-
-
-
# src/item_image.c:342
-
# src/item_image.c:342
#. ------ Size Reset Button ------
-#: src/view-image.c:364
+#: src/item_image.c:342
msgid "Reset image size"
msgstr "Restaurer la taille d'image"
-# src/item_text.c:432
-
-
-
-# src/item_text.c:432
-
-
-
-# src/item_text.c:450
-
-# src/item_text.c:450
-#: src/view-text.c:265
-msgid "Edit text object properties"
-msgstr "Editer les propriétés de l'objet texte..."
-
-# src/item_text.c:442 src/item_text.c:627
-
-
-
-# src/item_text.c:442 src/item_text.c:627
-
-
-
-# src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100
-
-# src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100
-#: src/view-text.c:285 src/view-text.c:605
-msgid "Text"
-msgstr "Texte"
+# src/item_image.c:389 src/item_image.c:444
+# src/item_image.c:388 src/item_image.c:442
+# src/item_image.c:389 src/item_image.c:454
+# src/item_image.c:389 src/item_image.c:454
+#: src/item_image.c:389 src/item_image.c:454
+msgid "Image format not currently supported"
+msgstr "Format d'image non supporté actuellement"
# src/item_barcode.c:299
-
-
-
# src/item_barcode.c:299
-
-
-
# src/item_barcode.c:287
-
# src/item_barcode.c:287
-#: src/view-barcode.c:267
+#: src/item_barcode.c:287
msgid "Edit barcode object properties"
msgstr "Editer les propriétés de l'objet code-barre..."
# src/item_barcode.c:309
-
-
-
# src/item_barcode.c:308
-
-
-
# src/item_barcode.c:297
-
# src/item_barcode.c:297
-#: src/view-barcode.c:287
+#: src/item_barcode.c:297
msgid "Data"
msgstr "Données"
# src/item_barcode.c:316
-
-
-
# src/item_barcode.c:317
-
-
-
# src/item_barcode.c:299
-
# src/item_barcode.c:299
-#: src/view-barcode.c:292
+#: src/item_barcode.c:299
msgid "Barcode data"
msgstr "Données de code-barre"
-# src/item_text.c:467
-
-
-
-# src/item_text.c:467
-
-
-
-# src/item_text.c:482
-
-# src/item_text.c:482
-#: src/view-barcode.c:318
-#, fuzzy
-msgid "Barcode Properties"
-msgstr "Propriétés du texte"
+# src/item_barcode.c:337
+# src/item_barcode.c:343 src/prefs.c:243
+# src/item_barcode.c:320 src/prefs.c:221
+# src/item_barcode.c:320 src/prefs.c:215
+#. ------ Begin Barcode Properties Frame ------
+#: src/item_barcode.c:320 src/prefs.c:215
+msgid "General"
+msgstr "Général"
# src/item_barcode.c:347
-
-
-
# src/item_barcode.c:353
-
-
-
# src/item_barcode.c:330
-
# src/item_barcode.c:330
#. ------ Barcode Style Frame ------
-#: src/view-barcode.c:328
+#: src/item_barcode.c:330
msgid "Style"
msgstr "Style"
# src/item_barcode.c:564 src/item_barcode.c:588 src/print.c:641
-
-
-
# src/item_barcode.c:570 src/item_barcode.c:594 src/print.c:641
-
-
-
# src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:799
-
# src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:600
-#: src/print.c:814 src/view-barcode.c:758
+#: src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:631
msgid "Invalid barcode"
msgstr "Code-barre invalide"
-# src/item_box.c:251
-
-
-
-# src/item_box.c:251
-
-
-
-# src/merge_properties.c:82
-
-# src/merge_properties.c:82
-#: src/merge-properties.c:84
-msgid "Edit document-merge properties"
-msgstr "Editer les propriétés de fusion de document"
-
-# src/merge_properties.c:131
-
-# src/merge_properties.c:131
-#: src/merge-properties.c:130
-msgid "Source"
-msgstr "Source"
-
-# src/prop_text.c:214
-
-
-
-# src/prop_text.c:199
-
-
-
-# src/merge_properties.c:143
-
-# src/merge_properties.c:143
-#: src/merge-properties.c:142
-msgid "Format:"
-msgstr "Format :"
-
-# src/merge_properties.c:158
-
-# src/merge_properties.c:158
-#: src/merge-properties.c:157
-msgid "Location:"
-msgstr "Emplacement :"
-
-# src/item_box.c:274 src/item_ellipse.c:279
-
-
-
-# src/item_box.c:274 src/item_ellipse.c:279
-
-
-
-# src/merge_properties.c:168
-
-# src/merge_properties.c:168
-#: src/merge-properties.c:167
-msgid "Fields"
-msgstr "Champs"
-
-# src/print.c:149
-
-
-
-# src/print.c:149
-
-
-
-# src/print.c:141
-
-# src/print_dialog.c:99
-#. ----- Contstruct basic print dialog with notebook -----
-#: src/print-dialog.c:102
-msgid "Print"
-msgstr "Imprimer"
-
-#: src/print-dialog.c:124
-msgid "_Job"
-msgstr ""
-
-# src/print.c:149
-
-
-
-# src/print.c:149
-
-
-
-# src/print.c:141
-
-# src/print_dialog.c:99
-#: src/print-dialog.c:129
-#, fuzzy
-msgid "P_rinter"
-msgstr "Imprimer"
-
-# src/print.c:153
-
-
-
-# src/print.c:153
-
-
-
-# src/print.c:146
-
-# src/print_dialog.c:104
-#. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:158
-msgid "Copies"
-msgstr "Copies"
-
-# src/print.c:164
+# src/prop_line.c:188
+# src/prop_line.c:187 src/prop_size.c:202
+# src/prop_line.c:169 src/prop_size.c:182
+# src/prop_line.c:169 src/prop_size.c:182
+#. W Label
+#: src/prop_size.c:182 src/prop_line.c:169
+msgid "Width:"
+msgstr "Largeur :"
-# src/print_dialog.c:121
-#. ------- Otherwise add merge control widget ------------
-#: src/print-dialog.c:174
-msgid "Document merge control"
-msgstr "Contrôle de la fusion de document"
+# src/prop_size.c:220
+# src/prop_size.c:198
+# src/prop_size.c:198
+#. H label
+#: src/prop_size.c:198
+msgid "Height:"
+msgstr "Hauteur :"
-# src/print.c:171
+# src/prop_size.c:215
+# src/prop_size.c:247
+# src/prop_size.c:222
+# src/prop_size.c:222
+#: src/prop_size.c:222
+msgid "Maintain current aspect ratio"
+msgstr "Conserver le rapport d'échelle actuel"
+# src/prop_position.c:192
+# src/prop_position.c:173
+# src/prop_position.c:173
+#. X label
+#: src/prop_position.c:173
+msgid "X:"
+msgstr "X :"
+# src/prop_position.c:212
+# src/prop_position.c:191
+# src/prop_position.c:191
+#. Y label
+#: src/prop_position.c:191
+msgid "Y:"
+msgstr "Y :"
# src/print.c:171
-
-
-
-# src/print.c:186
-
-# src/print_dialog.c:141
-#. ----------- Add custom print options area ------------
-#: src/print-dialog.c:195
-msgid "Options"
-msgstr "Options"
-
-# src/print.c:235
-
-
-
-# src/print.c:235
-
-
-
-# src/print.c:283 src/print.c:348
-
-# src/print_dialog.c:241 src/print_dialog.c:280
-#: src/print-dialog.c:345 src/print-dialog.c:384
-msgid "Print preview"
-msgstr "Aperçu avant impression"
-
-#: src/label.c:535
-#, c-format
-msgid "%s %d"
-msgstr ""
-
-#: src/label.c:535
-msgid "Untitled"
-msgstr ""
-
-# src/template.c:179
-
-
-
-# src/template.c:178
-
-# src/template.c:223
-#: src/template.c:346
-msgid "No template files found!"
-msgstr "Aucun fichier de patron trouvé !"
-
-# src/label.c:186 src/label.c:211
-
-
-
-# src/label.c:186 src/label.c:211
-
-
-
-# src/label.c:170 src/label.c:194
-
-# src/label.c:168 src/label.c:192
-#: src/xml-label.c:108 src/xml-label.c:139
-msgid "xmlParseFile error"
-msgstr "erreur xmlParseFile"
-
-# src/label.c:243
-
-
-
-# src/label.c:244
-
-
-
-# src/label.c:225
-
-# src/label.c:223
-#: src/xml-label.c:174
-msgid "No document root"
-msgstr "Pas de racine de document"
-
-#: src/xml-label.c:186
-msgid "Importing from glabels 0.1 format"
-msgstr ""
-
-#: src/xml-label.c:194
-msgid "Importing from glabels 0.4 format"
-msgstr ""
-
-# src/label.c:248
-
-
-
-# src/label.c:249
-
-
-
-# src/label.c:236
-
-# src/label.c:234
-#: src/xml-label.c:198
-#, fuzzy
-msgid "bad document, unknown glabels Namespace"
-msgstr "document de type erroné, aucun espace de noms glabels trouvé"
-
-# src/label.c:253
-
-
-
-# src/label.c:254
-
-
-
-# src/label.c:241
-
-# src/label.c:239
-#: src/xml-label.c:226
-#, c-format
-msgid "Bad root node = \"%s\""
-msgstr "Mauvais noeud racine = \"%s\""
-
-# src/label.c:298
-
-
-
-# src/label.c:301
-
-
-
-# src/label.c:294
-
-# src/label.c:290
-#: src/xml-label.c:249 src/xml-label.c:281
-#, c-format
-msgid "bad node = \"%s\""
-msgstr "mauvais noeud = \"%s\""
-
-# src/label.c:487
-
-
-
-# src/label.c:493
-
-
-
-# src/label.c:589
-
-# src/label.c:587
-#: src/xml-label.c:656
-msgid "Problem saving xml file."
-msgstr "Problčme de sauvegarde du fichier xml."
-
-# src/merge.c:80
-
-# src/merge.c:78
-#: src/merge.c:80
-msgid "None"
-msgstr "Aucun"
-
-# src/merge.c:89
-
-# src/merge.c:86
-#: src/merge.c:88
-msgid "Text with tab separators"
-msgstr "Texte avec séparateurs de tabulation"
-
-# src/merge.c:98
-
-# src/merge.c:94
-#: src/merge.c:96
-msgid "Text with comma separators"
-msgstr "Texte séparé par des virgules"
-
-# src/merge.c:107
-
-# src/merge.c:102
-#: src/merge.c:104
-msgid "Text with colon separators"
-msgstr "Texte séparé par des deux-points"
-
-# src/merge_ui.c:207 src/merge_ui.c:242 src/merge_ui.c:387 src/merge_ui.c:428
-
-# src/merge_ui.c:207 src/merge_ui.c:242 src/merge_ui.c:387 src/merge_ui.c:428
-#: src/merge-ui.c:223 src/merge-ui.c:265 src/merge-ui.c:435 src/merge-ui.c:483
-msgid "N/A"
-msgstr "Non défini"
-
-# src/merge_ui_text.c:170
-
-# src/merge_ui_text.c:170
-#: src/merge-ui-text.c:172
-msgid "Select merge-database source"
-msgstr "Sélection de la base de données source de la fusion"
-
-# src/merge_ui_text.c:330
-
-# src/merge_ui_text.c:330
-#: src/merge-ui-text.c:330
-msgid "Column"
-msgstr "Colonne"
-
-# src/merge_ui_text.c:334
-
-# src/merge_ui_text.c:334
-#: src/merge-ui-text.c:334
-msgid "Custom field key"
-msgstr "Clé de champ spécifique"
-
-# src/merge_ui_text.c:338
-
-# src/merge_ui_text.c:338
-#: src/merge-ui-text.c:338
-msgid "Sample data"
-msgstr "Exemple de données"
-
-# src/prop_text.c:214
-
-
-
-# src/prop_text.c:199
-
-
-
-# src/prop_text.c:181
-
-# src/prop_text.c:181
-#. Font label
-#: src/wdgt-text-props.c:184
-msgid "Font:"
-msgstr "Police :"
+# src/prefs.c:463 src/prefs.c:470 src/prop_line.c:202
+# src/prefs.c:445 src/prefs.c:452 src/prop_line.c:183
+# src/prefs.c:448 src/prefs.c:455 src/prop_line.c:183
+#. Line Width units
+#: src/prop_line.c:183 src/prefs.c:448 src/prefs.c:455
+msgid "points"
+msgstr "points"
# src/prop_bc.c:204 src/prop_fill.c:186 src/prop_line.c:203
-
-
-
# src/prop_text.c:263
-
-
-
# src/prop_bc.c:210 src/prop_fill.c:184 src/prop_line.c:209
-
-
-
# src/prop_text.c:247
-
-
-
# src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189
-
# src/prop_text.c:234
-
# src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189
# src/prop_text.c:234
-#. Text Color Label
-#: src/wdgt-bc-props.c:190 src/wdgt-fill.c:169 src/wdgt-line.c:192
-#: src/wdgt-text-props.c:237
+#. Line Color Label
+#: src/prop_line.c:189 src/prop_fill.c:166 src/prop_text.c:234
+#: src/prop_bc.c:188
msgid "Color:"
msgstr "Couleur :"
-# src/prop_text.c:277
-
-
+# src/prop_text.c:214
+# src/prop_text.c:199
+# src/prop_text.c:181
+# src/prop_text.c:181
+#. Font label
+#: src/prop_text.c:181
+msgid "Font:"
+msgstr "Police :"
+# src/prop_text.c:277
# src/prop_text.c:264
-
-
-
# src/prop_text.c:248
-
# src/prop_text.c:248
#. Alignment label
-#: src/wdgt-text-props.c:251
+#: src/prop_text.c:248
msgid "Alignment:"
msgstr "Alignement :"
# src/prop_bc_data.c:196 src/prop_text_entry.c:180
-
# src/prop_bc_data.c:196 src/prop_text_entry.c:180
#. Insert merge field label
-#: src/wdgt-bc-data.c:199 src/wdgt-text-entry.c:201
+#: src/prop_text_entry.c:180 src/prop_bc_data.c:196
msgid "Key:"
msgstr "Clé :"
# src/prop_text_entry.c:196
-
# src/prop_text_entry.c:196
-#: src/wdgt-text-entry.c:217
+#: src/prop_text_entry.c:196
msgid "Insert merge field"
msgstr "Insérer champ de fusion"
-# src/prop_position.c:192
-
-
-
-# src/prop_position.c:173
-
-# src/prop_position.c:173
-#. X label
-#: src/wdgt-position.c:182
-msgid "X:"
-msgstr "X :"
-
-# src/prop_position.c:212
-
-
-
-# src/prop_position.c:191
-
-# src/prop_position.c:191
-#. Y label
-#: src/wdgt-position.c:200
-msgid "Y:"
-msgstr "Y :"
-
-# src/prop_line.c:188
-
-
-
-# src/prop_line.c:187 src/prop_size.c:202
-
-
-
-# src/prop_line.c:169 src/prop_size.c:182
-
-# src/prop_line.c:169 src/prop_size.c:182
-#. W Label
-#: src/wdgt-line.c:172 src/wdgt-size.c:184
-msgid "Width:"
-msgstr "Largeur :"
-
-# src/prop_size.c:220
-
-
-
-# src/prop_size.c:198
-
-# src/prop_size.c:198
-#. H label
-#: src/wdgt-size.c:200
-msgid "Height:"
-msgstr "Hauteur :"
-
-# src/prop_size.c:215
-
-
-
-# src/prop_size.c:247
-
-
-
-# src/prop_size.c:222
-
-# src/prop_size.c:222
-#: src/wdgt-size.c:224
-msgid "Maintain current aspect ratio"
-msgstr "Conserver le rapport d'échelle actuel"
-
# src/prop_vector.c:196
-
-
-
# src/prop_vector.c:202
-
-
-
# src/prop_vector.c:183
-
# src/prop_vector.c:183
#. Length label
-#: src/wdgt-vector.c:186
+#: src/prop_vector.c:183
msgid "Length:"
msgstr "Longueur :"
# src/prop_vector.c:207
-
-
-
# src/prop_vector.c:228
-
-
-
# src/prop_vector.c:207
-
# src/prop_vector.c:207
#. Angle label
-#: src/wdgt-vector.c:210
+#: src/prop_vector.c:207
msgid "Angle:"
msgstr "Angle :"
# src/prop_vector.c:245
-
-
-
# src/prop_vector.c:224
-
# src/prop_vector.c:224
#. Angle units label
-#: src/wdgt-vector.c:227
+#: src/prop_vector.c:224
msgid "degrees"
msgstr "degrés"
# src/prop_bc.c:189
-
-
-
# src/prop_bc.c:187
-
-
-
# src/prop_bc.c:168
-
# src/prop_bc.c:168
#. Scale Label
-#: src/wdgt-bc-props.c:170
+#: src/prop_bc.c:168
msgid "Scale:"
msgstr "Echelle :"
# src/prop_bc.c:202
-
-
-
# src/prop_bc.c:182
-
# src/prop_bc.c:182
#. % Label
-#: src/wdgt-bc-props.c:184
-#, c-format
+#: src/prop_bc.c:182
msgid "%"
msgstr "%"
# src/prop_bc_style.c:328
-
-
-
# src/prop_bc_style.c:328
-
-
-
# src/prop_bc_style.c:313
-
# src/prop_bc_style.c:313
-#: src/wdgt-bc-style.c:316
+#: src/prop_bc_style.c:313
msgid "Show text with barcode"
msgstr "Afficher du texte avec le code-barre"
# src/prop_bc_data.c:176
-
# src/prop_bc_data.c:176
-#: src/wdgt-bc-data.c:179
+#: src/prop_bc_data.c:176
msgid "Literal:"
msgstr "Littéral :"
-# src/print_copies.c:193
-
-
-
-# src/print_copies.c:193
-
-
-
-# src/print_copies.c:171
-
-# src/print_copies.c:170
-#: src/wdgt-print-copies.c:178
-msgid "Sheets:"
-msgstr "Feuilles :"
-
-# src/print_copies.c:210
-
-
-
-# src/print_copies.c:210
-
-
-
-# src/print_copies.c:188
-
-# src/print_copies.c:187
-#: src/wdgt-print-copies.c:195
-msgid "Labels"
-msgstr "Etiquettes"
-
-# src/print_copies.c:213
-
-
-
-# src/print_copies.c:213
-
-
-
-# src/print_copies.c:191
-
-# src/print_copies.c:190
-#: src/wdgt-print-copies.c:198
-msgid "from:"
-msgstr "de :"
-
-# src/print_copies.c:221
-
-
-
-# src/print_copies.c:221
-
-
-
-# src/print_copies.c:199
-
-# src/print_copies.c:198
-#: src/wdgt-print-copies.c:206
-msgid "to:"
-msgstr "ŕ :"
-
-# src/print_copies_merge.c:197
-
-# src/print_merge.c:170
-#: src/wdgt-print-merge.c:177
-msgid "Start on label"
-msgstr "Commencer par l'étiquette"
-
-# src/print_copies_merge.c:206
-
-# src/print_merge.c:179
-#: src/wdgt-print-merge.c:186
-msgid "on 1st sheet"
-msgstr "en 1čre page"
-
-# src/rotate_select.c:187
-
-
-
-# src/rotate_select.c:187
-
-
-
-# src/print_copies_merge.c:186
-
-# src/print_merge.c:188
-#: src/wdgt-print-merge.c:197
-msgid "Collate"
-msgstr "Assembler"
-
-# src/print.c:153
-
-
-
-# src/print.c:153
-
-
-
-# src/print_copies_merge.c:173
-
-# src/print_merge.c:195
-#: src/wdgt-print-merge.c:204
-msgid "Copies:"
-msgstr "Copies :"
-
-# src/media_select.c:216
-
-
-
-# src/media_select.c:242
-
-
-
-# src/media_select.c:222
-
-# src/media_select.c:222
-#: src/wdgt-media-select.c:252
-msgid "Description:"
-msgstr "Description :"
-
-# src/media_select.c:221
-
-
-
-# src/media_select.c:247
-
-
-
-# src/media_select.c:227
-
-# src/media_select.c:227
-#: src/wdgt-media-select.c:257
-msgid "Page size:"
-msgstr "Taille de page :"
-
-# src/media_select.c:226
-
-
-
-# src/media_select.c:252
-
-
-
-# src/media_select.c:232
-
-# src/media_select.c:232
-#: src/wdgt-media-select.c:262
-msgid "Label size:"
-msgstr "Taille d'étiquette :"
-
-# src/media_select.c:231
-
-
-
-# src/media_select.c:257
-
-
-
-# src/media_select.c:237
-
-# src/media_select.c:237
-#: src/wdgt-media-select.c:267
-msgid "Layout:"
-msgstr "Disposition :"
-
-# src/media_select.c:515
-
-
-
-# src/media_select.c:481
-
-# src/media_select.c:353
-#: src/wdgt-media-select.c:408
-#, c-format
-msgid "%d x %d (%d per sheet)"
-msgstr "%d x %d (%d par feuille)"
-
-# src/media_select.c:522
-
-
-
-# src/media_select.c:488
-
-# src/media_select.c:367
-#: src/wdgt-media-select.c:422
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
-
-# src/media_select.c:522
-
+# src/label.c:186 src/label.c:211
+# src/label.c:186 src/label.c:211
+# src/label.c:170 src/label.c:194
+# src/label.c:168 src/label.c:192
+#: src/label.c:173 src/label.c:197
+msgid "xmlParseFile error"
+msgstr "erreur xmlParseFile"
+# src/label.c:243
+# src/label.c:244
+# src/label.c:225
+# src/label.c:223
+#: src/label.c:228
+msgid "No document root"
+msgstr "Pas de racine de document"
-# src/media_select.c:488
+# src/label.c:248
+# src/label.c:249
+# src/label.c:236
+# src/label.c:234
+#: src/label.c:239
+msgid "document of the wrong type, glabels Namespace not found"
+msgstr "document de type erroné, aucun espace de noms glabels trouvé"
-# src/media_select.c:372
-#: src/wdgt-media-select.c:427
+# src/label.c:253
+# src/label.c:254
+# src/label.c:241
+# src/label.c:239
+#: src/label.c:244
#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
-
-# src/rotate_select.c:187
-
-
-
-# src/rotate_select.c:187
-
-
-
-# src/rotate_select.c:167
-
-# src/rotate_select.c:169
-#: src/wdgt-rotate-label.c:176
-msgid "Rotate"
-msgstr "Rotation"
+msgid "Bad root node = \"%s\""
+msgstr "Mauvais noeud racine = \"%s\""
-#: src/bonobo-mdi.c:522 src/bonobo-mdi.c:612 src/bonobo-mdi.c:1850
+# src/label.c:298
+# src/label.c:301
+# src/label.c:294
+# src/label.c:290
+#: src/label.c:291
#, c-format
-msgid "Activate %s"
-msgstr ""
-
-# src/file.c:178
-
-
-
-# src/file.c:178
-
-
-
-# src/file.c:211
-
-# src/file.c:211
-#: src/gnome-recent-view-bonobo.c:189
-#, fuzzy, c-format
-msgid "Open %s"
-msgstr "Ouvrir"
-
-# src/mdi.c:190
-
-
-
-# src/mdi.c:189
-
-
-
-# src/mdi.c:169
-
-# src/mdi.c:169
-#~ msgid "Revert to saved copy of %s?"
-#~ msgstr "Rétablir la version sauvegardée de %s ?"
-
-# src/mdi.c:219
-
-
-
-# src/mdi.c:207
-
-# src/mdi.c:207
-#~ msgid "Unknown media type. Using default."
-#~ msgstr "Type de media inconnu. Utilisation de celui par défaut."
-
-# src/mdi.c:477
-
-
-
-# src/mdi.c:483
-
-
-
-# src/mdi.c:455
-
-# src/mdi.c:455
-#~ msgid ""
-#~ "``%s'' has been modified.\n"
-#~ "\n"
-#~ "Do you wish to save it?"
-#~ msgstr ""
-#~ "``%s'' a été modifié \n"
-#~ "\n"
-#~ "Voulez-vous l'enregistrer ?"
-
-# src/file.c:248 src/mdi.c:635
-
-
-
-# src/file.c:248 src/mdi.c:641
-
-
-
-# src/file.c:288 src/mdi.c:601
-
-# src/file.c:288 src/mdi.c:601
-#~ msgid "Cannot save file"
-#~ msgstr "Impossible d'enregistrer le fichier"
-
-# src/file.c:271 src/mdi.c:660
-
-
-
-# src/file.c:271 src/mdi.c:666
-
-
-
-# src/file.c:311 src/mdi.c:623
-
-# src/file.c:311 src/mdi.c:623
-#~ msgid "Save As"
-#~ msgstr "Enregistrer sous"
-
-# src/mdi.c:663
-
-
-
-# src/mdi.c:669
-
-
-
-# src/mdi.c:626
-
-# src/mdi.c:626
-#~ msgid "Close / Save label as"
-#~ msgstr "Fermer / Enregistrer l'étiquette sous"
-
-# src/file.c:309 src/mdi.c:716
-
-
-
-# src/file.c:309 src/mdi.c:722
-
-
-
-# src/file.c:352 src/mdi.c:680
-
-# src/file.c:352 src/mdi.c:680
-#~ msgid "Label no longer valid!"
-#~ msgstr "Etiquette plus valide !"
+msgid "bad node = \"%s\""
+msgstr "mauvais noeud = \"%s\""
-# src/item_image.c:389 src/item_image.c:444
+# src/label.c:487
+# src/label.c:493
+# src/label.c:589
+# src/label.c:587
+#: src/label.c:606
+msgid "Problem saving xml file."
+msgstr "Problčme de sauvegarde du fichier xml."
+# src/template.c:179
+# src/template.c:178
+# src/template.c:223
+#: src/template.c:224
+msgid "No template files found!"
+msgstr "Aucun fichier de patron trouvé !"
+# src/item_box.c:251
+# src/item_box.c:251
+# src/merge_properties.c:82
+# src/merge_properties.c:82
+#: src/merge_properties.c:82
+msgid "Edit document-merge properties"
+msgstr "Editer les propriétés de fusion de document"
-# src/item_image.c:388 src/item_image.c:442
+# src/merge_properties.c:131
+# src/merge_properties.c:131
+#: src/merge_properties.c:131
+msgid "Source"
+msgstr "Source"
+# src/prop_text.c:214
+# src/prop_text.c:199
+# src/merge_properties.c:143
+# src/merge_properties.c:143
+#: src/merge_properties.c:143
+msgid "Format:"
+msgstr "Format :"
+# src/merge_properties.c:158
+# src/merge_properties.c:158
+#: src/merge_properties.c:158
+msgid "Location:"
+msgstr "Emplacement :"
-# src/item_image.c:389 src/item_image.c:454
+# src/item_box.c:274 src/item_ellipse.c:279
+# src/item_box.c:274 src/item_ellipse.c:279
+# src/merge_properties.c:168
+# src/merge_properties.c:168
+#: src/merge_properties.c:168
+msgid "Fields"
+msgstr "Champs"
-# src/item_image.c:389 src/item_image.c:454
-#~ msgid "Image format not currently supported"
-#~ msgstr "Format d'image non supporté actuellement"
+# src/merge.c:80
+# src/merge.c:78
+#: src/merge.c:78
+msgid "None"
+msgstr "Aucun"
-# src/item_barcode.c:337
+# src/merge.c:89
+# src/merge.c:86
+#: src/merge.c:86
+msgid "Text with tab separators"
+msgstr "Texte avec séparateurs de tabulation"
+# src/merge.c:98
+# src/merge.c:94
+#: src/merge.c:94
+msgid "Text with comma separators (CSV)"
+msgstr "Texte séparé par des virgules (CSV)"
+# src/merge.c:107
+# src/merge.c:102
+#: src/merge.c:102
+msgid "Text with colon separators"
+msgstr "Texte séparé par des deux-points"
-# src/item_barcode.c:343 src/prefs.c:243
+# src/merge_ui.c:207 src/merge_ui.c:242 src/merge_ui.c:387 src/merge_ui.c:428
+# src/merge_ui.c:207 src/merge_ui.c:242 src/merge_ui.c:387 src/merge_ui.c:428
+#: src/merge_ui.c:207 src/merge_ui.c:242 src/merge_ui.c:387 src/merge_ui.c:428
+msgid "N/A"
+msgstr "Non défini"
+# src/merge_ui_text.c:170
+# src/merge_ui_text.c:170
+#: src/merge_ui_text.c:170
+msgid "Select merge-database source"
+msgstr "Sélection de la base de données source de la fusion"
+# src/merge_ui_text.c:330
+# src/merge_ui_text.c:330
+#: src/merge_ui_text.c:330
+msgid "Column"
+msgstr "Colonne"
-# src/item_barcode.c:320 src/prefs.c:221
+# src/merge_ui_text.c:334
+# src/merge_ui_text.c:334
+#: src/merge_ui_text.c:334
+msgid "Custom field key"
+msgstr "Clé de champ spécifique"
-# src/item_barcode.c:320 src/prefs.c:215
-#~ msgid "General"
-#~ msgstr "Général"
+# src/merge_ui_text.c:338
+# src/merge_ui_text.c:338
+#: src/merge_ui_text.c:338
+msgid "Sample data"
+msgstr "Exemple de données"
# src/menu.c:50
-
-
-
# src/menu.c:50
-
-
-
# src/menu.c:50
-
# src/menu.c:50
-#~ msgid "_New"
-#~ msgstr "_Nouveau"
+#: src/menu.c:50
+msgid "_New"
+msgstr "_Nouveau"
# src/menu.c:51
-
-
-
# src/menu.c:51
-
-
-
# src/menu.c:51
-
# src/menu.c:51
-#~ msgid "Make a new, empty label"
-#~ msgstr "Créer une nouvelle étiquette vide"
+#: src/menu.c:51
+msgid "Make a new, empty label"
+msgstr "Créer une nouvelle étiquette vide"
# src/menu.c:86
-
-
-
# src/menu.c:86
-
-
-
# src/menu.c:85
-
# src/menu.c:85
-#~ msgid "U_nselect All "
-#~ msgstr "_Désélectionne tout"
+#: src/menu.c:85
+msgid "U_nselect All "
+msgstr "_Désélectionne tout"
# src/menu.c:86
-
-
-
# src/menu.c:86
-
-
-
# src/menu.c:86
-
# src/menu.c:86
-#~ msgid "Remove all selections"
-#~ msgstr "Supprime toutes les sélections"
+#: src/menu.c:86
+msgid "Remove all selections"
+msgstr "Supprime toutes les sélections"
# src/display.c:1157 src/display.c:1205
-
-
-
# src/display.c:1160 src/display.c:1208
-
-
-
# src/menu.c:94
-
# src/menu.c:94
-#~ msgid "Select"
-#~ msgstr "Sélectionner"
+#: src/menu.c:94
+msgid "Select"
+msgstr "Sélectionner"
# src/tools.c:59
-
-
-
# src/tools.c:59
-
-
-
# src/menu.c:95 src/menu.c:186
-
# src/menu.c:95 src/menu.c:186
-#~ msgid "Select, move and modify objects"
-#~ msgstr "Sélectionner, déplacer et modifier les objets"
+#: src/menu.c:95 src/menu.c:186
+msgid "Select, move and modify objects"
+msgstr "Sélectionner, déplacer et modifier les objets"
# src/tools.c:64
-
-
-
# src/tools.c:64
-
-
-
# src/menu.c:100 src/menu.c:191
-
# src/menu.c:100 src/menu.c:191
-#~ msgid "Create text object"
-#~ msgstr "Créer un objet texte"
+#: src/menu.c:100 src/menu.c:191
+msgid "Create text object"
+msgstr "Créer un objet texte"
# src/menu.c:103
-
# src/menu.c:103
-#~ msgid "Box"
-#~ msgstr "Boîte"
+#: src/menu.c:103
+msgid "Box"
+msgstr "Boîte"
# src/tools.c:67
-
-
-
# src/tools.c:67
-
-
-
# src/menu.c:103 src/menu.c:194
-
# src/menu.c:103 src/menu.c:194
-#~ msgid "Create box/rectangle object"
-#~ msgstr "Créer un objet boîte/rectangle"
+#: src/menu.c:103 src/menu.c:194
+msgid "Create box/rectangle object"
+msgstr "Créer un objet boîte/rectangle"
# src/tools.c:70
-
-
-
# src/tools.c:70
-
-
-
# src/menu.c:106 src/menu.c:197
-
# src/menu.c:106 src/menu.c:197
-#~ msgid "Create line object"
-#~ msgstr "Créer un objet ligne"
+#: src/menu.c:106 src/menu.c:197
+msgid "Create line object"
+msgstr "Créer un objet ligne"
# src/menu.c:109
-
# src/menu.c:109
-#~ msgid "Ellipse"
-#~ msgstr "Ellipse"
+#: src/menu.c:109
+msgid "Ellipse"
+msgstr "Ellipse"
# src/tools.c:73
-
-
-
# src/tools.c:73
-
-
-
# src/menu.c:110 src/menu.c:200
-
# src/menu.c:110 src/menu.c:200
-#~ msgid "Create ellipse/circle object"
-#~ msgstr "Créer un objet ellipse/cercle"
+#: src/menu.c:110 src/menu.c:200
+msgid "Create ellipse/circle object"
+msgstr "Créer un objet ellipse/cercle"
# src/tools.c:76
-
-
-
# src/tools.c:76
-
-
-
# src/menu.c:113 src/menu.c:203
-
# src/menu.c:113 src/menu.c:203
-#~ msgid "Create image object"
-#~ msgstr "Créer un objet image"
+#: src/menu.c:113 src/menu.c:203
+msgid "Create image object"
+msgstr "Créer un objet image"
# src/item_barcode.c:316
-
-
-
# src/item_barcode.c:317
-
-
-
# src/menu.c:116
-
# src/menu.c:116
-#~ msgid "Barcode"
-#~ msgstr "Code-barre"
+#: src/menu.c:116
+msgid "Barcode"
+msgstr "Code-barre"
# src/tools.c:79
-
-
-
# src/tools.c:79
-
-
-
# src/menu.c:116 src/menu.c:206
-
# src/menu.c:116 src/menu.c:206
-#~ msgid "Create barcode object"
-#~ msgstr "Créer un objet code-barre"
+#: src/menu.c:116 src/menu.c:206
+msgid "Create barcode object"
+msgstr "Créer un objet code-barre"
# src/tools.c:84
-
-
-
# src/tools.c:84
-
-
-
# src/menu.c:121 src/menu.c:211
-
# src/menu.c:121 src/menu.c:211
-#~ msgid "Zoom in"
-#~ msgstr "Zoom supérieur"
+#: src/menu.c:121 src/menu.c:211
+msgid "Zoom in"
+msgstr "Zoom supérieur"
# src/tools.c:87
-
-
-
# src/tools.c:87
-
-
-
# src/menu.c:124 src/menu.c:214
-
# src/menu.c:124 src/menu.c:214
-#~ msgid "Zoom out"
-#~ msgstr "Zoom inférieur"
+#: src/menu.c:124 src/menu.c:214
+msgid "Zoom out"
+msgstr "Zoom inférieur"
# src/tools.c:90
-
-
-
# src/tools.c:90
-
-
-
# src/menu.c:127
-
# src/menu.c:127
-#~ msgid "Zoom 1:1"
-#~ msgstr "Zoom 1:1"
+#: src/menu.c:127
+msgid "Zoom 1:1"
+msgstr "Zoom 1:1"
# src/tools.c:90
-
-
-
# src/tools.c:90
-
-
-
# src/menu.c:127 src/menu.c:217
-
# src/menu.c:127 src/menu.c:217
-#~ msgid "Zoom to 1:1"
-#~ msgstr "Zoomer ŕ 1:1"
+#: src/menu.c:127 src/menu.c:217
+msgid "Zoom to 1:1"
+msgstr "Zoomer ŕ 1:1"
# src/item_text.c:467
-
-
-
# src/item_text.c:467
-
-
-
# src/menu.c:132 src/menu.c:223
-
# src/menu.c:132 src/menu.c:223
-#~ msgid "Merge properties"
-#~ msgstr "Propriétés de fusion"
+#: src/menu.c:132 src/menu.c:223
+msgid "Merge properties"
+msgstr "Propriétés de fusion"
# src/item_image.c:272
-
-
-
# src/item_image.c:272
-
-
-
# src/menu.c:133
-
# src/menu.c:133
-#~ msgid "Edit merge properties"
-#~ msgstr "Editer les propriétés de fusion"
+#: src/menu.c:133
+msgid "Edit merge properties"
+msgstr "Editer les propriétés de fusion"
# src/menu.c:157
-
# src/menu.c:157
-#~ msgid "_Tools"
-#~ msgstr "_Outils"
+#: src/menu.c:157
+msgid "_Tools"
+msgstr "_Outils"
# src/menu.c:138
-
-
-
# src/menu.c:138
-
-
-
# src/menu.c:168
-
# src/menu.c:168
-#~ msgid " New "
-#~ msgstr " Nouveau "
+#: src/menu.c:168
+msgid " New "
+msgstr " Nouveau "
# src/menu.c:138
-
-
-
# src/menu.c:138
-
-
-
# src/menu.c:168
-
# src/menu.c:168
-#~ msgid "New Label/Card"
-#~ msgstr "Nouvelle étiquette/carte"
+#: src/menu.c:168
+msgid "New Label/Card"
+msgstr "Nouvelle étiquette/carte"
# src/menu.c:140
-
-
-
# src/menu.c:140
-
-
-
# src/menu.c:170
-
# src/menu.c:170
-#~ msgid " Open "
-#~ msgstr " Ouvrir "
+#: src/menu.c:170
+msgid " Open "
+msgstr " Ouvrir "
# src/menu.c:140
-
-
-
# src/menu.c:140
-
-
-
# src/menu.c:170
-
# src/menu.c:170
-#~ msgid "Open a file"
-#~ msgstr "Ouvrir un fichier"
+#: src/menu.c:170
+msgid "Open a file"
+msgstr "Ouvrir un fichier"
# src/menu.c:142
-
-
-
# src/menu.c:142
-
-
-
# src/menu.c:172
-
# src/menu.c:172
-#~ msgid " Save "
-#~ msgstr " Enregistrer "
+#: src/menu.c:172
+msgid " Save "
+msgstr " Enregistrer "
# src/menu.c:142
+# src/menu.c:142
+# src/menu.c:172
+# src/menu.c:172
+#: src/menu.c:172
+msgid "Save current file"
+msgstr "Sauvegarder le fichier en cours"
+# src/menu.c:145
+# src/menu.c:145
+# src/menu.c:175
+# src/menu.c:175
+#: src/menu.c:175
+msgid " Print "
+msgstr " Imprimer "
+# src/menu.c:145
+# src/menu.c:145
+# src/menu.c:175
+# src/menu.c:175
+#: src/menu.c:175
+msgid "Print current file"
+msgstr "Imprimer le fichier en cours"
-# src/menu.c:142
+# src/menu.c:185
+# src/menu.c:185
+# src/menu.c:290
+# src/menu.c:290
+#: src/menu.c:290
+msgid ""
+"A label and business card creation program for GNOME.\n"
+" \n"
+"Glabels is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+" \n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+msgstr ""
+"Un programme de création d'étiquettes et de cartes de visite pour GNOME.\n"
+" \n"
+"Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le "
+"modifier conformément aux dispositions de la Licence Publique Générale GNU, "
+"telle que publiée par la Free Software Foundation ; version 2 de la licence, "
+"ou encore (ŕ votre choix) toute version ultérieure.\n"
+" \n"
+"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE "
+"GARANTIE ; sans męme la garantie implicite de COMMERCIALISATION ou "
+"D'ADAPTATION A UN OBJET PARTICULIER. Pour plus de détail, voir la Licence "
+"Publique Générale GNU.\n"
+# src/menu.c:221
+# src/menu.c:221
+# src/menu.c:326
+# src/menu.c:326
+#: src/menu.c:326
+msgid "Function is not implemented!"
+msgstr "Cette fonction n'est pas implémentée !"
+# src/file.c:59
+# src/file.c:59
+# src/file.c:72
+# src/file.c:72
+#: src/file.c:72
+msgid "New Label or Card"
+msgstr "Nouvelle étiquette ou carte"
-# src/menu.c:172
+# src/file.c:87
+# src/file.c:87
+# src/file.c:98
+# src/file.c:98
+#: src/file.c:98
+msgid "Media Type"
+msgstr "Type de média"
-# src/menu.c:172
-#~ msgid "Save current file"
-#~ msgstr "Sauvegarder le fichier en cours"
+# src/file.c:98
+# src/file.c:98
+# src/file.c:109
+# src/file.c:109
+#: src/file.c:109
+msgid "Label orientation"
+msgstr "Orientation de l'étiquette"
-# src/menu.c:145
+# src/file.c:178
+# src/file.c:178
+# src/file.c:211
+# src/file.c:211
+#: src/file.c:211
+msgid "Open"
+msgstr "Ouvrir"
+# src/file.c:183
+# src/file.c:183
+# src/file.c:213
+# src/file.c:213
+#: src/file.c:213
+msgid "Open label"
+msgstr "Ouvrir une étiquette"
+# src/file.c:214
+# src/file.c:214
+# src/file.c:249
+# src/file.c:249
+#: src/file.c:249
+msgid "Cannot open file"
+msgstr "Impossible d'ouvrir le fichier"
-# src/menu.c:145
+# src/file.c:278
+# src/file.c:278
+# src/file.c:316
+# src/file.c:316
+#: src/file.c:316
+msgid "Save label as"
+msgstr "Enregistrer l'étiquette sous"
+# src/media_select.c:216
+# src/media_select.c:242
+# src/media_select.c:222
+# src/media_select.c:222
+#: src/media_select.c:222
+msgid "Description:"
+msgstr "Description :"
+# src/media_select.c:221
+# src/media_select.c:247
+# src/media_select.c:227
+# src/media_select.c:227
+#: src/media_select.c:227
+msgid "Page size:"
+msgstr "Taille de page :"
-# src/menu.c:175
+# src/media_select.c:226
+# src/media_select.c:252
+# src/media_select.c:232
+# src/media_select.c:232
+#: src/media_select.c:232
+msgid "Label size:"
+msgstr "Taille d'étiquette :"
-# src/menu.c:175
-#~ msgid " Print "
-#~ msgstr " Imprimer "
+# src/media_select.c:231
+# src/media_select.c:257
+# src/media_select.c:237
+# src/media_select.c:237
+#: src/media_select.c:237
+msgid "Layout:"
+msgstr "Disposition :"
-# src/menu.c:145
+# src/media_select.c:515
+# src/media_select.c:481
+# src/media_select.c:353
+#: src/media_select.c:353
+#, c-format
+msgid "%d x %d (%d per sheet)"
+msgstr "%d x %d (%d par feuille)"
+# src/media_select.c:522
+# src/media_select.c:488
+# src/media_select.c:367
+#: src/media_select.c:367
+#, c-format
+msgid "%s x %s %s"
+msgstr "%s x %s %s"
+# src/media_select.c:522
+# src/media_select.c:488
+# src/media_select.c:372
+#: src/media_select.c:372
+#, c-format
+msgid "%.5g x %.5g %s"
+msgstr "%.5g x %.5g %s"
-# src/menu.c:145
+# src/rotate_select.c:187
+# src/rotate_select.c:187
+# src/rotate_select.c:167
+# src/rotate_select.c:169
+#: src/rotate_select.c:169
+msgid "Rotate"
+msgstr "Rotation"
+# src/print.c:149
+# src/print.c:149
+# src/print.c:141
+# src/print_dialog.c:99
+#: src/print_dialog.c:99
+msgid "Print"
+msgstr "Imprimer"
+# src/print.c:153
+# src/print.c:153
+# src/print.c:146
+# src/print_dialog.c:104
+#. ----------- Add simple-copies widget ------------
+#: src/print_dialog.c:104
+msgid "Copies"
+msgstr "Copies"
-# src/menu.c:175
+# src/print.c:164
+# src/print_dialog.c:121
+#. -------Otherwise add merge control widget ------------
+#: src/print_dialog.c:121
+msgid "Document merge control"
+msgstr "Contrôle de la fusion de document"
-# src/menu.c:175
-#~ msgid "Print current file"
-#~ msgstr "Imprimer le fichier en cours"
+# src/print.c:171
+# src/print.c:171
+# src/print.c:186
+# src/print_dialog.c:141
+#. ----------- Add custom print options area ------------
+#: src/print_dialog.c:141
+msgid "Options"
+msgstr "Options"
-# src/menu.c:221
+# src/print.c:235
+# src/print.c:235
+# src/print.c:283 src/print.c:348
+# src/print_dialog.c:241 src/print_dialog.c:280
+#: src/print_dialog.c:241 src/print_dialog.c:280
+msgid "Print preview"
+msgstr "Aperçu avant impression"
+# src/print_copies.c:193
+# src/print_copies.c:193
+# src/print_copies.c:171
+# src/print_copies.c:170
+#: src/print_copies.c:170
+msgid "Sheets:"
+msgstr "Feuilles :"
+# src/print_copies.c:210
+# src/print_copies.c:210
+# src/print_copies.c:188
+# src/print_copies.c:187
+#: src/print_copies.c:187
+msgid "Labels"
+msgstr "Etiquettes"
-# src/menu.c:221
+# src/print_copies.c:213
+# src/print_copies.c:213
+# src/print_copies.c:191
+# src/print_copies.c:190
+#: src/print_copies.c:190
+msgid "from:"
+msgstr "de :"
+# src/print_copies.c:221
+# src/print_copies.c:221
+# src/print_copies.c:199
+# src/print_copies.c:198
+#: src/print_copies.c:198
+msgid "to:"
+msgstr "ŕ :"
+# src/print_copies_merge.c:197
+# src/print_merge.c:170
+#: src/print_merge.c:170
+msgid "Start on label"
+msgstr "Commencer par l'étiquette"
-# src/menu.c:326
+# src/print_copies_merge.c:206
+# src/print_merge.c:179
+#: src/print_merge.c:179
+msgid "on 1st sheet"
+msgstr "en 1čre page"
-# src/menu.c:326
-#~ msgid "Function is not implemented!"
-#~ msgstr "Cette fonction n'est pas implémentée !"
+# src/rotate_select.c:187
+# src/rotate_select.c:187
+# src/print_copies_merge.c:186
+# src/print_merge.c:188
+#: src/print_merge.c:188
+msgid "Collate"
+msgstr "Assembler"
-# src/tools.c:297
+# src/print.c:153
+# src/print.c:153
+# src/print_copies_merge.c:173
+# src/print_merge.c:195
+#: src/print_merge.c:195
+msgid "Copies:"
+msgstr "Copies :"
+# src/preferences.c:92
+# src/prefs.c:101
+# src/prefs.c:92
+# src/prefs.c:86
+#: src/prefs.c:86
+msgid "Glabels: Preferences"
+msgstr "Glabels : Préférences"
+# src/prefs.c:248
+# src/prefs.c:226
+# src/prefs.c:220
+#. ----- Display Units Frame ------------------------------------
+#: src/prefs.c:220
+msgid "Display units"
+msgstr "Unités d'affichage"
-# src/tools.c:297
+# src/print.c:149
+# src/prefs.c:259
+# src/prefs.c:237
+# src/prefs.c:231
+#: src/prefs.c:231
+msgid "Points"
+msgstr "Points"
+# src/prefs.c:265
+# src/prefs.c:243
+# src/prefs.c:237
+#: src/prefs.c:237
+msgid "Inches"
+msgstr "Pouces"
+# src/prefs.c:271
+# src/prefs.c:250
+# src/prefs.c:244
+#: src/prefs.c:244
+msgid "Millimeters"
+msgstr "Milimčtres"
-#~ msgid "Function is not yet implemented!"
-#~ msgstr "Cette fonction n'est pas encore implémentée !"
+# src/item_image.c:341
+# src/prefs.c:278
+# src/prefs.c:255
+# src/prefs.c:249
+#. ----- Display Units Frame ------------------------------------
+#: src/prefs.c:249
+msgid "Default page size"
+msgstr "Taille de page par défaut"
-# src/prop_size.c:194
+# src/item_line.c:271
+# src/prefs.c:465
+# src/prefs.c:447
+# src/prefs.c:450
+#: src/prefs.c:450
+msgid "inches"
+msgstr "pouces"
+# src/prefs.c:467
+# src/prefs.c:449
+# src/prefs.c:452
+#: src/prefs.c:452
+msgid "mm"
+msgstr "mm"
+# src/tools.c:297
+# src/tools.c:297
+#~ msgid "Function is not yet implemented!"
+#~ msgstr "Cette fonction n'est pas encore implémentée !"
+# src/prop_size.c:194
#~ msgid "w"
#~ msgstr "l"
# src/prop_size.c:203
-
-
-
#~ msgid "h"
#~ msgstr "h"
# src/prop_position.c:183
-
-
-
#~ msgid "x"
#~ msgstr "x"
# src/prop_position.c:195
-
-
-
#~ msgid "y"
#~ msgstr "y"
# src/media_select.c:462
-
-
-
#~ msgid "%.1f x %.1f"
#~ msgstr "%.1f x %.1f"
# src/preferences.c:213
-
-
-
#~ msgid "Startup"
#~ msgstr "Démarrage"
# src/preferences.c:215
-
-
-
#~ msgid "Under construction"
#~ msgstr "En construction"
diff --git a/glabels2/po/glabels.pot b/glabels2/po/glabels.pot
deleted file mode 100644
index 3cfbe2e..0000000
--- a/glabels2/po/glabels.pot
+++ /dev/null
@@ -1,709 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#: src/commands.c:384
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-08-20 21:43-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/glabels.c:59
-msgid "Show view debugging messages."
-msgstr ""
-
-#: src/glabels.c:62
-msgid "Show item debugging messages."
-msgstr ""
-
-#: src/glabels.c:65
-msgid "Show printing debugging messages."
-msgstr ""
-
-#: src/glabels.c:68
-msgid "Show prefs debugging messages."
-msgstr ""
-
-#: src/glabels.c:71
-msgid "Show file debugging messages."
-msgstr ""
-
-#: src/glabels.c:74
-msgid "Show document debugging messages."
-msgstr ""
-
-#: src/glabels.c:77
-msgid "Show template debugging messages."
-msgstr ""
-
-#: src/glabels.c:80
-msgid "Show xml debugging messages."
-msgstr ""
-
-#: src/glabels.c:83
-msgid "Show document merge debugging messages."
-msgstr ""
-
-#: src/glabels.c:86
-msgid "Show commands debugging messages."
-msgstr ""
-
-#: src/glabels.c:89
-msgid "Show undo debugging messages."
-msgstr ""
-
-#: src/glabels.c:92
-msgid "Show recent debugging messages."
-msgstr ""
-
-#: src/glabels.c:95
-msgid "Show mdi debugging messages."
-msgstr ""
-
-#: src/glabels.c:98
-msgid "Show media select widget debugging messages."
-msgstr ""
-
-#: src/glabels.c:101
-msgid "Show mini preview widget debugging messages."
-msgstr ""
-
-#: src/glabels.c:104
-msgid "Show widget debugging messages."
-msgstr ""
-
-#: src/glabels.c:107
-msgid "Turn on all debugging messages."
-msgstr ""
-
-#: src/glabels-batch.c:47
-msgid "print this message"
-msgstr ""
-
-#: src/glabels-batch.c:49
-msgid "print the version of glabels-batch being used"
-msgstr ""
-
-#: src/glabels-batch.c:51
-msgid "set output filename (default=\"output.ps\")"
-msgstr ""
-
-#: src/glabels-batch.c:51
-msgid "filename"
-msgstr ""
-
-#: src/glabels-batch.c:53
-msgid "number of sheets (default=1)"
-msgstr ""
-
-#: src/glabels-batch.c:53
-msgid "sheets"
-msgstr ""
-
-#: src/glabels-batch.c:55
-msgid "number of copies (default=1)"
-msgstr ""
-
-#: src/glabels-batch.c:55
-msgid "copies"
-msgstr ""
-
-#: src/glabels-batch.c:57 src/print-dialog.c:205
-msgid "print outlines (to test printer alignment)"
-msgstr ""
-
-#: src/glabels-batch.c:59 src/print-dialog.c:214
-msgid "print in reverse (i.e. a mirror image)"
-msgstr ""
-
-#: src/glabels-batch.c:90
-msgid "[OPTION...] GLABELS_FILE..."
-msgstr ""
-
-#: src/glabels-batch.c:109
-msgid "missing glabels file\n"
-msgstr ""
-
-#: src/glabels-batch.c:140
-#, c-format
-msgid "cannot open glabels file %s\n"
-msgstr ""
-
-#: src/mdi.c:579
-#, c-format
-msgid ""
-"Do you want to save the changes you made to the document \"%s\"? \n"
-"\n"
-"Your changes will be lost if you don't save them."
-msgstr ""
-
-#: src/mdi.c:584
-msgid "Do_n't save"
-msgstr ""
-
-#: src/mdi.c:604
-msgid "_Don't quit"
-msgstr ""
-
-#: src/mdi.c:609
-msgid "_Don't close"
-msgstr ""
-
-#: src/mdi.c:706
-msgid "(modified)"
-msgstr ""
-
-#: src/commands.c:359
-msgid ""
-"A label and business card creation program for GNOME.\n"
-" \n"
-"Glabels is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version.\n"
-" \n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-msgstr ""
-
-#: src/commands.c:371
-msgid "Author:"
-msgstr ""
-
-#: src/commands.c:374
-msgid "See the file AUTHORS for additional acknowledgments,"
-msgstr ""
-
-#: src/commands.c:375
-msgid "or visit http://snaught.com/glabels"
-msgstr ""
-
-#: src/commands.c:397
-msgid "glabels"
-msgstr ""
-
-#: src/file.c:82
-msgid "New Label or Card"
-msgstr ""
-
-#: src/file.c:109
-msgid "Media Type"
-msgstr ""
-
-#: src/file.c:119
-msgid "Label orientation"
-msgstr ""
-
-#: src/file.c:248
-msgid "Open"
-msgstr ""
-
-#: src/file.c:250
-msgid "Open label"
-msgstr ""
-
-#: src/file.c:338
-#, c-format
-msgid "Cannot open file '%s'"
-msgstr ""
-
-#: src/file.c:429
-#, c-format
-msgid "Error saving file '%s'"
-msgstr ""
-
-#: src/file.c:468
-msgid "Save label as"
-msgstr ""
-
-#: src/file.c:550
-msgid "Must supply file name"
-msgstr ""
-
-#: src/file.c:569
-#, c-format
-msgid "Error writing file '%s'"
-msgstr ""
-
-#. Should not happen
-#: src/prefs.c:625 src/prefs.c:632 src/wdgt-line.c:186
-msgid "points"
-msgstr ""
-
-#: src/prefs.c:627
-msgid "inches"
-msgstr ""
-
-#: src/prefs.c:629
-msgid "mm"
-msgstr ""
-
-#: src/prefs-dialog.c:220
-msgid "Locale"
-msgstr ""
-
-#: src/prefs-dialog.c:224
-msgid "Object defaults"
-msgstr ""
-
-#: src/prefs-dialog.c:232
-msgid "Preferences"
-msgstr ""
-
-#: src/prefs-dialog.c:272
-msgid "Select locale specific behavior."
-msgstr ""
-
-#. ----- Display Units Frame ------------------------------------
-#: src/prefs-dialog.c:279
-msgid "Display units"
-msgstr ""
-
-#: src/prefs-dialog.c:289
-msgid "Points"
-msgstr ""
-
-#: src/prefs-dialog.c:296
-msgid "Inches"
-msgstr ""
-
-#: src/prefs-dialog.c:303
-msgid "Millimeters"
-msgstr ""
-
-#. ----- Page Size Frame ------------------------------------
-#: src/prefs-dialog.c:310
-msgid "Default page size"
-msgstr ""
-
-#: src/prefs-dialog.c:364
-msgid "Select default properties for new objects."
-msgstr ""
-
-#. ------ Line box ------
-#: src/prefs-dialog.c:377
-msgid "Line"
-msgstr ""
-
-#. ------ Fill box ------
-#: src/prefs-dialog.c:382 src/view-box.c:325 src/view-ellipse.c:325
-msgid "Fill"
-msgstr ""
-
-#: src/view-object.c:406 src/view.c:1520
-msgid "Delete"
-msgstr ""
-
-#: src/view-object.c:416 src/view.c:1530
-msgid "Bring to front"
-msgstr ""
-
-#: src/view-object.c:423 src/view.c:1536
-msgid "Send to back"
-msgstr ""
-
-#: src/view-object.c:395
-msgid "Edit properties..."
-msgstr ""
-
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-box.c:293
-msgid "Edit box object properties"
-msgstr ""
-
-#: src/view-barcode.c:313 src/view-box.c:312 src/view-ellipse.c:312
-#: src/view-line.c:309 src/view-text.c:311
-msgid "Appearance"
-msgstr ""
-
-#. ------ Line box ------
-#: src/view-box.c:315 src/view-ellipse.c:315 src/view-line.c:312
-msgid "Outline"
-msgstr ""
-
-#: src/view-box.c:340 src/view-ellipse.c:340 src/view-image.c:337
-#: src/view-line.c:328
-msgid "Position/Size"
-msgstr ""
-
-#. ------ Position Frame ------
-#: src/view-barcode.c:345 src/view-barcode.c:349 src/view-box.c:343
-#: src/view-ellipse.c:343 src/view-image.c:340 src/view-line.c:331
-#: src/view-text.c:334 src/view-text.c:338
-msgid "Position"
-msgstr ""
-
-#. ------ Size Frame ------
-#: src/view-box.c:354 src/view-ellipse.c:356 src/view-image.c:353
-#: src/view-line.c:344
-msgid "Size"
-msgstr ""
-
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-ellipse.c:293
-msgid "Edit ellipse object properties"
-msgstr ""
-
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-line.c:290
-msgid "Edit line object properties"
-msgstr ""
-
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-image.c:281
-msgid "Edit image object properties"
-msgstr ""
-
-#: src/view-image.c:300
-msgid "Image"
-msgstr ""
-
-#. ------ Size Reset Button ------
-#: src/view-image.c:364
-msgid "Reset image size"
-msgstr ""
-
-#: src/view-text.c:265
-msgid "Edit text object properties"
-msgstr ""
-
-#: src/view-text.c:285 src/view-text.c:605
-msgid "Text"
-msgstr ""
-
-#: src/view-barcode.c:267
-msgid "Edit barcode object properties"
-msgstr ""
-
-#: src/view-barcode.c:287
-msgid "Data"
-msgstr ""
-
-#: src/view-barcode.c:292
-msgid "Barcode data"
-msgstr ""
-
-#: src/view-barcode.c:318
-msgid "Barcode Properties"
-msgstr ""
-
-#. ------ Barcode Style Frame ------
-#: src/view-barcode.c:328
-msgid "Style"
-msgstr ""
-
-#: src/print.c:814 src/view-barcode.c:758
-msgid "Invalid barcode"
-msgstr ""
-
-#: src/merge-properties.c:84
-msgid "Edit document-merge properties"
-msgstr ""
-
-#: src/merge-properties.c:130
-msgid "Source"
-msgstr ""
-
-#: src/merge-properties.c:142
-msgid "Format:"
-msgstr ""
-
-#: src/merge-properties.c:157
-msgid "Location:"
-msgstr ""
-
-#: src/merge-properties.c:167
-msgid "Fields"
-msgstr ""
-
-#. ----- Contstruct basic print dialog with notebook -----
-#: src/print-dialog.c:102
-msgid "Print"
-msgstr ""
-
-#: src/print-dialog.c:124
-msgid "_Job"
-msgstr ""
-
-#: src/print-dialog.c:129
-msgid "P_rinter"
-msgstr ""
-
-#. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:158
-msgid "Copies"
-msgstr ""
-
-#. ------- Otherwise add merge control widget ------------
-#: src/print-dialog.c:174
-msgid "Document merge control"
-msgstr ""
-
-#. ----------- Add custom print options area ------------
-#: src/print-dialog.c:195
-msgid "Options"
-msgstr ""
-
-#: src/print-dialog.c:345 src/print-dialog.c:384
-msgid "Print preview"
-msgstr ""
-
-#: src/label.c:535
-#, c-format
-msgid "%s %d"
-msgstr ""
-
-#: src/label.c:535
-msgid "Untitled"
-msgstr ""
-
-#: src/template.c:346
-msgid "No template files found!"
-msgstr ""
-
-#: src/xml-label.c:108 src/xml-label.c:139
-msgid "xmlParseFile error"
-msgstr ""
-
-#: src/xml-label.c:174
-msgid "No document root"
-msgstr ""
-
-#: src/xml-label.c:186
-msgid "Importing from glabels 0.1 format"
-msgstr ""
-
-#: src/xml-label.c:194
-msgid "Importing from glabels 0.4 format"
-msgstr ""
-
-#: src/xml-label.c:198
-msgid "bad document, unknown glabels Namespace"
-msgstr ""
-
-#: src/xml-label.c:226
-#, c-format
-msgid "Bad root node = \"%s\""
-msgstr ""
-
-#: src/xml-label.c:249 src/xml-label.c:281
-#, c-format
-msgid "bad node = \"%s\""
-msgstr ""
-
-#: src/xml-label.c:656
-msgid "Problem saving xml file."
-msgstr ""
-
-#: src/merge.c:80
-msgid "None"
-msgstr ""
-
-#: src/merge.c:88
-msgid "Text with tab separators"
-msgstr ""
-
-#: src/merge.c:96
-msgid "Text with comma separators"
-msgstr ""
-
-#: src/merge.c:104
-msgid "Text with colon separators"
-msgstr ""
-
-#: src/merge-ui.c:223 src/merge-ui.c:265 src/merge-ui.c:435 src/merge-ui.c:483
-msgid "N/A"
-msgstr ""
-
-#: src/merge-ui-text.c:172
-msgid "Select merge-database source"
-msgstr ""
-
-#: src/merge-ui-text.c:330
-msgid "Column"
-msgstr ""
-
-#: src/merge-ui-text.c:334
-msgid "Custom field key"
-msgstr ""
-
-#: src/merge-ui-text.c:338
-msgid "Sample data"
-msgstr ""
-
-#. Font label
-#: src/wdgt-text-props.c:184
-msgid "Font:"
-msgstr ""
-
-#. Text Color Label
-#: src/wdgt-bc-props.c:190 src/wdgt-fill.c:169 src/wdgt-line.c:192
-#: src/wdgt-text-props.c:237
-msgid "Color:"
-msgstr ""
-
-#. Alignment label
-#: src/wdgt-text-props.c:251
-msgid "Alignment:"
-msgstr ""
-
-#. Insert merge field label
-#: src/wdgt-bc-data.c:199 src/wdgt-text-entry.c:201
-msgid "Key:"
-msgstr ""
-
-#: src/wdgt-text-entry.c:217
-msgid "Insert merge field"
-msgstr ""
-
-#. X label
-#: src/wdgt-position.c:182
-msgid "X:"
-msgstr ""
-
-#. Y label
-#: src/wdgt-position.c:200
-msgid "Y:"
-msgstr ""
-
-#. W Label
-#: src/wdgt-line.c:172 src/wdgt-size.c:184
-msgid "Width:"
-msgstr ""
-
-#. H label
-#: src/wdgt-size.c:200
-msgid "Height:"
-msgstr ""
-
-#: src/wdgt-size.c:224
-msgid "Maintain current aspect ratio"
-msgstr ""
-
-#. Length label
-#: src/wdgt-vector.c:186
-msgid "Length:"
-msgstr ""
-
-#. Angle label
-#: src/wdgt-vector.c:210
-msgid "Angle:"
-msgstr ""
-
-#. Angle units label
-#: src/wdgt-vector.c:227
-msgid "degrees"
-msgstr ""
-
-#. Scale Label
-#: src/wdgt-bc-props.c:170
-msgid "Scale:"
-msgstr ""
-
-#. % Label
-#: src/wdgt-bc-props.c:184
-#, c-format
-msgid "%"
-msgstr ""
-
-#: src/wdgt-bc-style.c:316
-msgid "Show text with barcode"
-msgstr ""
-
-#: src/wdgt-bc-data.c:179
-msgid "Literal:"
-msgstr ""
-
-#: src/wdgt-print-copies.c:178
-msgid "Sheets:"
-msgstr ""
-
-#: src/wdgt-print-copies.c:195
-msgid "Labels"
-msgstr ""
-
-#: src/wdgt-print-copies.c:198
-msgid "from:"
-msgstr ""
-
-#: src/wdgt-print-copies.c:206
-msgid "to:"
-msgstr ""
-
-#: src/wdgt-print-merge.c:177
-msgid "Start on label"
-msgstr ""
-
-#: src/wdgt-print-merge.c:186
-msgid "on 1st sheet"
-msgstr ""
-
-#: src/wdgt-print-merge.c:197
-msgid "Collate"
-msgstr ""
-
-#: src/wdgt-print-merge.c:204
-msgid "Copies:"
-msgstr ""
-
-#: src/wdgt-media-select.c:252
-msgid "Description:"
-msgstr ""
-
-#: src/wdgt-media-select.c:257
-msgid "Page size:"
-msgstr ""
-
-#: src/wdgt-media-select.c:262
-msgid "Label size:"
-msgstr ""
-
-#: src/wdgt-media-select.c:267
-msgid "Layout:"
-msgstr ""
-
-#: src/wdgt-media-select.c:408
-#, c-format
-msgid "%d x %d (%d per sheet)"
-msgstr ""
-
-#: src/wdgt-media-select.c:422
-#, c-format
-msgid "%s x %s %s"
-msgstr ""
-
-#: src/wdgt-media-select.c:427
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr ""
-
-#: src/wdgt-rotate-label.c:176
-msgid "Rotate"
-msgstr ""
-
-#: src/bonobo-mdi.c:522 src/bonobo-mdi.c:612 src/bonobo-mdi.c:1850
-#, c-format
-msgid "Activate %s"
-msgstr ""
-
-#: src/gnome-recent-view-bonobo.c:189
-#, c-format
-msgid "Open %s"
-msgstr ""
diff --git a/glabels2/po/ja.po b/glabels2/po/ja.po
index 836c63d..f52d7c2 100644
--- a/glabels2/po/ja.po
+++ b/glabels2/po/ja.po
@@ -2,853 +2,710 @@
# Copyright (C) 2001 Free Software Foundation, Inc.
# Takeshi Aihana <aihana@gnome.gr.jp>, 2001, 2002.
#
-#: src/commands.c:384
msgid ""
msgstr ""
-"Project-Id-Version: glabels 0.4.1\n"
-"POT-Creation-Date: 2002-08-20 21:43-0400\n"
-"PO-Revision-Date: 2002-01-15 22:34+0900\n"
+"Project-Id-Version: glabels 0.4.3\n"
+"POT-Creation-Date: 2002-08-24 22:30-0400\n"
+"PO-Revision-Date: 2002-03-10 21:17+0900\n"
"Last-Translator: Takeshi Aihana <aihana@gnome.gr.jp>\n"
"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=euc-jp\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/glabels.c:59
-msgid "Show view debugging messages."
-msgstr ""
-
-#: src/glabels.c:62
-msgid "Show item debugging messages."
-msgstr ""
-
-#: src/glabels.c:65
-msgid "Show printing debugging messages."
-msgstr ""
-
-#: src/glabels.c:68
-msgid "Show prefs debugging messages."
-msgstr ""
-
-#: src/glabels.c:71
-msgid "Show file debugging messages."
-msgstr ""
-
-#: src/glabels.c:74
-msgid "Show document debugging messages."
-msgstr ""
-
-#: src/glabels.c:77
-msgid "Show template debugging messages."
-msgstr ""
-
-#: src/glabels.c:80
-msgid "Show xml debugging messages."
-msgstr ""
-
-#: src/glabels.c:83
-msgid "Show document merge debugging messages."
-msgstr ""
-
-#: src/glabels.c:86
-msgid "Show commands debugging messages."
-msgstr ""
-
-#: src/glabels.c:89
-msgid "Show undo debugging messages."
-msgstr ""
-
-#: src/glabels.c:92
-msgid "Show recent debugging messages."
-msgstr ""
-
-#: src/glabels.c:95
-msgid "Show mdi debugging messages."
-msgstr ""
-
-#: src/glabels.c:98
-msgid "Show media select widget debugging messages."
-msgstr ""
-
-#: src/glabels.c:101
-msgid "Show mini preview widget debugging messages."
-msgstr ""
-
-#: src/glabels.c:104
-msgid "Show widget debugging messages."
-msgstr ""
-
-#: src/glabels.c:107
-msgid "Turn on all debugging messages."
-msgstr ""
-
-#: src/glabels-batch.c:47
+#: src/glabels_batch.c:49
msgid "print this message"
-msgstr ""
+msgstr "¤ł¤ÎĄáĄĂĄ»ˇĽĄ¸¤ňÉ˝Ľ¨¤ą¤ë"
-#: src/glabels-batch.c:49
+#: src/glabels_batch.c:51
msgid "print the version of glabels-batch being used"
-msgstr ""
+msgstr "»ČÍѤ·¤Ć¤¤¤ë gLabel ¤ÎĄĐˇĽĄ¸ĄçĄó¤ňÉ˝Ľ¨¤ą¤ë"
-#: src/glabels-batch.c:51
+#: src/glabels_batch.c:53
msgid "set output filename (default=\"output.ps\")"
-msgstr ""
+msgstr "˝ĐÎϤą¤ëĄŐĄˇĄ¤ĄëĚľ¤ň»ŘÄꤹ¤ë (ĄÇĄŐĄ©ĄëĄČ = \"output.ps\")"
-#: src/glabels-batch.c:51
+#: src/glabels_batch.c:53
msgid "filename"
-msgstr ""
+msgstr "ĄŐĄˇĄ¤ĄëĚľ"
-#: src/glabels-batch.c:53
+#: src/glabels_batch.c:55
msgid "number of sheets (default=1)"
-msgstr ""
+msgstr "ÍŃ»ć¤Îżô (ĄÇĄŐĄ©ĄëĄČ = 1)"
-#: src/glabels-batch.c:53
-#, fuzzy
+#: src/glabels_batch.c:55
msgid "sheets"
-msgstr "用紙:"
+msgstr "ÍŃ»ć¤Îżô"
-#: src/glabels-batch.c:55
+#: src/glabels_batch.c:57
msgid "number of copies (default=1)"
-msgstr ""
+msgstr "ĄłĄÔˇĽ¤Îżô (ĄÇĄŐĄ©ĄëĄČ = 1)"
-#: src/glabels-batch.c:55
-#, fuzzy
+#: src/glabels_batch.c:57
msgid "copies"
-msgstr "ă‚łă”ăĽ"
+msgstr "ĄłĄÔˇĽ¤Îżô"
-#: src/glabels-batch.c:57 src/print-dialog.c:205
+#: src/glabels_batch.c:59 src/print_dialog.c:152
msgid "print outlines (to test printer alignment)"
-msgstr "アウăă©ă‚¤ăłă‚’印ĺ·ă™ă‚‹ (印ĺ·ć™‚ă®é…Ťç˝®ă‚’確認ă™ă‚‹ăźă‚)"
+msgstr "Ą˘Ą¦ĄČĄéĄ¤Ąó¤ň°őşţ¤ą¤ë (°őşţ»ţ¤ÎÇŰĂÖ¤ňłÎǧ¤ą¤ë¤ż¤á)"
-#: src/glabels-batch.c:59 src/print-dialog.c:214
+#: src/glabels_batch.c:61 src/print_dialog.c:160
msgid "print in reverse (i.e. a mirror image)"
-msgstr "反転ă—ă¦ĺŤ°ĺ· (i.e. ç”»ĺŹă‚’ăźă©ăĽă—ăźă‚‚ă®)"
+msgstr "ȿž¤·¤Ć°őşţ (i.e. ˛čÁü¤ňĄßĄéˇĽ¤·¤ż¤â¤Î)"
-#: src/glabels-batch.c:90
+#: src/glabels_batch.c:92
msgid "[OPTION...] GLABELS_FILE..."
-msgstr ""
+msgstr "[ĄŞĄ×Ą·ĄçĄó...] ĄŐĄˇĄ¤ĄëĚľ..."
-#: src/glabels-batch.c:109
+#: src/glabels_batch.c:111
msgid "missing glabels file\n"
-msgstr ""
+msgstr "gLabel ¤Ç»ČÍѤą¤ëĄŐĄˇĄ¤Ąë¤¬¤˘¤ę¤Ţ¤»¤ó\n"
-#: src/glabels-batch.c:140
-#, fuzzy, c-format
+#: src/glabels_batch.c:139
+#, c-format
msgid "cannot open glabels file %s\n"
-msgstr "ă•ă‚ˇă‚¤ă«ăŚé–‹ă‘ăľă›ă‚“"
+msgstr "gLabel ¤Ç»ČÍѤą¤ëĄŐĄˇĄ¤Ąë %s ¤¬ł«¤±¤Ţ¤»¤ó\n"
-#: src/mdi.c:579
+#: src/mdi.c:169
#, c-format
-msgid ""
-"Do you want to save the changes you made to the document \"%s\"? \n"
-"\n"
-"Your changes will be lost if you don't save them."
-msgstr ""
+msgid "Revert to saved copy of %s?"
+msgstr "%s ¤ÎĄłĄÔˇĽ¤ňȿž¤·¤Ţ¤ą¤«ˇ©"
-#: src/mdi.c:584
-#, fuzzy
-msgid "Do_n't save"
-msgstr "äżťĺ­ă—ăŞă„"
-
-#: src/mdi.c:604
-msgid "_Don't quit"
-msgstr ""
-
-#: src/mdi.c:609
-#, fuzzy
-msgid "_Don't close"
-msgstr "äżťĺ­ă—ăŞă„"
+#: src/mdi.c:207
+msgid "Unknown media type. Using default."
+msgstr "ĄáĄÇĄŁĄ˘¤ÎĽďÎबĆĂÄę¤Ç¤­¤Ţ¤»¤óˇŁĄÇĄŐĄ©ĄëĄČ¤ň»ČÍѤ·¤Ţ¤ąˇŁ"
-#: src/mdi.c:706
-msgid "(modified)"
-msgstr ""
-
-#: src/commands.c:359
+#: src/mdi.c:455
+#, c-format
msgid ""
-"A label and business card creation program for GNOME.\n"
-" \n"
-"Glabels is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version.\n"
-" \n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-msgstr ""
-"GNOME ĺ‘ă‘ă®ă©ă™ă«/ă“ジăŤă‚ąă‚«ăĽă‰ă®ä˝śćă—ă­ă‚°ă©ă ă§ă™ă€‚\n"
-"\n"
-"Glabels ăŻă•ăŞăĽă‚˝ă•ăă§ă™ă€‚ă•ăŞăĽă‚˝ă•ăウェア財団ăŚĺ®šă‚ă‚‹ GNU 一č¬ĺ…¬ćś‰ä˝żç”¨č¨±"
-"諾契約書ă®ç¬¬2ç‰ă‚‚ă—ăŹăŻăťă‚Śä»Ąé™Ťă®ăăĽă‚¸ă§ăłă®ä¸‹ă§č¤‡čŁ˝ă€ć”ąç·¨ă€ĺ†Ťé…Ťĺ¸ăŚčŞŤă‚られ"
-"ă¦ă„ăľă™ă€‚\n"
+"``%s'' has been modified.\n"
"\n"
-"ă“ă®ă—ă­ă‚°ă©ă ăŚĺ˝ąă«ç«‹ă¤ă“ă¨ă‚’望む中ă§é…Ťĺ¸ă•ă‚Śă¦ă„ăľă™ăŚă€ĺ®Śĺ…¨ç„ˇäżťč¨Ľă§ă™ă€‚販"
-"売目的ăľăźăŻĺ•†ç”¨ç›®çš„ă®äżťč¨ĽăŻă‚ă‚Šăľă›ă‚“。詳細ă«ă¤ă„ă¦ăŻ GNU 一č¬ĺ…¬ćś‰ä˝żç”¨č¨±č«ľĺĄ‘"
-"約書を参照ă—ă¦ä¸‹ă•ă„。\n"
-
-#: src/commands.c:371
-#, fuzzy
-msgid "Author:"
-msgstr "終了:"
-
-#: src/commands.c:374
-msgid "See the file AUTHORS for additional acknowledgments,"
-msgstr ""
-
-#: src/commands.c:375
-msgid "or visit http://snaught.com/glabels"
+"Do you wish to save it?"
msgstr ""
+"%s ¤ĎĘÔ˝¸¤µ¤ě¤Ć¤¤¤Ţ¤ąˇŁ\n"
+"\n"
+"Ęݸ¤·¤Ţ¤ą¤«ˇ©"
-#: src/commands.c:397
-#, fuzzy
-msgid "glabels"
-msgstr "ă©ă™ă«"
-
-#: src/file.c:82
-msgid "New Label or Card"
-msgstr "新規ă©ă™ă«ăľăźăŻă‚«ăĽă‰"
-
-#: src/file.c:109
-msgid "Media Type"
-msgstr "ăˇă‡ă‚Łă‚˘ă®ç¨®éˇž"
-
-#: src/file.c:119
-msgid "Label orientation"
-msgstr "ă©ă™ă«ă®ĺ‘ăŤ"
-
-#: src/file.c:248
-msgid "Open"
-msgstr "é–‹ăŹ"
+#: src/mdi.c:459
+msgid "Don't save"
+msgstr "Ęݸ¤·¤Ę¤¤"
-#: src/file.c:250
-msgid "Open label"
-msgstr "ă©ă™ă«ă‚’é–‹ăŤăľă™"
+#: src/mdi.c:601 src/file.c:288
+msgid "Cannot save file"
+msgstr "ĄŐĄˇĄ¤Ąë¤ňĘݸ¤ą¤ë¤ł¤Č¤¬˝ĐÍč¤Ţ¤»¤ó"
-#: src/file.c:338
-#, fuzzy, c-format
-msgid "Cannot open file '%s'"
-msgstr "ă•ă‚ˇă‚¤ă«ăŚé–‹ă‘ăľă›ă‚“"
+#: src/mdi.c:623 src/file.c:311
+msgid "Save As"
+msgstr "ĚľÁ°¤ňÉŐ¤±¤ĆĘݸ"
-#: src/file.c:429
-#, fuzzy, c-format
-msgid "Error saving file '%s'"
-msgstr "ă•ă‚ˇă‚¤ă«ă®ć›¸ăŤčľĽăżă§ă‚¨ă©ăĽ"
+#: src/mdi.c:626
+msgid "Close / Save label as"
+msgstr "ĄéĄŮĄë¤ËĚľÁ°¤ňÉŐ¤±¤ĆĘݸ¤·¤ĆĘĤ¸¤Ţ¤ą"
-#: src/file.c:468
-msgid "Save label as"
-msgstr "ă©ă™ă«ă«ĺŤĺ‰Ťă‚’ä»ă‘ă¦äżťĺ­ă—ăľă™"
+#: src/mdi.c:680 src/file.c:352
+msgid "Label no longer valid!"
+msgstr "ĄéĄŮĄë¤ĎÍ­¸ú¤Ç¤Ď¤˘¤ę¤Ţ¤»¤óˇŞ"
-#: src/file.c:550
+#: src/mdi.c:693 src/file.c:362
msgid "Must supply file name"
-msgstr "ă•ă‚ˇă‚¤ă«ĺŤă‚’指定ă—ă¦ä¸‹ă•ă„"
+msgstr "ĄŐĄˇĄ¤ĄëĚľ¤ň»ŘÄꤷ¤Ć˛Ľ¤µ¤¤"
-#: src/file.c:569
-#, fuzzy, c-format
-msgid "Error writing file '%s'"
-msgstr "ă•ă‚ˇă‚¤ă«ă®ć›¸ăŤčľĽăżă§ă‚¨ă©ăĽ"
+#: src/mdi.c:705 src/file.c:374
+msgid "Error writing file"
+msgstr "ĄŐĄˇĄ¤Ąë¤Î˝ń¤­ąţ¤ß¤ÇĄ¨ĄéˇĽ"
-#. Should not happen
-#: src/prefs.c:625 src/prefs.c:632 src/wdgt-line.c:186
-msgid "points"
-msgstr "ăťă‚¤ăłă"
-
-#: src/prefs.c:627
-msgid "inches"
-msgstr "[イăłă]"
-
-#: src/prefs.c:629
-msgid "mm"
-msgstr "[ăźăŞ]"
-
-#: src/prefs-dialog.c:220
-#, fuzzy
-msgid "Locale"
-msgstr "寸法:"
+#: src/display.c:1250 src/display.c:1298
+msgid "Delete"
+msgstr "şď˝ü"
-#: src/prefs-dialog.c:224
-msgid "Object defaults"
-msgstr ""
+#: src/display.c:1260 src/display.c:1308
+msgid "Bring to front"
+msgstr "Á°¤Ë»ý¤Ă¤ĆÍč¤ë"
-#: src/prefs-dialog.c:232
-#, fuzzy
-msgid "Preferences"
-msgstr "Glabels: 設定"
+#: src/display.c:1266 src/display.c:1314
+msgid "Send to back"
+msgstr "¸ĺ¤í¤Ë¤Ţ¤ď¤ą"
-#: src/prefs-dialog.c:272
-msgid "Select locale specific behavior."
-msgstr ""
+#: src/display.c:1287
+msgid "Edit properties..."
+msgstr "Ą×ĄíĄŃĄĆĄŁ¤ÎĘÔ˝¸..."
-#. ----- Display Units Frame ------------------------------------
-#: src/prefs-dialog.c:279
-msgid "Display units"
-msgstr "表示ă™ă‚‹ĺŤä˝Ť"
+#: src/item_text.c:450
+msgid "Edit text object properties"
+msgstr "ĄĆĄ­ĄąĄČ¤ÎĘÔ˝¸"
-#: src/prefs-dialog.c:289
-msgid "Points"
-msgstr "ăťă‚¤ăłă"
+#: src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100
+msgid "Text"
+msgstr "ĄĆĄ­ĄąĄČ"
-#: src/prefs-dialog.c:296
-msgid "Inches"
-msgstr "イăłă"
+#: src/item_text.c:479 src/item_line.c:253 src/item_box.c:245
+#: src/item_ellipse.c:247 src/item_barcode.c:317
+msgid "Appearance"
+msgstr "ł°´Ń"
-#: src/prefs-dialog.c:303
-msgid "Millimeters"
-msgstr "ăźăŞ"
+#. ------ Begin Text Properties box ------
+#: src/item_text.c:482
+msgid "Text Properties"
+msgstr "ʸ»úĄ×ĄíĄŃĄĆĄŁ..."
-#. ----- Page Size Frame ------------------------------------
-#: src/prefs-dialog.c:310
-msgid "Default page size"
-msgstr "ă‡ă•ă‚©ă«ăă®ç”¨ç´™ă‚µă‚¤ă‚ş"
+#. ------ Position Frame ------
+#: src/item_text.c:500 src/item_text.c:503 src/item_line.c:274
+#: src/item_box.c:275 src/item_ellipse.c:277 src/item_image.c:318
+#: src/item_barcode.c:345 src/item_barcode.c:348
+msgid "Position"
+msgstr "°ĚĂÖ"
-#: src/prefs-dialog.c:364
-msgid "Select default properties for new objects."
-msgstr ""
+#: src/item_line.c:243
+msgid "Edit line object properties"
+msgstr "ÄľŔţ¤ÎĘÔ˝¸"
-#. ------ Line box ------
-#: src/prefs-dialog.c:377
+#. ------ Begin Line box ------
+#: src/item_line.c:256 src/menu.c:106
msgid "Line"
-msgstr "ç›´ç·š"
+msgstr "ÄľŔţ"
-#. ------ Fill box ------
-#: src/prefs-dialog.c:382 src/view-box.c:325 src/view-ellipse.c:325
-msgid "Fill"
-msgstr "塗りă¤ă¶ă—"
-
-#: src/view-object.c:406 src/view.c:1520
-msgid "Delete"
-msgstr "削除"
-
-#: src/view-object.c:416 src/view.c:1530
-msgid "Bring to front"
-msgstr "前ă«ćŚăŁă¦ćťĄă‚‹"
-
-#: src/view-object.c:423 src/view.c:1536
-msgid "Send to back"
-msgstr "後ろă«ăľă‚Źă™"
+#: src/item_line.c:271 src/item_box.c:272 src/item_ellipse.c:274
+#: src/item_image.c:315
+msgid "Position/Size"
+msgstr "°ĚĂ֤ȥµĄ¤Ąş"
-#: src/view-object.c:395
-msgid "Edit properties..."
-msgstr "ă—ă­ă‘ă†ă‚Łă®ç·¨é›†..."
+#. ------ Size Frame ------
+#: src/item_line.c:285 src/item_box.c:286 src/item_ellipse.c:288
+#: src/item_image.c:329
+msgid "Size"
+msgstr "ĄµĄ¤Ąş"
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-box.c:293
+#: src/item_box.c:235
msgid "Edit box object properties"
-msgstr "四角ă®ç·¨é›†"
-
-#: src/view-barcode.c:313 src/view-box.c:312 src/view-ellipse.c:312
-#: src/view-line.c:309 src/view-text.c:311
-msgid "Appearance"
-msgstr "外観"
+msgstr "»ÍłŃ¤ÎĘÔ˝¸"
#. ------ Line box ------
-#: src/view-box.c:315 src/view-ellipse.c:315 src/view-line.c:312
+#: src/item_box.c:248 src/item_ellipse.c:250
msgid "Outline"
-msgstr "矩形"
+msgstr "¶ë·Á"
-#: src/view-box.c:340 src/view-ellipse.c:340 src/view-image.c:337
-#: src/view-line.c:328
-msgid "Position/Size"
-msgstr "位置ă¨ă‚µă‚¤ă‚ş"
-
-#. ------ Position Frame ------
-#: src/view-barcode.c:345 src/view-barcode.c:349 src/view-box.c:343
-#: src/view-ellipse.c:343 src/view-image.c:340 src/view-line.c:331
-#: src/view-text.c:334 src/view-text.c:338
-msgid "Position"
-msgstr "位置"
-
-#. ------ Size Frame ------
-#: src/view-box.c:354 src/view-ellipse.c:356 src/view-image.c:353
-#: src/view-line.c:344
-msgid "Size"
-msgstr "サイズ"
+#. ------ Fill box ------
+#: src/item_box.c:258 src/item_ellipse.c:260
+msgid "Fill"
+msgstr "Ĺɤę¤Ä¤Ö¤·"
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-ellipse.c:293
+#: src/item_ellipse.c:237
msgid "Edit ellipse object properties"
-msgstr "楕円ă®ç·¨é›†"
-
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-line.c:290
-msgid "Edit line object properties"
-msgstr "ç›´ç·šă®ç·¨é›†"
+msgstr "ÂʱߤÎĘÔ˝¸"
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-image.c:281
+#: src/item_image.c:257
msgid "Edit image object properties"
-msgstr "ç”»ĺŹă®ç·¨é›†"
+msgstr "˛čÁü¤ÎĘÔ˝¸"
-#: src/view-image.c:300
+#: src/item_image.c:268 src/menu.c:113
msgid "Image"
-msgstr "ç”»ĺŹ"
+msgstr "˛čÁü"
#. ------ Size Reset Button ------
-#: src/view-image.c:364
+#: src/item_image.c:342
msgid "Reset image size"
-msgstr "ç”»ĺŹă‚µă‚¤ă‚şă®ăŞă‚»ăă"
-
-#: src/view-text.c:265
-msgid "Edit text object properties"
-msgstr "ă†ă‚­ă‚ąăă®ç·¨é›†"
+msgstr "˛čÁüĄµĄ¤Ąş¤ÎĄęĄ»ĄĂĄČ"
-#: src/view-text.c:285 src/view-text.c:605
-msgid "Text"
-msgstr "ă†ă‚­ă‚ąă"
+#: src/item_image.c:389 src/item_image.c:454
+msgid "Image format not currently supported"
+msgstr "˛čÁüĄŐĄ©ˇĽĄŢĄĂĄČ¤ĎĄµĄÝˇĽĄČ¤·¤Ć¤¤¤Ţ¤»¤ó"
-#: src/view-barcode.c:267
+#: src/item_barcode.c:287
msgid "Edit barcode object properties"
-msgstr "ăăĽă‚łăĽă‰ă®ç·¨é›†"
+msgstr "ĄĐˇĽĄłˇĽĄÉ¤ÎĘÔ˝¸"
-#: src/view-barcode.c:287
+#: src/item_barcode.c:297
msgid "Data"
-msgstr "ă‡ăĽă‚ż"
+msgstr "ĄÇˇĽĄż"
-#: src/view-barcode.c:292
+#: src/item_barcode.c:299
msgid "Barcode data"
-msgstr "ăăĽă‚łăĽă‰ă»ă‡ăĽă‚ż"
+msgstr "ĄĐˇĽĄłˇĽĄÉˇ¦ĄÇˇĽĄż"
-#: src/view-barcode.c:318
-#, fuzzy
-msgid "Barcode Properties"
-msgstr "文字ă—ă­ă‘ă†ă‚Ł..."
+#. ------ Begin Barcode Properties Frame ------
+#: src/item_barcode.c:320 src/prefs.c:215
+msgid "General"
+msgstr "Á´ČĚ"
#. ------ Barcode Style Frame ------
-#: src/view-barcode.c:328
+#: src/item_barcode.c:330
msgid "Style"
-msgstr "スタイă«"
+msgstr "ĄąĄżĄ¤Ąë"
-#: src/print.c:814 src/view-barcode.c:758
+#: src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:631
msgid "Invalid barcode"
-msgstr "ăŠă‹ă—ăŞăăĽă‚łăĽă‰"
+msgstr "¤Ş¤«¤·¤ĘĄĐˇĽĄłˇĽĄÉ"
-#: src/merge-properties.c:84
-msgid "Edit document-merge properties"
-msgstr "çµĺă‰ă‚­ăĄăˇăłăă»ă—ă­ă‘ă†ă‚Łă®ç·¨é›†"
+#. W Label
+#: src/prop_size.c:182 src/prop_line.c:169
+msgid "Width:"
+msgstr "Éý:"
-#: src/merge-properties.c:130
-msgid "Source"
-msgstr "ă‚˝ăĽă‚ą"
+#. H label
+#: src/prop_size.c:198
+msgid "Height:"
+msgstr "ąâ¤µ:"
-#: src/merge-properties.c:142
-msgid "Format:"
-msgstr "書式:"
+#: src/prop_size.c:222
+msgid "Maintain current aspect ratio"
+msgstr "¸˝şß¤ÎĄ˘ĄąĄÚĄŻĄČČćΨ¤ň°Ý»ý¤ą¤ë"
-#: src/merge-properties.c:157
-msgid "Location:"
-msgstr "場所:"
+#. X label
+#: src/prop_position.c:173
+msgid "X:"
+msgstr "X:"
-#: src/merge-properties.c:167
-msgid "Fields"
-msgstr "ă•ă‚ŁăĽă«ă‰"
+#. Y label
+#: src/prop_position.c:191
+msgid "Y:"
+msgstr "Y:"
-#. ----- Contstruct basic print dialog with notebook -----
-#: src/print-dialog.c:102
-msgid "Print"
-msgstr "印ĺ·"
+#. Line Width units
+#: src/prop_line.c:183 src/prefs.c:448 src/prefs.c:455
+msgid "points"
+msgstr "ĄÝĄ¤ĄóĄČ"
-#: src/print-dialog.c:124
-msgid "_Job"
-msgstr ""
+#. Line Color Label
+#: src/prop_line.c:189 src/prop_fill.c:166 src/prop_text.c:234
+#: src/prop_bc.c:188
+msgid "Color:"
+msgstr "ż§:"
-#: src/print-dialog.c:129
-#, fuzzy
-msgid "P_rinter"
-msgstr "印ĺ·"
+#. Font label
+#: src/prop_text.c:181
+msgid "Font:"
+msgstr "ĄŐĄ©ĄóĄČ:"
-#. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:158
-msgid "Copies"
-msgstr "ă‚łă”ăĽ"
+#. Alignment label
+#: src/prop_text.c:248
+msgid "Alignment:"
+msgstr "°ĚĂÖ:"
-#. ------- Otherwise add merge control widget ------------
-#: src/print-dialog.c:174
-msgid "Document merge control"
-msgstr "ă‰ă‚­ăĄăˇăłăă‚’ă‚łăłăă­ăĽă«ă«ăžăĽă‚¸ă™ă‚‹"
+#. Insert merge field label
+#: src/prop_text_entry.c:180 src/prop_bc_data.c:196
+msgid "Key:"
+msgstr "Ą­ˇĽ:"
-#. ----------- Add custom print options area ------------
-#: src/print-dialog.c:195
-msgid "Options"
-msgstr "ă‚Şă—ă‚·ă§ăł"
+#: src/prop_text_entry.c:196
+msgid "Insert merge field"
+msgstr "·ëąçĄŐĄŁˇĽĄëĄÉ¤ÎÁŢĆţ"
-#: src/print-dialog.c:345 src/print-dialog.c:384
-msgid "Print preview"
-msgstr "印ĺ·ă—ă¬ă“ăĄăĽ"
+#. Length label
+#: src/prop_vector.c:183
+msgid "Length:"
+msgstr "Äą¤µ:"
-#: src/label.c:535
-#, c-format
-msgid "%s %d"
-msgstr ""
+#. Angle label
+#: src/prop_vector.c:207
+msgid "Angle:"
+msgstr "łŃĹŮ:"
-#: src/label.c:535
-msgid "Untitled"
-msgstr ""
+#. Angle units label
+#: src/prop_vector.c:224
+msgid "degrees"
+msgstr "ĹŮ"
-#: src/template.c:346
-msgid "No template files found!"
-msgstr "ă†ăłă—ă¬ăĽăă»ă•ă‚ˇă‚¤ă«ăŚč¦‹ă¤ă‹ă‚Šăľă›ă‚“ďĽ"
+#. Scale Label
+#: src/prop_bc.c:168
+msgid "Scale:"
+msgstr "ŔŁËˇ:"
-#: src/xml-label.c:108 src/xml-label.c:139
-msgid "xmlParseFile error"
-msgstr "xmlParseFile エă©ăĽ"
+#. % Label
+#: src/prop_bc.c:182
+msgid "%"
+msgstr "%"
-#: src/xml-label.c:174
-msgid "No document root"
-msgstr "root ă‰ă‚­ăĄăˇăłăă§ăŻă‚ă‚Šăľă›ă‚“"
+#: src/prop_bc_style.c:313
+msgid "Show text with barcode"
+msgstr "ĄĐˇĽĄłˇĽĄÉ¤ňÉŐ¤±¤ĆĄĆĄ­ĄąĄČ¤ňÉ˝Ľ¨¤ą¤ë"
-#: src/xml-label.c:186
-msgid "Importing from glabels 0.1 format"
-msgstr ""
+#: src/prop_bc_data.c:176
+msgid "Literal:"
+msgstr "ĄęĄĆĄéĄë:"
-#: src/xml-label.c:194
-msgid "Importing from glabels 0.4 format"
-msgstr ""
+#: src/label.c:173 src/label.c:197
+msgid "xmlParseFile error"
+msgstr "xmlParseFile Ą¨ĄéˇĽ"
-#: src/xml-label.c:198
-#, fuzzy
-msgid "bad document, unknown glabels Namespace"
-msgstr "ă‰ă‚­ăĄăˇăłăă®ç¨®éˇžăŚé–“é•ăŁă¦ă„ăľă™ă€‚Glabels ĺŤĺ‰Ťç©şé–“ăŚč¦‹ă¤ă‹ă‚Šăľă›ă‚“。"
+#: src/label.c:228
+msgid "No document root"
+msgstr "root ĄÉĄ­ĄĺĄáĄóĄČ¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó"
+
+#: src/label.c:239
+msgid "document of the wrong type, glabels Namespace not found"
+msgstr "ĄÉĄ­ĄĺĄáĄóĄČ¤ÎĽďÎब´Ö°ă¤Ă¤Ć¤¤¤Ţ¤ąˇŁGlabels ĚľÁ°¶ő´Ö¤¬¸«¤Ä¤«¤ę¤Ţ¤»¤óˇŁ"
-#: src/xml-label.c:226
+#: src/label.c:244
#, c-format
msgid "Bad root node = \"%s\""
-msgstr "ăŠă‹ă—㪠root ă®ăŽăĽă‰ = \"%s\""
+msgstr "¤Ş¤«¤·¤Ę root ¤ÎĄÎˇĽĄÉ = \"%s\""
-#: src/xml-label.c:249 src/xml-label.c:281
+#: src/label.c:291
#, c-format
msgid "bad node = \"%s\""
-msgstr "ăŠă‹ă—ăŞăŽăĽă‰ = \"%s\""
+msgstr "¤Ş¤«¤·¤ĘĄÎˇĽĄÉ = \"%s\""
-#: src/xml-label.c:656
+#: src/label.c:606
msgid "Problem saving xml file."
-msgstr "XML ă•ă‚ˇă‚¤ă«ă®äżťĺ­ă§ĺ•ŹéˇŚăŚă‚ă‚Šăľă™"
+msgstr "XML ĄŐĄˇĄ¤Ąë¤ÎĘݸ¤ÇĚäÂ꤬¤˘¤ę¤Ţ¤ą"
+
+#: src/template.c:224
+msgid "No template files found!"
+msgstr "ĄĆĄóĄ×ĄěˇĽĄČˇ¦ĄŐĄˇĄ¤Ąë¤¬¸«¤Ä¤«¤ę¤Ţ¤»¤óˇŞ"
+
+#: src/merge_properties.c:82
+msgid "Edit document-merge properties"
+msgstr "·ëąçĄÉĄ­ĄĺĄáĄóĄČˇ¦Ą×ĄíĄŃĄĆĄŁ¤ÎĘÔ˝¸"
+
+#: src/merge_properties.c:131
+msgid "Source"
+msgstr "Ą˝ˇĽĄą"
+
+#: src/merge_properties.c:143
+msgid "Format:"
+msgstr "˝ńĽ°:"
+
+#: src/merge_properties.c:158
+msgid "Location:"
+msgstr "ľě˝ę:"
-#: src/merge.c:80
+#: src/merge_properties.c:168
+msgid "Fields"
+msgstr "ĄŐĄŁˇĽĄëĄÉ"
+
+#: src/merge.c:78
msgid "None"
-msgstr "ăŞă—"
+msgstr "¤Ę¤·"
-#: src/merge.c:88
+#: src/merge.c:86
msgid "Text with tab separators"
-msgstr "ă‚żă–ă§ĺŚşĺ‡ăŁăźă†ă‚­ă‚ąă"
+msgstr "ĄżĄÖ¤Ç¶čŔڤ俥ƥ­ĄąĄČ"
-#: src/merge.c:96
-msgid "Text with comma separators"
-msgstr "ă‚łăłăžă§ĺŚşĺ‡ăŁăźă†ă‚­ă‚ąă"
+#: src/merge.c:94
+#, fuzzy
+msgid "Text with comma separators (CSV)"
+msgstr "ĄłĄóĄŢ¤Ç¶čŔڤ俥ƥ­ĄąĄČ"
-#: src/merge.c:104
+#: src/merge.c:102
msgid "Text with colon separators"
-msgstr "ă‚łă­ăłă§ĺŚşĺ‡ăŁăźă†ă‚­ă‚ąă"
+msgstr "ĄłĄíĄó¤Ç¶čŔڤ俥ƥ­ĄąĄČ"
-#: src/merge-ui.c:223 src/merge-ui.c:265 src/merge-ui.c:435 src/merge-ui.c:483
+#: src/merge_ui.c:207 src/merge_ui.c:242 src/merge_ui.c:387 src/merge_ui.c:428
msgid "N/A"
msgstr "N/A"
-#: src/merge-ui-text.c:172
+#: src/merge_ui_text.c:170
msgid "Select merge-database source"
-msgstr "çµĺă‡ăĽă‚żă™ăĽă‚ąă»ă‚˝ăĽă‚ąă®é¸ćŠž"
+msgstr "·ëąçĄÇˇĽĄżĄŮˇĽĄąˇ¦Ą˝ˇĽĄą¤ÎÁŞÂň"
-#: src/merge-ui-text.c:330
+#: src/merge_ui_text.c:330
msgid "Column"
-msgstr "ĺ—"
+msgstr "Îó"
-#: src/merge-ui-text.c:334
+#: src/merge_ui_text.c:334
msgid "Custom field key"
-msgstr "ă‚«ă‚ąă‚żă ă»ă•ă‚ŁăĽă«ă‰ă»ă‚­ăĽ"
+msgstr "Ą«ĄąĄżĄŕˇ¦ĄŐĄŁˇĽĄëĄÉˇ¦Ą­ˇĽ"
-#: src/merge-ui-text.c:338
+#: src/merge_ui_text.c:338
msgid "Sample data"
-msgstr "サăłă—ă«ă‡ăĽă‚ż"
+msgstr "ĄµĄóĄ×ĄëĄÇˇĽĄż"
-#. Font label
-#: src/wdgt-text-props.c:184
-msgid "Font:"
-msgstr "ă•ă‚©ăłă:"
+#: src/menu.c:50
+msgid "_New"
+msgstr "ż·µ¬(_N)"
-#. Text Color Label
-#: src/wdgt-bc-props.c:190 src/wdgt-fill.c:169 src/wdgt-line.c:192
-#: src/wdgt-text-props.c:237
-msgid "Color:"
-msgstr "色:"
+#: src/menu.c:51
+msgid "Make a new, empty label"
+msgstr "ż·µ¬¤Ë¶ő¤ÎĄéĄŮĄë¤ňşîŔ®¤·¤Ţ¤ą"
-#. Alignment label
-#: src/wdgt-text-props.c:251
-msgid "Alignment:"
-msgstr "位置:"
+#: src/menu.c:85
+msgid "U_nselect All "
+msgstr "Á´¤ĆÁŞÂň˛ň˝ü(_N)"
-#. Insert merge field label
-#: src/wdgt-bc-data.c:199 src/wdgt-text-entry.c:201
-msgid "Key:"
-msgstr "ă‚­ăĽ:"
-
-#: src/wdgt-text-entry.c:217
-msgid "Insert merge field"
-msgstr "çµĺă•ă‚ŁăĽă«ă‰ă®ćŚżĺ…Ą"
-
-#. X label
-#: src/wdgt-position.c:182
-msgid "X:"
-msgstr "X:"
-
-#. Y label
-#: src/wdgt-position.c:200
-msgid "Y:"
-msgstr "Y:"
+#: src/menu.c:86
+msgid "Remove all selections"
+msgstr "ÁŞÂňČϰϤň˛ň˝ü¤·¤Ţ¤ą"
-#. W Label
-#: src/wdgt-line.c:172 src/wdgt-size.c:184
-msgid "Width:"
-msgstr "ĺą…:"
+#: src/menu.c:94
+msgid "Select"
+msgstr "ÁŞÂň"
-#. H label
-#: src/wdgt-size.c:200
-msgid "Height:"
-msgstr "é«ă•:"
+#: src/menu.c:95 src/menu.c:186
+msgid "Select, move and modify objects"
+msgstr "ĄŞĄÖĄ¸Ą§ĄŻĄČ¤ÎÁŞÂňˇ˘°ÜĆ°ˇ˘ĘÔ˝¸¤ňąÔ¤¤¤Ţ¤ą"
-#: src/wdgt-size.c:224
-msgid "Maintain current aspect ratio"
-msgstr "現在ă®ă‚˘ă‚ąăšă‚Żă比率を維ćŚă™ă‚‹"
+#: src/menu.c:100 src/menu.c:191
+msgid "Create text object"
+msgstr "ĄĆĄ­ĄąĄČˇ¦ĄŞĄÖĄ¸Ą§ĄŻĄČ¤ňşîŔ®¤·¤Ţ¤ą"
-#. Length label
-#: src/wdgt-vector.c:186
-msgid "Length:"
-msgstr "é•·ă•:"
+#: src/menu.c:103
+msgid "Box"
+msgstr "»ÍłŃ"
-#. Angle label
-#: src/wdgt-vector.c:210
-msgid "Angle:"
-msgstr "角度:"
+#: src/menu.c:103 src/menu.c:194
+msgid "Create box/rectangle object"
+msgstr "»ÍłŃ/»°łŃ¤ÎĄŞĄÖĄ¸Ą§ĄŻĄČ¤ňşîŔ®¤·¤Ţ¤ą"
-#. Angle units label
-#: src/wdgt-vector.c:227
-msgid "degrees"
-msgstr "度"
+#: src/menu.c:106 src/menu.c:197
+msgid "Create line object"
+msgstr "ÄľŔţĄŞĄÖĄ¸Ą§ĄŻĄČ¤ňşîŔ®¤·¤Ţ¤ą"
-#. Scale Label
-#: src/wdgt-bc-props.c:170
-msgid "Scale:"
-msgstr "寸法:"
+#: src/menu.c:109
+msgid "Ellipse"
+msgstr "Âʱß"
-#. % Label
-#: src/wdgt-bc-props.c:184
-#, c-format
-msgid "%"
-msgstr "%"
+#: src/menu.c:110 src/menu.c:200
+msgid "Create ellipse/circle object"
+msgstr "Âʱß/±ßĄŞĄÖĄ¸Ą§ĄŻĄČ¤ňşîŔ®¤·¤Ţ¤ą"
-#: src/wdgt-bc-style.c:316
-msgid "Show text with barcode"
-msgstr "ăăĽă‚łăĽă‰ă‚’ä»ă‘ă¦ă†ă‚­ă‚ąăを表示ă™ă‚‹"
+#: src/menu.c:113 src/menu.c:203
+msgid "Create image object"
+msgstr "˛čÁüĄŞĄÖĄ¸Ą§ĄŻĄČ¤ňşîŔ®¤·¤Ţ¤ą"
-#: src/wdgt-bc-data.c:179
-msgid "Literal:"
-msgstr "ăŞă†ă©ă«:"
+#: src/menu.c:116
+msgid "Barcode"
+msgstr "ĄĐˇĽĄłˇĽĄÉ"
-#: src/wdgt-print-copies.c:178
-msgid "Sheets:"
-msgstr "用紙:"
+#: src/menu.c:116 src/menu.c:206
+msgid "Create barcode object"
+msgstr "ĄĐˇĽĄłˇĽĄÉˇ¦ĄŞĄÖĄ¸Ą§ĄŻĄČ¤ňşîŔ®¤·¤Ţ¤ą"
-#: src/wdgt-print-copies.c:195
-msgid "Labels"
-msgstr "ă©ă™ă«"
+#: src/menu.c:121 src/menu.c:211
+msgid "Zoom in"
+msgstr "łČÂç"
-#: src/wdgt-print-copies.c:198
-msgid "from:"
-msgstr "開始:"
+#: src/menu.c:124 src/menu.c:214
+msgid "Zoom out"
+msgstr "˝Ěľ®"
-#: src/wdgt-print-copies.c:206
-msgid "to:"
-msgstr "終了:"
+#: src/menu.c:127
+msgid "Zoom 1:1"
+msgstr "¸µ¤ÎĄµĄ¤Ąş¤Ř"
-#: src/wdgt-print-merge.c:177
-msgid "Start on label"
-msgstr "ă©ă™ă«ă®é–‹ĺ§‹"
+#: src/menu.c:127 src/menu.c:217
+msgid "Zoom to 1:1"
+msgstr "˝Ä˛ŁČć 1:1 ¤ÎĄµĄ¤Ąş¤Ë¤·¤Ţ¤ą"
-#: src/wdgt-print-merge.c:186
-msgid "on 1st sheet"
-msgstr "(最ĺťă®ă‚·ăĽă)"
+#: src/menu.c:132 src/menu.c:223
+msgid "Merge properties"
+msgstr "·ëąçĄ×ĄíĄŃĄĆĄŁ"
-#: src/wdgt-print-merge.c:197
-msgid "Collate"
-msgstr "製本"
+#: src/menu.c:133
+msgid "Edit merge properties"
+msgstr "·ëąçĄ×ĄíĄŃĄĆĄŁ¤ňĘÔ˝¸¤·¤Ţ¤ą"
-#: src/wdgt-print-merge.c:204
-msgid "Copies:"
-msgstr "ă‚łă”ăĽ:"
+#: src/menu.c:157
+msgid "_Tools"
+msgstr "ĄÄˇĽĄë(_T)"
-#: src/wdgt-media-select.c:252
-msgid "Description:"
-msgstr "説ćŽ:"
+#: src/menu.c:168
+msgid " New "
+msgstr " ż·µ¬ "
-#: src/wdgt-media-select.c:257
-msgid "Page size:"
-msgstr "用紙ă®ă‚µă‚¤ă‚ş:"
+#: src/menu.c:168
+msgid "New Label/Card"
+msgstr "ż·µ¬¤ÎĄéĄŮĄë/Ą«ˇĽĄÉ¤ňşîŔ®¤·¤Ţ¤ą"
-#: src/wdgt-media-select.c:262
-msgid "Label size:"
-msgstr "ă©ă™ă«ă®ĺ¤§ăŤă•:"
+#: src/menu.c:170
+msgid " Open "
+msgstr " ł«¤Ż "
-#: src/wdgt-media-select.c:267
-msgid "Layout:"
-msgstr "ă¬ă‚¤ă‚˘ă‚¦ă:"
+#: src/menu.c:170
+msgid "Open a file"
+msgstr "ĄŐĄˇĄ¤Ąë¤ňł«¤­¤Ţ¤ą"
-#: src/wdgt-media-select.c:408
-#, c-format
-msgid "%d x %d (%d per sheet)"
-msgstr "%d x %d (%d 個/ă‚·ăĽă)"
+#: src/menu.c:172
+msgid " Save "
+msgstr " Ęݸ "
-#: src/wdgt-media-select.c:422
-#, c-format
-msgid "%s x %s %s"
-msgstr "%s x %s %s"
+#: src/menu.c:172
+msgid "Save current file"
+msgstr "¤ł¤ÎĄŐĄˇĄ¤Ąë¤ňĘݸ¤·¤Ţ¤ą"
-#: src/wdgt-media-select.c:427
-#, c-format
-msgid "%.5g x %.5g %s"
-msgstr "%.5g x %.5g %s"
+#: src/menu.c:175
+msgid " Print "
+msgstr " °őşţ "
-#: src/wdgt-rotate-label.c:176
-msgid "Rotate"
-msgstr "回転ă•ă›ă‚‹"
+#: src/menu.c:175
+msgid "Print current file"
+msgstr "¤ł¤ÎĄŐĄˇĄ¤Ąë¤ň°őşţ¤·¤Ţ¤ą"
-#: src/bonobo-mdi.c:522 src/bonobo-mdi.c:612 src/bonobo-mdi.c:1850
-#, c-format
-msgid "Activate %s"
+#: src/menu.c:290
+msgid ""
+"A label and business card creation program for GNOME.\n"
+" \n"
+"Glabels is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+" \n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
msgstr ""
+"GNOME ¸ţ¤±¤ÎĄéĄŮĄë/ĄÓĄ¸ĄÍĄąĄ«ˇĽĄÉ¤ÎşîŔ®Ą×ĄíĄ°ĄéĄŕ¤Ç¤ąˇŁ\n"
+"\n"
+"Glabels ¤ĎĄŐĄęˇĽĄ˝ĄŐĄČ¤Ç¤ąˇŁĄŐĄęˇĽĄ˝ĄŐĄČĄ¦Ą§Ą˘şâĂĤ¬Äę¤á¤ë GNU °ěČ̸řÍ­»ČÍѵö"
+"Âú·ŔĚó˝ń¤ÎÂč2ČǤ⤷¤Ż¤Ď¤˝¤ě°Ęąß¤ÎĄĐˇĽĄ¸ĄçĄó¤Î˛Ľ¤ÇĘŁŔ˝ˇ˘˛ţĘÔˇ˘şĆÇŰÉۤ¬Ç§¤á¤é¤ě"
+"¤Ć¤¤¤Ţ¤ąˇŁ\n"
+"\n"
+"¤ł¤ÎĄ×ĄíĄ°ĄéĄŕ¤¬Ěň¤ËΩ¤Ä¤ł¤Č¤ňËľ¤ŕĂć¤ÇÇŰÉۤµ¤ě¤Ć¤¤¤Ţ¤ą¤¬ˇ˘´°Á´ĚµĘݾڤǤąˇŁČÎ"
+"ÇäĚÜĹŞ¤Ţ¤ż¤Ďľ¦ÍŃĚÜĹŞ¤ÎĘݾڤϤ˘¤ę¤Ţ¤»¤óˇŁľÜşŮ¤Ë¤Ä¤¤¤Ć¤Ď GNU °ěČ̸řÍ­»ČÍѵöÂú·Ŕ"
+"Ěó˝ń¤ň»˛ľČ¤·¤Ć˛Ľ¤µ¤¤ˇŁ\n"
-#: src/gnome-recent-view-bonobo.c:189
-#, fuzzy, c-format
-msgid "Open %s"
-msgstr "é–‹ăŹ"
-
-#~ msgid "Revert to saved copy of %s?"
-#~ msgstr "%s ă®ă‚łă”ăĽă‚’反転ă—ăľă™ă‹ďĽź"
-
-#~ msgid "Unknown media type. Using default."
-#~ msgstr "ăˇă‡ă‚Łă‚˘ă®ç¨®éˇžăŚç‰ąĺ®šă§ăŤăľă›ă‚“。ă‡ă•ă‚©ă«ăを使用ă—ăľă™ă€‚"
-
-#~ msgid ""
-#~ "``%s'' has been modified.\n"
-#~ "\n"
-#~ "Do you wish to save it?"
-#~ msgstr ""
-#~ "%s ăŻç·¨é›†ă•ă‚Śă¦ă„ăľă™ă€‚\n"
-#~ "\n"
-#~ "äżťĺ­ă—ăľă™ă‹ďĽź"
-
-#~ msgid "Cannot save file"
-#~ msgstr "ă•ă‚ˇă‚¤ă«ă‚’äżťĺ­ă™ă‚‹ă“ă¨ăŚĺ‡şćťĄăľă›ă‚“"
+#: src/menu.c:326
+msgid "Function is not implemented!"
+msgstr "¤Ţ¤Ŕ¤ł¤ÎµˇÇ˝¤ĎĽÂÁő¤µ¤ě¤Ć¤¤¤Ţ¤»¤óˇŞ"
-#~ msgid "Save As"
-#~ msgstr "ĺŤĺ‰Ťă‚’ä»ă‘ă¦äżťĺ­"
+#: src/file.c:72
+msgid "New Label or Card"
+msgstr "ż·µ¬ĄéĄŮĄë¤Ţ¤ż¤ĎĄ«ˇĽĄÉ"
-#~ msgid "Close / Save label as"
-#~ msgstr "ă©ă™ă«ă«ĺŤĺ‰Ťă‚’ä»ă‘ă¦äżťĺ­ă—ă¦é–‰ăăľă™"
+#: src/file.c:98
+msgid "Media Type"
+msgstr "ĄáĄÇĄŁĄ˘¤ÎĽďÎŕ"
-#~ msgid "Label no longer valid!"
-#~ msgstr "ă©ă™ă«ăŻćś‰ĺŠąă§ăŻă‚ă‚Šăľă›ă‚“ďĽ"
+#: src/file.c:109
+msgid "Label orientation"
+msgstr "ĄéĄŮĄë¤Î¸ţ¤­"
-#~ msgid "Image format not currently supported"
-#~ msgstr "ç”»ĺŹă•ă‚©ăĽăžăăăŻă‚µăťăĽăă—ă¦ă„ăľă›ă‚“"
+#: src/file.c:211
+msgid "Open"
+msgstr "ł«¤Ż"
-#~ msgid "General"
-#~ msgstr "ĺ…¨č¬"
+#: src/file.c:213
+msgid "Open label"
+msgstr "ĄéĄŮĄë¤ňł«¤­¤Ţ¤ą"
-#~ msgid "_New"
-#~ msgstr "新規(_N)"
+#: src/file.c:249
+msgid "Cannot open file"
+msgstr "ĄŐĄˇĄ¤Ąë¤¬ł«¤±¤Ţ¤»¤ó"
-#~ msgid "Make a new, empty label"
-#~ msgstr "新規ă«ç©şă®ă©ă™ă«ă‚’作ćă—ăľă™"
+#: src/file.c:316
+msgid "Save label as"
+msgstr "ĄéĄŮĄë¤ËĚľÁ°¤ňÉŐ¤±¤ĆĘݸ¤·¤Ţ¤ą"
-#~ msgid "U_nselect All "
-#~ msgstr "ĺ…¨ă¦é¸ćŠžč§Łé™¤(_N)"
+#: src/media_select.c:222
+msgid "Description:"
+msgstr "ŔâĚŔ:"
-#~ msgid "Remove all selections"
-#~ msgstr "é¸ćŠžçŻ„囲を解除ă—ăľă™"
+#: src/media_select.c:227
+msgid "Page size:"
+msgstr "ÍŃ»ć¤ÎĄµĄ¤Ąş:"
-#~ msgid "Select"
-#~ msgstr "é¸ćŠž"
+#: src/media_select.c:232
+msgid "Label size:"
+msgstr "ĄéĄŮĄë¤ÎÂ礭¤µ:"
-#~ msgid "Select, move and modify objects"
-#~ msgstr "ă‚Şă–ジェクăă®é¸ćŠžă€ç§»ĺ‹•ă€ç·¨é›†ă‚’行ă„ăľă™"
+#: src/media_select.c:237
+msgid "Layout:"
+msgstr "ĄěĄ¤Ą˘Ą¦ĄČ:"
-#~ msgid "Create text object"
-#~ msgstr "ă†ă‚­ă‚ąăă»ă‚Şă–ジェクăを作ćă—ăľă™"
+#: src/media_select.c:353
+#, c-format
+msgid "%d x %d (%d per sheet)"
+msgstr "%d x %d (%d ¸Ä/Ą·ˇĽĄČ)"
-#~ msgid "Box"
-#~ msgstr "四角"
+#: src/media_select.c:367
+#, c-format
+msgid "%s x %s %s"
+msgstr "%s x %s %s"
-#~ msgid "Create box/rectangle object"
-#~ msgstr "四角/三角ă®ă‚Şă–ジェクăを作ćă—ăľă™"
+#: src/media_select.c:372
+#, c-format
+msgid "%.5g x %.5g %s"
+msgstr "%.5g x %.5g %s"
-#~ msgid "Create line object"
-#~ msgstr "ç›´ç·šă‚Şă–ジェクăを作ćă—ăľă™"
+#: src/rotate_select.c:169
+msgid "Rotate"
+msgstr "˛óĹľ¤µ¤»¤ë"
-#~ msgid "Ellipse"
-#~ msgstr "楕円"
+#: src/print_dialog.c:99
+msgid "Print"
+msgstr "°őşţ"
-#~ msgid "Create ellipse/circle object"
-#~ msgstr "楕円/円オă–ジェクăを作ćă—ăľă™"
+#. ----------- Add simple-copies widget ------------
+#: src/print_dialog.c:104
+msgid "Copies"
+msgstr "ĄłĄÔˇĽ"
-#~ msgid "Create image object"
-#~ msgstr "ç”»ĺŹă‚Şă–ジェクăを作ćă—ăľă™"
+#. -------Otherwise add merge control widget ------------
+#: src/print_dialog.c:121
+msgid "Document merge control"
+msgstr "ĄÉĄ­ĄĺĄáĄóĄČ¤ňĄłĄóĄČĄíˇĽĄë¤ËĄŢˇĽĄ¸¤ą¤ë"
-#~ msgid "Barcode"
-#~ msgstr "ăăĽă‚łăĽă‰"
+#. ----------- Add custom print options area ------------
+#: src/print_dialog.c:141
+msgid "Options"
+msgstr "ĄŞĄ×Ą·ĄçĄó"
-#~ msgid "Create barcode object"
-#~ msgstr "ăăĽă‚łăĽă‰ă»ă‚Şă–ジェクăを作ćă—ăľă™"
+#: src/print_dialog.c:241 src/print_dialog.c:280
+msgid "Print preview"
+msgstr "°őşţĄ×ĄěĄÓĄĺˇĽ"
-#~ msgid "Zoom in"
-#~ msgstr "拡大"
+#: src/print_copies.c:170
+msgid "Sheets:"
+msgstr "ÍŃ»ć:"
-#~ msgid "Zoom out"
-#~ msgstr "縮小"
+#: src/print_copies.c:187
+msgid "Labels"
+msgstr "ĄéĄŮĄë"
-#~ msgid "Zoom 1:1"
-#~ msgstr "ĺ…ă®ă‚µă‚¤ă‚şă¸"
+#: src/print_copies.c:190
+msgid "from:"
+msgstr "ł«»Ď:"
-#~ msgid "Zoom to 1:1"
-#~ msgstr "縦横比 1:1 ă®ă‚µă‚¤ă‚şă«ă—ăľă™"
+#: src/print_copies.c:198
+msgid "to:"
+msgstr "˝ŞÎ»:"
-#~ msgid "Merge properties"
-#~ msgstr "çµĺă—ă­ă‘ă†ă‚Ł"
+#: src/print_merge.c:170
+msgid "Start on label"
+msgstr "ĄéĄŮĄë¤Îł«»Ď"
-#~ msgid "Edit merge properties"
-#~ msgstr "çµĺă—ă­ă‘ă†ă‚Łă‚’編集ă—ăľă™"
+#: src/print_merge.c:179
+msgid "on 1st sheet"
+msgstr "(şÇ˝é¤ÎĄ·ˇĽĄČ)"
-#~ msgid "_Tools"
-#~ msgstr "ă„ăĽă«(_T)"
+#: src/print_merge.c:188
+msgid "Collate"
+msgstr "Ŕ˝ËÜ"
-#~ msgid " New "
-#~ msgstr " 新規 "
+#: src/print_merge.c:195
+msgid "Copies:"
+msgstr "ĄłĄÔˇĽ:"
-#~ msgid "New Label/Card"
-#~ msgstr "新規ă®ă©ă™ă«/ă‚«ăĽă‰ă‚’作ćă—ăľă™"
+#: src/prefs.c:86
+msgid "Glabels: Preferences"
+msgstr "Glabels: ŔßÄę"
-#~ msgid " Open "
-#~ msgstr " 開㏠"
+#. ----- Display Units Frame ------------------------------------
+#: src/prefs.c:220
+msgid "Display units"
+msgstr "É˝Ľ¨¤ą¤ëñ°Ě"
-#~ msgid "Open a file"
-#~ msgstr "ă•ă‚ˇă‚¤ă«ă‚’é–‹ăŤăľă™"
+#: src/prefs.c:231
+msgid "Points"
+msgstr "ĄÝĄ¤ĄóĄČ"
-#~ msgid " Save "
-#~ msgstr " äżťĺ­ "
+#: src/prefs.c:237
+msgid "Inches"
+msgstr "Ą¤ĄóĄÁ"
-#~ msgid "Save current file"
-#~ msgstr "ă“ă®ă•ă‚ˇă‚¤ă«ă‚’äżťĺ­ă—ăľă™"
+#: src/prefs.c:244
+msgid "Millimeters"
+msgstr "ĄßĄę"
-#~ msgid " Print "
-#~ msgstr " ĺŤ°ĺ· "
+#. ----- Display Units Frame ------------------------------------
+#: src/prefs.c:249
+msgid "Default page size"
+msgstr "ĄÇĄŐĄ©ĄëĄČ¤ÎÍѻ極Ą¤Ąş"
-#~ msgid "Print current file"
-#~ msgstr "ă“ă®ă•ă‚ˇă‚¤ă«ă‚’印ĺ·ă—ăľă™"
+#: src/prefs.c:450
+msgid "inches"
+msgstr "[Ą¤ĄóĄÁ]"
-#~ msgid "Function is not implemented!"
-#~ msgstr "ăľă ă“ă®ć©źč˝ăŻĺ®źčŁ…ă•ă‚Śă¦ă„ăľă›ă‚“ďĽ"
+#: src/prefs.c:452
+msgid "mm"
+msgstr "[ĄßĄę]"
diff --git a/glabels2/po/pl.po b/glabels2/po/pl.po
new file mode 100644
index 0000000..bfa7d1b
--- /dev/null
+++ b/glabels2/po/pl.po
@@ -0,0 +1,712 @@
+# 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"
+"POT-Creation-Date: 2002-08-24 22:30-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=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/glabels_batch.c:49
+msgid "print this message"
+msgstr "wy¶wietla ten komunikat"
+
+#: src/glabels_batch.c:51
+msgid "print the version of glabels-batch being used"
+msgstr "wy¶wietla aktualnie używan± wersję glabel-batch"
+
+#: src/glabels_batch.c:53
+msgid "set output filename (default=\"output.ps\")"
+msgstr "okre¶l nazwę pliku wyj¶ciowego (domy¶lnie=\"output.ps\")"
+
+#: src/glabels_batch.c:53
+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 src/print_dialog.c:152
+msgid "print outlines (to test printer alignment)"
+msgstr "drukowanie ramek (w celu przetestowania wyrównania)"
+
+#: src/glabels_batch.c:61 src/print_dialog.c:160
+msgid "print in reverse (i.e. a mirror image)"
+msgstr "drukowanie odwrócone (np. odbicie zwierciadlane)"
+
+#: src/glabels_batch.c:92
+msgid "[OPTION...] GLABELS_FILE..."
+msgstr "[OPCJA...] PLIK_GLABELS..."
+
+#: src/glabels_batch.c:111
+msgid "missing glabels file\n"
+msgstr "brak pliku glabels\n"
+
+#: src/glabels_batch.c:139
+#, c-format
+msgid "cannot open glabels file %s\n"
+msgstr "nie można otworzyć pliku glabels o nazwie %s\n"
+
+#: src/mdi.c:169
+#, c-format
+msgid "Revert to saved copy of %s?"
+msgstr "Przywrócić zapisan± kopię pliku %s?"
+
+#: src/mdi.c:207
+msgid "Unknown media type. Using default."
+msgstr "Nieznany typ no¶nika. Użyto warto¶ci domy¶lnych."
+
+#: src/mdi.c:455
+#, c-format
+msgid ""
+"``%s'' has been modified.\n"
+"\n"
+"Do you wish to save it?"
+msgstr ""
+"Plik \"%s\" został zmodyfikowany.\n"
+"\n"
+"Czy chcesz go zapisać?"
+
+#: src/mdi.c:459
+msgid "Don't save"
+msgstr "Nie zapisuj"
+
+#: src/mdi.c:601 src/file.c:288
+msgid "Cannot save file"
+msgstr "Nie można zapisać pliku"
+
+#: src/mdi.c:623 src/file.c:311
+msgid "Save As"
+msgstr "Zapisz jako"
+
+#: src/mdi.c:626
+msgid "Close / Save label as"
+msgstr "Zamyka / Zapisuje etykietę jako"
+
+#: src/mdi.c:680 src/file.c:352
+msgid "Label no longer valid!"
+msgstr "Etykieta nie jest już poprawna!"
+
+#: src/mdi.c:693 src/file.c:362
+msgid "Must supply file name"
+msgstr "Należy podać nazwę pliku"
+
+#: src/mdi.c:705 src/file.c:374
+msgid "Error writing file"
+msgstr "Bł±d podczas zapisu pliku"
+
+#: src/display.c:1250 src/display.c:1298
+msgid "Delete"
+msgstr "Usuń"
+
+#: src/display.c:1260 src/display.c:1308
+msgid "Bring to front"
+msgstr "Przesun na wierzch"
+
+#: src/display.c:1266 src/display.c:1314
+msgid "Send to back"
+msgstr "Przesuń w dół"
+
+#: src/display.c:1287
+msgid "Edit properties..."
+msgstr "Modyfikuj wła¶ciwo¶ci..."
+
+#: src/item_text.c:450
+msgid "Edit text object properties"
+msgstr "Modyfikacja wła¶ciowo¶ci tekstu"
+
+#: src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100
+msgid "Text"
+msgstr "Tekst"
+
+#: src/item_text.c:479 src/item_line.c:253 src/item_box.c:245
+#: src/item_ellipse.c:247 src/item_barcode.c:317
+msgid "Appearance"
+msgstr "Wygl±d"
+
+#. ------ Begin Text Properties box ------
+#: src/item_text.c:482
+msgid "Text Properties"
+msgstr "Wła¶ciwo¶ci tekstu"
+
+#. ------ Position Frame ------
+#: src/item_text.c:500 src/item_text.c:503 src/item_line.c:274
+#: src/item_box.c:275 src/item_ellipse.c:277 src/item_image.c:318
+#: src/item_barcode.c:345 src/item_barcode.c:348
+msgid "Position"
+msgstr "Pozycja"
+
+#: src/item_line.c:243
+msgid "Edit line object properties"
+msgstr "Modyfikacja wła¶ciwo¶ci linii"
+
+#. ------ Begin Line box ------
+#: src/item_line.c:256 src/menu.c:106
+msgid "Line"
+msgstr "Linia"
+
+#: src/item_line.c:271 src/item_box.c:272 src/item_ellipse.c:274
+#: src/item_image.c:315
+msgid "Position/Size"
+msgstr "Pozycja/Rozmiar"
+
+#. ------ Size Frame ------
+#: src/item_line.c:285 src/item_box.c:286 src/item_ellipse.c:288
+#: src/item_image.c:329
+msgid "Size"
+msgstr "Rozmiar"
+
+#: src/item_box.c:235
+msgid "Edit box object properties"
+msgstr "Modyfikacja wła¶ciwo¶ci skrzynki"
+
+#. ------ Line box ------
+#: src/item_box.c:248 src/item_ellipse.c:250
+msgid "Outline"
+msgstr "Ramka"
+
+#. ------ Fill box ------
+#: src/item_box.c:258 src/item_ellipse.c:260
+msgid "Fill"
+msgstr "Wypełnienie"
+
+#: src/item_ellipse.c:237
+msgid "Edit ellipse object properties"
+msgstr "Modyfikacja wła¶ciwo¶ci elipsy"
+
+#: src/item_image.c:257
+msgid "Edit image object properties"
+msgstr "Modyfikacja wła¶ciwo¶ci obrazu"
+
+#: src/item_image.c:268 src/menu.c:113
+msgid "Image"
+msgstr "Obraz"
+
+#. ------ Size Reset Button ------
+#: src/item_image.c:342
+msgid "Reset image size"
+msgstr "Wyzeruj rozmiar obrazu"
+
+#: src/item_image.c:389 src/item_image.c:454
+msgid "Image format not currently supported"
+msgstr "Format obrazu aktualnie nie jest obsługiwany"
+
+#: src/item_barcode.c:287
+msgid "Edit barcode object properties"
+msgstr "Modyfikacja wła¶ciwo¶ci kodu paskowego"
+
+#: src/item_barcode.c:297
+msgid "Data"
+msgstr "Dane"
+
+#: src/item_barcode.c:299
+msgid "Barcode data"
+msgstr "Dane kodu paskowego"
+
+#. ------ Begin Barcode Properties Frame ------
+#: src/item_barcode.c:320 src/prefs.c:215
+msgid "General"
+msgstr "Ogólne"
+
+#. ------ Barcode Style Frame ------
+#: src/item_barcode.c:330
+msgid "Style"
+msgstr "Styl"
+
+#: src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:631
+msgid "Invalid barcode"
+msgstr "Niepoprawny kod paskowy"
+
+#. W Label
+#: src/prop_size.c:182 src/prop_line.c:169
+msgid "Width:"
+msgstr "Szeroko¶ć:"
+
+#. H label
+#: src/prop_size.c:198
+msgid "Height:"
+msgstr "Wysoko¶ć:"
+
+#: src/prop_size.c:222
+msgid "Maintain current aspect ratio"
+msgstr "Utrzymywanie aktualnych proporcji"
+
+#. X label
+#: src/prop_position.c:173
+msgid "X:"
+msgstr "X:"
+
+#. Y label
+#: src/prop_position.c:191
+msgid "Y:"
+msgstr "Y:"
+
+#. Line Width units
+#: src/prop_line.c:183 src/prefs.c:448 src/prefs.c:455
+msgid "points"
+msgstr "punkty(-ów)"
+
+#. Line Color Label
+#: src/prop_line.c:189 src/prop_fill.c:166 src/prop_text.c:234
+#: src/prop_bc.c:188
+msgid "Color:"
+msgstr "Kolor:"
+
+#. Font label
+#: src/prop_text.c:181
+msgid "Font:"
+msgstr "Czcionka:"
+
+#. Alignment label
+#: src/prop_text.c:248
+msgid "Alignment:"
+msgstr "Wyrównanie:"
+
+#. Insert merge field label
+#: src/prop_text_entry.c:180 src/prop_bc_data.c:196
+msgid "Key:"
+msgstr "Klucz:"
+
+#: src/prop_text_entry.c:196
+msgid "Insert merge field"
+msgstr "Wstaw pole zł±czenia"
+
+#. Length label
+#: src/prop_vector.c:183
+msgid "Length:"
+msgstr "Długo¶ć:"
+
+#. Angle label
+#: src/prop_vector.c:207
+msgid "Angle:"
+msgstr "K±t"
+
+#. Angle units label
+#: src/prop_vector.c:224
+msgid "degrees"
+msgstr "stopni(e)"
+
+#. Scale Label
+#: src/prop_bc.c:168
+msgid "Scale:"
+msgstr "Skala"
+
+#. % Label
+#: src/prop_bc.c:182
+msgid "%"
+msgstr "%"
+
+#: src/prop_bc_style.c:313
+msgid "Show text with barcode"
+msgstr "Wy¶wietlanie tekstu z kodem paskowym"
+
+#: src/prop_bc_data.c:176
+msgid "Literal:"
+msgstr "Literał:"
+
+#: src/label.c:173 src/label.c:197
+msgid "xmlParseFile error"
+msgstr "bł±d przetwarzania pliku xml"
+
+#: src/label.c:228
+msgid "No document root"
+msgstr "Brak głównego dokumentu"
+
+#: src/label.c:239
+msgid "document of the wrong type, glabels Namespace not found"
+msgstr ""
+"dokument jest niepoprawnego typu, nie odnaleziono przestrzeni nazw glabels"
+
+#: src/label.c:244
+#, c-format
+msgid "Bad root node = \"%s\""
+msgstr "Niepoprawny węzeł główny = \"%s\""
+
+#: src/label.c:291
+#, c-format
+msgid "bad node = \"%s\""
+msgstr "niepoprawny węzeł = \"%s\""
+
+#: src/label.c:606
+msgid "Problem saving xml file."
+msgstr "Problem podczas zapisu pliku xml."
+
+#: src/template.c:224
+msgid "No template files found!"
+msgstr "Nie znaleziono pliku szablonu!"
+
+#: src/merge_properties.c:82
+msgid "Edit document-merge properties"
+msgstr "Modyfikacja wła¶ciwo¶ci zł±czania dokumentów"
+
+#: src/merge_properties.c:131
+msgid "Source"
+msgstr "¬ródło"
+
+#: src/merge_properties.c:143
+msgid "Format:"
+msgstr "Format:"
+
+#: src/merge_properties.c:158
+msgid "Location:"
+msgstr "Położenie:"
+
+#: src/merge_properties.c:168
+msgid "Fields"
+msgstr "Pola"
+
+#: src/merge.c:78
+msgid "None"
+msgstr "Brak"
+
+#: src/merge.c:86
+msgid "Text with tab separators"
+msgstr "Tekst oddzielony tabulacjami"
+
+#: src/merge.c:94
+msgid "Text with comma separators (CSV)"
+msgstr "Tekst oddzielony przecinkami (CSV)"
+
+#: src/merge.c:102
+msgid "Text with colon separators"
+msgstr "Tekst oddzielany dwukropkami"
+
+#: src/merge_ui.c:207 src/merge_ui.c:242 src/merge_ui.c:387 src/merge_ui.c:428
+msgid "N/A"
+msgstr "N/A"
+
+#: src/merge_ui_text.c:170
+msgid "Select merge-database source"
+msgstr "Wybierz Ľródło bazy danych zł±czania "
+
+#: src/merge_ui_text.c:330
+msgid "Column"
+msgstr "Kolumna"
+
+#: src/merge_ui_text.c:334
+msgid "Custom field key"
+msgstr "Własny klucz pola"
+
+#: src/merge_ui_text.c:338
+msgid "Sample data"
+msgstr "Próbne dane"
+
+#: src/menu.c:50
+msgid "_New"
+msgstr "_Nowa"
+
+#: src/menu.c:51
+msgid "Make a new, empty label"
+msgstr "Tworzy now±, pust± etykietę"
+
+#: src/menu.c:85
+msgid "U_nselect All "
+msgstr "O_dznacz wszystko"
+
+#: src/menu.c:86
+msgid "Remove all selections"
+msgstr "Usuwa wszelkie zaznaczenia"
+
+#: src/menu.c:94
+msgid "Select"
+msgstr "Wybierz"
+
+#: src/menu.c:95 src/menu.c:186
+msgid "Select, move and modify objects"
+msgstr "Wybierz, przeno¶ i modyfikuj obiekty"
+
+#: src/menu.c:100 src/menu.c:191
+msgid "Create text object"
+msgstr "Tworzy obiekt tekstowy"
+
+#: src/menu.c:103
+msgid "Box"
+msgstr "Skrzynka"
+
+#: src/menu.c:103 src/menu.c:194
+msgid "Create box/rectangle object"
+msgstr "Tworzy skrzynkę/prostok±t"
+
+#: src/menu.c:106 src/menu.c:197
+msgid "Create line object"
+msgstr "Tworzy linię"
+
+#: src/menu.c:109
+msgid "Ellipse"
+msgstr "Elipsa"
+
+#: src/menu.c:110 src/menu.c:200
+msgid "Create ellipse/circle object"
+msgstr "Tworzy elipsę/okr±g"
+
+#: src/menu.c:113 src/menu.c:203
+msgid "Create image object"
+msgstr "Tworzy obraz"
+
+#: src/menu.c:116
+msgid "Barcode"
+msgstr "Kod paskowy"
+
+#: src/menu.c:116 src/menu.c:206
+msgid "Create barcode object"
+msgstr "Tworzy kod paskowy"
+
+#: src/menu.c:121 src/menu.c:211
+msgid "Zoom in"
+msgstr "Powiększ"
+
+#: src/menu.c:124 src/menu.c:214
+msgid "Zoom out"
+msgstr "Pomniejsz"
+
+#: src/menu.c:127
+msgid "Zoom 1:1"
+msgstr "Powiększenie 1:1"
+
+#: src/menu.c:127 src/menu.c:217
+msgid "Zoom to 1:1"
+msgstr "Powiększa 1:1"
+
+#: src/menu.c:132 src/menu.c:223
+msgid "Merge properties"
+msgstr "Wła¶ciwo¶ci zł±czania"
+
+#: src/menu.c:133
+msgid "Edit merge properties"
+msgstr "Modyfikuje wła¶ciwo¶ci zł±czania"
+
+#: src/menu.c:157
+msgid "_Tools"
+msgstr "_Narzędzia"
+
+#: src/menu.c:168
+msgid " New "
+msgstr " Nowa "
+
+#: src/menu.c:168
+msgid "New Label/Card"
+msgstr "Nowa Etykieta/Karta"
+
+#: src/menu.c:170
+msgid " Open "
+msgstr " Otwórz "
+
+#: src/menu.c:170
+msgid "Open a file"
+msgstr "Otwiera plik"
+
+#: src/menu.c:172
+msgid " Save "
+msgstr " Zapisz "
+
+#: src/menu.c:172
+msgid "Save current file"
+msgstr "Zapisuje bież±cy plik"
+
+#: src/menu.c:175
+msgid " Print "
+msgstr " Wydrukuj "
+
+#: src/menu.c:175
+msgid "Print current file"
+msgstr "Drukuje bież±cy plik"
+
+#: src/menu.c:290
+msgid ""
+"A label and business card creation program for GNOME.\n"
+" \n"
+"Glabels is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+" \n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+msgstr ""
+"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/menu.c:326
+msgid "Function is not implemented!"
+msgstr "Funkcja nie jest zaimplementowana!"
+
+#: src/file.c:72
+msgid "New Label or Card"
+msgstr "Nowa etykieta lub karta"
+
+#: src/file.c:98
+msgid "Media Type"
+msgstr "Typ no¶nika"
+
+#: src/file.c:109
+msgid "Label orientation"
+msgstr "Ułożenie etykiety"
+
+#: src/file.c:211
+msgid "Open"
+msgstr "Otwórz"
+
+#: src/file.c:213
+msgid "Open label"
+msgstr "Otwórz etykietę"
+
+#: src/file.c:249
+msgid "Cannot open file"
+msgstr "Nie można otworzyć pliku"
+
+#: src/file.c:316
+msgid "Save label as"
+msgstr "Zapisz etykietę jako"
+
+#: src/media_select.c:222
+msgid "Description:"
+msgstr "Opis:"
+
+#: src/media_select.c:227
+msgid "Page size:"
+msgstr "Rozmiar strony:"
+
+#: src/media_select.c:232
+msgid "Label size:"
+msgstr "Rozmiar etykiety:"
+
+#: src/media_select.c:237
+msgid "Layout:"
+msgstr "Wygl±d:"
+
+#: src/media_select.c:353
+#, c-format
+msgid "%d x %d (%d per sheet)"
+msgstr "%d x %d (%d na arkusz)"
+
+#: src/media_select.c:367
+#, c-format
+msgid "%s x %s %s"
+msgstr "%s x %s %s"
+
+#: src/media_select.c:372
+#, c-format
+msgid "%.5g x %.5g %s"
+msgstr "%.5g x %.5g %s"
+
+#: src/rotate_select.c:169
+msgid "Rotate"
+msgstr "Obróć"
+
+#: src/print_dialog.c:99
+msgid "Print"
+msgstr "Wydrukuj"
+
+#. ----------- Add simple-copies widget ------------
+#: src/print_dialog.c:104
+msgid "Copies"
+msgstr "Kopie"
+
+#. -------Otherwise add merge control widget ------------
+#: src/print_dialog.c:121
+msgid "Document merge control"
+msgstr "Kontrola zł±czania dokumentów"
+
+#. ----------- Add custom print options area ------------
+#: src/print_dialog.c:141
+msgid "Options"
+msgstr "Opcje"
+
+#: src/print_dialog.c:241 src/print_dialog.c:280
+msgid "Print preview"
+msgstr "Podgl±d wydruku"
+
+#: src/print_copies.c:170
+msgid "Sheets:"
+msgstr "Arkusze:"
+
+#: src/print_copies.c:187
+msgid "Labels"
+msgstr "Etykiety"
+
+#: src/print_copies.c:190
+msgid "from:"
+msgstr "od:"
+
+#: src/print_copies.c:198
+msgid "to:"
+msgstr "do:"
+
+#: src/print_merge.c:170
+msgid "Start on label"
+msgstr "Rozpocznij od etykiety"
+
+#: src/print_merge.c:179
+msgid "on 1st sheet"
+msgstr "na pierwszym arkuszu"
+
+#: src/print_merge.c:188
+msgid "Collate"
+msgstr "Układanie"
+
+#: src/print_merge.c:195
+msgid "Copies:"
+msgstr "Kopie:"
+
+#: src/prefs.c:86
+msgid "Glabels: Preferences"
+msgstr "Glabels: Preferencje"
+
+#. ----- Display Units Frame ------------------------------------
+#: src/prefs.c:220
+msgid "Display units"
+msgstr "Jednostki wy¶wietlania"
+
+#: src/prefs.c:231
+msgid "Points"
+msgstr "Punkty"
+
+#: src/prefs.c:237
+msgid "Inches"
+msgstr "Cale"
+
+#: src/prefs.c:244
+msgid "Millimeters"
+msgstr "Milimetry"
+
+#. ----- Display Units Frame ------------------------------------
+#: src/prefs.c:249
+msgid "Default page size"
+msgstr "Domy¶lny rozmiar strony"
+
+#: src/prefs.c:450
+msgid "inches"
+msgstr "cali"
+
+#: src/prefs.c:452
+msgid "mm"
+msgstr "mm"
diff --git a/glabels2/po/pt_BR.po b/glabels2/po/pt_BR.po
index 65628ec..1f3eb8d 100644
--- a/glabels2/po/pt_BR.po
+++ b/glabels2/po/pt_BR.po
@@ -2,11 +2,10 @@
# Copyright (C) 2001 Jim Evins <evins@snaught.com>
# Paulo R. Ormenese <pormenese@uol.com.br>, 2001.
#
-#: src/commands.c:384
msgid ""
msgstr ""
"Project-Id-Version: glabels 0.4.1\n"
-"POT-Creation-Date: 2002-08-20 21:43-0400\n"
+"POT-Creation-Date: 2002-08-24 22:30-0400\n"
"PO-Revision-Date: 2002-01-31 21:20+ZONE\n"
"Last-Translator: Paulo R. Ormenese <pormenese@uol.com.br>\n"
"Language-Team: Brazilian portuguese <>\n"
@@ -14,848 +13,708 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/glabels.c:59
-msgid "Show view debugging messages."
-msgstr ""
-
-#: src/glabels.c:62
-msgid "Show item debugging messages."
-msgstr ""
-
-#: src/glabels.c:65
-msgid "Show printing debugging messages."
-msgstr ""
-
-#: src/glabels.c:68
-msgid "Show prefs debugging messages."
-msgstr ""
-
-#: src/glabels.c:71
-msgid "Show file debugging messages."
-msgstr ""
-
-#: src/glabels.c:74
-msgid "Show document debugging messages."
-msgstr ""
-
-#: src/glabels.c:77
-msgid "Show template debugging messages."
-msgstr ""
-
-#: src/glabels.c:80
-msgid "Show xml debugging messages."
-msgstr ""
-
-#: src/glabels.c:83
-msgid "Show document merge debugging messages."
-msgstr ""
-
-#: src/glabels.c:86
-msgid "Show commands debugging messages."
-msgstr ""
-
-#: src/glabels.c:89
-msgid "Show undo debugging messages."
-msgstr ""
-
-#: src/glabels.c:92
-msgid "Show recent debugging messages."
-msgstr ""
-
-#: src/glabels.c:95
-msgid "Show mdi debugging messages."
-msgstr ""
-
-#: src/glabels.c:98
-msgid "Show media select widget debugging messages."
-msgstr ""
-
-#: src/glabels.c:101
-msgid "Show mini preview widget debugging messages."
-msgstr ""
-
-#: src/glabels.c:104
-msgid "Show widget debugging messages."
-msgstr ""
-
-#: src/glabels.c:107
-msgid "Turn on all debugging messages."
-msgstr ""
-
-#: src/glabels-batch.c:47
+#: src/glabels_batch.c:49
msgid "print this message"
msgstr ""
-#: src/glabels-batch.c:49
+#: src/glabels_batch.c:51
msgid "print the version of glabels-batch being used"
msgstr ""
-#: src/glabels-batch.c:51
+#: src/glabels_batch.c:53
msgid "set output filename (default=\"output.ps\")"
msgstr ""
-#: src/glabels-batch.c:51
+#: src/glabels_batch.c:53
msgid "filename"
msgstr ""
-#: src/glabels-batch.c:53
+#: src/glabels_batch.c:55
msgid "number of sheets (default=1)"
msgstr ""
-#: src/glabels-batch.c:53
+#: src/glabels_batch.c:55
#, fuzzy
msgid "sheets"
msgstr "Páginas:"
-#: src/glabels-batch.c:55
+#: src/glabels_batch.c:57
msgid "number of copies (default=1)"
msgstr ""
-#: src/glabels-batch.c:55
+#: src/glabels_batch.c:57
#, fuzzy
msgid "copies"
msgstr "Cópias"
-#: src/glabels-batch.c:57 src/print-dialog.c:205
+#: src/glabels_batch.c:59 src/print_dialog.c:152
msgid "print outlines (to test printer alignment)"
msgstr "imprimir contornos (testar alinhamento da impressora)"
-#: src/glabels-batch.c:59 src/print-dialog.c:214
+#: src/glabels_batch.c:61 src/print_dialog.c:160
msgid "print in reverse (i.e. a mirror image)"
msgstr "imprimir ao contrário (como uma imagem de espelho)"
-#: src/glabels-batch.c:90
+#: src/glabels_batch.c:92
msgid "[OPTION...] GLABELS_FILE..."
msgstr ""
-#: src/glabels-batch.c:109
+#: src/glabels_batch.c:111
msgid "missing glabels file\n"
msgstr ""
-#: src/glabels-batch.c:140
+#: src/glabels_batch.c:139
#, fuzzy, c-format
msgid "cannot open glabels file %s\n"
msgstr "Impossível abrir o arquivo"
-#: src/mdi.c:579
+#: src/mdi.c:169
#, c-format
-msgid ""
-"Do you want to save the changes you made to the document \"%s\"? \n"
-"\n"
-"Your changes will be lost if you don't save them."
-msgstr ""
+msgid "Revert to saved copy of %s?"
+msgstr "Reverter para a cópia gravada de %s?"
-#: src/mdi.c:584
-#, fuzzy
-msgid "Do_n't save"
-msgstr "Năo salve"
-
-#: src/mdi.c:604
-msgid "_Don't quit"
-msgstr ""
-
-#: src/mdi.c:609
-#, fuzzy
-msgid "_Don't close"
-msgstr "Năo salve"
-
-#: src/mdi.c:706
-msgid "(modified)"
-msgstr ""
+#: src/mdi.c:207
+msgid "Unknown media type. Using default."
+msgstr "Tipo de mídia desconhecido. Usando padrăo."
-#: src/commands.c:359
+#: src/mdi.c:455
+#, c-format
msgid ""
-"A label and business card creation program for GNOME.\n"
-" \n"
-"Glabels is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version.\n"
-" \n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-msgstr ""
-"Um programa para criaçăo de etiquetas e cartőes de negócios para o GNOME.\n"
+"``%s'' has been modified.\n"
"\n"
-"Glabels é software livre; vocę pode redistribuí-lo e/ou modificá-lo sob os "
-"termos da Licença Pública Geral GNU conforme publicada pela Free Software "
-"Foundation; ou a versăo 2 da Licença, ou (sob sua opçăo) qualquer versăo "
-"posterior.\n"
-"\n"
-"Este programa é distribuido na esperança de que seja útil, mas SEM QUALQUER "
-"GARANTIA; sem mesmo as garantias implícitas de COMERCIALIZAÇĂO ou AJUSTES A "
-"UM PROPÓSITO PARTICULAR. Veja a Licença Pública Geral GNU para mais "
-"detalhes.\n"
-
-#: src/commands.c:371
-#, fuzzy
-msgid "Author:"
-msgstr "até:"
-
-#: src/commands.c:374
-msgid "See the file AUTHORS for additional acknowledgments,"
+"Do you wish to save it?"
msgstr ""
+"``%s'' foi modificado.\n"
+"\n"
+"Deseja salvá-lo?"
-#: src/commands.c:375
-msgid "or visit http://snaught.com/glabels"
-msgstr ""
-
-#: src/commands.c:397
-#, fuzzy
-msgid "glabels"
-msgstr "Etiquetas"
-
-#: src/file.c:82
-msgid "New Label or Card"
-msgstr "Nova Etiqueta ou Cartăo"
-
-#: src/file.c:109
-msgid "Media Type"
-msgstr "Tipo de mídia"
-
-#: src/file.c:119
-msgid "Label orientation"
-msgstr "Orientaçăo da etiqueta"
-
-#: src/file.c:248
-msgid "Open"
-msgstr "Abrir"
+#: src/mdi.c:459
+msgid "Don't save"
+msgstr "Năo salve"
-#: src/file.c:250
-msgid "Open label"
-msgstr "Abrir etiqueta"
+#: src/mdi.c:601 src/file.c:288
+msgid "Cannot save file"
+msgstr "Năo posso salvar o arquivo"
-#: src/file.c:338
-#, fuzzy, c-format
-msgid "Cannot open file '%s'"
-msgstr "Impossível abrir o arquivo"
+#: src/mdi.c:623 src/file.c:311
+msgid "Save As"
+msgstr "Salvar como"
-#: src/file.c:429
-#, fuzzy, c-format
-msgid "Error saving file '%s'"
-msgstr "Erro gravando o arquivo"
+#: src/mdi.c:626
+msgid "Close / Save label as"
+msgstr "Fechar / Salvar etiqueta como"
-#: src/file.c:468
-msgid "Save label as"
-msgstr "Salvar etiqueta como"
+#: src/mdi.c:680 src/file.c:352
+msgid "Label no longer valid!"
+msgstr "Etiqueta năo é mais válida"
-#: src/file.c:550
+#: src/mdi.c:693 src/file.c:362
msgid "Must supply file name"
msgstr "Necessário informar nome do arquivo"
-#: src/file.c:569
-#, fuzzy, c-format
-msgid "Error writing file '%s'"
+#: src/mdi.c:705 src/file.c:374
+msgid "Error writing file"
msgstr "Erro gravando o arquivo"
-#. Should not happen
-#: src/prefs.c:625 src/prefs.c:632 src/wdgt-line.c:186
-msgid "points"
-msgstr "pontos"
-
-#: src/prefs.c:627
-msgid "inches"
-msgstr "poleg."
-
-#: src/prefs.c:629
-msgid "mm"
-msgstr "mm"
-
-#: src/prefs-dialog.c:220
-#, fuzzy
-msgid "Locale"
-msgstr "Escala:"
-
-#: src/prefs-dialog.c:224
-msgid "Object defaults"
-msgstr ""
-
-#: src/prefs-dialog.c:232
-#, fuzzy
-msgid "Preferences"
-msgstr "Glabels: Preferęncias"
-
-#: src/prefs-dialog.c:272
-msgid "Select locale specific behavior."
-msgstr ""
-
-#. ----- Display Units Frame ------------------------------------
-#: src/prefs-dialog.c:279
-msgid "Display units"
-msgstr "Exibir unidades"
-
-#: src/prefs-dialog.c:289
-msgid "Points"
-msgstr "Pontos"
-
-#: src/prefs-dialog.c:296
-msgid "Inches"
-msgstr "Polegadas"
-
-#: src/prefs-dialog.c:303
-msgid "Millimeters"
-msgstr "Milímetros"
-
-#. ----- Page Size Frame ------------------------------------
-#: src/prefs-dialog.c:310
-msgid "Default page size"
-msgstr "Tamanho de página padrăo"
-
-#: src/prefs-dialog.c:364
-msgid "Select default properties for new objects."
-msgstr ""
-
-#. ------ Line box ------
-#: src/prefs-dialog.c:377
-msgid "Line"
-msgstr "Linha"
-
-#. ------ Fill box ------
-#: src/prefs-dialog.c:382 src/view-box.c:325 src/view-ellipse.c:325
-msgid "Fill"
-msgstr "Preencher"
-
-#: src/view-object.c:406 src/view.c:1520
+#: src/display.c:1250 src/display.c:1298
msgid "Delete"
msgstr "Apagar"
-#: src/view-object.c:416 src/view.c:1530
+#: src/display.c:1260 src/display.c:1308
msgid "Bring to front"
msgstr "Trazer para frente"
-#: src/view-object.c:423 src/view.c:1536
+#: src/display.c:1266 src/display.c:1314
msgid "Send to back"
msgstr "Enviar para trás"
-#: src/view-object.c:395
+#: src/display.c:1287
msgid "Edit properties..."
msgstr "Editar propriedades..."
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-box.c:293
-msgid "Edit box object properties"
-msgstr "Editar propriedades do objeto caixa"
+#: src/item_text.c:450
+msgid "Edit text object properties"
+msgstr "Editar propriedades do objeto texto"
+
+#: src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100
+msgid "Text"
+msgstr "Texto"
-#: src/view-barcode.c:313 src/view-box.c:312 src/view-ellipse.c:312
-#: src/view-line.c:309 src/view-text.c:311
+#: src/item_text.c:479 src/item_line.c:253 src/item_box.c:245
+#: src/item_ellipse.c:247 src/item_barcode.c:317
msgid "Appearance"
msgstr "Aparęncia"
-#. ------ Line box ------
-#: src/view-box.c:315 src/view-ellipse.c:315 src/view-line.c:312
-msgid "Outline"
-msgstr "Contorno"
-
-#: src/view-box.c:340 src/view-ellipse.c:340 src/view-image.c:337
-#: src/view-line.c:328
-msgid "Position/Size"
-msgstr "Posiçăo/Tamanho"
+#. ------ Begin Text Properties box ------
+#: src/item_text.c:482
+msgid "Text Properties"
+msgstr "Propriedades de Texto"
#. ------ Position Frame ------
-#: src/view-barcode.c:345 src/view-barcode.c:349 src/view-box.c:343
-#: src/view-ellipse.c:343 src/view-image.c:340 src/view-line.c:331
-#: src/view-text.c:334 src/view-text.c:338
+#: src/item_text.c:500 src/item_text.c:503 src/item_line.c:274
+#: src/item_box.c:275 src/item_ellipse.c:277 src/item_image.c:318
+#: src/item_barcode.c:345 src/item_barcode.c:348
msgid "Position"
msgstr "Posiçăo"
+#: src/item_line.c:243
+msgid "Edit line object properties"
+msgstr "Editar propriedades do objeto linha"
+
+#. ------ Begin Line box ------
+#: src/item_line.c:256 src/menu.c:106
+msgid "Line"
+msgstr "Linha"
+
+#: src/item_line.c:271 src/item_box.c:272 src/item_ellipse.c:274
+#: src/item_image.c:315
+msgid "Position/Size"
+msgstr "Posiçăo/Tamanho"
+
#. ------ Size Frame ------
-#: src/view-box.c:354 src/view-ellipse.c:356 src/view-image.c:353
-#: src/view-line.c:344
+#: src/item_line.c:285 src/item_box.c:286 src/item_ellipse.c:288
+#: src/item_image.c:329
msgid "Size"
msgstr "Tamanho"
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-ellipse.c:293
+#: src/item_box.c:235
+msgid "Edit box object properties"
+msgstr "Editar propriedades do objeto caixa"
+
+#. ------ Line box ------
+#: src/item_box.c:248 src/item_ellipse.c:250
+msgid "Outline"
+msgstr "Contorno"
+
+#. ------ Fill box ------
+#: src/item_box.c:258 src/item_ellipse.c:260
+msgid "Fill"
+msgstr "Preencher"
+
+#: src/item_ellipse.c:237
msgid "Edit ellipse object properties"
msgstr "Editar propriedades do objeto elipse"
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-line.c:290
-msgid "Edit line object properties"
-msgstr "Editar propriedades do objeto linha"
-
-#. -----------------------------------------------------------------
-#. Build dialog with notebook.
-#. -----------------------------------------------------------------
-#: src/view-image.c:281
+#: src/item_image.c:257
msgid "Edit image object properties"
msgstr "Editar propriedades do objeto imagem"
-#: src/view-image.c:300
+#: src/item_image.c:268 src/menu.c:113
msgid "Image"
msgstr "Imagem"
#. ------ Size Reset Button ------
-#: src/view-image.c:364
+#: src/item_image.c:342
msgid "Reset image size"
msgstr "Redefinir tamanho da imagem"
-#: src/view-text.c:265
-msgid "Edit text object properties"
-msgstr "Editar propriedades do objeto texto"
-
-#: src/view-text.c:285 src/view-text.c:605
-msgid "Text"
-msgstr "Texto"
+#: src/item_image.c:389 src/item_image.c:454
+msgid "Image format not currently supported"
+msgstr "Formato de imagem năo suportado atualmente"
-#: src/view-barcode.c:267
+#: src/item_barcode.c:287
msgid "Edit barcode object properties"
msgstr "Editar propriedades do objeto código de barras"
-#: src/view-barcode.c:287
+#: src/item_barcode.c:297
msgid "Data"
msgstr "Dado"
-#: src/view-barcode.c:292
+#: src/item_barcode.c:299
msgid "Barcode data"
msgstr "Dado do Código de Barras:"
-#: src/view-barcode.c:318
-#, fuzzy
-msgid "Barcode Properties"
-msgstr "Propriedades de Texto"
+#. ------ Begin Barcode Properties Frame ------
+#: src/item_barcode.c:320 src/prefs.c:215
+msgid "General"
+msgstr "Geral"
#. ------ Barcode Style Frame ------
-#: src/view-barcode.c:328
+#: src/item_barcode.c:330
msgid "Style"
msgstr "Estilo"
-#: src/print.c:814 src/view-barcode.c:758
+#: src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:631
msgid "Invalid barcode"
msgstr "Código de barras inválido"
-#: src/merge-properties.c:84
-msgid "Edit document-merge properties"
-msgstr "Editar propriedades de fusăo do documento"
+#. W Label
+#: src/prop_size.c:182 src/prop_line.c:169
+msgid "Width:"
+msgstr "Largura:"
-#: src/merge-properties.c:130
-msgid "Source"
-msgstr "Fonte"
+#. H label
+#: src/prop_size.c:198
+msgid "Height:"
+msgstr "Altura:"
-#: src/merge-properties.c:142
-msgid "Format:"
-msgstr "Formato:"
+#: src/prop_size.c:222
+msgid "Maintain current aspect ratio"
+msgstr "Manter taxa de aspecto atual"
-#: src/merge-properties.c:157
-msgid "Location:"
-msgstr "Localizaçăo"
+#. X label
+#: src/prop_position.c:173
+msgid "X:"
+msgstr "X:"
-#: src/merge-properties.c:167
-msgid "Fields"
-msgstr "Campos"
+#. Y label
+#: src/prop_position.c:191
+msgid "Y:"
+msgstr "Y:"
-#. ----- Contstruct basic print dialog with notebook -----
-#: src/print-dialog.c:102
-msgid "Print"
-msgstr "Imprimir"
+#. Line Width units
+#: src/prop_line.c:183 src/prefs.c:448 src/prefs.c:455
+msgid "points"
+msgstr "pontos"
-#: src/print-dialog.c:124
-msgid "_Job"
-msgstr ""
+#. Line Color Label
+#: src/prop_line.c:189 src/prop_fill.c:166 src/prop_text.c:234
+#: src/prop_bc.c:188
+msgid "Color:"
+msgstr "Cor:"
-#: src/print-dialog.c:129
-#, fuzzy
-msgid "P_rinter"
-msgstr "Imprimir"
+#. Font label
+#: src/prop_text.c:181
+msgid "Font:"
+msgstr "Fonte:"
-#. ----------- Add simple-copies widget ------------
-#: src/print-dialog.c:158
-msgid "Copies"
-msgstr "Cópias"
+#. Alignment label
+#: src/prop_text.c:248
+msgid "Alignment:"
+msgstr "Alinhamento:"
-#. ------- Otherwise add merge control widget ------------
-#: src/print-dialog.c:174
-msgid "Document merge control"
-msgstr "Controle de fusăo do documento"
+#. Insert merge field label
+#: src/prop_text_entry.c:180 src/prop_bc_data.c:196
+msgid "Key:"
+msgstr "Chave:"
-#. ----------- Add custom print options area ------------
-#: src/print-dialog.c:195
-msgid "Options"
-msgstr "Opçőes"
+#: src/prop_text_entry.c:196
+msgid "Insert merge field"
+msgstr "Inserir campo de fusăo"
-#: src/print-dialog.c:345 src/print-dialog.c:384
-msgid "Print preview"
-msgstr "Visualizar impressăo"
+#. Length label
+#: src/prop_vector.c:183
+msgid "Length:"
+msgstr "Comprimento:"
-#: src/label.c:535
-#, c-format
-msgid "%s %d"
-msgstr ""
+#. Angle label
+#: src/prop_vector.c:207
+msgid "Angle:"
+msgstr "Ângulo:"
-#: src/label.c:535
-msgid "Untitled"
-msgstr ""
+#. Angle units label
+#: src/prop_vector.c:224
+msgid "degrees"
+msgstr "graus"
-#: src/template.c:346
-msgid "No template files found!"
-msgstr "Nenhum arquivo modelo encontrado!"
+#. Scale Label
+#: src/prop_bc.c:168
+msgid "Scale:"
+msgstr "Escala:"
+
+#. % Label
+#: src/prop_bc.c:182
+msgid "%"
+msgstr "%"
-#: src/xml-label.c:108 src/xml-label.c:139
+#: src/prop_bc_style.c:313
+msgid "Show text with barcode"
+msgstr "Exibir texto com código de barras"
+
+#: src/prop_bc_data.c:176
+msgid "Literal:"
+msgstr "Literal:"
+
+#: src/label.c:173 src/label.c:197
msgid "xmlParseFile error"
msgstr "erro: xmlParseFile"
-#: src/xml-label.c:174
+#: src/label.c:228
#, fuzzy
msgid "No document root"
msgstr "Sem raiz do documento"
-#: src/xml-label.c:186
-msgid "Importing from glabels 0.1 format"
-msgstr ""
-
-#: src/xml-label.c:194
-msgid "Importing from glabels 0.4 format"
-msgstr ""
-
-#: src/xml-label.c:198
-#, fuzzy
-msgid "bad document, unknown glabels Namespace"
+#: src/label.c:239
+msgid "document of the wrong type, glabels Namespace not found"
msgstr "documento de tipo errado, espaço de nome glabels năo encontrado"
-#: src/xml-label.c:226
+#: src/label.c:244
#, c-format
msgid "Bad root node = \"%s\""
msgstr "Nó raiz ruim = \"%s\""
-#: src/xml-label.c:249 src/xml-label.c:281
+#: src/label.c:291
#, c-format
msgid "bad node = \"%s\""
msgstr "nó ruim = \"%s\""
-#: src/xml-label.c:656
+#: src/label.c:606
msgid "Problem saving xml file."
msgstr "Problema salvando arquivo xml."
-#: src/merge.c:80
+#: src/template.c:224
+msgid "No template files found!"
+msgstr "Nenhum arquivo modelo encontrado!"
+
+#: src/merge_properties.c:82
+msgid "Edit document-merge properties"
+msgstr "Editar propriedades de fusăo do documento"
+
+#: src/merge_properties.c:131
+msgid "Source"
+msgstr "Fonte"
+
+#: src/merge_properties.c:143
+msgid "Format:"
+msgstr "Formato:"
+
+#: src/merge_properties.c:158
+msgid "Location:"
+msgstr "Localizaçăo"
+
+#: src/merge_properties.c:168
+msgid "Fields"
+msgstr "Campos"
+
+#: src/merge.c:78
msgid "None"
msgstr "Nenhum"
-#: src/merge.c:88
+#: src/merge.c:86
msgid "Text with tab separators"
msgstr "Texto separado com tab"
-#: src/merge.c:96
-msgid "Text with comma separators"
+#: src/merge.c:94
+#, fuzzy
+msgid "Text with comma separators (CSV)"
msgstr "Texto separado com vírgula"
-#: src/merge.c:104
+#: src/merge.c:102
msgid "Text with colon separators"
msgstr "Texto separado com dois pontos"
-#: src/merge-ui.c:223 src/merge-ui.c:265 src/merge-ui.c:435 src/merge-ui.c:483
+#: src/merge_ui.c:207 src/merge_ui.c:242 src/merge_ui.c:387 src/merge_ui.c:428
msgid "N/A"
msgstr "Năo definido"
-#: src/merge-ui-text.c:172
+#: src/merge_ui_text.c:170
msgid "Select merge-database source"
msgstr "Selecione a fonte da base de dados da fusăo"
-#: src/merge-ui-text.c:330
+#: src/merge_ui_text.c:330
msgid "Column"
msgstr "Coluna"
-#: src/merge-ui-text.c:334
+#: src/merge_ui_text.c:334
msgid "Custom field key"
msgstr "Chave do campo específico"
-#: src/merge-ui-text.c:338
+#: src/merge_ui_text.c:338
msgid "Sample data"
msgstr "Dado de amostra"
-#. Font label
-#: src/wdgt-text-props.c:184
-msgid "Font:"
-msgstr "Fonte:"
+#: src/menu.c:50
+msgid "_New"
+msgstr "_Novo"
-#. Text Color Label
-#: src/wdgt-bc-props.c:190 src/wdgt-fill.c:169 src/wdgt-line.c:192
-#: src/wdgt-text-props.c:237
-msgid "Color:"
-msgstr "Cor:"
+#: src/menu.c:51
+msgid "Make a new, empty label"
+msgstr "Criar uma etiqueta nova, vazia"
-#. Alignment label
-#: src/wdgt-text-props.c:251
-msgid "Alignment:"
-msgstr "Alinhamento:"
+#: src/menu.c:85
+msgid "U_nselect All "
+msgstr "D_esmarcar Tudo "
-#. Insert merge field label
-#: src/wdgt-bc-data.c:199 src/wdgt-text-entry.c:201
-msgid "Key:"
-msgstr "Chave:"
+#: src/menu.c:86
+msgid "Remove all selections"
+msgstr "Remover todas as seleçőes"
-#: src/wdgt-text-entry.c:217
-msgid "Insert merge field"
-msgstr "Inserir campo de fusăo"
+#: src/menu.c:94
+msgid "Select"
+msgstr "Selecionar"
-#. X label
-#: src/wdgt-position.c:182
-msgid "X:"
-msgstr "X:"
+#: src/menu.c:95 src/menu.c:186
+msgid "Select, move and modify objects"
+msgstr "Selecionar, movimentar e modificar objetos"
-#. Y label
-#: src/wdgt-position.c:200
-msgid "Y:"
-msgstr "Y:"
+#: src/menu.c:100 src/menu.c:191
+msgid "Create text object"
+msgstr "Criar objeto texto"
-#. W Label
-#: src/wdgt-line.c:172 src/wdgt-size.c:184
-msgid "Width:"
-msgstr "Largura:"
+#: src/menu.c:103
+msgid "Box"
+msgstr "Caixa"
-#. H label
-#: src/wdgt-size.c:200
-msgid "Height:"
-msgstr "Altura:"
+#: src/menu.c:103 src/menu.c:194
+msgid "Create box/rectangle object"
+msgstr "Criar objeto caixa/retângulo"
-#: src/wdgt-size.c:224
-msgid "Maintain current aspect ratio"
-msgstr "Manter taxa de aspecto atual"
+#: src/menu.c:106 src/menu.c:197
+msgid "Create line object"
+msgstr "Criar objeto linha"
-#. Length label
-#: src/wdgt-vector.c:186
-msgid "Length:"
-msgstr "Comprimento:"
+#: src/menu.c:109
+msgid "Ellipse"
+msgstr "Elipse"
-#. Angle label
-#: src/wdgt-vector.c:210
-msgid "Angle:"
-msgstr "Ângulo:"
+#: src/menu.c:110 src/menu.c:200
+msgid "Create ellipse/circle object"
+msgstr "Criar objeto elipse/círculo"
-#. Angle units label
-#: src/wdgt-vector.c:227
-msgid "degrees"
-msgstr "graus"
+#: src/menu.c:113 src/menu.c:203
+msgid "Create image object"
+msgstr "Criar objeto imagem"
-#. Scale Label
-#: src/wdgt-bc-props.c:170
-msgid "Scale:"
-msgstr "Escala:"
+#: src/menu.c:116
+msgid "Barcode"
+msgstr "Código de Barras"
-#. % Label
-#: src/wdgt-bc-props.c:184
-#, c-format
-msgid "%"
-msgstr "%"
+#: src/menu.c:116 src/menu.c:206
+msgid "Create barcode object"
+msgstr "Criar objeto código de barras"
-#: src/wdgt-bc-style.c:316
-msgid "Show text with barcode"
-msgstr "Exibir texto com código de barras"
+#: src/menu.c:121 src/menu.c:211
+msgid "Zoom in"
+msgstr "Mais Zoom"
-#: src/wdgt-bc-data.c:179
-msgid "Literal:"
-msgstr "Literal:"
+#: src/menu.c:124 src/menu.c:214
+msgid "Zoom out"
+msgstr "Menos Zoom"
-#: src/wdgt-print-copies.c:178
-msgid "Sheets:"
-msgstr "Páginas:"
+#: src/menu.c:127
+msgid "Zoom 1:1"
+msgstr "Zoom 1:1"
-#: src/wdgt-print-copies.c:195
-msgid "Labels"
-msgstr "Etiquetas"
+#: src/menu.c:127 src/menu.c:217
+msgid "Zoom to 1:1"
+msgstr "Zoom para 1:1"
-#: src/wdgt-print-copies.c:198
-msgid "from:"
-msgstr "de:"
+#: src/menu.c:132 src/menu.c:223
+msgid "Merge properties"
+msgstr "Propriedades de Fusăo"
-#: src/wdgt-print-copies.c:206
-msgid "to:"
-msgstr "até:"
+#: src/menu.c:133
+msgid "Edit merge properties"
+msgstr "Editar propriedades de fusăo"
-#: src/wdgt-print-merge.c:177
-msgid "Start on label"
-msgstr "Iniciar na etiqueta"
+#: src/menu.c:157
+msgid "_Tools"
+msgstr "_Ferramentas"
-#: src/wdgt-print-merge.c:186
-msgid "on 1st sheet"
-msgstr "na primeira folha"
+#: src/menu.c:168
+msgid " New "
+msgstr " Novo "
-#: src/wdgt-print-merge.c:197
-#, fuzzy
-msgid "Collate"
-msgstr "Montar"
+#: src/menu.c:168
+msgid "New Label/Card"
+msgstr "Nova Etiqueta/Cartăo"
-#: src/wdgt-print-merge.c:204
-msgid "Copies:"
-msgstr "Cópias:"
+#: src/menu.c:170
+msgid " Open "
+msgstr " Abrir "
+
+#: src/menu.c:170
+msgid "Open a file"
+msgstr "Abrir um arquivo"
+
+#: src/menu.c:172
+msgid " Save "
+msgstr " Salvar "
+
+#: src/menu.c:172
+msgid "Save current file"
+msgstr "Salvar arquivo atual"
-#: src/wdgt-media-select.c:252
+#: src/menu.c:175
+msgid " Print "
+msgstr " Imprimir "
+
+#: src/menu.c:175
+msgid "Print current file"
+msgstr "Imprimir arquivo atual"
+
+#: src/menu.c:290
+msgid ""
+"A label and business card creation program for GNOME.\n"
+" \n"
+"Glabels is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+" \n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+msgstr ""
+"Um programa para criaçăo de etiquetas e cartőes de negócios para o GNOME.\n"
+"\n"
+"Glabels é software livre; vocę pode redistribuí-lo e/ou modificá-lo sob os "
+"termos da Licença Pública Geral GNU conforme publicada pela Free Software "
+"Foundation; ou a versăo 2 da Licença, ou (sob sua opçăo) qualquer versăo "
+"posterior.\n"
+"\n"
+"Este programa é distribuido na esperança de que seja útil, mas SEM QUALQUER "
+"GARANTIA; sem mesmo as garantias implícitas de COMERCIALIZAÇĂO ou AJUSTES A "
+"UM PROPÓSITO PARTICULAR. Veja a Licença Pública Geral GNU para mais "
+"detalhes.\n"
+
+#: src/menu.c:326
+msgid "Function is not implemented!"
+msgstr "Funçăo năo está implementada!"
+
+#: src/file.c:72
+msgid "New Label or Card"
+msgstr "Nova Etiqueta ou Cartăo"
+
+#: src/file.c:98
+msgid "Media Type"
+msgstr "Tipo de mídia"
+
+#: src/file.c:109
+msgid "Label orientation"
+msgstr "Orientaçăo da etiqueta"
+
+#: src/file.c:211
+msgid "Open"
+msgstr "Abrir"
+
+#: src/file.c:213
+msgid "Open label"
+msgstr "Abrir etiqueta"
+
+#: src/file.c:249
+msgid "Cannot open file"
+msgstr "Impossível abrir o arquivo"
+
+#: src/file.c:316
+msgid "Save label as"
+msgstr "Salvar etiqueta como"
+
+#: src/media_select.c:222
msgid "Description:"
msgstr "Descriçăo:"
-#: src/wdgt-media-select.c:257
+#: src/media_select.c:227
msgid "Page size:"
msgstr "Tamanho da página:"
-#: src/wdgt-media-select.c:262
+#: src/media_select.c:232
msgid "Label size:"
msgstr "Tamanho da etiqueta:"
-#: src/wdgt-media-select.c:267
+#: src/media_select.c:237
msgid "Layout:"
msgstr "Disposiçăo:"
-#: src/wdgt-media-select.c:408
+#: src/media_select.c:353
#, c-format
msgid "%d x %d (%d per sheet)"
msgstr "%d x %d (%d por página)"
-#: src/wdgt-media-select.c:422
+#: src/media_select.c:367
#, c-format
msgid "%s x %s %s"
msgstr "%s x %s %s"
-#: src/wdgt-media-select.c:427
+#: src/media_select.c:372
#, c-format
msgid "%.5g x %.5g %s"
msgstr "%.5g x %.5g %s"
-#: src/wdgt-rotate-label.c:176
+#: src/rotate_select.c:169
msgid "Rotate"
msgstr "Girar"
-#: src/bonobo-mdi.c:522 src/bonobo-mdi.c:612 src/bonobo-mdi.c:1850
-#, c-format
-msgid "Activate %s"
-msgstr ""
-
-#: src/gnome-recent-view-bonobo.c:189
-#, fuzzy, c-format
-msgid "Open %s"
-msgstr "Abrir"
-
-#~ msgid "Revert to saved copy of %s?"
-#~ msgstr "Reverter para a cópia gravada de %s?"
-
-#~ msgid "Unknown media type. Using default."
-#~ msgstr "Tipo de mídia desconhecido. Usando padrăo."
-
-#~ msgid ""
-#~ "``%s'' has been modified.\n"
-#~ "\n"
-#~ "Do you wish to save it?"
-#~ msgstr ""
-#~ "``%s'' foi modificado.\n"
-#~ "\n"
-#~ "Deseja salvá-lo?"
-
-#~ msgid "Cannot save file"
-#~ msgstr "Năo posso salvar o arquivo"
-
-#~ msgid "Save As"
-#~ msgstr "Salvar como"
-
-#~ msgid "Close / Save label as"
-#~ msgstr "Fechar / Salvar etiqueta como"
-
-#~ msgid "Label no longer valid!"
-#~ msgstr "Etiqueta năo é mais válida"
-
-#~ msgid "Image format not currently supported"
-#~ msgstr "Formato de imagem năo suportado atualmente"
-
-#~ msgid "General"
-#~ msgstr "Geral"
-
-#~ msgid "_New"
-#~ msgstr "_Novo"
-
-#~ msgid "Make a new, empty label"
-#~ msgstr "Criar uma etiqueta nova, vazia"
-
-#~ msgid "U_nselect All "
-#~ msgstr "D_esmarcar Tudo "
-
-#~ msgid "Remove all selections"
-#~ msgstr "Remover todas as seleçőes"
-
-#~ msgid "Select"
-#~ msgstr "Selecionar"
-
-#~ msgid "Select, move and modify objects"
-#~ msgstr "Selecionar, movimentar e modificar objetos"
-
-#~ msgid "Create text object"
-#~ msgstr "Criar objeto texto"
-
-#~ msgid "Box"
-#~ msgstr "Caixa"
-
-#~ msgid "Create box/rectangle object"
-#~ msgstr "Criar objeto caixa/retângulo"
-
-#~ msgid "Create line object"
-#~ msgstr "Criar objeto linha"
-
-#~ msgid "Ellipse"
-#~ msgstr "Elipse"
+#: src/print_dialog.c:99
+msgid "Print"
+msgstr "Imprimir"
-#~ msgid "Create ellipse/circle object"
-#~ msgstr "Criar objeto elipse/círculo"
+#. ----------- Add simple-copies widget ------------
+#: src/print_dialog.c:104
+msgid "Copies"
+msgstr "Cópias"
-#~ msgid "Create image object"
-#~ msgstr "Criar objeto imagem"
+#. -------Otherwise add merge control widget ------------
+#: src/print_dialog.c:121
+msgid "Document merge control"
+msgstr "Controle de fusăo do documento"
-#~ msgid "Barcode"
-#~ msgstr "Código de Barras"
+#. ----------- Add custom print options area ------------
+#: src/print_dialog.c:141
+msgid "Options"
+msgstr "Opçőes"
-#~ msgid "Create barcode object"
-#~ msgstr "Criar objeto código de barras"
+#: src/print_dialog.c:241 src/print_dialog.c:280
+msgid "Print preview"
+msgstr "Visualizar impressăo"
-#~ msgid "Zoom in"
-#~ msgstr "Mais Zoom"
+#: src/print_copies.c:170
+msgid "Sheets:"
+msgstr "Páginas:"
-#~ msgid "Zoom out"
-#~ msgstr "Menos Zoom"
+#: src/print_copies.c:187
+msgid "Labels"
+msgstr "Etiquetas"
-#~ msgid "Zoom 1:1"
-#~ msgstr "Zoom 1:1"
+#: src/print_copies.c:190
+msgid "from:"
+msgstr "de:"
-#~ msgid "Zoom to 1:1"
-#~ msgstr "Zoom para 1:1"
+#: src/print_copies.c:198
+msgid "to:"
+msgstr "até:"
-#~ msgid "Merge properties"
-#~ msgstr "Propriedades de Fusăo"
+#: src/print_merge.c:170
+msgid "Start on label"
+msgstr "Iniciar na etiqueta"
-#~ msgid "Edit merge properties"
-#~ msgstr "Editar propriedades de fusăo"
+#: src/print_merge.c:179
+msgid "on 1st sheet"
+msgstr "na primeira folha"
-#~ msgid "_Tools"
-#~ msgstr "_Ferramentas"
+#: src/print_merge.c:188
+#, fuzzy
+msgid "Collate"
+msgstr "Montar"
-#~ msgid " New "
-#~ msgstr " Novo "
+#: src/print_merge.c:195
+msgid "Copies:"
+msgstr "Cópias:"
-#~ msgid "New Label/Card"
-#~ msgstr "Nova Etiqueta/Cartăo"
+#: src/prefs.c:86
+msgid "Glabels: Preferences"
+msgstr "Glabels: Preferęncias"
-#~ msgid " Open "
-#~ msgstr " Abrir "
+#. ----- Display Units Frame ------------------------------------
+#: src/prefs.c:220
+msgid "Display units"
+msgstr "Exibir unidades"
-#~ msgid "Open a file"
-#~ msgstr "Abrir um arquivo"
+#: src/prefs.c:231
+msgid "Points"
+msgstr "Pontos"
-#~ msgid " Save "
-#~ msgstr " Salvar "
+#: src/prefs.c:237
+msgid "Inches"
+msgstr "Polegadas"
-#~ msgid "Save current file"
-#~ msgstr "Salvar arquivo atual"
+#: src/prefs.c:244
+msgid "Millimeters"
+msgstr "Milímetros"
-#~ msgid " Print "
-#~ msgstr " Imprimir "
+#. ----- Display Units Frame ------------------------------------
+#: src/prefs.c:249
+msgid "Default page size"
+msgstr "Tamanho de página padrăo"
-#~ msgid "Print current file"
-#~ msgstr "Imprimir arquivo atual"
+#: src/prefs.c:450
+msgid "inches"
+msgstr "poleg."
-#~ msgid "Function is not implemented!"
-#~ msgstr "Funçăo năo está implementada!"
+#: src/prefs.c:452
+msgid "mm"
+msgstr "mm"
#~ msgid "Function is not yet implemented!"
#~ msgstr "Funçăo ainda năo implementada!"
diff --git a/glabels2/po/ru.po b/glabels2/po/ru.po
new file mode 100644
index 0000000..064cea8
--- /dev/null
+++ b/glabels2/po/ru.po
@@ -0,0 +1,716 @@
+# Russian translation of glabels.
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Vitaly Lipatov <lav@altlinux.ru>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: glabels 0.4.3\n"
+"POT-Creation-Date: 2002-08-24 22:30-0400\n"
+"PO-Revision-Date: 2002-06-28 00:05MSK\n"
+"Last-Translator: Vitaly Lipatov <lav@altlinux.ru>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 0.9.6\n"
+
+#: src/glabels_batch.c:49
+msgid "print this message"
+msgstr ""
+
+#: src/glabels_batch.c:51
+msgid "print the version of glabels-batch being used"
+msgstr ""
+
+#: src/glabels_batch.c:53
+msgid "set output filename (default=\"output.ps\")"
+msgstr ""
+
+#: src/glabels_batch.c:53
+msgid "filename"
+msgstr ""
+
+#: src/glabels_batch.c:55
+msgid "number of sheets (default=1)"
+msgstr ""
+
+#: src/glabels_batch.c:55
+#, fuzzy
+msgid "sheets"
+msgstr "ěÉÓÔĎ×:"
+
+#: src/glabels_batch.c:57
+msgid "number of copies (default=1)"
+msgstr ""
+
+#: src/glabels_batch.c:57
+#, fuzzy
+msgid "copies"
+msgstr "ëĎĐÉĘ"
+
+#: src/glabels_batch.c:59 src/print_dialog.c:152
+msgid "print outlines (to test printer alignment)"
+msgstr "ŇÁÓĐĹŢÁÔÁÔŘ ËĎÎÔŐŇŮ (ÄĚŃ ĐŇĎ×ĹŇËÉ ×ŮŇÁ×ÎÉ×ÁÎÉŃ ÎÁ ĐŇÉÎÔĹŇĹ)"
+
+#: src/glabels_batch.c:61 src/print_dialog.c:160
+msgid "print in reverse (i.e. a mirror image)"
+msgstr "ŇÁÓĐĹŢÁÔÁÔŘ ÚĹŇËÁĚŘÎĎ"
+
+#: src/glabels_batch.c:92
+msgid "[OPTION...] GLABELS_FILE..."
+msgstr ""
+
+#: src/glabels_batch.c:111
+msgid "missing glabels file\n"
+msgstr ""
+
+#: src/glabels_batch.c:139
+#, fuzzy, c-format
+msgid "cannot open glabels file %s\n"
+msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ"
+
+#: src/mdi.c:169
+#, c-format
+msgid "Revert to saved copy of %s?"
+msgstr "÷ĹŇÎŐÔŘÓŃ Ë ÓĎČŇÁÎŁÎÎĎĘ ËĎĐÉÉ %s?"
+
+#: src/mdi.c:207
+msgid "Unknown media type. Using default."
+msgstr "îĹÉÚ×ĹÓÔÎŮĘ ÔÉĐ ÎĎÓÉÔĹĚŃ. éÓĐĎĚŘÚŐĹÍ ÚÎÁŢĹÎÉĹ ĐĎ ŐÍĎĚŢÁÎÉŔ."
+
+#: src/mdi.c:455
+#, c-format
+msgid ""
+"``%s'' has been modified.\n"
+"\n"
+"Do you wish to save it?"
+msgstr ""
+"``%s'' ÂŮĚ ÉÚÍĹÎŁÎ.\n"
+"\n"
+"óĎČŇÁÎÉÔŘ ĹÇĎ?"
+
+#: src/mdi.c:459
+msgid "Don't save"
+msgstr "îĹ ÓĎČŇÁÎŃÔŘ"
+
+#: src/mdi.c:601 src/file.c:288
+msgid "Cannot save file"
+msgstr "îĹ×ĎÚÍĎÖÎĎ ÓĎČŇÁÎÉÔŘ ĆÁĘĚ"
+
+#: src/mdi.c:623 src/file.c:311
+msgid "Save As"
+msgstr "óĎČŇÁÎÉÔŘ ËÁË"
+
+#: src/mdi.c:626
+msgid "Close / Save label as"
+msgstr "úÁËŇŮÔŘ / óĎČŇÁÎÉÔŘ ÜÔÉËĹÔËŐ ËÁË"
+
+#: src/mdi.c:680 src/file.c:352
+msgid "Label no longer valid!"
+msgstr "üÔÉËĹÔËÁ ÂĎĚŘŰĹ ÎĹ ×ĹŇÎÁ!"
+
+#: src/mdi.c:693 src/file.c:362
+msgid "Must supply file name"
+msgstr "îÁÚ×ÁÎÉĹ ĆÁĘĚÁ ÄĎĚÖÎĎ ÂŮÔŘ ŐËÁÚÁÎĎ"
+
+#: src/mdi.c:705 src/file.c:374
+msgid "Error writing file"
+msgstr "ďŰÉÂËÁ ÚÁĐÉÓÉ ĆÁĘĚÁ"
+
+#: src/display.c:1250 src/display.c:1298
+msgid "Delete"
+msgstr "őÄÁĚÉÔŘ"
+
+#: src/display.c:1260 src/display.c:1308
+msgid "Bring to front"
+msgstr "îÁ ĐĹŇĹÄÎÉĘ ĐĚÁÎ"
+
+#: src/display.c:1266 src/display.c:1314
+msgid "Send to back"
+msgstr "îÁ ÚÁÄÎÉĘ ĐĚÁÎ"
+
+#: src/display.c:1287
+msgid "Edit properties..."
+msgstr "éÚÍĹÎÉÔŘ Ó×ĎĘÓÔ×Á..."
+
+#: src/item_text.c:450
+msgid "Edit text object properties"
+msgstr "éÚÍĹÎÉÔŘ Ó×ĎĘÓÔ×Á ĎÂßĹËÔÁ ÔÉĐÁ ÔĹËÓÔ"
+
+#: src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100
+msgid "Text"
+msgstr "ôĹËÓÔ"
+
+#: src/item_text.c:479 src/item_line.c:253 src/item_box.c:245
+#: src/item_ellipse.c:247 src/item_barcode.c:317
+msgid "Appearance"
+msgstr "÷ÎĹŰÎÉĘ ×ÉÄ"
+
+#. ------ Begin Text Properties box ------
+#: src/item_text.c:482
+msgid "Text Properties"
+msgstr "ó×ĎĘÓÔ×Á ÔĹËÓÔÁ"
+
+#. ------ Position Frame ------
+#: src/item_text.c:500 src/item_text.c:503 src/item_line.c:274
+#: src/item_box.c:275 src/item_ellipse.c:277 src/item_image.c:318
+#: src/item_barcode.c:345 src/item_barcode.c:348
+msgid "Position"
+msgstr "ňÁÓĐĎĚĎÖĹÎÉĹ"
+
+#: src/item_line.c:243
+msgid "Edit line object properties"
+msgstr "éÚÍĹÎÉÔŘ Ó×ĎĘÓÔ×Á ĎÂßĹËÔÁ ÔÉĐÁ ĚÉÎÉŃ"
+
+#. ------ Begin Line box ------
+#: src/item_line.c:256 src/menu.c:106
+msgid "Line"
+msgstr "ěÉÎÉŃ"
+
+#: src/item_line.c:271 src/item_box.c:272 src/item_ellipse.c:274
+#: src/item_image.c:315
+msgid "Position/Size"
+msgstr "ňÁÓĐĎĚĎÖĹÎÉĹ/ňÁÚÍĹŇ"
+
+#. ------ Size Frame ------
+#: src/item_line.c:285 src/item_box.c:286 src/item_ellipse.c:288
+#: src/item_image.c:329
+msgid "Size"
+msgstr "ňÁÚÍĹŇ"
+
+#: src/item_box.c:235
+msgid "Edit box object properties"
+msgstr "éÚÍĹÎÉÔŘ Ó×ĎĘÓÔ×Á ĎÂßĹËÔÁ ÔÉĐÁ ĐŇŃÍĎŐÇĎĚŘÎÉË"
+
+#. ------ Line box ------
+#: src/item_box.c:248 src/item_ellipse.c:250
+msgid "Outline"
+msgstr "ëĎÎÔŐŇ"
+
+#. ------ Fill box ------
+#: src/item_box.c:258 src/item_ellipse.c:260
+msgid "Fill"
+msgstr "úÁĐĎĚÎĹÎÉĹ"
+
+#: src/item_ellipse.c:237
+msgid "Edit ellipse object properties"
+msgstr "éÓĐŇÁ×ÉÔŘ Ó×ĎĘÓÔ×Á ĎÂßĹËÔÁ ÔÉĐÁ ÜĚĚÉĐÓ"
+
+#: src/item_image.c:257
+msgid "Edit image object properties"
+msgstr "éÓĐŇÁ×ÉÔŘ Ó×ĎĘÓÔ×Á ĎÂßĹËÔÁ ÔÉĐÁ ÉÚĎÂŇÁÖĹÎÉĹ"
+
+#: src/item_image.c:268 src/menu.c:113
+msgid "Image"
+msgstr "éÚĎÂŇÁÖĹÎÉĹ"
+
+#. ------ Size Reset Button ------
+#: src/item_image.c:342
+msgid "Reset image size"
+msgstr "őÓÔÁÎĎ×ÉÔŘ ŇÁÚÍĹŇ ÉÚĎÂŇÁÖĹÎÉŃ ĐĎ ŐÍĎĚŢÁÎÉŔ"
+
+#: src/item_image.c:389 src/item_image.c:454
+msgid "Image format not currently supported"
+msgstr "äÁÎÎŮĘ ĆĎŇÍÁÔ ÉÚĎÂŇÁÖĹÎÉĘ ÎĹ ĐĎÄÄĹŇÖÉ×ÁĹÔÓŃ"
+
+#: src/item_barcode.c:287
+msgid "Edit barcode object properties"
+msgstr "éÚÍĹÎÉÔŘ Ó×ĎĘÓÔ×Á ĎÂßĹËÔÁ ÔÉĐÁ ŰÔŇÉČ-ËĎÄ"
+
+#: src/item_barcode.c:297
+msgid "Data"
+msgstr "äÁÎÎŮĹ"
+
+#: src/item_barcode.c:299
+msgid "Barcode data"
+msgstr "äÁÎÎŮĹ ŰÔŇÉČ-ËĎÄÁ"
+
+#. ------ Begin Barcode Properties Frame ------
+#: src/item_barcode.c:320 src/prefs.c:215
+msgid "General"
+msgstr "ďÂÝĹĹ"
+
+#. ------ Barcode Style Frame ------
+#: src/item_barcode.c:330
+msgid "Style"
+msgstr "ôÉĐ"
+
+#: src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:631
+msgid "Invalid barcode"
+msgstr "îĹ×ĹŇÎŮĘ ŰÔŇÉČ-ËĎÄ"
+
+#. W Label
+#: src/prop_size.c:182 src/prop_line.c:169
+msgid "Width:"
+msgstr "űÉŇÉÎÁ:"
+
+#. H label
+#: src/prop_size.c:198
+msgid "Height:"
+msgstr "÷ŮÓĎÔÁ:"
+
+#: src/prop_size.c:222
+msgid "Maintain current aspect ratio"
+msgstr "óĎČŇÁÎŃÔŘ ÔĹËŐÝÉĹ ĐŇĎĐĎŇĂÉÉ"
+
+#. X label
+#: src/prop_position.c:173
+msgid "X:"
+msgstr "X:"
+
+#. Y label
+#: src/prop_position.c:191
+msgid "Y:"
+msgstr "Y:"
+
+#. Line Width units
+#: src/prop_line.c:183 src/prefs.c:448 src/prefs.c:455
+msgid "points"
+msgstr "ÔĎŢĹË"
+
+#. Line Color Label
+#: src/prop_line.c:189 src/prop_fill.c:166 src/prop_text.c:234
+#: src/prop_bc.c:188
+msgid "Color:"
+msgstr "ă×ĹÔ:"
+
+#. Font label
+#: src/prop_text.c:181
+msgid "Font:"
+msgstr "űŇÉĆÔ:"
+
+#. Alignment label
+#: src/prop_text.c:248
+msgid "Alignment:"
+msgstr "÷ŮŇÁ×ÎÉ×ÁÎÉĹ:"
+
+#. Insert merge field label
+#: src/prop_text_entry.c:180 src/prop_bc_data.c:196
+msgid "Key:"
+msgstr "ëĚŔŢ:"
+
+#: src/prop_text_entry.c:196
+msgid "Insert merge field"
+msgstr "÷ÓÔÁ×ÉÔŘ ĎÂßĹÄÉÎÉÔĹĚŘÎĎĹ ĐĎĚĹ"
+
+#. Length label
+#: src/prop_vector.c:183
+msgid "Length:"
+msgstr "äĚÉÎÁ:"
+
+#. Angle label
+#: src/prop_vector.c:207
+msgid "Angle:"
+msgstr "őÇĎĚ:"
+
+#. Angle units label
+#: src/prop_vector.c:224
+msgid "degrees"
+msgstr "ÇŇÁÄŐÓĎ×"
+
+#. Scale Label
+#: src/prop_bc.c:168
+msgid "Scale:"
+msgstr "íÁÓŰÔÁÂ:"
+
+#. % Label
+#: src/prop_bc.c:182
+msgid "%"
+msgstr "%"
+
+#: src/prop_bc_style.c:313
+msgid "Show text with barcode"
+msgstr "đĎËÁÚÁÔŘ ÔĹËÓÔ ÓĎ ŰÔŇÉČ-ËĎÄĎÍ"
+
+#: src/prop_bc_data.c:176
+msgid "Literal:"
+msgstr "âŐË×ÁĚŘÎĎ:"
+
+#: src/label.c:173 src/label.c:197
+msgid "xmlParseFile error"
+msgstr "ďŰÉÂËÁ ĐŇÉ ŇÁÚÂĎŇĹ ĆÁĘĚÁ XML"
+
+#: src/label.c:228
+msgid "No document root"
+msgstr "îĹÔ ËĎŇÎŃ ÄĎËŐÍĹÎÔÁ"
+
+#: src/label.c:239
+msgid "document of the wrong type, glabels Namespace not found"
+msgstr "ÄĎËŐÍĹÎÔ ÎĹ×ĹŇÎĎÇĎ ÔÉĐÁ, ĐŇĎÓÔŇÁÎÓÔ×Ď ÉÍŁÎ ÎĹ ÎÁĘÄĹÎĎ"
+
+#: src/label.c:244
+#, c-format
+msgid "Bad root node = \"%s\""
+msgstr "îĹ×ĹŇÎŮĘ ËĎŇÎĹ×ĎĘ ŐÚĹĚ = \"%s\""
+
+#: src/label.c:291
+#, c-format
+msgid "bad node = \"%s\""
+msgstr "ÎĹ×ĹŇÎŮĘ ŐÚĹĚ = \"%s\""
+
+#: src/label.c:606
+msgid "Problem saving xml file."
+msgstr "đŇĎÂĚĹÍŮ ĐŇÉ ÓĎČŇÁÎĹÎÉÉ ĆÁĘĚÁ XML"
+
+#: src/template.c:224
+msgid "No template files found!"
+msgstr "îĹ ÎÁĘÄĹÎŮ ĆÁĘĚŮ ŰÁÂĚĎÎÁ!"
+
+#: src/merge_properties.c:82
+msgid "Edit document-merge properties"
+msgstr "éÓĐŇÁ×ÉÔŘ Ó×ĎĘÓÔ×Á ÄĎËŐÍĹÎÔÁ-ĎÂßĹÄÉÎĹÎÉŃ"
+
+#: src/merge_properties.c:131
+msgid "Source"
+msgstr "éÓÔĎŢÎÉË"
+
+#: src/merge_properties.c:143
+msgid "Format:"
+msgstr "ćĎŇÍÁÔ:"
+
+#: src/merge_properties.c:158
+msgid "Location:"
+msgstr "ňÁÓĐĎĚĎÖĹÎÉĹ:"
+
+#: src/merge_properties.c:168
+msgid "Fields"
+msgstr "đĎĚŃ"
+
+#: src/merge.c:78
+msgid "None"
+msgstr "îÉŢĹÇĎ"
+
+#: src/merge.c:86
+msgid "Text with tab separators"
+msgstr "ôĹËÓÔ Ó ÔÁÂŐĚŃÔĎŇÁÍÉ × ËÁŢĹÓÔ×Ĺ ŇÁÚÄĹĚÉÔĹĚŃ"
+
+#: src/merge.c:94
+msgid "Text with comma separators (CSV)"
+msgstr "ôĹËÓÔ Ó ÚÁĐŃÔŮÍÉ × ËÁŢĹÓÔ×Ĺ ŇÁÚÄĹĚÉÔĹĚŃ"
+
+#: src/merge.c:102
+msgid "Text with colon separators"
+msgstr "ôĹËÓÔ Ó Ä×ĎĹÔĎŢÉŃÍÉ × ËÁŢĹÓÔ×Ĺ ŇÁÚÄĹĚÉÔĹĚŃ"
+
+#: src/merge_ui.c:207 src/merge_ui.c:242 src/merge_ui.c:387 src/merge_ui.c:428
+msgid "N/A"
+msgstr "îĹÄĎÓÔŐĐÎĎ"
+
+#: src/merge_ui_text.c:170
+msgid "Select merge-database source"
+msgstr "÷ŮÂŇÁÔŘ ÉÓÔĎŢÎÉË ĎÂßĹÄÉÎĹÎÉŃ-ÂÁÚŮ ÄÁÎÎŮČ"
+
+#: src/merge_ui_text.c:330
+msgid "Column"
+msgstr "óÔĎĚÂĹĂ"
+
+#: src/merge_ui_text.c:334
+msgid "Custom field key"
+msgstr "îĹÓÔÁÎÄÁŇÔÎŮĘ ËĚŔŢ ĐĎĚŃ"
+
+#: src/merge_ui_text.c:338
+msgid "Sample data"
+msgstr "đŇÉÍĹŇ ÄÁÎÎŮČ"
+
+#: src/menu.c:50
+msgid "_New"
+msgstr "_óĎÚÄÁÔŘ"
+
+#: src/menu.c:51
+msgid "Make a new, empty label"
+msgstr "óĎÚÄÁÔŘ ÎĎ×ŐŔ, ĐŐÓÔŐŔ ÜÔÉËĹÔËŐ"
+
+#: src/menu.c:85
+msgid "U_nselect All "
+msgstr "_óÎŃÔŘ ×ŮÄĹĚĹÎÉĹ"
+
+#: src/menu.c:86
+msgid "Remove all selections"
+msgstr "őÄÁĚÉÔŘ ×ÓŁ ×ŮÄĹĚĹÎÎĎĹ"
+
+#: src/menu.c:94
+msgid "Select"
+msgstr "÷ŮÂĎŇ"
+
+#: src/menu.c:95 src/menu.c:186
+msgid "Select, move and modify objects"
+msgstr "÷ŮÂŇÁÔŘ, ĐĹŇĹÍĹÓÔÉÔŘ ÉĚÉ ÉÚÍĹÎÉÔŘ ĎÂßĹËÔŮ"
+
+#: src/menu.c:100 src/menu.c:191
+msgid "Create text object"
+msgstr "óĎÚÄÁÔŘ ÔĹËÓÔĎ×ŮĘ ĎÂßĹËÔ"
+
+#: src/menu.c:103
+msgid "Box"
+msgstr "đŇŃÍĎŐÇĎĚŘÎÉË"
+
+#: src/menu.c:103 src/menu.c:194
+msgid "Create box/rectangle object"
+msgstr "óĎÚÄÁÔŘ ĐŇŃÍĎŐÇĎĚŘÎÉË"
+
+#: src/menu.c:106 src/menu.c:197
+msgid "Create line object"
+msgstr "óĎÚÄÁÔŘ ĚÉÎÉŔ"
+
+#: src/menu.c:109
+msgid "Ellipse"
+msgstr "üĚĚÉĐÓ"
+
+#: src/menu.c:110 src/menu.c:200
+msgid "Create ellipse/circle object"
+msgstr "óĎÚÄÁÔŘ ÜĚĚÉĐÓ/ËŇŐÇ"
+
+#: src/menu.c:113 src/menu.c:203
+msgid "Create image object"
+msgstr "óĎÚÄÁÔŘ ÉÚĎÂŇÁÖĹÎÉĹ"
+
+#: src/menu.c:116
+msgid "Barcode"
+msgstr "űÔŇÉČ-ËĎÄ"
+
+#: src/menu.c:116 src/menu.c:206
+msgid "Create barcode object"
+msgstr "óĎÚÄÁÔŘ ĎÂßĹËÔ ŰÔŇÉČ-ËĎÄÁ"
+
+#: src/menu.c:121 src/menu.c:211
+msgid "Zoom in"
+msgstr "ő×ĹĚÉŢÉÔŘ"
+
+#: src/menu.c:124 src/menu.c:214
+msgid "Zoom out"
+msgstr "őÍĹÎŘŰÉÔŘ"
+
+#: src/menu.c:127
+msgid "Zoom 1:1"
+msgstr "íÁÓŰÔÁ 1:1"
+
+#: src/menu.c:127 src/menu.c:217
+msgid "Zoom to 1:1"
+msgstr "őÓÔÁÎĎ×ÉÔŘ ÍÁÓŰÔÁÂ"
+
+#: src/menu.c:132 src/menu.c:223
+msgid "Merge properties"
+msgstr "ó×ĎĘÓÔ×Á ĎÂßĹÄÉÎĹÎÉŃ"
+
+#: src/menu.c:133
+msgid "Edit merge properties"
+msgstr "éÓĐŇÁ×ÉÔŘ Ó×ĎĘÓÔ×Á ĎÂßĹÄÉÎĹÎÉŃ"
+
+#: src/menu.c:157
+msgid "_Tools"
+msgstr "_éÎÓÔŇŐÍĹÎÔŮ"
+
+#: src/menu.c:168
+msgid " New "
+msgstr "óĎÚÄÁÔŘ"
+
+#: src/menu.c:168
+msgid "New Label/Card"
+msgstr "óĎÚÄÁÔŘ ÎĎ×ŐŔ ÜÔÉËĹÔËŐ ÉĚÉ ×ÉÚÉÔËŐ"
+
+#: src/menu.c:170
+msgid " Open "
+msgstr "ďÔËŇŮÔŘ"
+
+#: src/menu.c:170
+msgid "Open a file"
+msgstr "ďÔËŇŮÔŘ ĆÁĘĚ"
+
+#: src/menu.c:172
+msgid " Save "
+msgstr "óĎČŇÁÎÉÔŘ"
+
+#: src/menu.c:172
+msgid "Save current file"
+msgstr "óĎČŇÁÎÉÔŘ ÔĹËŐÝÉĘ ĆÁĘĚ"
+
+#: src/menu.c:175
+msgid " Print "
+msgstr "ňÁÓĐĹŢÁÔÁÔŘ"
+
+#: src/menu.c:175
+msgid "Print current file"
+msgstr "ňÁÓĐĹŢÁÔÁÔŘ ÔĹËŐÝÉĘ ĆÁĘĚ"
+
+#: src/menu.c:290
+msgid ""
+"A label and business card creation program for GNOME.\n"
+" \n"
+"Glabels is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+" \n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+msgstr ""
+"đŇĎÇŇÁÍÍÁ ÓĎÚÄÁÎÉŃ ÜÔÉËĹÔĎË É ×ÉÚÉÔĎË ÄĚŃ GNOME\n"
+" \n"
+"Glabels Ń×ĚŃĹÔÓŃ Ó×ĎÂĎÄÎŮÍ ĐŇĎÇŇÁÍÍÎŮÍ ĎÂĹÓĐĹŢĹÎÉĹÍ; ×Ů ×ĐŇÁ×Ĺ "
+"ŇÁÓĐŇĎÓÔŇÁÎŃÔŘ ĹŁ É/ÉĚÉ ÍĎÄÉĆÉĂÉŇĎ×ÁÔŘ × ÓĎĎÔ×ĹÔÓÔ×ÉŃÍÉ Ó ŐÓĚĎ×ÉŃÍÉ ×ĹŇÓÉÉ 2 "
+"ĚÉÂĎ ĐĎ ×ÁŰĹÍŐ ×ŮÂĎŇŐ ÂĎĚĹĹ ĐĎÚÄÎĹĘ ×ĹŇÓÉÉ óÔÁÎÄÁŇÔÎĎĘ ďÂÝĹÓÔ×ĹÎÎĎĘ ěÉĂĹÎÚÉÉ "
+"GNU, ĎĐŐÂĚÉËĎ×ÁÎÎĎĘ Free Software Foundation.\n"
+" \n"
+"íŮ ŇÁÓĐŇĎÓÔŇÁÎŃĹÍ ÄÁÎÎŐŔ ĐŇĎÇŇÁÍÍŐ × ÎÁÄĹÖÄĹ ÎÁ ÔĎ, ŢÔĎ ĎÎÁ ÂŐÄĹÔ ×ÁÍ "
+"ĐĎĚĹÚÎĎĘ, ĎÄÎÁËĎ îĺ đňĺäďóôá÷ěńĺí îá îĺł îéëáëéč çáňáîôéę, × ÔĎÍ ŢÉÓĚĹ "
+"çáňáîôéé ôď÷áňîďçď óďóôďńîéń đňé đňďäáöĺ É đňéçďäîďóôé äěń éóđďěřúď÷áîéń ÷ "
+"ëďîëňĺôîůč ăĺěńč. äĚŃ ĐĎĚŐŢĹÎÉŃ ÂĎĚĹĹ ĐĎÄŇĎÂÎĎĘ ÉÎĆĎŇÍÁĂÉÉ ĎÚÎÁËĎÍŘÔĹÓŘ ÓĎ "
+"óÔÁÎÄÁŇÔÎĎĘ ďÂÝĹÓÔ×ĹÎÎĎĘ ěÉĂĹÎÚÉĹĘ GNU.\n"
+
+#: src/menu.c:326
+msgid "Function is not implemented!"
+msgstr "ćŐÎËĂÉŃ ÎĹ ŇĹÁĚÉÚĎ×ÁÎÁ!"
+
+#: src/file.c:72
+msgid "New Label or Card"
+msgstr "îĎ×ÁŃ ÜÔÉËĹÔËÁ ÉĚÉ ×ÉÚÉÔËÁ"
+
+#: src/file.c:98
+msgid "Media Type"
+msgstr "ôÉĐ ÎĎÓÉÔĹĚŃ"
+
+#: src/file.c:109
+msgid "Label orientation"
+msgstr "ňÁÓĐĎĚĎÖĹÎÉĹ ÜÔÉËĹÔËÉ"
+
+#: src/file.c:211
+msgid "Open"
+msgstr "ďÔËŇŮÔŘ"
+
+#: src/file.c:213
+msgid "Open label"
+msgstr "ďÔËŇŮÔŘ ÜÔÉËĹÔËŐ"
+
+#: src/file.c:249
+msgid "Cannot open file"
+msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ ĆÁĘĚ"
+
+#: src/file.c:316
+msgid "Save label as"
+msgstr "óĎČŇÁÎÉÔŘ ÜÔÉËĹÔËŐ ËÁË"
+
+#: src/media_select.c:222
+msgid "Description:"
+msgstr "ďĐÉÓÁÎÉĹ:"
+
+#: src/media_select.c:227
+msgid "Page size:"
+msgstr "ňÁÚÍĹŇ ÓÔŇÁÎÉĂŮ:"
+
+#: src/media_select.c:232
+msgid "Label size:"
+msgstr "ňÁÚÍĹŇ ÜÔÉËĹÔËÉ:"
+
+#: src/media_select.c:237
+msgid "Layout:"
+msgstr "ćĎŇÍÁÔ:"
+
+#: src/media_select.c:353
+#, c-format
+msgid "%d x %d (%d per sheet)"
+msgstr "%d x %d (%d ÎÁ ĚÉÓÔ)"
+
+#: src/media_select.c:367
+#, c-format
+msgid "%s x %s %s"
+msgstr "%s x %s %s"
+
+#: src/media_select.c:372
+#, c-format
+msgid "%.5g x %.5g %s"
+msgstr "%.5g x %.5g %s"
+
+#: src/rotate_select.c:169
+msgid "Rotate"
+msgstr "đĎ×ĹŇÎŐÔŘ"
+
+#: src/print_dialog.c:99
+msgid "Print"
+msgstr "ňÁÓĐĹŢÁÔÁÔŘ"
+
+#. ----------- Add simple-copies widget ------------
+#: src/print_dialog.c:104
+msgid "Copies"
+msgstr "ëĎĐÉĘ"
+
+#. -------Otherwise add merge control widget ------------
+#: src/print_dialog.c:121
+msgid "Document merge control"
+msgstr "őĐŇÁ×ĚĹÎÉĹ ĎÂßĹÄÉÎĹÎÉĹÍ"
+
+#. ----------- Add custom print options area ------------
+#: src/print_dialog.c:141
+msgid "Options"
+msgstr "đÁŇÁÍĹÔŇŮ"
+
+#: src/print_dialog.c:241 src/print_dialog.c:280
+msgid "Print preview"
+msgstr "đŇĎÓÍĎÔŇĹÔŘ"
+
+#: src/print_copies.c:170
+msgid "Sheets:"
+msgstr "ěÉÓÔĎ×:"
+
+#: src/print_copies.c:187
+msgid "Labels"
+msgstr "üÔÉËĹÔËÉ"
+
+#: src/print_copies.c:190
+msgid "from:"
+msgstr "Ó:"
+
+#: src/print_copies.c:198
+msgid "to:"
+msgstr "ÄĎ:"
+
+#: src/print_merge.c:170
+msgid "Start on label"
+msgstr "îÁŢÁÔŘ Ó ÜÔÉËĹÔËÉ"
+
+#: src/print_merge.c:179
+msgid "on 1st sheet"
+msgstr "ÎÁ ĐĹŇ×ĎÍ ĚÉÓÔĹ"
+
+#: src/print_merge.c:188
+msgid "Collate"
+msgstr "óĎÂÉŇÁÔŘ"
+
+#: src/print_merge.c:195
+msgid "Copies:"
+msgstr "ëĎĐÉĘ:"
+
+#: src/prefs.c:86
+msgid "Glabels: Preferences"
+msgstr "Glabels: đÁŇÁÍĹÔŇŮ"
+
+#. ----- Display Units Frame ------------------------------------
+#: src/prefs.c:220
+msgid "Display units"
+msgstr "ĺÄÉÎÉĂŮ ĎÔĎÂŇÁÖĹÎÉŃ"
+
+#: src/prefs.c:231
+msgid "Points"
+msgstr "ôĎŢËÉ"
+
+#: src/prefs.c:237
+msgid "Inches"
+msgstr "äŔĘÍŮ"
+
+#: src/prefs.c:244
+msgid "Millimeters"
+msgstr "íÉĚĚÉÍĹÔŇŮ"
+
+#. ----- Display Units Frame ------------------------------------
+#: src/prefs.c:249
+msgid "Default page size"
+msgstr "ňÁÚÍĹŇ ÂŐÍÁÇÉ ĐĎ ŐÍĎĚŢÁÎÉŔ"
+
+#: src/prefs.c:450
+msgid "inches"
+msgstr "ÄŔĘÍĎ×"
+
+#: src/prefs.c:452
+msgid "mm"
+msgstr "ÍÍ"
diff --git a/glabels2/po/zh_TW.Big5.po b/glabels2/po/zh_TW.Big5.po
new file mode 100644
index 0000000..864f618
--- /dev/null
+++ b/glabels2/po/zh_TW.Big5.po
@@ -0,0 +1,712 @@
+# Traditional Chinese Translation for glabels
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Shell Hung <shell@debian.org>, 2002
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: glabels 0.4.4\n"
+"POT-Creation-Date: 2002-08-24 22:30-0400\n"
+"PO-Revision-Date: 2002-07-14 18:30+0800\n"
+"Last-Translator: Shell Hung <shell@debian.org>\n"
+"Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=big5\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/glabels_batch.c:49
+msgid "print this message"
+msgstr "¦C¦Lło­Ó°T®§"
+
+#: src/glabels_batch.c:51
+msgid "print the version of glabels-batch being used"
+msgstr "¦C¦LĄX glabels-batch ŞşŞ©Ą»¸ę°T"
+
+#: src/glabels_batch.c:53
+msgid "set output filename (default=\"output.ps\")"
+msgstr "ł]©wżéĄXŔɦWşŮ (ąwł]¬°\"output.ps\")"
+
+#: src/glabels_batch.c:53
+msgid "filename"
+msgstr "ŔɮצWşŮ"
+
+#: src/glabels_batch.c:55
+msgid "number of sheets (default=1)"
+msgstr "ŻČ±iĽĆĄŘ (ąwł]¬° 1)"
+
+#: src/glabels_batch.c:55
+msgid "sheets"
+msgstr "ŻČ±i"
+
+#: src/glabels_batch.c:57
+msgid "number of copies (default=1)"
+msgstr "Ą÷ĽĆ (ąwł]¬° 1)"
+
+#: src/glabels_batch.c:57
+msgid "copies"
+msgstr "Ą÷ĽĆ"
+
+#: src/glabels_batch.c:59 src/print_dialog.c:152
+msgid "print outlines (to test printer alignment)"
+msgstr "¦LĄXĄ~Ăä (´ú¸ŐĄ´¦Lľ÷°ŃĽĆ)"
+
+#: src/glabels_batch.c:61 src/print_dialog.c:160
+msgid "print in reverse (i.e. a mirror image)"
+msgstr "¤Ď¤č¦V¦C¦L (¦p­Ë¦VĽvął)"
+
+#: src/glabels_batch.c:92
+msgid "[OPTION...] GLABELS_FILE..."
+msgstr "[żď¶µ...] GLABELS_FILE..."
+
+#: src/glabels_batch.c:111
+msgid "missing glabels file\n"
+msgstr "¨S¦łżé¤J glabels ŞşŔÉ®×\n"
+
+#: src/glabels_batch.c:139
+#, c-format
+msgid "cannot open glabels file %s\n"
+msgstr "¶}±ŇŔɮץ˘±Ń %s\n"
+
+#: src/mdi.c:169
+#, c-format
+msgid "Revert to saved copy of %s?"
+msgstr "­n¸ü¤J¤wŔx¦sŞşłĆĄ÷ %s ?"
+
+#: src/mdi.c:207
+msgid "Unknown media type. Using default."
+msgstr "¤Ł©úŞş´CĹéĂţ§Î. ¨ĎĄÎąwł]."
+
+#: src/mdi.c:455
+#, c-format
+msgid ""
+"``%s'' has been modified.\n"
+"\n"
+"Do you wish to save it?"
+msgstr ""
+"``%s`` ¤włQ­×§ď.\n"
+"\n"
+"­n˛{¦bŔx¦s¶Ü ?"
+
+#: src/mdi.c:459
+msgid "Don't save"
+msgstr "¤Ł­nŔx¦s"
+
+#: src/mdi.c:601 src/file.c:288
+msgid "Cannot save file"
+msgstr "¤ŁŻŕŔx¦sŔÉ®×"
+
+#: src/mdi.c:623 src/file.c:311
+msgid "Save As"
+msgstr "Ąt¦s¬°..."
+
+#: src/mdi.c:626
+msgid "Close / Save label as"
+msgstr "Ăöł¬ / Ŕx¦sĽĐñ¬°..."
+
+#: src/mdi.c:680 src/file.c:352
+msgid "Label no longer valid!"
+msgstr "ĽĐñ¨Ă¤Ł¬OĄż˝TĄiĹŞŞş !"
+
+#: src/mdi.c:693 src/file.c:362
+msgid "Must supply file name"
+msgstr "˝ĐĄ˛»Ýżé¤JŔɮצWşŮ"
+
+#: src/mdi.c:705 src/file.c:374
+msgid "Error writing file"
+msgstr "¦bĽg¤JŔɮ׮ɵoĄÍżů»~"
+
+#: src/display.c:1250 src/display.c:1298
+msgid "Delete"
+msgstr "§R°Ł"
+
+#: src/display.c:1260 src/display.c:1308
+msgid "Bring to front"
+msgstr "±aĄX¨ě«e­±"
+
+#: src/display.c:1266 src/display.c:1314
+msgid "Send to back"
+msgstr "©ń¦błĚ©ł"
+
+#: src/display.c:1287
+msgid "Edit properties..."
+msgstr "­×§ďł]©w..."
+
+#: src/item_text.c:450
+msgid "Edit text object properties"
+msgstr "­×§ď¤ĺ¦rŞ«ĄóŞşł]©w"
+
+#: src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100
+msgid "Text"
+msgstr "¤ĺ¦r"
+
+#: src/item_text.c:479 src/item_line.c:253 src/item_box.c:245
+#: src/item_ellipse.c:247 src/item_barcode.c:317
+msgid "Appearance"
+msgstr "ĽË»Ş"
+
+#. ------ Begin Text Properties box ------
+#: src/item_text.c:482
+msgid "Text Properties"
+msgstr "¤ĺ¦rĽË»Ş"
+
+#. ------ Position Frame ------
+#: src/item_text.c:500 src/item_text.c:503 src/item_line.c:274
+#: src/item_box.c:275 src/item_ellipse.c:277 src/item_image.c:318
+#: src/item_barcode.c:345 src/item_barcode.c:348
+msgid "Position"
+msgstr "¦ě¸m"
+
+#: src/item_line.c:243
+msgid "Edit line object properties"
+msgstr "­×§ď˝uŞ«ĄóŞşł]©w"
+
+#. ------ Begin Line box ------
+#: src/item_line.c:256 src/menu.c:106
+msgid "Line"
+msgstr "˝u"
+
+#: src/item_line.c:271 src/item_box.c:272 src/item_ellipse.c:274
+#: src/item_image.c:315
+msgid "Position/Size"
+msgstr "¦ě¸m/¤j¤p"
+
+#. ------ Size Frame ------
+#: src/item_line.c:285 src/item_box.c:286 src/item_ellipse.c:288
+#: src/item_image.c:329
+msgid "Size"
+msgstr "¤j¤p"
+
+#: src/item_box.c:235
+msgid "Edit box object properties"
+msgstr "­×§ď¤č¶ôŞ«Ąół]©w"
+
+#. ------ Line box ------
+#: src/item_box.c:248 src/item_ellipse.c:250
+msgid "Outline"
+msgstr "Ą~Ăä"
+
+#. ------ Fill box ------
+#: src/item_box.c:258 src/item_ellipse.c:260
+msgid "Fill"
+msgstr "¶ńşˇ"
+
+#: src/item_ellipse.c:237
+msgid "Edit ellipse object properties"
+msgstr "­×§ďľň¶ęŞ«Ąół]©w"
+
+#: src/item_image.c:257
+msgid "Edit image object properties"
+msgstr "­×§ďąĎąłŞ«Ąół]©w"
+
+#: src/item_image.c:268 src/menu.c:113
+msgid "Image"
+msgstr "ąĎął"
+
+#. ------ Size Reset Button ------
+#: src/item_image.c:342
+msgid "Reset image size"
+msgstr "­«ł]ąĎął¤j¤p"
+
+#: src/item_image.c:389 src/item_image.c:454
+msgid "Image format not currently supported"
+msgstr "ąĎął®ć¦ˇ¨Ă¨S¦ł¤ä´©"
+
+#: src/item_barcode.c:287
+msgid "Edit barcode object properties"
+msgstr "­×§ďĽĆ˝X±řŞ«Ąół]©w"
+
+#: src/item_barcode.c:297
+msgid "Data"
+msgstr "¸ę®Ć"
+
+#: src/item_barcode.c:299
+msgid "Barcode data"
+msgstr "ĽĆ˝X±ř¸ę®Ć"
+
+#. ------ Begin Barcode Properties Frame ------
+#: src/item_barcode.c:320 src/prefs.c:215
+msgid "General"
+msgstr "¤@Żë"
+
+#. ------ Barcode Style Frame ------
+#: src/item_barcode.c:330
+msgid "Style"
+msgstr "ĽË¦ˇ"
+
+#: src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:631
+msgid "Invalid barcode"
+msgstr "¤ŁĄż˝TŞşĽĆ˝X±ř"
+
+#. W Label
+#: src/prop_size.c:182 src/prop_line.c:169
+msgid "Width:"
+msgstr "Áď«×:"
+
+#. H label
+#: src/prop_size.c:198
+msgid "Height:"
+msgstr "°Ş«×:"
+
+#: src/prop_size.c:222
+msgid "Maintain current aspect ratio"
+msgstr "«OŻd˛{¦łŞş¤j¤p¤ń¨Ň"
+
+#. X label
+#: src/prop_position.c:173
+msgid "X:"
+msgstr "X:"
+
+#. Y label
+#: src/prop_position.c:191
+msgid "Y:"
+msgstr "Y:"
+
+#. Line Width units
+#: src/prop_line.c:183 src/prefs.c:448 src/prefs.c:455
+msgid "points"
+msgstr "ÂI"
+
+#. Line Color Label
+#: src/prop_line.c:189 src/prop_fill.c:166 src/prop_text.c:234
+#: src/prop_bc.c:188
+msgid "Color:"
+msgstr "ĂC¦â:"
+
+#. Font label
+#: src/prop_text.c:181
+msgid "Font:"
+msgstr "¦r«¬:"
+
+#. Alignment label
+#: src/prop_text.c:248
+msgid "Alignment:"
+msgstr "ąď¸m:"
+
+#. Insert merge field label
+#: src/prop_text_entry.c:180 src/prop_bc_data.c:196
+msgid "Key:"
+msgstr "¸ę®Ć­Č:"
+
+#: src/prop_text_entry.c:196
+msgid "Insert merge field"
+msgstr "´ˇ¤J¦X¨Ö¦C"
+
+#. Length label
+#: src/prop_vector.c:183
+msgid "Length:"
+msgstr "Şř«×:"
+
+#. Angle label
+#: src/prop_vector.c:207
+msgid "Angle:"
+msgstr "¨¤«×:"
+
+#. Angle units label
+#: src/prop_vector.c:224
+msgid "degrees"
+msgstr "«×ĽĆ"
+
+#. Scale Label
+#: src/prop_bc.c:168
+msgid "Scale:"
+msgstr "¤ń¨Ň:"
+
+#. % Label
+#: src/prop_bc.c:182
+msgid "%"
+msgstr "%"
+
+#: src/prop_bc_style.c:313
+msgid "Show text with barcode"
+msgstr "ĹăĄÜĽĆ˝X±ř¤ĺ¦r"
+
+#: src/prop_bc_data.c:176
+msgid "Literal:"
+msgstr "¤ĺ¦r:"
+
+#: src/label.c:173 src/label.c:197
+msgid "xmlParseFile error"
+msgstr "xmlParseFile żů»~"
+
+#: src/label.c:228
+msgid "No document root"
+msgstr "¨S¦ł¤ĺĄó©lşÝ"
+
+#: src/label.c:239
+msgid "document of the wrong type, glabels Namespace not found"
+msgstr "¤ŁĄż˝TŞş¤ĺĄóşŘĂţ, §ä¤Ł¨ě glabels ®ć¦ˇ"
+
+#: src/label.c:244
+#, c-format
+msgid "Bad root node = \"%s\""
+msgstr "żů»~Şş°ň˝X = \"%s\""
+
+#: src/label.c:291
+#, c-format
+msgid "bad node = \"%s\""
+msgstr "żů»~Şş¸`ÂI = \"%s\""
+
+#: src/label.c:606
+msgid "Problem saving xml file."
+msgstr "Ŕx¦s XML Ŕɮ׮ɵoĄÍżů»~."
+
+#: src/template.c:224
+msgid "No template files found!"
+msgstr "§ä¤Ł¨ěĽËŞ©ŔÉ®× !"
+
+#: src/merge_properties.c:82
+msgid "Edit document-merge properties"
+msgstr "­×§ď¤ĺĄó¦X¨Öł]©w"
+
+#: src/merge_properties.c:131
+msgid "Source"
+msgstr "¨Ó·˝ŔÉ"
+
+#: src/merge_properties.c:143
+msgid "Format:"
+msgstr "®ć¦ˇ:"
+
+#: src/merge_properties.c:158
+msgid "Location:"
+msgstr "¦ě¸m:"
+
+#: src/merge_properties.c:168
+msgid "Fields"
+msgstr "Äć¦ě"
+
+#: src/merge.c:78
+msgid "None"
+msgstr "¨S¦ł"
+
+#: src/merge.c:86
+msgid "Text with tab separators"
+msgstr "ĄH [TAB] ¬°¤Ŕ®ć"
+
+#: src/merge.c:94
+msgid "Text with comma separators (CSV)"
+msgstr "ĄHłr¸ą¤Ŕ®ć (CSV)"
+
+#: src/merge.c:102
+msgid "Text with colon separators"
+msgstr "ĄH«_¸ą¤Ŕ®ć"
+
+#: src/merge_ui.c:207 src/merge_ui.c:242 src/merge_ui.c:387 src/merge_ui.c:428
+msgid "N/A"
+msgstr "N/A"
+
+#: src/merge_ui_text.c:170
+msgid "Select merge-database source"
+msgstr "żďľÜ¦X¨Ö¸ę®Ć®w¨Ó·˝"
+
+#: src/merge_ui_text.c:330
+msgid "Column"
+msgstr "¦C"
+
+#: src/merge_ui_text.c:334
+msgid "Custom field key"
+msgstr "¦Ű­qÄć¦ěĆ_"
+
+#: src/merge_ui_text.c:338
+msgid "Sample data"
+msgstr "ĽËĄ»¸ę®Ć"
+
+#: src/menu.c:50
+msgid "_New"
+msgstr "·sĽW (&_N)"
+
+#: src/menu.c:51
+msgid "Make a new, empty label"
+msgstr "»s§@·sŔÉ, ŞĹŞşĽËñ"
+
+#: src/menu.c:85
+msgid "U_nselect All "
+msgstr "¤ĎżďľÜĄţłˇ (&_N)"
+
+#: src/menu.c:86
+msgid "Remove all selections"
+msgstr "˛ľ°Ł©Ň¦łżďľÜ¶µ"
+
+#: src/menu.c:94
+msgid "Select"
+msgstr "żďľÜ"
+
+#: src/menu.c:95 src/menu.c:186
+msgid "Select, move and modify objects"
+msgstr "żďľÜ, ˛ľ°Ę¤Î­×§ďŞ«Ąó"
+
+#: src/menu.c:100 src/menu.c:191
+msgid "Create text object"
+msgstr "«ŘĄß·sŞş¤ĺ¦rŞ«Ąó"
+
+#: src/menu.c:103
+msgid "Box"
+msgstr "˛°¤l"
+
+#: src/menu.c:103 src/menu.c:194
+msgid "Create box/rectangle object"
+msgstr "«ŘĄß·sŞş˛°¤l/¤č§ÎŞ«Ąó"
+
+#: src/menu.c:106 src/menu.c:197
+msgid "Create line object"
+msgstr "µe˝uŞ«Ąó"
+
+#: src/menu.c:109
+msgid "Ellipse"
+msgstr "ľň¶ę§Î"
+
+#: src/menu.c:110 src/menu.c:200
+msgid "Create ellipse/circle object"
+msgstr "«ŘĄßľň¶ę§Î/ąĎ§ÎŞ«Ąó"
+
+#: src/menu.c:113 src/menu.c:203
+msgid "Create image object"
+msgstr "«ŘĄßĽvąłŞ«Ąó"
+
+#: src/menu.c:116
+msgid "Barcode"
+msgstr "ĽĆ˝X±ř"
+
+#: src/menu.c:116 src/menu.c:206
+msgid "Create barcode object"
+msgstr "«ŘĄßĽĆ˝X±ř"
+
+#: src/menu.c:121 src/menu.c:211
+msgid "Zoom in"
+msgstr "©ń¤j"
+
+#: src/menu.c:124 src/menu.c:214
+msgid "Zoom out"
+msgstr "ÁY¤p"
+
+#: src/menu.c:127
+msgid "Zoom 1:1"
+msgstr "1:1 ĹăĄÜ"
+
+#: src/menu.c:127 src/menu.c:217
+msgid "Zoom to 1:1"
+msgstr "1:1 ĹăĄÜ"
+
+#: src/menu.c:132 src/menu.c:223
+msgid "Merge properties"
+msgstr "¦X¨Öł]©w"
+
+#: src/menu.c:133
+msgid "Edit merge properties"
+msgstr "­×§ď¦X¨Öł]©w"
+
+#: src/menu.c:157
+msgid "_Tools"
+msgstr "¤u¨ă (&_T)"
+
+#: src/menu.c:168
+msgid " New "
+msgstr " ·sĽW "
+
+#: src/menu.c:168
+msgid "New Label/Card"
+msgstr "·sĽWĽĐñ/Ąd"
+
+#: src/menu.c:170
+msgid " Open "
+msgstr " ¶}±Ň "
+
+#: src/menu.c:170
+msgid "Open a file"
+msgstr "¶}±ŇŔÉ®×"
+
+#: src/menu.c:172
+msgid " Save "
+msgstr " Ŕx¦s "
+
+#: src/menu.c:172
+msgid "Save current file"
+msgstr "Ŕx¦s˛{¦bŔÉ®×"
+
+#: src/menu.c:175
+msgid " Print "
+msgstr " ¦C¦L "
+
+#: src/menu.c:175
+msgid "Print current file"
+msgstr "¦C¦L˛{¦łŔÉ®×"
+
+#: src/menu.c:290
+msgid ""
+"A label and business card creation program for GNOME.\n"
+" \n"
+"Glabels is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+" \n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+msgstr ""
+"A label and business card creation program for GNOME.\n"
+" \n"
+"Glabels is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+" \n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+
+#: src/menu.c:326
+msgid "Function is not implemented!"
+msgstr "Ą\ŻŕĄĽ§ą¦¨ !"
+
+#: src/file.c:72
+msgid "New Label or Card"
+msgstr "·sĽWĽĐñ©ÎĄd"
+
+#: src/file.c:98
+msgid "Media Type"
+msgstr "´CĹéşŘĂţ"
+
+#: src/file.c:109
+msgid "Label orientation"
+msgstr "ĽĐñ¤č¦V"
+
+#: src/file.c:211
+msgid "Open"
+msgstr "¶}±Ň"
+
+#: src/file.c:213
+msgid "Open label"
+msgstr "¶}±ŇĽĐñ"
+
+#: src/file.c:249
+msgid "Cannot open file"
+msgstr "¶}±ŇŔɮץ˘±Ń"
+
+#: src/file.c:316
+msgid "Save label as"
+msgstr "Ŕx¦sĽĐñ¬°..."
+
+#: src/media_select.c:222
+msgid "Description:"
+msgstr "´y­z:"
+
+#: src/media_select.c:227
+msgid "Page size:"
+msgstr "ŻČ±i¤j¤p:"
+
+#: src/media_select.c:232
+msgid "Label size:"
+msgstr "ĽĐñ¤j¤p:"
+
+#: src/media_select.c:237
+msgid "Layout:"
+msgstr "Ş©­±:"
+
+#: src/media_select.c:353
+#, c-format
+msgid "%d x %d (%d per sheet)"
+msgstr "%d x %d (¨C­¶ %d)"
+
+#: src/media_select.c:367
+#, c-format
+msgid "%s x %s %s"
+msgstr "%s x %s %s"
+
+#: src/media_select.c:372
+#, c-format
+msgid "%.5g x %.5g %s"
+msgstr "%.5g x %.5g %s"
+
+#: src/rotate_select.c:169
+msgid "Rotate"
+msgstr "±ŰÂŕ"
+
+#: src/print_dialog.c:99
+msgid "Print"
+msgstr "¦C¦L"
+
+#. ----------- Add simple-copies widget ------------
+#: src/print_dialog.c:104
+msgid "Copies"
+msgstr "Ą÷ĽĆ"
+
+#. -------Otherwise add merge control widget ------------
+#: src/print_dialog.c:121
+msgid "Document merge control"
+msgstr "¤ĺĄó¦X¨Ö±±¨î"
+
+#. ----------- Add custom print options area ------------
+#: src/print_dialog.c:141
+msgid "Options"
+msgstr "ł]©w"
+
+#: src/print_dialog.c:241 src/print_dialog.c:280
+msgid "Print preview"
+msgstr "ąwÄý¦C¦L"
+
+#: src/print_copies.c:170
+msgid "Sheets:"
+msgstr "ŻČ±i:"
+
+#: src/print_copies.c:187
+msgid "Labels"
+msgstr "ĽĐñ"
+
+#: src/print_copies.c:190
+msgid "from:"
+msgstr "ĄŃ:"
+
+#: src/print_copies.c:198
+msgid "to:"
+msgstr "¨ě:"
+
+#: src/print_merge.c:170
+msgid "Start on label"
+msgstr "ĄŃ¸Tñ¶}ŻĹ"
+
+#: src/print_merge.c:179
+msgid "on 1st sheet"
+msgstr "¦b­ş±iŻČ"
+
+#: src/print_merge.c:188
+msgid "Collate"
+msgstr "®Őąď"
+
+#: src/print_merge.c:195
+msgid "Copies:"
+msgstr "Ą÷ĽĆ:"
+
+#: src/prefs.c:86
+msgid "Glabels: Preferences"
+msgstr "Glabels: ł]©w­Č"
+
+#. ----- Display Units Frame ------------------------------------
+#: src/prefs.c:220
+msgid "Display units"
+msgstr "ĹăĄÜłć¦ě"
+
+#: src/prefs.c:231
+msgid "Points"
+msgstr "ÂI"
+
+#: src/prefs.c:237
+msgid "Inches"
+msgstr "­^¤o"
+
+#: src/prefs.c:244
+msgid "Millimeters"
+msgstr "˛@¦Ě"
+
+#. ----- Display Units Frame ------------------------------------
+#: src/prefs.c:249
+msgid "Default page size"
+msgstr "ąwł]ŻČ±i¤j¤p"
+
+#: src/prefs.c:450
+msgid "inches"
+msgstr "­^¤o"
+
+#: src/prefs.c:452
+msgid "mm"
+msgstr "mm"
diff --git a/glabels2/src/Makefile.in b/glabels2/src/Makefile.in
deleted file mode 100644
index 2ec5081..0000000
--- a/glabels2/src/Makefile.in
+++ /dev/null
@@ -1,478 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-DATADIRNAME = @DATADIRNAME@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLABELS_CFLAGS = @GLABELS_CFLAGS@
-GLABELS_LIBS = @GLABELS_LIBS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@
-INSTOBJEXT = @INSTOBJEXT@
-INTLDEPS = @INTLDEPS@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-PACKAGE = @PACKAGE@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-cxxflags_set = @cxxflags_set@
-
-LIB_BARCODE_DIR = ../barcode-0.98
-
-SUBDIRS = pixmaps stock-pixmaps
-
-bin_PROGRAMS = glabels glabels-batch
-
-uidir = $(datadir)/glabels/ui/
-
-INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/dialogs $(GLABELS_CFLAGS) -I$(LIB_BARCODE_DIR) -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" -DGLABELS_LOCALEDIR=\""$(datadir)/locale"\" -DGLABELS_UI_DIR=\""$(datadir)/glabels/ui/"\" -DGLABELS_GLADEDIR=\""$(datadir)/glabels/glade/"\" -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
-
-
-glabels_LDFLAGS = -export-dynamic
-
-glabels_LDADD = $(GLABELS_LIBS) -L$(LIB_BARCODE_DIR) -lbarcode
-
-
-glabels_batch_LDFLAGS = -export-dynamic
-
-glabels_batch_LDADD = $(GLABELS_LIBS) -L$(LIB_BARCODE_DIR) -lbarcode
-
-
-BUILT_SOURCES = marshal.c marshal.h gnome-recent-marshal.c gnome-recent-marshal.h
-
-
-glabels_SOURCES = glabels.c glabels.h splash.c splash.h mdi.c mdi.h mdi-child.c mdi-child.h stock.c stock.h menus.h menus.c commands.h commands.c file.h file.c recent.h recent.c tools.h tools.c prefs.c prefs.h prefs-dialog.c prefs-dialog.h view.c view.h view-object.c view-object.h view-box.c view-box.h view-ellipse.c view-ellipse.h view-line.c view-line.h view-image.c view-image.h view-text.c view-text.h view-barcode.c view-barcode.h view-highlight.c view-highlight.h merge-properties.c merge-properties.h print.c print.h print-dialog.c print-dialog.h bc.c bc.h bc-gnubarcode.c bc-gnubarcode.h bc-postnet.c bc-postnet.h label.c label.h label-object.c label-object.h label-text.c label-text.h label-box.c label-box.h label-line.c label-line.h label-ellipse.c label-ellipse.h label-image.c label-image.h label-barcode.c label-barcode.h template.c template.h xml-label.c xml-label.h merge.c merge.h merge-text.c merge-text.h merge-ui.c merge-ui.h merge-ui-text.c merge-ui-text.h text-node.c text-node.h wdgt-text-props.c wdgt-text-props.h wdgt-text-entry.c wdgt-text-entry.h wdgt-position.c wdgt-position.h wdgt-size.c wdgt-size.h wdgt-line.c wdgt-line.h wdgt-fill.c wdgt-fill.h wdgt-vector.c wdgt-vector.h wdgt-bc-props.c wdgt-bc-props.h wdgt-bc-style.c wdgt-bc-style.h wdgt-bc-data.c wdgt-bc-data.h wdgt-print-copies.c wdgt-print-copies.h wdgt-print-merge.c wdgt-print-merge.h wdgt-media-select.c wdgt-media-select.h wdgt-mini-preview.c wdgt-mini-preview.h wdgt-rotate-label.c wdgt-rotate-label.h util.c util.h canvas-hacktext.c canvas-hacktext.h bonobo-mdi-child.c bonobo-mdi-child.h bonobo-mdi.c bonobo-mdi.h gnome-recent-model.c gnome-recent-model.h gnome-recent-util.c gnome-recent-util.h gnome-recent-view.c gnome-recent-view.h gnome-recent-view-bonobo.c gnome-recent-view-bonobo.h debug.c debug.h $(BUILT_SOURCES)
-
-
-glabels_batch_SOURCES = glabels-batch.c prefs.c prefs.h print.c print.h bc.c bc.h bc-gnubarcode.c bc-gnubarcode.h bc-postnet.c bc-postnet.h label.c label.h label-object.c label-object.h label-text.c label-text.h label-box.c label-box.h label-line.c label-line.h label-ellipse.c label-ellipse.h label-image.c label-image.h label-barcode.c label-barcode.h template.c template.h xml-label.c xml-label.h merge.c merge.h merge-text.c merge-text.h text-node.c text-node.h util.c util.h debug.c debug.h $(BUILT_SOURCES)
-
-
-ui_DATA = glabels-ui.xml
-
-EXTRA_DIST = $(ui_DATA) marshal.list gnome-recent-marshal.list
-
-
-CLEANFILES = $(BUILT_SOURCES)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES =
-PROGRAMS = $(bin_PROGRAMS)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-glabels_OBJECTS = glabels.o splash.o mdi.o mdi-child.o stock.o menus.o \
-commands.o file.o recent.o tools.o prefs.o prefs-dialog.o view.o \
-view-object.o view-box.o view-ellipse.o view-line.o view-image.o \
-view-text.o view-barcode.o view-highlight.o merge-properties.o print.o \
-print-dialog.o bc.o bc-gnubarcode.o bc-postnet.o label.o label-object.o \
-label-text.o label-box.o label-line.o label-ellipse.o label-image.o \
-label-barcode.o template.o xml-label.o merge.o merge-text.o merge-ui.o \
-merge-ui-text.o text-node.o wdgt-text-props.o wdgt-text-entry.o \
-wdgt-position.o wdgt-size.o wdgt-line.o wdgt-fill.o wdgt-vector.o \
-wdgt-bc-props.o wdgt-bc-style.o wdgt-bc-data.o wdgt-print-copies.o \
-wdgt-print-merge.o wdgt-media-select.o wdgt-mini-preview.o \
-wdgt-rotate-label.o util.o canvas-hacktext.o bonobo-mdi-child.o \
-bonobo-mdi.o gnome-recent-model.o gnome-recent-util.o \
-gnome-recent-view.o gnome-recent-view-bonobo.o debug.o marshal.o \
-gnome-recent-marshal.o
-glabels_DEPENDENCIES =
-glabels_batch_OBJECTS = glabels-batch.o prefs.o print.o bc.o \
-bc-gnubarcode.o bc-postnet.o label.o label-object.o label-text.o \
-label-box.o label-line.o label-ellipse.o label-image.o label-barcode.o \
-template.o xml-label.o merge.o merge-text.o text-node.o util.o debug.o \
-marshal.o gnome-recent-marshal.o
-glabels_batch_DEPENDENCIES =
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA = $(ui_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(glabels_SOURCES) $(glabels_batch_SOURCES)
-OBJECTS = $(glabels_OBJECTS) $(glabels_batch_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-binPROGRAMS:
-
-clean-binPROGRAMS:
- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-distclean-binPROGRAMS:
-
-maintainer-clean-binPROGRAMS:
-
-install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- if test -f $$p; then \
- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- else :; fi; \
- done
-
-uninstall-binPROGRAMS:
- @$(NORMAL_UNINSTALL)
- list='$(bin_PROGRAMS)'; for p in $$list; do \
- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- done
-
-.c.o:
- $(COMPILE) -c $<
-
-.s.o:
- $(COMPILE) -c $<
-
-.S.o:
- $(COMPILE) -c $<
-
-mostlyclean-compile:
- -rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
- -rm -f *.tab.c
-
-maintainer-clean-compile:
-
-glabels: $(glabels_OBJECTS) $(glabels_DEPENDENCIES)
- @rm -f glabels
- $(LINK) $(glabels_LDFLAGS) $(glabels_OBJECTS) $(glabels_LDADD) $(LIBS)
-
-glabels-batch: $(glabels_batch_OBJECTS) $(glabels_batch_DEPENDENCIES)
- @rm -f glabels-batch
- $(LINK) $(glabels_batch_LDFLAGS) $(glabels_batch_OBJECTS) $(glabels_batch_LDADD) $(LIBS)
-
-install-uiDATA: $(ui_DATA)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(uidir)
- @list='$(ui_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(uidir)/$$p"; \
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(uidir)/$$p; \
- else if test -f $$p; then \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(uidir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(uidir)/$$p; \
- fi; fi; \
- done
-
-uninstall-uiDATA:
- @$(NORMAL_UNINSTALL)
- list='$(ui_DATA)'; for p in $$list; do \
- rm -f $(DESTDIR)$(uidir)/$$p; \
- done
-
-# 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.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
- @set fnord $(MAKEFLAGS); amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $(MAKEFLAGS); amf=$$2; \
- dot_seen=no; \
- rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
- rev="$$subdir $$rev"; \
- test "$$subdir" != "." || dot_seen=yes; \
- done; \
- test "$$dot_seen" = "no" && 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; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- here=`pwd` && cd $(srcdir) \
- && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
- -rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src
-
-distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
- else \
- test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
- fi; \
- done
- for subdir in $(SUBDIRS); do \
- if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
- || exit 1; \
- chmod 777 $(distdir)/$$subdir; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
- || exit 1; \
- fi; \
- done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am: install-binPROGRAMS
-install-exec: install-exec-recursive
-
-install-data-am: install-uiDATA
-install-data: install-data-recursive
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-binPROGRAMS uninstall-uiDATA
-uninstall: uninstall-recursive
-all-am: Makefile $(PROGRAMS) $(DATA)
-all-redirect: all-recursive
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(uidir)
-
-
-mostlyclean-generic:
-
-clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
- mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am: clean-binPROGRAMS clean-compile clean-tags clean-generic \
- mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \
- distclean-generic clean-am
-
-distclean: distclean-recursive
-
-maintainer-clean-am: maintainer-clean-binPROGRAMS \
- maintainer-clean-compile maintainer-clean-tags \
- maintainer-clean-generic distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile uninstall-uiDATA install-uiDATA \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-marshal.h: marshal.list $(GLIB_GENMARSHAL)
- $(GLIB_GENMARSHAL) $< --header --prefix=gl_marshal > $@
-
-marshal.c: marshal.list $(GLIB_GENMARSHAL)
- echo "#include \"marshal.h\"" > $@ && \
- $(GLIB_GENMARSHAL) $< --body --prefix=gl_marshal >> $@
-
-gnome-recent-marshal.h: gnome-recent-marshal.list $(GLIB_GENMARSHAL)
- $(GLIB_GENMARSHAL) $< --header --prefix=gnome_recent > $@
-
-gnome-recent-marshal.c: gnome-recent-marshal.list $(GLIB_GENMARSHAL)
- echo "#include \"gnome-recent-marshal.h\"" > $@ && \
- $(GLIB_GENMARSHAL) $< --body --prefix=gnome_recent >> $@
-
-$(bin_PROGRAMS): $(LIB_BARCODE_DIR)/libbarcode.a
-
-$(LIB_BARCODE_DIR)/libbarcode.a:
- cd $(LIB_BARCODE_DIR); $(MAKE)
-
-clean: barcode_clean
-
-barcode_clean:
- cd $(LIB_BARCODE_DIR); $(MAKE) clean
-
-distclean maintainer-clean: barcode_distclean
-
-barcode_distclean:
- cd $(LIB_BARCODE_DIR); $(MAKE) distclean
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/glabels2/src/glabels-ui.xml b/glabels2/src/glabels-ui.xml
index 836a082..bc65e65 100644
--- a/glabels2/src/glabels-ui.xml
+++ b/glabels2/src/glabels-ui.xml
@@ -123,9 +123,10 @@
<cmd name="HelpContents" _label="Contents" _tip="Open the gedit manual"
- accel="F1"/>
+ accel="F1" pixtype="stock" pixname="gtk-help"/>
- <cmd name="About" _label="About..." _tip="About this application"/>
+ <cmd name="About" _label="About..." _tip="About this application"
+ pixtype="stock" pixname="About"/>
<cmd name="BonoboUIDump" _label="Dump XML" _tip="Dump the UI Xml description" hidden="0"/>
diff --git a/glabels2/src/pixmaps/Makefile.in b/glabels2/src/pixmaps/Makefile.in
deleted file mode 100644
index 2685092..0000000
--- a/glabels2/src/pixmaps/Makefile.in
+++ /dev/null
@@ -1,191 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-DATADIRNAME = @DATADIRNAME@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLABELS_CFLAGS = @GLABELS_CFLAGS@
-GLABELS_LIBS = @GLABELS_LIBS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@
-INSTOBJEXT = @INSTOBJEXT@
-INTLDEPS = @INTLDEPS@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-PACKAGE = @PACKAGE@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-cxxflags_set = @cxxflags_set@
-
-EXTRA_DIST = collate.xpm nocollate.xpm checkerboard.xpm cursor_text.xbm cursor_text_mask.xbm cursor_box.xbm cursor_box_mask.xbm cursor_line.xbm cursor_line_mask.xbm cursor_ellipse.xbm cursor_ellipse_mask.xbm cursor_image.xbm cursor_image_mask.xbm cursor_barcode.xbm cursor_barcode_mask.xbm
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES =
-DIST_COMMON = Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/pixmaps/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src/pixmaps
-
-distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
- else \
- test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
- fi; \
- done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am: mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am: clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am: distclean-generic clean-am
-
-distclean: distclean-am
-
-maintainer-clean-am: maintainer-clean-generic distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/glabels2/src/stock-pixmaps/Makefile.in b/glabels2/src/stock-pixmaps/Makefile.in
deleted file mode 100644
index 0a6dfe9..0000000
--- a/glabels2/src/stock-pixmaps/Makefile.in
+++ /dev/null
@@ -1,207 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-DATADIRNAME = @DATADIRNAME@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLABELS_CFLAGS = @GLABELS_CFLAGS@
-GLABELS_LIBS = @GLABELS_LIBS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@
-INSTOBJEXT = @INSTOBJEXT@
-INTLDEPS = @INTLDEPS@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-PACKAGE = @PACKAGE@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-cxxflags_set = @cxxflags_set@
-
-IMAGES = stock_arrow_24.png stock_barcode_24.png stock_box_24.png stock_ellipse_24.png stock_image_24.png stock_line_24.png stock_merge_24.png stock_text_24.png
-
-
-VARIABLES1 = stock_arrow_24 $(srcdir)/stock_arrow_24.png stock_barcode_24 $(srcdir)/stock_barcode_24.png stock_box_24 $(srcdir)/stock_box_24.png stock_ellipse_24 $(srcdir)/stock_ellipse_24.png stock_image_24 $(srcdir)/stock_image_24.png stock_line_24 $(srcdir)/stock_line_24.png stock_merge_24 $(srcdir)/stock_merge_24.png stock_text_24 $(srcdir)/stock_text_24.png
-
-
-noinst_DATA = stockpixbufs.h
-CLEANFILES = $(noinst_DATA)
-
-EXTRA_DIST = $(IMAGES) stockpixbufs.h
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES =
-DATA = $(noinst_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/stock-pixmaps/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src/stock-pixmaps
-
-distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
- else \
- test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
- fi; \
- done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am: mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am: clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am: distclean-generic clean-am
-
-distclean: distclean-am
-
-maintainer-clean-am: maintainer-clean-generic distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-stockpixbufs.h: $(IMAGES)
- gdk-pixbuf-csource \
- --raw --build-list $(VARIABLES1) > $(srcdir)/stockpixbufs.h || \
- ( rm -f $(srcdir)/stockpixbufs.h && false )
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/glabels2/src/view-barcode.c b/glabels2/src/view-barcode.c
index 49bae83..364b24f 100644
--- a/glabels2/src/view-barcode.c
+++ b/glabels2/src/view-barcode.c
@@ -681,8 +681,8 @@ gl_view_barcode_create_event_handler (GnomeCanvas *canvas,
gl_debug (DEBUG_VIEW, "MOTION_NOTIFY");
if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
gnome_canvas_window_to_world (canvas,
- event->button.x,
- event->button.y, &x, &y);
+ event->motion.x,
+ event->motion.y, &x, &y);
gl_label_object_set_position (GL_LABEL_OBJECT(object),
x, y);
return TRUE;
diff --git a/glabels2/src/view-box.c b/glabels2/src/view-box.c
index 545fd8d..6fe809d 100644
--- a/glabels2/src/view-box.c
+++ b/glabels2/src/view-box.c
@@ -686,8 +686,8 @@ gl_view_box_create_event_handler (GnomeCanvas *canvas,
case GDK_MOTION_NOTIFY:
if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
gnome_canvas_window_to_world (canvas,
- event->button.x,
- event->button.y, &x, &y);
+ event->motion.x,
+ event->motion.y, &x, &y);
gl_label_object_set_position (GL_LABEL_OBJECT(object),
MIN (x, x0), MIN (y, y0));
gl_debug (DEBUG_VIEW, "BUTTON_MOTION (%f, %f) -> (%f, %f)", event->button.x, event->button.y, x, y);
diff --git a/glabels2/src/view-ellipse.c b/glabels2/src/view-ellipse.c
index b21c646..fe6100a 100644
--- a/glabels2/src/view-ellipse.c
+++ b/glabels2/src/view-ellipse.c
@@ -686,8 +686,8 @@ gl_view_ellipse_create_event_handler (GnomeCanvas *canvas,
case GDK_MOTION_NOTIFY:
if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
gnome_canvas_window_to_world (canvas,
- event->button.x,
- event->button.y, &x, &y);
+ event->motion.x,
+ event->motion.y, &x, &y);
gl_label_object_set_position (GL_LABEL_OBJECT(object),
MIN (x, x0), MIN (y, y0));
w = MAX (x, x0) - MIN (x, x0);
diff --git a/glabels2/src/view-highlight.c b/glabels2/src/view-highlight.c
index 5c148b7..af2e69b 100644
--- a/glabels2/src/view-highlight.c
+++ b/glabels2/src/view-highlight.c
@@ -314,6 +314,7 @@ highlight_resizable_box (glViewObject *view_object,
NULL);
g_object_set_data (G_OBJECT (highlight), "object", object);
+ g_object_set_data (G_OBJECT (highlight), "view", view);
g_object_set_data (G_OBJECT (highlight), "outline", outline);
@@ -346,7 +347,9 @@ highlight_resizable_box (glViewObject *view_object,
g_signal_connect (G_OBJECT (outline), "event",
G_CALLBACK (passthrough_event_handler), view_object);
+ /* send to top, then lower below all items that form the foregound */
gnome_canvas_item_raise_to_top (highlight);
+ gl_view_raise_fg (view);
gl_debug (DEBUG_VIEW, "END");
@@ -420,6 +423,7 @@ highlight_resizable_line (glViewObject *view_object)
NULL);
g_object_set_data (G_OBJECT (highlight), "object", object);
+ g_object_set_data (G_OBJECT (highlight), "view", view);
g_object_set_data (G_OBJECT (highlight), "outline", outline);
@@ -436,7 +440,9 @@ highlight_resizable_line (glViewObject *view_object)
gnome_canvas_points_free (points);
+ /* send to top, then lower below all items that form the foregound */
gnome_canvas_item_raise_to_top (highlight);
+ gl_view_raise_fg (view);
gl_debug (DEBUG_VIEW, "END");
@@ -484,14 +490,17 @@ highlight_simple (glViewObject *view_object)
NULL);
- g_object_set_data (G_OBJECT (highlight), "outline", outline);
-
g_object_set_data (G_OBJECT (highlight), "object", object);
+ g_object_set_data (G_OBJECT (highlight), "view", view);
+
+ g_object_set_data (G_OBJECT (highlight), "outline", outline);
g_signal_connect (G_OBJECT (highlight), "event",
G_CALLBACK (passthrough_event_handler), view_object);
+ /* send to top, then lower below all items that form the foregound */
gnome_canvas_item_raise_to_top (highlight);
+ gl_view_raise_fg (view);
gl_debug (DEBUG_VIEW, "END");
@@ -506,6 +515,7 @@ update_resizable_box (GnomeCanvasItem *highlight,
glViewHighlightStyle style)
{
glLabelObject *object;
+ glView *view;
gdouble w, h;
GnomeCanvasItem *outline; /* Outline around item */
GnomeCanvasItem *tl, *tr, *bl, *br; /* Handles at four corners */
@@ -518,6 +528,8 @@ update_resizable_box (GnomeCanvasItem *highlight,
object = g_object_get_data (G_OBJECT (highlight), "object");
gl_label_object_get_size (object, &w, &h);
+ view = g_object_get_data (G_OBJECT (highlight), "view");
+
outline = g_object_get_data (G_OBJECT (highlight), "outline");
tl = g_object_get_data (G_OBJECT (highlight), "tl");
@@ -592,7 +604,9 @@ update_resizable_box (GnomeCanvasItem *highlight,
"y2", h + 1.0,
NULL);
+ /* send to top, then lower below all items that form the foregound */
gnome_canvas_item_raise_to_top (highlight);
+ gl_view_raise_fg (view);
gl_debug (DEBUG_VIEW, "END");
}
@@ -604,6 +618,7 @@ static void
update_resizable_line (GnomeCanvasItem *highlight)
{
glLabelObject *object;
+ glView *view;
gdouble dx, dy;
GnomeCanvasPoints *points;
GnomeCanvasItem *outline; /* Outline around item */
@@ -616,6 +631,8 @@ update_resizable_line (GnomeCanvasItem *highlight)
object = g_object_get_data (G_OBJECT (highlight), "object");
gl_label_object_get_size (object, &dx, &dy);
+ view = g_object_get_data (G_OBJECT (highlight), "view");
+
points = gnome_canvas_points_new (2);
outline = g_object_get_data (G_OBJECT (highlight), "outline");
@@ -645,7 +662,9 @@ update_resizable_line (GnomeCanvasItem *highlight)
gnome_canvas_points_free (points);
+ /* send to top, then lower below all items that form the foregound */
gnome_canvas_item_raise_to_top (highlight);
+ gl_view_raise_fg (view);
gl_debug (DEBUG_VIEW, "END");
}
@@ -657,6 +676,7 @@ static void
update_simple (GnomeCanvasItem *highlight)
{
glLabelObject *object;
+ glView *view;
gdouble w, h;
GnomeCanvasItem *outline; /* Outline around item */
@@ -667,6 +687,8 @@ update_simple (GnomeCanvasItem *highlight)
object = g_object_get_data (G_OBJECT (highlight), "object");
gl_label_object_get_size (object, &w, &h);
+ view = g_object_get_data (G_OBJECT (highlight), "view");
+
outline = g_object_get_data (G_OBJECT (highlight), "outline");
gnome_canvas_item_set (outline,
@@ -674,7 +696,9 @@ update_simple (GnomeCanvasItem *highlight)
"y2", h + 0.5,
NULL);
+ /* send to top, then lower below all items that form the foregound */
gnome_canvas_item_raise_to_top (highlight);
+ gl_view_raise_fg (view);
gl_debug (DEBUG_VIEW, "END");
}
@@ -746,10 +770,10 @@ tl_resize_event_handler (GnomeCanvasItem * handle_item,
case GDK_MOTION_NOTIFY:
if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
- x = MIN (event->button.x, x2 - MIN_ITEM_SIZE);
- y = MIN (event->button.y, y2 - MIN_ITEM_SIZE);
- w = MAX (x2 - event->button.x, MIN_ITEM_SIZE);
- h = MAX (y2 - event->button.y, MIN_ITEM_SIZE);
+ x = MIN (event->motion.x, x2 - MIN_ITEM_SIZE);
+ y = MIN (event->motion.y, y2 - MIN_ITEM_SIZE);
+ w = MAX (x2 - event->motion.x, MIN_ITEM_SIZE);
+ h = MAX (y2 - event->motion.y, MIN_ITEM_SIZE);
gl_label_object_set_position (object, x, y);
gl_label_object_set_size (object, w, h);
return TRUE;
@@ -843,9 +867,9 @@ tr_resize_event_handler (GnomeCanvasItem * handle_item,
case GDK_MOTION_NOTIFY:
if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
x = x1;
- y = MIN (event->button.y, y2 - MIN_ITEM_SIZE);
- w = MAX (event->button.x - x1, MIN_ITEM_SIZE);
- h = MAX (y2 - event->button.y, MIN_ITEM_SIZE);
+ y = MIN (event->motion.y, y2 - MIN_ITEM_SIZE);
+ w = MAX (event->motion.x - x1, MIN_ITEM_SIZE);
+ h = MAX (y2 - event->motion.y, MIN_ITEM_SIZE);
gl_label_object_set_position (object, x, y);
gl_label_object_set_size (object, w, h);
return TRUE;
@@ -938,10 +962,10 @@ bl_resize_event_handler (GnomeCanvasItem * handle_item,
case GDK_MOTION_NOTIFY:
if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
- x = MIN (event->button.x, x2 - MIN_ITEM_SIZE);
+ x = MIN (event->motion.x, x2 - MIN_ITEM_SIZE);
y = y1;
- w = MAX (x2 - event->button.x, MIN_ITEM_SIZE);
- h = MAX (event->button.y - y1, MIN_ITEM_SIZE);
+ w = MAX (x2 - event->motion.x, MIN_ITEM_SIZE);
+ h = MAX (event->motion.y - y1, MIN_ITEM_SIZE);
gl_label_object_set_position (object, x, y);
gl_label_object_set_size (object, w, h);
return TRUE;
@@ -1036,8 +1060,8 @@ br_resize_event_handler (GnomeCanvasItem * handle_item,
if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
x = x1;
y = y1;
- w = MAX (event->button.x - x1, MIN_ITEM_SIZE);
- h = MAX (event->button.y - y1, MIN_ITEM_SIZE);
+ w = MAX (event->motion.x - x1, MIN_ITEM_SIZE);
+ h = MAX (event->motion.y - y1, MIN_ITEM_SIZE);
gl_label_object_set_position (object, x, y);
gl_label_object_set_size (object, w, h);
return TRUE;
@@ -1127,8 +1151,8 @@ sl_resize_event_handler (GnomeCanvasItem * handle_item,
case GDK_MOTION_NOTIFY:
if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
- x = MIN (event->button.x, x2 - MIN_ITEM_SIZE);
- w = MAX (x2 - event->button.x, MIN_ITEM_SIZE);
+ x = MIN (event->motion.x, x2 - MIN_ITEM_SIZE);
+ w = MAX (x2 - event->motion.x, MIN_ITEM_SIZE);
gl_label_object_set_position (object, x, y);
gl_label_object_set_size (object, w, h);
return TRUE;
@@ -1219,7 +1243,7 @@ sr_resize_event_handler (GnomeCanvasItem * handle_item,
case GDK_MOTION_NOTIFY:
if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
x = x1;
- w = MAX (event->button.x - x1, MIN_ITEM_SIZE);
+ w = MAX (event->motion.x - x1, MIN_ITEM_SIZE);
gl_label_object_set_position (object, x, y);
gl_label_object_set_size (object, w, h);
return TRUE;
@@ -1309,8 +1333,8 @@ st_resize_event_handler (GnomeCanvasItem * handle_item,
case GDK_MOTION_NOTIFY:
if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
- y = MIN (event->button.y, y2 - MIN_ITEM_SIZE);
- h = MAX (y2 - event->button.y, MIN_ITEM_SIZE);
+ y = MIN (event->motion.y, y2 - MIN_ITEM_SIZE);
+ h = MAX (y2 - event->motion.y, MIN_ITEM_SIZE);
gl_label_object_set_position (object, x, y);
gl_label_object_set_size (object, w, h);
return TRUE;
@@ -1401,7 +1425,7 @@ sb_resize_event_handler (GnomeCanvasItem * handle_item,
case GDK_MOTION_NOTIFY:
if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
y = y1;
- h = MAX (event->button.y - y1, MIN_ITEM_SIZE);
+ h = MAX (event->motion.y - y1, MIN_ITEM_SIZE);
gl_label_object_set_position (object, x, y);
gl_label_object_set_size (object, w, h);
return TRUE;
@@ -1496,8 +1520,8 @@ p1_resize_event_handler (GnomeCanvasItem * handle_item,
if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
x = x0;
y = y0;
- dx = (event->button.x - x0);
- dy = (event->button.y - y0);
+ dx = (event->motion.x - x0);
+ dy = (event->motion.y - y0);
gl_label_object_set_position (object, x, y);
gl_label_object_set_size (object, dx, dy);
return TRUE;
@@ -1592,8 +1616,8 @@ p2_resize_event_handler (GnomeCanvasItem * handle_item,
if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
x = x0;
y = y0;
- dx = (event->button.x - x0);
- dy = (event->button.y - y0);
+ dx = (event->motion.x - x0);
+ dy = (event->motion.y - y0);
gl_label_object_set_position (object, x, y);
gl_label_object_set_size (object, dx, dy);
return TRUE;
diff --git a/glabels2/src/view-image.c b/glabels2/src/view-image.c
index a00db39..a9c8741 100644
--- a/glabels2/src/view-image.c
+++ b/glabels2/src/view-image.c
@@ -665,8 +665,8 @@ gl_view_image_create_event_handler (GnomeCanvas *canvas,
case GDK_MOTION_NOTIFY:
if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
gnome_canvas_window_to_world (canvas,
- event->button.x,
- event->button.y, &x, &y);
+ event->motion.x,
+ event->motion.y, &x, &y);
gl_label_object_set_position (GL_LABEL_OBJECT(object),
MIN (x, x0), MIN (y, y0));
w = MAX (x, x0) - MIN (x, x0);
diff --git a/glabels2/src/view-line.c b/glabels2/src/view-line.c
index 27dc800..511f6c9 100644
--- a/glabels2/src/view-line.c
+++ b/glabels2/src/view-line.c
@@ -634,8 +634,8 @@ gl_view_line_create_event_handler (GnomeCanvas *canvas,
case GDK_MOTION_NOTIFY:
if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
gnome_canvas_window_to_world (canvas,
- event->button.x,
- event->button.y, &x, &y);
+ event->motion.x,
+ event->motion.y, &x, &y);
w = x - x0;
h = y - y0;
gl_label_object_set_size (GL_LABEL_OBJECT(object),
diff --git a/glabels2/src/view-object.c b/glabels2/src/view-object.c
index 9897b3f..b6dfa1c 100644
--- a/glabels2/src/view-object.c
+++ b/glabels2/src/view-object.c
@@ -214,6 +214,8 @@ gl_view_object_set_object (glViewObject *view_object,
view_object->private->highlight =
gl_view_highlight_new (view_object, style);
+ gl_view_raise_fg (view_object->private->view);
+
view_object->private->menu = GTK_WIDGET(new_menu (view_object));
g_signal_connect (G_OBJECT (object), "moved",
@@ -358,6 +360,8 @@ gl_view_object_show_highlight (glViewObject *view_object)
gnome_canvas_item_show (view_object->private->highlight);
gnome_canvas_item_raise_to_top (view_object->private->highlight);
+ gl_view_raise_fg (view_object->private->view);
+
gl_debug (DEBUG_VIEW, "END");
}
@@ -481,9 +485,14 @@ raise_object_cb (GtkWidget * widget,
gl_debug (DEBUG_VIEW, "START");
+ /* send to top */
gnome_canvas_item_raise_to_top (view_object->private->group);
+
+ /* send highlight to top */
gnome_canvas_item_raise_to_top (view_object->private->highlight);
+ gl_view_raise_fg (view_object->private->view);
+
gl_debug (DEBUG_VIEW, "END");
}
diff --git a/glabels2/src/view-text.c b/glabels2/src/view-text.c
index 228f0c7..f38c4ae 100644
--- a/glabels2/src/view-text.c
+++ b/glabels2/src/view-text.c
@@ -638,8 +638,8 @@ gl_view_text_create_event_handler (GnomeCanvas *canvas,
gl_debug (DEBUG_VIEW, "MOTION_NOTIFY");
if (dragging && (event->motion.state & GDK_BUTTON1_MASK)) {
gnome_canvas_window_to_world (canvas,
- event->button.x,
- event->button.y, &x, &y);
+ event->motion.x,
+ event->motion.y, &x, &y);
gl_label_object_set_position (GL_LABEL_OBJECT(object),
x, y);
return TRUE;
diff --git a/glabels2/src/view.c b/glabels2/src/view.c
index d6e3a3d..b6b5d5f 100644
--- a/glabels2/src/view.c
+++ b/glabels2/src/view.c
@@ -53,7 +53,8 @@ static GtkContainerClass *parent_class;
static GdkAtom clipboard_atom = GDK_NONE;
#define HOME_SCALE 2.0
-static gdouble scales[] = { 8.0, 6.0, 4.0, 3.0,
+static gdouble scales[] = {
+ 8.0, 6.0, 4.0, 3.0,
2.0,
1.5, 1.0, 0.5, 0.25,
0.0
@@ -63,64 +64,72 @@ static gdouble scales[] = { 8.0, 6.0, 4.0, 3.0,
/* Local function prototypes */
/*===========================================*/
-static void gl_view_class_init (glViewClass *class);
-static void gl_view_init (glView * view);
-static void gl_view_finalize (GObject * object);
+static void gl_view_class_init (glViewClass *class);
+static void gl_view_init (glView *view);
+static void gl_view_finalize (GObject *object);
static void gl_view_construct (glView *view);
static GtkWidget *gl_view_construct_canvas (glView *view);
static void gl_view_construct_selection (glView *view);
-static gdouble get_apropriate_scale (gdouble w, gdouble h);
+static gdouble get_apropriate_scale (gdouble w, gdouble h);
-static void draw_rect_bg (glView * view);
-static void draw_rounded_rect_bg (glView * view);
-static void draw_round_bg (glView * view);
-static void draw_cd_bg (glView * view);
+static void draw_rect_bg_fg (glView *view);
+static void draw_rounded_rect_bg_fg (glView *view);
+static void draw_round_bg_fg (glView *view);
+static void draw_cd_bg_fg (glView *view);
-static int canvas_event (GnomeCanvas * canvas,
- GdkEvent * event,
- glView *view);
-static int canvas_event_arrow_mode (GnomeCanvas * canvas,
- GdkEvent * event, glView *view);
+static int canvas_event (GnomeCanvas *canvas,
+ GdkEvent *event,
+ glView *view);
+static int canvas_event_arrow_mode (GnomeCanvas *canvas,
+ GdkEvent *event,
+ glView *view);
-static void select_region (glView * view,
+static void select_region (glView *view,
gdouble x1,
gdouble y1,
gdouble x2,
gdouble y2);
-static void select_object (glViewObject *view_object);
-static void unselect_object (glViewObject *view_object);
-static gboolean object_at (glView * view,
+static void select_object (glViewObject *view_object);
+static void unselect_object (glViewObject *view_object);
+static gboolean object_at (glView *view,
gdouble x, gdouble y);
-static gboolean object_selected (glViewObject *view_object);
-static gboolean multiple_items_selected (glView * view);
+static gboolean object_selected (glViewObject *view_object);
+static gboolean multiple_items_selected (glView *view);
-static int item_event_arrow_mode (GnomeCanvasItem * item,
- GdkEvent * event,
- glViewObject *view_object);
+static int item_event_arrow_mode (GnomeCanvasItem *item,
+ GdkEvent *event,
+ glViewObject *view_object);
-static GtkWidget *new_selection_menu (glView * view);
+static GtkWidget *new_selection_menu (glView *view);
-static void popup_selection_menu (glView *view,
- glViewObject *view_object, GdkEvent *event);
+static void popup_selection_menu (glView *view,
+ glViewObject *view_object,
+ GdkEvent *event);
-static void move_selected_items (glView * view, gdouble dx, gdouble dy);
-static void move_item (GnomeCanvasItem * item, gdouble dx, gdouble dy);
+static void move_selected_items (glView *view,
+ gdouble dx, gdouble dy);
+static void move_item (GnomeCanvasItem *item,
+ gdouble dx, gdouble dy);
-static void raise_selection_cb (GtkWidget * widget, glView * view);
-static void lower_selection_cb (GtkWidget * widget, glView * view);
+static void raise_selection_cb (GtkWidget *widget, glView *view);
+static void lower_selection_cb (GtkWidget *widget, glView *view);
-static void selection_clear_cb (GtkWidget * widget,
- GdkEventSelection * event, gpointer data);
+static void selection_clear_cb (GtkWidget *widget,
+ GdkEventSelection *event,
+ gpointer data);
-static void selection_get_cb (GtkWidget * widget,
- GtkSelectionData * selection_data, guint info,
- guint time, gpointer data);
+static void selection_get_cb (GtkWidget *widget,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time,
+ gpointer data);
-static void selection_received_cb (GtkWidget * widget,
- GtkSelectionData * selection_data,
- guint time, gpointer data);
+static void selection_received_cb (GtkWidget *widget,
+ GtkSelectionData *selection_data,
+ guint time,
+ gpointer data);
/****************************************************************************/
/* Boilerplate Object stuff. */
@@ -152,7 +161,7 @@ gl_view_get_type (void)
}
static void
-gl_view_class_init (glViewClass * class)
+gl_view_class_init (glViewClass *class)
{
GObjectClass *object_class = (GObjectClass *) class;
@@ -166,7 +175,7 @@ gl_view_class_init (glViewClass * class)
}
static void
-gl_view_init (glView * view)
+gl_view_init (glView *view)
{
gl_debug (DEBUG_VIEW, "START");
@@ -176,7 +185,7 @@ gl_view_init (glView * view)
}
static void
-gl_view_finalize (GObject * object)
+gl_view_finalize (GObject *object)
{
glView *view;
@@ -193,7 +202,7 @@ gl_view_finalize (GObject * object)
}
GtkWidget *
-gl_view_new (glLabel * label)
+gl_view_new (glLabel *label)
{
glView *view = g_object_new (gl_view_get_type (), NULL);
@@ -212,7 +221,7 @@ gl_view_new (glLabel * label)
/* PRIVATE. Construct composite widget. */
/*---------------------------------------------------------------------------*/
static void
-gl_view_construct (glView * view)
+gl_view_construct (glView *view)
{
GtkWidget *wvbox, *wscroll;
@@ -244,7 +253,7 @@ gl_view_construct (glView * view)
/* PRIVATE. Create canvas w/ a background in the shape of the label/card. */
/*---------------------------------------------------------------------------*/
static GtkWidget *
-gl_view_construct_canvas (glView * view)
+gl_view_construct_canvas (glView *view)
{
gdouble scale;
glLabel *label = view->label;
@@ -290,25 +299,27 @@ gl_view_construct_canvas (glView * view)
case GL_TEMPLATE_STYLE_RECT:
if (label_template->label_round == 0.0) {
/* Square corners. */
- draw_rect_bg (view);
+ draw_rect_bg_fg (view);
} else {
/* Rounded corners. */
- draw_rounded_rect_bg (view);
+ draw_rounded_rect_bg_fg (view);
}
break;
case GL_TEMPLATE_STYLE_ROUND:
- draw_round_bg (view);
+ draw_round_bg_fg (view);
break;
case GL_TEMPLATE_STYLE_CD:
- draw_cd_bg (view);
+ draw_cd_bg_fg (view);
break;
default:
g_warning ("Unknown template label style");
break;
}
+ gl_debug (DEBUG_VIEW, "n_bg_items = %d, n_fg_items = %d",
+ view->n_bg_items, view->n_fg_items);
g_signal_connect (G_OBJECT (view->canvas), "event",
G_CALLBACK (canvas_event), view);
@@ -350,7 +361,7 @@ gl_view_construct_canvas (glView * view)
/* PRIVATE. Create selection targets. */
/*---------------------------------------------------------------------------*/
static void
-gl_view_construct_selection (glView * view)
+gl_view_construct_selection (glView *view)
{
gl_debug (DEBUG_VIEW, "START");
@@ -414,7 +425,7 @@ get_apropriate_scale (gdouble w, gdouble h)
/* PRIVATE. Draw simple recangular background. */
/*---------------------------------------------------------------------------*/
static void
-draw_rect_bg (glView * view)
+draw_rect_bg_fg (glView *view)
{
glLabel *label = view->label;
glTemplate *template;
@@ -433,6 +444,8 @@ draw_rect_bg (glView * view)
view->n_bg_items = 0;
view->bg_item_list = NULL;
+ view->n_fg_items = 0;
+ view->fg_item_list = NULL;
group = gnome_canvas_root (GNOME_CANVAS (view->canvas));
@@ -460,6 +473,18 @@ draw_rect_bg (glView * view)
view->n_bg_items++;
view->bg_item_list = g_list_append (view->bg_item_list, item);
+ item = gnome_canvas_item_new (group,
+ gnome_canvas_rect_get_type (),
+ "x1", 0.0,
+ "y1", 0.0,
+ "x2", w,
+ "y2", h,
+ "width_pixels", 2,
+ "outline_color", "light blue",
+ NULL);
+ view->n_fg_items++;
+ view->fg_item_list = g_list_append (view->fg_item_list, item);
+
gl_debug (DEBUG_VIEW, "END");
}
@@ -467,10 +492,10 @@ draw_rect_bg (glView * view)
/* PRIVATE. Draw rounded recangular background. */
/*---------------------------------------------------------------------------*/
static void
-draw_rounded_rect_bg (glView * view)
+draw_rounded_rect_bg_fg (glView *view)
{
glLabel *label = view->label;
- GnomeCanvasPoints *points;
+ GnomeCanvasPoints *label_points, *margin_points;
gint i_coords, i_theta;
glTemplate *template;
gdouble r, w, h, m;
@@ -486,48 +511,51 @@ draw_rounded_rect_bg (glView * view)
view->n_bg_items = 0;
view->bg_item_list = NULL;
+ view->n_fg_items = 0;
+ view->fg_item_list = NULL;
gl_label_get_size (label, &w, &h);
template = gl_label_get_template (label);
r = template->label_round;
m = template->label_margin;
- points = gnome_canvas_points_new (4 * (1 + 90 / 5));
+ label_points = gnome_canvas_points_new (4 * (1 + 90 / 5));
i_coords = 0;
for (i_theta = 0; i_theta <= 90; i_theta += 5) {
- points->coords[i_coords++] =
+ label_points->coords[i_coords++] =
r - r * sin (i_theta * M_PI / 180.0);
- points->coords[i_coords++] =
+ label_points->coords[i_coords++] =
r - r * cos (i_theta * M_PI / 180.0);
}
for (i_theta = 0; i_theta <= 90; i_theta += 5) {
- points->coords[i_coords++] =
+ label_points->coords[i_coords++] =
r - r * cos (i_theta * M_PI / 180.0);
- points->coords[i_coords++] =
+ label_points->coords[i_coords++] =
(h - r) + r * sin (i_theta * M_PI / 180.0);
}
for (i_theta = 0; i_theta <= 90; i_theta += 5) {
- points->coords[i_coords++] =
+ label_points->coords[i_coords++] =
(w - r) + r * sin (i_theta * M_PI / 180.0);
- points->coords[i_coords++] =
+ label_points->coords[i_coords++] =
(h - r) + r * cos (i_theta * M_PI / 180.0);
}
for (i_theta = 0; i_theta <= 90; i_theta += 5) {
- points->coords[i_coords++] =
+ label_points->coords[i_coords++] =
(w - r) + r * cos (i_theta * M_PI / 180.0);
- points->coords[i_coords++] =
+ label_points->coords[i_coords++] =
r - r * sin (i_theta * M_PI / 180.0);
}
+
+ /* Basic background */
item = gnome_canvas_item_new (group,
gnome_canvas_polygon_get_type (),
- "points", points,
+ "points", label_points,
"fill_color", "white",
NULL);
- gnome_canvas_points_free (points);
view->n_bg_items++;
view->bg_item_list = g_list_append (view->bg_item_list, item);
- /* Bounding box @ margin */
+ /* Margin outline */
if (template->label_margin >= template->label_round) {
/* simple rectangle */
item = gnome_canvas_item_new (group,
@@ -548,44 +576,56 @@ draw_rounded_rect_bg (glView * view)
h = h - 2 * m;
/* rectangle with rounded corners */
- points = gnome_canvas_points_new (4 * (1 + 90 / 5));
+ margin_points = gnome_canvas_points_new (4 * (1 + 90 / 5));
i_coords = 0;
for (i_theta = 0; i_theta <= 90; i_theta += 5) {
- points->coords[i_coords++] =
+ margin_points->coords[i_coords++] =
m + r - r * sin (i_theta * M_PI / 180.0);
- points->coords[i_coords++] =
+ margin_points->coords[i_coords++] =
m + r - r * cos (i_theta * M_PI / 180.0);
}
for (i_theta = 0; i_theta <= 90; i_theta += 5) {
- points->coords[i_coords++] =
+ margin_points->coords[i_coords++] =
m + r - r * cos (i_theta * M_PI / 180.0);
- points->coords[i_coords++] =
+ margin_points->coords[i_coords++] =
m + (h - r) + r * sin (i_theta * M_PI / 180.0);
}
for (i_theta = 0; i_theta <= 90; i_theta += 5) {
- points->coords[i_coords++] =
+ margin_points->coords[i_coords++] =
m + (w - r) + r * sin (i_theta * M_PI / 180.0);
- points->coords[i_coords++] =
+ margin_points->coords[i_coords++] =
m + (h - r) + r * cos (i_theta * M_PI / 180.0);
}
for (i_theta = 0; i_theta <= 90; i_theta += 5) {
- points->coords[i_coords++] =
+ margin_points->coords[i_coords++] =
m + (w - r) + r * cos (i_theta * M_PI / 180.0);
- points->coords[i_coords++] =
+ margin_points->coords[i_coords++] =
m + r - r * sin (i_theta * M_PI / 180.0);
}
item = gnome_canvas_item_new (group,
gnome_canvas_polygon_get_type (),
- "points", points,
+ "points", margin_points,
"width_pixels", 1,
"outline_color", "light blue",
NULL);
- gnome_canvas_points_free (points);
+ gnome_canvas_points_free (margin_points);
view->n_bg_items++;
view->bg_item_list =
g_list_append (view->bg_item_list, item);
}
+ /* Foreground outline */
+ item = gnome_canvas_item_new (group,
+ gnome_canvas_polygon_get_type (),
+ "points", label_points,
+ "width_pixels", 2,
+ "outline_color", "light blue",
+ NULL);
+ view->n_fg_items++;
+ view->fg_item_list = g_list_append (view->fg_item_list, item);
+
+ gnome_canvas_points_free (label_points);
+
gl_debug (DEBUG_VIEW, "END");
}
@@ -593,13 +633,11 @@ draw_rounded_rect_bg (glView * view)
/* PRIVATE. Draw round background. */
/*---------------------------------------------------------------------------*/
static void
-draw_round_bg (glView * view)
+draw_round_bg_fg (glView *view)
{
glLabel *label = view->label;
glTemplate *template;
- GnomeCanvasPoints *points;
- gint i_coords, i_theta;
- gdouble r, r1;
+ gdouble r, m;
GnomeCanvasItem *item;
GnomeCanvasGroup *group;
@@ -614,44 +652,50 @@ draw_round_bg (glView * view)
view->n_bg_items = 0;
view->bg_item_list = NULL;
+ view->n_fg_items = 0;
+ view->fg_item_list = NULL;
- r1 = template->label_radius;
- points = gnome_canvas_points_new (1 + 360/2);
- i_coords = 0;
- for (i_theta = 0; i_theta <= 360; i_theta += 2) {
- points->coords[i_coords++] =
- r1 - r1 * sin (i_theta * M_PI / 180.0);
- points->coords[i_coords++] =
- r1 - r1 * cos (i_theta * M_PI / 180.0);
- }
+ r = template->label_radius;
+ m = template->label_margin;
+
+ /* Basic background */
item = gnome_canvas_item_new (group,
- gnome_canvas_polygon_get_type (),
- "points", points,
+ gnome_canvas_ellipse_get_type (),
+ "x1", 0.0,
+ "y1", 0.0,
+ "x2", 2.0*r,
+ "y2", 2.0*r,
"fill_color", "white",
NULL);
- gnome_canvas_points_free (points);
view->n_bg_items++;
view->bg_item_list = g_list_append (view->bg_item_list, item);
- /* Bounding box @ margin */
- r = template->label_radius - template->label_margin;
- points = gnome_canvas_points_new (360 / 2);
- i_coords = 0;
- for (i_theta = 0; i_theta < 360; i_theta += 2) {
- points->coords[i_coords++] =
- r1 - r * sin (i_theta * M_PI / 180.0);
- points->coords[i_coords++] =
- r1 - r * cos (i_theta * M_PI / 180.0);
- }
+ /* Margin outline */
item = gnome_canvas_item_new (group,
- gnome_canvas_polygon_get_type (),
- "points", points,
+ gnome_canvas_ellipse_get_type (),
+ "x1", m,
+ "y1", m,
+ "x2", 2.0*r - m,
+ "y2", 2.0*r - m,
"width_pixels", 1,
"outline_color", "light blue", NULL);
- gnome_canvas_points_free (points);
view->n_bg_items++;
view->bg_item_list = g_list_append (view->bg_item_list, item);
+ /* Foreground outline */
+ r = template->label_radius;
+ item = gnome_canvas_item_new (group,
+ gnome_canvas_ellipse_get_type (),
+ "x1", 0.0,
+ "y1", 0.0,
+ "x2", 2.0*r,
+ "y2", 2.0*r,
+ "width_pixels", 2,
+ "outline_color", "light blue",
+ NULL);
+ view->n_fg_items++;
+ view->fg_item_list = g_list_append (view->fg_item_list, item);
+
gl_debug (DEBUG_VIEW, "END");
}
@@ -659,13 +703,11 @@ draw_round_bg (glView * view)
/* PRIVATE. Draw CD style background, circular w/ concentric hole. */
/*---------------------------------------------------------------------------*/
static void
-draw_cd_bg (glView * view)
+draw_cd_bg_fg (glView *view)
{
glLabel *label = view->label;
glTemplate *template;
- GnomeCanvasPoints *points;
- gint i_coords, i_theta;
- gdouble r, r1, r2;
+ gdouble m, r1, r2;
GnomeCanvasItem *item;
GnomeCanvasGroup *group;
@@ -680,80 +722,108 @@ draw_cd_bg (glView * view)
view->n_bg_items = 0;
view->bg_item_list = NULL;
+ view->n_fg_items = 0;
+ view->fg_item_list = NULL;
r1 = template->label_radius;
r2 = template->label_hole;
- points = gnome_canvas_points_new (2 * (1 + 360 / 2));
- i_coords = 0;
- for (i_theta = 0; i_theta <= 360; i_theta += 2) {
- points->coords[i_coords++] =
- r1 - r1 * sin (i_theta * M_PI / 180.0);
- points->coords[i_coords++] =
- r1 - r1 * cos (i_theta * M_PI / 180.0);
- }
- for (i_theta = 0; i_theta <= 360; i_theta += 2) {
- points->coords[i_coords++] =
- r1 - r2 * sin (i_theta * M_PI / 180.0);
- points->coords[i_coords++] =
- r1 - r2 * cos (i_theta * M_PI / 180.0);
- }
+ m = template->label_margin;
+
+ /* Basic background */
+ /* outer circle */
item = gnome_canvas_item_new (group,
- gnome_canvas_polygon_get_type (),
- "points", points,
+ gnome_canvas_ellipse_get_type (),
+ "x1", 0.0,
+ "y1", 0.0,
+ "x2", 2.0*r1,
+ "y2", 2.0*r1,
"fill_color", "white",
NULL);
- gnome_canvas_points_free (points);
+ view->n_bg_items++;
+ view->bg_item_list = g_list_append (view->bg_item_list, item);
+ /* hole */
+ item = gnome_canvas_item_new (group,
+ gnome_canvas_ellipse_get_type (),
+ "x1", r1 - r2,
+ "y1", r1 - r2,
+ "x2", r1 + r2,
+ "y2", r1 + r2,
+ "fill_color", "gray",
+ NULL);
view->n_bg_items++;
view->bg_item_list = g_list_append (view->bg_item_list, item);
- /* Bounding box @ margin */
+ /* Margin outline */
/* outer margin */
- r = template->label_radius - template->label_margin;
- points = gnome_canvas_points_new (360 / 2);
- i_coords = 0;
- for (i_theta = 0; i_theta < 360; i_theta += 2) {
- points->coords[i_coords++] =
- r1 - r * sin (i_theta * M_PI / 180.0);
- points->coords[i_coords++] =
- r1 - r * cos (i_theta * M_PI / 180.0);
- }
item = gnome_canvas_item_new (group,
- gnome_canvas_polygon_get_type (),
- "points", points,
+ gnome_canvas_ellipse_get_type (),
+ "x1", m,
+ "y1", m,
+ "x2", 2.0*r1 - m,
+ "y2", 2.0*r1 - m,
"width_pixels", 1,
"outline_color", "light blue", NULL);
- gnome_canvas_points_free (points);
view->n_bg_items++;
view->bg_item_list = g_list_append (view->bg_item_list, item);
-
/* inner margin */
- r = template->label_hole + template->label_margin;
- points = gnome_canvas_points_new (360 / 2);
- i_coords = 0;
- for (i_theta = 0; i_theta < 360; i_theta += 2) {
- points->coords[i_coords++] =
- r1 - r * sin (i_theta * M_PI / 180.0);
- points->coords[i_coords++] =
- r1 - r * cos (i_theta * M_PI / 180.0);
- }
item = gnome_canvas_item_new (group,
- gnome_canvas_polygon_get_type (),
- "points", points,
+ gnome_canvas_ellipse_get_type (),
+ "x1", r1 - r2 - m,
+ "y1", r1 - r2 - m,
+ "x2", r1 + r2 + m,
+ "y2", r1 + r2 + m,
"width_pixels", 1,
"outline_color", "light blue",
NULL);
- gnome_canvas_points_free (points);
view->n_bg_items++;
view->bg_item_list = g_list_append (view->bg_item_list, item);
+ /* Foreground outline */
+ /* outer circle */
+ item = gnome_canvas_item_new (group,
+ gnome_canvas_ellipse_get_type (),
+ "x1", 0.0,
+ "y1", 0.0,
+ "x2", 2.0*r1,
+ "y2", 2.0*r1,
+ "width_pixels", 2,
+ "outline_color", "light blue",
+ NULL);
+ view->n_fg_items++;
+ view->fg_item_list = g_list_append (view->fg_item_list, item);
+ /* hole */
+ item = gnome_canvas_item_new (group,
+ gnome_canvas_ellipse_get_type (),
+ "x1", r1 - r2,
+ "y1", r1 - r2,
+ "x2", r1 + r2,
+ "y2", r1 + r2,
+ "width_pixels", 2,
+ "outline_color", "light blue",
+ NULL);
+ view->n_fg_items++;
+ view->fg_item_list = g_list_append (view->fg_item_list, item);
+
gl_debug (DEBUG_VIEW, "END");
}
/*****************************************************************************/
+/* Raise foreground items to top. */
+/*****************************************************************************/
+void gl_view_raise_fg (glView *view)
+{
+ GList *p;
+
+ for (p = view->fg_item_list; p != NULL; p = p->next) {
+ gnome_canvas_item_raise_to_top (GNOME_CANVAS_ITEM(p->data));
+ }
+}
+
+/*****************************************************************************/
/* Set arrow mode. */
/*****************************************************************************/
void
-gl_view_arrow_mode (glView * view)
+gl_view_arrow_mode (glView *view)
{
static GdkCursor *cursor = NULL;
@@ -776,7 +846,7 @@ gl_view_arrow_mode (glView * view)
/* Set create text object mode. */
/*****************************************************************************/
void
-gl_view_object_create_mode (glView * view,
+gl_view_object_create_mode (glView *view,
glLabelObjectType type)
{
GdkCursor *cursor;
@@ -834,7 +904,7 @@ gl_view_select_object (glView *view, glViewObject *view_object)
/* Select all items. */
/*****************************************************************************/
void
-gl_view_select_all (glView * view)
+gl_view_select_all (glView *view)
{
GList *p;
@@ -855,7 +925,7 @@ gl_view_select_all (glView * view)
/* Remove all selections */
/*****************************************************************************/
void
-gl_view_unselect_all (glView * view)
+gl_view_unselect_all (glView *view)
{
GList *p, *p_next;
@@ -875,7 +945,7 @@ gl_view_unselect_all (glView * view)
/* "Cut" selected items and place in clipboard selections. */
/*****************************************************************************/
void
-gl_view_cut (glView * view)
+gl_view_cut (glView *view)
{
gl_debug (DEBUG_VIEW, "START");
@@ -891,7 +961,7 @@ gl_view_cut (glView * view)
/* "Copy" selected items to clipboard selections. */
/*****************************************************************************/
void
-gl_view_copy (glView * view)
+gl_view_copy (glView *view)
{
GList *p;
glViewObject *view_object;
@@ -961,7 +1031,7 @@ gl_view_copy (glView * view)
/* "Paste" from private clipboard selection. */
/*****************************************************************************/
void
-gl_view_paste (glView * view)
+gl_view_paste (glView *view)
{
gl_debug (DEBUG_VIEW, "START");
@@ -1190,7 +1260,7 @@ canvas_event_arrow_mode (GnomeCanvas *canvas,
/* PRIVATE. Select all objects within given rectangular region. */
/*---------------------------------------------------------------------------*/
static void
-select_region (glView * view,
+select_region (glView *view,
gdouble x1,
gdouble y1,
gdouble x2,
@@ -1233,7 +1303,7 @@ select_region (glView * view,
static void
select_object (glViewObject *view_object)
{
- glView * view;
+ glView *view;
gl_debug (DEBUG_VIEW, "START");
@@ -1257,7 +1327,7 @@ select_object (glViewObject *view_object)
static void
unselect_object (glViewObject *view_object)
{
- glView * view;
+ glView *view;
gl_debug (DEBUG_VIEW, "START");
@@ -1277,7 +1347,7 @@ unselect_object (glViewObject *view_object)
/* PRIVATE. Return object at (x,y). */
/*---------------------------------------------------------------------------*/
static gboolean
-object_at (glView * view,
+object_at (glView *view,
gdouble x,
gdouble y)
{
@@ -1324,7 +1394,7 @@ object_selected (glViewObject *view_object)
/* PRIVATE. Are there multiple objects in our current selection? */
/*---------------------------------------------------------------------------*/
static gboolean
-multiple_items_selected (glView * view)
+multiple_items_selected (glView *view)
{
gl_debug (DEBUG_VIEW, "");
@@ -1507,7 +1577,7 @@ item_event_arrow_mode (GnomeCanvasItem *item,
/* PRIVATE. create menu for multiple selections. */
/*---------------------------------------------------------------------------*/
GtkWidget *
-new_selection_menu (glView * view)
+new_selection_menu (glView *view)
{
GtkWidget *menu, *menuitem;
@@ -1585,7 +1655,7 @@ popup_selection_menu (glView *view,
/* Delete selected objects. */
/*---------------------------------------------------------------------------*/
void
-gl_view_delete_selection (glView * view)
+gl_view_delete_selection (glView *view)
{
GList *p, *p_next;
@@ -1605,8 +1675,8 @@ gl_view_delete_selection (glView * view)
/* PRIVATE. raise item to front callback. */
/*---------------------------------------------------------------------------*/
static void
-raise_selection_cb (GtkWidget * widget,
- glView * view)
+raise_selection_cb (GtkWidget *widget,
+ glView *view)
{
GList *p;
@@ -1625,8 +1695,8 @@ raise_selection_cb (GtkWidget * widget,
/* PRIVATE. lower item to back callback. */
/*---------------------------------------------------------------------------*/
static void
-lower_selection_cb (GtkWidget * widget,
- glView * view)
+lower_selection_cb (GtkWidget *widget,
+ glView *view)
{
GList *p;
@@ -1645,7 +1715,7 @@ lower_selection_cb (GtkWidget * widget,
/* PRIVATE. move selected items */
/*---------------------------------------------------------------------------*/
static void
-move_selected_items (glView * view,
+move_selected_items (glView *view,
gdouble dx,
gdouble dy)
{
@@ -1670,9 +1740,9 @@ move_selected_items (glView * view,
/* PRIVATE. Handle "selection-clear" signal. */
/*---------------------------------------------------------------------------*/
static void
-selection_clear_cb (GtkWidget * widget,
- GdkEventSelection * event,
- gpointer data)
+selection_clear_cb (GtkWidget *widget,
+ GdkEventSelection *event,
+ gpointer data)
{
glView *view = GL_VIEW (data);
@@ -1691,11 +1761,11 @@ selection_clear_cb (GtkWidget * widget,
/* PRIVATE. Handle "selection-get" signal. */
/*---------------------------------------------------------------------------*/
static void
-selection_get_cb (GtkWidget * widget,
- GtkSelectionData * selection_data,
- guint info,
- guint time,
- gpointer data)
+selection_get_cb (GtkWidget *widget,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time,
+ gpointer data)
{
glView *view = GL_VIEW (data);
gchar *buffer;
@@ -1722,10 +1792,10 @@ selection_get_cb (GtkWidget * widget,
/* PRIVATE. Handle "selection-received" signal. (Result of Paste) */
/*---------------------------------------------------------------------------*/
static void
-selection_received_cb (GtkWidget * widget,
- GtkSelectionData * selection_data,
- guint time,
- gpointer data)
+selection_received_cb (GtkWidget *widget,
+ GtkSelectionData *selection_data,
+ guint time,
+ gpointer data)
{
glView *view = GL_VIEW (data);
glLabel *label = NULL;
@@ -1790,7 +1860,7 @@ selection_received_cb (GtkWidget * widget,
/* Zoom in one "notch" */
/*****************************************************************************/
void
-gl_view_zoom_in (glView * view)
+gl_view_zoom_in (glView *view)
{
gint i, i_min;
gdouble dist, dist_min;
@@ -1821,7 +1891,7 @@ gl_view_zoom_in (glView * view)
/* Zoom out one "notch" */
/*****************************************************************************/
void
-gl_view_zoom_out (glView * view)
+gl_view_zoom_out (glView *view)
{
gint i, i_min;
gdouble dist, dist_min;
@@ -1856,8 +1926,8 @@ gl_view_zoom_out (glView * view)
/* Set current zoom factor to explicit value. */
/*****************************************************************************/
void
-gl_view_set_zoom (glView * view,
- gdouble scale)
+gl_view_set_zoom (glView *view,
+ gdouble scale)
{
gl_debug (DEBUG_VIEW, "START");
@@ -1875,7 +1945,7 @@ gl_view_set_zoom (glView * view,
/* Get current zoom factor. */
/*****************************************************************************/
gdouble
-gl_view_get_zoom (glView * view)
+gl_view_get_zoom (glView *view)
{
gl_debug (DEBUG_VIEW, "");
diff --git a/glabels2/src/view.h b/glabels2/src/view.h
index 813c084..1b3647a 100644
--- a/glabels2/src/view.h
+++ b/glabels2/src/view.h
@@ -33,10 +33,10 @@ typedef enum {
GL_VIEW_STATE_OBJECT_CREATE
} glViewState;
-#define GL_TYPE_VIEW (gl_view_get_type ())
-#define GL_VIEW(obj) (GTK_CHECK_CAST((obj), GL_TYPE_VIEW, glView ))
-#define GL_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_VIEW, glViewClass))
-#define GL_IS_VIEW(obj) (GTK_CHECK_TYPE ((obj), GL_TYPE_VIEW))
+#define GL_TYPE_VIEW (gl_view_get_type ())
+#define GL_VIEW(obj) (GTK_CHECK_CAST((obj), GL_TYPE_VIEW, glView ))
+#define GL_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_VIEW, glViewClass))
+#define GL_IS_VIEW(obj) (GTK_CHECK_TYPE ((obj), GL_TYPE_VIEW))
#define GL_IS_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_VIEW))
typedef struct _glView glView;
@@ -45,57 +45,62 @@ typedef struct _glViewClass glViewClass;
#include "view-object.h"
struct _glView {
- GtkVBox parent_widget;
+ GtkVBox parent_widget;
- glLabel *label;
+ glLabel *label;
- GtkWidget *canvas;
- gdouble scale;
- gint n_bg_items;
- GList *bg_item_list;
+ GtkWidget *canvas;
+ gdouble scale;
+ gint n_bg_items;
+ GList *bg_item_list;
+ gint n_fg_items;
+ GList *fg_item_list;
- glViewState state;
+ glViewState state;
glLabelObjectType create_type;
- GList *object_list;
- GList *selected_object_list;
+ GList *object_list;
+ GList *selected_object_list;
- gint have_selection;
- glLabel *selection_data;
- GtkWidget *invisible;
+ gint have_selection;
+ glLabel *selection_data;
+ GtkWidget *invisible;
- GtkWidget *menu;
+ GtkWidget *menu;
};
struct _glViewClass {
- GtkVBoxClass parent_class;
+ GtkVBoxClass parent_class;
};
-extern guint gl_view_get_type (void);
+extern guint gl_view_get_type (void);
-extern GtkWidget *gl_view_new (glLabel * label);
+extern GtkWidget *gl_view_new (glLabel *label);
-extern void gl_view_arrow_mode (glView * view);
-extern void gl_view_object_create_mode (glView * view,
- glLabelObjectType type);
+extern void gl_view_raise_fg (glView *view);
-extern void gl_view_select_object (glView *view, glViewObject *view_object);
-extern void gl_view_select_all (glView *view);
-extern void gl_view_unselect_all (glView *view);
-extern void gl_view_delete_selection (glView *view);
+extern void gl_view_arrow_mode (glView *view);
+extern void gl_view_object_create_mode (glView *view,
+ glLabelObjectType type);
+extern void gl_view_select_object (glView *view,
+ glViewObject *view_object);
+extern void gl_view_select_all (glView *view);
+extern void gl_view_unselect_all (glView *view);
+extern void gl_view_delete_selection (glView *view);
-extern int gl_view_item_event_handler (GnomeCanvasItem * item,
- GdkEvent * event,
- glViewObject *view_object);
-extern void gl_view_cut (glView * view);
-extern void gl_view_copy (glView * view);
-extern void gl_view_paste (glView * view);
+extern int gl_view_item_event_handler (GnomeCanvasItem *item,
+ GdkEvent *event,
+ glViewObject *view_object);
-extern void gl_view_zoom_in (glView * view);
-extern void gl_view_zoom_out (glView * view);
-extern void gl_view_set_zoom (glView * view, gdouble scale);
-extern gdouble gl_view_get_zoom (glView * view);
+extern void gl_view_cut (glView *view);
+extern void gl_view_copy (glView *view);
+extern void gl_view_paste (glView *view);
+
+extern void gl_view_zoom_in (glView *view);
+extern void gl_view_zoom_out (glView *view);
+extern void gl_view_set_zoom (glView *view, gdouble scale);
+extern gdouble gl_view_get_zoom (glView *view);
#endif
diff --git a/glabels2/src/wdgt-text-props.c b/glabels2/src/wdgt-text-props.c
index 7dbbc65..50e01d8 100644
--- a/glabels2/src/wdgt-text-props.c
+++ b/glabels2/src/wdgt-text-props.c
@@ -43,8 +43,7 @@ enum {
LAST_SIGNAL
};
-typedef void (*glWdgtTextPropsSignal) (GObject * object,
- gpointer data);
+typedef void (*glWdgtTextPropsSignal) (GObject *object, gpointer data);
/*===========================================*/
/* Private globals */
@@ -58,14 +57,16 @@ static gint wdgt_text_props_signals[LAST_SIGNAL] = { 0 };
/* Local function prototypes */
/*===========================================*/
-static void gl_wdgt_text_props_class_init (glWdgtTextPropsClass * class);
-static void gl_wdgt_text_props_instance_init (glWdgtTextProps * text);
-static void gl_wdgt_text_props_finalize (GObject * object);
-static void gl_wdgt_text_props_construct (glWdgtTextProps * text, gchar * label);
+static void gl_wdgt_text_props_class_init (glWdgtTextPropsClass *class);
+static void gl_wdgt_text_props_instance_init (glWdgtTextProps *text);
+static void gl_wdgt_text_props_finalize (GObject *object);
+static void gl_wdgt_text_props_construct (glWdgtTextProps *text,
+ gchar *label);
-static void changed_cb (glWdgtTextProps * text);
-static void just_toggled_cb (GtkToggleButton * togglebutton,
- gpointer user_data);
+static void family_changed_cb (GtkEntry *entry, glWdgtTextProps *text);
+static void changed_cb (glWdgtTextProps *text);
+static void just_toggled_cb (GtkToggleButton *togglebutton,
+ gpointer user_data);
/*================================================================*/
/* Boilerplate Object stuff. */
@@ -97,7 +98,7 @@ gl_wdgt_text_props_get_type (void)
}
static void
-gl_wdgt_text_props_class_init (glWdgtTextPropsClass * class)
+gl_wdgt_text_props_class_init (glWdgtTextPropsClass *class)
{
GObjectClass *object_class;
@@ -119,7 +120,7 @@ gl_wdgt_text_props_class_init (glWdgtTextPropsClass * class)
}
static void
-gl_wdgt_text_props_instance_init (glWdgtTextProps * text)
+gl_wdgt_text_props_instance_init (glWdgtTextProps *text)
{
text->font_family_entry = NULL;
text->font_size_spin = NULL;
@@ -134,7 +135,7 @@ gl_wdgt_text_props_instance_init (glWdgtTextProps * text)
}
static void
-gl_wdgt_text_props_finalize (GObject * object)
+gl_wdgt_text_props_finalize (GObject *object)
{
glWdgtTextProps *text;
@@ -147,7 +148,7 @@ gl_wdgt_text_props_finalize (GObject * object)
}
GtkWidget *
-gl_wdgt_text_props_new (gchar * label)
+gl_wdgt_text_props_new (gchar *label)
{
glWdgtTextProps *text;
@@ -162,11 +163,11 @@ gl_wdgt_text_props_new (gchar * label)
/* Construct composite widget. */
/*============================================================*/
static void
-gl_wdgt_text_props_construct (glWdgtTextProps * text,
- gchar * label)
+gl_wdgt_text_props_construct (glWdgtTextProps *text,
+ gchar *label)
{
GtkWidget *wvbox, *wframe, *wtable, *wlabel, *whbox1, *wcombo;
- GList *family_names = NULL;
+ GList *family_names = NULL;
GtkObject *adjust;
wvbox = GTK_WIDGET (text);
@@ -196,12 +197,12 @@ gl_wdgt_text_props_construct (glWdgtTextProps * text,
gtk_combo_set_popdown_strings (GTK_COMBO (wcombo), family_names);
gnome_font_family_list_free (family_names);
text->font_family_entry = GTK_COMBO (wcombo)->entry;
+ gtk_combo_set_value_in_list (GTK_COMBO(wcombo), TRUE, FALSE);
gtk_entry_set_editable (GTK_ENTRY (text->font_family_entry), FALSE);
gtk_widget_set_size_request (wcombo, 200, -1);
gtk_box_pack_start (GTK_BOX (whbox1), wcombo, FALSE, FALSE, 0);
- g_signal_connect_swapped (G_OBJECT (text->font_family_entry),
- "changed", G_CALLBACK (changed_cb),
- G_OBJECT (text));
+ g_signal_connect (G_OBJECT (text->font_family_entry),
+ "changed", G_CALLBACK (family_changed_cb), text);
/* Font size entry widget */
adjust = gtk_adjustment_new (1.0, 1.0, 250.0, 1.0, 10.0, 10.0);
@@ -288,10 +289,28 @@ gl_wdgt_text_props_construct (glWdgtTextProps * text,
}
/*--------------------------------------------------------------------------*/
+/* PRIVATE. modify widget due to change in selection */
+/*--------------------------------------------------------------------------*/
+static void
+family_changed_cb (GtkEntry *entry,
+ glWdgtTextProps *text)
+{
+ gchar *family_name;
+
+ family_name = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1);
+ if ( strlen(family_name) ) {
+ /* Emit our "changed" signal */
+ g_signal_emit (G_OBJECT (text),
+ wdgt_text_props_signals[CHANGED], 0);
+ }
+ g_free (family_name);
+}
+
+/*--------------------------------------------------------------------------*/
/* PRIVATE. Callback for when any control in the widget has changed. */
/*--------------------------------------------------------------------------*/
static void
-changed_cb (glWdgtTextProps * text)
+changed_cb (glWdgtTextProps *text)
{
/* Emit our "changed" signal */
g_signal_emit (G_OBJECT (text), wdgt_text_props_signals[CHANGED], 0);
@@ -301,8 +320,8 @@ changed_cb (glWdgtTextProps * text)
/* PRIVATE. Justify toggle button callback. */
/*--------------------------------------------------------------------------*/
static void
-just_toggled_cb (GtkToggleButton * togglebutton,
- gpointer user_data)
+just_toggled_cb (GtkToggleButton *togglebutton,
+ gpointer user_data)
{
glWdgtTextProps *text = GL_WDGT_TEXT_PROPS (user_data);
@@ -343,13 +362,13 @@ just_toggled_cb (GtkToggleButton * togglebutton,
/* query values from controls. */
/*====================================================================*/
void
-gl_wdgt_text_props_get_params (glWdgtTextProps * text,
- gchar ** font_family,
- gdouble * font_size,
- GnomeFontWeight * font_weight,
- gboolean * font_italic_flag,
- guint * color,
- GtkJustification * just)
+gl_wdgt_text_props_get_params (glWdgtTextProps *text,
+ gchar **font_family,
+ gdouble *font_size,
+ GnomeFontWeight *font_weight,
+ gboolean *font_italic_flag,
+ guint *color,
+ GtkJustification *just)
{
guint8 r, g, b, a;
@@ -396,12 +415,12 @@ gl_wdgt_text_props_get_params (glWdgtTextProps * text,
/* fill in values and ranges for controls. */
/*====================================================================*/
void
-gl_wdgt_text_props_set_params (glWdgtTextProps * text,
- gchar * font_family,
- gdouble font_size,
- GnomeFontWeight font_weight,
- gboolean font_italic_flag,
- guint color,
+gl_wdgt_text_props_set_params (glWdgtTextProps *text,
+ gchar *font_family,
+ gdouble font_size,
+ GnomeFontWeight font_weight,
+ gboolean font_italic_flag,
+ guint color,
GtkJustification just)
{
gtk_entry_set_text (GTK_ENTRY (text->font_family_entry), font_family);
diff --git a/glabels2/stamp-h.in b/glabels2/stamp-h.in
deleted file mode 100644
index 9788f70..0000000
--- a/glabels2/stamp-h.in
+++ /dev/null
@@ -1 +0,0 @@
-timestamp