[Pkg-gnupg-commit] [gpa] 01/03: Imported Upstream version 0.9.9
Andreas Rönnquist
gusnan at moszumanska.debian.org
Sun Sep 13 09:40:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
gusnan pushed a commit to branch master
in repository gpa.
commit 3ae487f561034460405396aaa58325c8679c73a0
Author: Andreas Rönnquist <gusnan at gusnan.se>
Date: Thu Sep 10 19:43:45 2015 +0200
Imported Upstream version 0.9.9
---
ChangeLog | 67 +++++
Makefile.in | 321 +++++++++++----------
NEWS | 19 ++
README | 8 +-
VERSION | 2 +-
aclocal.m4 | 733 ++++++++++++++++++++++++++++--------------------
build-aux/compile | 347 +++++++++++++++++++++++
build-aux/config.guess | 317 +++++++--------------
build-aux/config.sub | 57 ++--
build-aux/depcomp | 38 ++-
build-aux/missing | 460 ++++++++++--------------------
config.h.in | 4 +-
configure | 447 +++++++++++++++++++++--------
configure.ac | 6 +-
doc/Makefile.in | 116 ++++----
doc/gpa.1 | 6 +-
m4/Makefile.in | 101 ++++---
m4/po.m4 | 2 +-
pixmaps/Makefile.in | 167 +++++++----
po/Makevars | 4 +-
po/ar.gmo | Bin 28794 -> 28799 bytes
po/ar.po | 138 ++++-----
po/cs.gmo | Bin 57437 -> 57442 bytes
po/cs.po | 138 ++++-----
po/de.gmo | Bin 53955 -> 53960 bytes
po/de.po | 138 ++++-----
po/es.gmo | Bin 25073 -> 25078 bytes
po/es.po | 138 ++++-----
po/fr.gmo | Bin 34099 -> 34104 bytes
po/fr.po | 138 ++++-----
po/gpa.pot | 140 ++++-----
po/ja.gmo | Bin 18060 -> 18065 bytes
po/ja.po | 138 ++++-----
po/nl.gmo | Bin 19558 -> 19563 bytes
po/nl.po | 138 ++++-----
po/pl.gmo | Bin 20073 -> 20078 bytes
po/pl.po | 138 ++++-----
po/pt_BR.gmo | Bin 16630 -> 16635 bytes
po/pt_BR.po | 138 ++++-----
po/ru.gmo | Bin 30295 -> 30300 bytes
po/ru.po | 138 ++++-----
po/sv.gmo | Bin 35688 -> 35693 bytes
po/sv.po | 138 ++++-----
po/tr.gmo | Bin 19479 -> 19484 bytes
po/tr.po | 138 ++++-----
po/zh_TW.gmo | Bin 15672 -> 15677 bytes
po/zh_TW.po | 138 ++++-----
src/Makefile.in | 204 +++++++++-----
src/confdialog.c | 2 +-
src/gpa-key-details.c | 19 +-
src/gpa.c | 44 +--
src/gpa.h | 7 +
src/gpaexportserverop.c | 2 +-
src/gpasubkeylist.c | 22 +-
src/gpawidgets.c | 35 ++-
src/gpgmeedit.c | 53 ++++
src/gpgmetools.c | 2 +-
src/helpmenu.c | 4 +-
src/keymanager.c | 26 +-
src/keymanager.h | 4 +-
src/keysigndlg.c | 7 +-
src/options.c | 11 +
src/options.h | 3 +
src/server.c | 2 +-
64 files changed, 3274 insertions(+), 2329 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3aa67e4..220be9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,72 @@
+2015-09-09 Werner Koch <wk at gnupg.org>
+
+ Release 0.9.9.
+
+ Fix build problem for gpgme < 1.6.1.
+ * src/gpasubkeylist.c (SubkeyListColumn): Fix macro condition.
+
+ Post release updates.
+
+ Release 0.9.8.
+
+ po: Auto-update.
+
+ build: Use AC_PROG_MKDIR_P to silence autoconf warning.
+ * m4/po.m4: Use modern macro.
+
+ build: Update config.guess et al.
+
+2015-09-08 Werner Koch <wk at gnupg.org>
+
+ Do not mention the now closed gpa-dev list.
+
+2015-08-31 Werner Koch <wk at gnupg.org>
+
+ Use GnuPG 2.1 style pubkey algo format also for subkey lists.
+ * src/gpasubkeylist.c (SUBKEY_SIZE): Define only for old gpgme
+ versions.
+ (gpa_subkey_list_new): Ditto for "Size".
+ (gpa_subkey_list_set_key): Use new algostr if possble.
+
+2015-08-30 Werner Koch <wk at gnupg.org>
+
+ Print the GnuPP 2.1 style pubkey algo string in key details.
+ * src/gpa-key-details.c (details_page_fill_key): Use new gpgme
+ function if available to print that string.
+
+ Truncate user ids in some dialogs.
+ * src/gpa.h (GPA_MAX_UID_WIDTH): New.
+ * src/gpawidgets.c (gpa_key_info_new): Truncate user ids and put the
+ full user id into a tooltip. Add a fingerprint line.
+ * src/keysigndlg.c (gpa_key_sign_run_dialog): Ditto.
+
+ Start off with the clipboard instead of the file manager.
+ * src/gpa.c (main): Move default action setting after options
+ reading. Set default action to clipboard unless we are in simple mode
+ and no key has yet been created.
+ * src/options.c (gpa_options_have_default_key): New.
+ * src/keymanager.c (key_manager_maybe_firsttime): New.
+ (key_manager_mapped): Use gpa_options_have_default_key.
+
+2015-08-25 Werner Koch <wk at gnupg.org>
+
+ Improve error handling for the sign key command.
+ * src/gpgmeedit.c (parse_status_error): New.
+ (edit_fnc): Add method to send the default answer.
+ (edit_sign_fnc_transit): Send default answer for unknown prompts.
+ Take care of ERROR status in the SIGN_CONFIRM state.
+
+2015-01-22 Werner Koch <wk at gnupg.org>
+
+ Fix handling of the windows close button in confirmation dialogs.
+ * src/gpaexportserverop.c (confirm_send): Only act upon the Yes button.
+ * src/confdialog.c (gpa_configure_keyserver): Ditto.
+ * src/gpgmetools.c (check_overwriting): Ditto.
+
2014-12-12 Werner Koch <wk at gnupg.org>
+ Post release updates.
+
Release 0.9.7.
po: Auto update.
diff --git a/Makefile.in b/Makefile.in
index fab4502..b1838f1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -36,23 +35,51 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -72,13 +99,19 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
- INSTALL NEWS THANKS TODO build-aux/config.guess \
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(srcdir)/config.h.in ABOUT-NLS COPYING THANKS TODO \
+ build-aux/compile build-aux/config.guess \
build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
build-aux/install-sh build-aux/mdate-sh build-aux/missing \
- mkinstalldirs
+ mkinstalldirs $(top_srcdir)/build-aux/compile \
+ $(top_srcdir)/build-aux/config.guess \
+ $(top_srcdir)/build-aux/config.rpath \
+ $(top_srcdir)/build-aux/config.sub \
+ $(top_srcdir)/build-aux/install-sh \
+ $(top_srcdir)/build-aux/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/check_zlib.m4 \
$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gpg-error.m4 \
@@ -96,21 +129,28 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_ at AM_V@)
am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
AM_V_at = $(am__v_at_ at AM_V@)
am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -148,11 +188,33 @@ am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icondir)" \
DATA = $(desktop_DATA) $(icon_DATA) $(pkgdata_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir dist dist-all distcheck
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+ cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+ $(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
@@ -163,6 +225,7 @@ am__remove_distdir = \
&& rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -190,6 +253,7 @@ am__relativize = \
reldir="$$dir2"
GZIP_ENV = --best
DIST_ARCHIVES = $(distdir).tar.bz2
+DIST_TARGETS = dist-bzip2
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -388,8 +452,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then rm -f stamp-h1; else :; fi
- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+ @test -f $@ || rm -f stamp-h1
+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
@@ -466,22 +530,25 @@ uninstall-pkgdataDATA:
dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -496,57 +563,12 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -562,12 +584,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -579,15 +596,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -596,9 +609,31 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+ test ! -s cscope.files \
+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+ -rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
$(am__remove_distdir)
@@ -669,39 +704,41 @@ distdir: $(DISTFILES)
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
- $(am__remove_distdir)
-
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-tarZ: distdir
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-shar: distdir
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
+dist dist-all:
+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+ $(am__post_remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
@@ -712,8 +749,6 @@ distcheck: dist
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.lz*) \
lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
@@ -725,18 +760,19 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod u+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
+ chmod -R a-w $(distdir)
+ chmod u+w $(distdir)
+ mkdir $(distdir)/_build $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ && ../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -759,7 +795,7 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
&& cd "$$am__cwd" \
|| exit 1
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -899,13 +935,12 @@ ps-am:
uninstall-am: uninstall-desktopDATA uninstall-iconDATA \
uninstall-pkgdataDATA
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
- ctags-recursive install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) all install-am install-strip
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-hook dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--refresh check check-am clean clean-cscope clean-generic \
+ cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+ dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
dist-zip distcheck distclean distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
@@ -916,7 +951,7 @@ uninstall-am: uninstall-desktopDATA uninstall-iconDATA \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ pdf-am ps ps-am tags tags-am uninstall uninstall-am \
uninstall-desktopDATA uninstall-iconDATA uninstall-pkgdataDATA
diff --git a/NEWS b/NEWS
index cd99a9a..34a328a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,22 @@
+Noteworthy changes in version 0.9.9 (2015-09-09)
+------------------------------------------------
+
+ * Fixed build problem in 0.9.8 if Libgpgme < 1.6.1 is used.
+
+
+Noteworthy changes in version 0.9.8 (2015-09-09)
+------------------------------------------------
+
+ * Does start with the clipboard view after a key has been created.
+
+ * Limit the size of dialogs by truncating too long user ids.
+
+ * Make the window frame's close button work as expected.
+
+ * With a decent version of libgpgme the key algorithm and size is
+ shown using the GnuPG 2.1 format.
+
+
Noteworthy changes in version 0.9.7 (2014-12-12)
------------------------------------------------
diff --git a/README b/README
index 3985583..bbd660b 100644
--- a/README
+++ b/README
@@ -45,19 +45,17 @@ See the file INSTALL for installation details; in short:
make
make install
-The configure scrits check whether all required libraries are
+The configure scripts check whether all required libraries are
installed and that they are recent enough. In order to do anything
useful with GPA you also need the GNU Privacy Guard (GnuPG) version 2
-installed - see http://www.gnupg.org.
-
-Please report any problems to gpa-dev at gnupg.org.
+installed - see https://gnupg.org.
Installation under MS-Windows
=============================
Instead of building GPA by yourself, you probably want to download
-the ready-to-use installer from http://www.gpg4win.org, the light
+the ready-to-use installer from https://www.gpg4win.org, the light
installer is sufficient, don't you? ;-)
If you want to do it your self, you need to have the Windows
diff --git a/VERSION b/VERSION
index c81aa44..7e310ba 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.7
+0.9.9
diff --git a/aclocal.m4 b/aclocal.m4
index 7f7cf07..501ff62 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -12,13 +11,14 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
# Configure paths for GTK+
# Owen Taylor 1997-2001
@@ -217,8 +217,8 @@ main ()
rm -f conf.gtktest
])
-# intlmacosx.m4 serial 3 (gettext-0.18)
-dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
+# intlmacosx.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -232,35 +232,40 @@ dnl by the GNU Library General Public License, and the rest of the GNU
dnl gettext package package is covered by the GNU General Public License.
dnl They are *not* in the public domain.
-dnl Checks for special options needed on MacOS X.
+dnl Checks for special options needed on Mac OS X.
dnl Defines INTL_MACOSX_LIBS.
AC_DEFUN([gt_INTL_MACOSX],
[
- dnl Check for API introduced in MacOS X 10.2.
+ dnl Check for API introduced in Mac OS X 10.2.
AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
[gt_cv_func_CFPreferencesCopyAppValue],
[gt_save_LIBS="$LIBS"
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
- [CFPreferencesCopyAppValue(NULL, NULL)],
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <CoreFoundation/CFPreferences.h>]],
+ [[CFPreferencesCopyAppValue(NULL, NULL)]])],
[gt_cv_func_CFPreferencesCopyAppValue=yes],
[gt_cv_func_CFPreferencesCopyAppValue=no])
LIBS="$gt_save_LIBS"])
if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
- [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+ [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
fi
- dnl Check for API introduced in MacOS X 10.3.
+ dnl Check for API introduced in Mac OS X 10.3.
AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
[gt_save_LIBS="$LIBS"
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <CoreFoundation/CFLocale.h>]],
+ [[CFLocaleCopyCurrent();]])],
[gt_cv_func_CFLocaleCopyCurrent=yes],
[gt_cv_func_CFLocaleCopyCurrent=no])
LIBS="$gt_save_LIBS"])
if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
- [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+ [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
fi
INTL_MACOSX_LIBS=
if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
@@ -269,25 +274,22 @@ AC_DEFUN([gt_INTL_MACOSX],
AC_SUBST([INTL_MACOSX_LIBS])
])
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.14'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.6], [],
+m4_if([$1], [1.14.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -303,24 +305,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
#
# Of course, Automake must honor this variable whenever it calls a
# tool from the auxiliary directory. The problem is that $srcdir (and
@@ -339,7 +339,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
#
# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
# start a VPATH build or use an absolute $srcdir.
#
# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -357,30 +357,26 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 9
-
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_SUBST([$1_TRUE])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -399,16 +395,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
@@ -418,7 +412,7 @@ fi])])
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
# We try a few techniques and use that to set a single cache variable.
#
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -431,12 +425,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
AC_CACHE_CHECK([dependency style of $depcc],
[am_cv_$1_dependencies_compiler_type],
@@ -444,8 +439,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
@@ -485,16 +480,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -503,8 +498,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@ -512,7 +507,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@ -560,7 +555,7 @@ AM_CONDITIONAL([am__fastdep$1], [
# AM_SET_DEPDIR
# -------------
# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
AC_DEFUN([AM_SET_DEPDIR],
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -570,9 +565,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
# AM_DEP_TRACK
# ------------
AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+ [--enable-dependency-tracking],
+ [do not reject slow dependency extractors])
+AS_HELP_STRING(
+ [--disable-dependency-tracking],
+ [speeds up one-time build])])
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
@@ -587,20 +586,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
[{
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@ -613,7 +610,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -625,21 +622,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
@@ -657,7 +652,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# This macro should only be invoked once -- use via AC_REQUIRE.
#
# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
+# is enabled. FIXME. This creates each '.P' file that we will
# need in order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
@@ -665,32 +660,23 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 16
-
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
# AM_INIT_AUTOMAKE([OPTIONS])
# -----------------------------------------------
@@ -703,7 +689,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -732,31 +718,40 @@ AC_SUBST([CYGPATH_W])
# Define the identity of the package.
dnl Distinguish between old-style and new-style calls.
m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+ [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+ [ok:ok],,
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
@@ -767,34 +762,79 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
[_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES([CC])],
+ [m4_define([AC_PROG_CC],
+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES([CXX])],
+ [m4_define([AC_PROG_CXX],
+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ [_AM_DEPENDENCIES([OBJC])],
+ [m4_define([AC_PROG_OBJC],
+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+ [_AM_DEPENDENCIES([OBJCXX])],
+ [m4_define([AC_PROG_OBJCXX],
+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
AC_CONFIG_COMMANDS_PRE(dnl
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes. So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present. This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake at gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message. This
+can help us improve future automake versions.
+
+END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+ fi
+fi
])
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
dnl mangled by Autoconf and run in a shell conditional statement.
m4_define([_AC_COMPILER_EXEEXT],
m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
# that is generated. The stamp files are numbered to have different names.
@@ -816,15 +856,12 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
@@ -838,16 +875,14 @@ if test x"${install_sh}" != xset; then
install_sh="\${SHELL} $am_aux_dir/install-sh"
esac
fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
-
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
AC_DEFUN([AM_SET_LEADING_DOT],
@@ -864,20 +899,17 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
-
# AM_MAINTAINER_MODE([DEFAULT-MODE])
# ----------------------------------
# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well. Anyway, the user
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well. Anyway, the user
# can override the default with the --enable/--disable switch.
AC_DEFUN([AM_MAINTAINER_MODE],
[m4_case(m4_default([$1], [disable]),
@@ -888,10 +920,11 @@ AC_DEFUN([AM_MAINTAINER_MODE],
AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode's default is 'disable' unless 'enable' is passed
AC_ARG_ENABLE([maintainer-mode],
-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
- (and sometimes confusing) to the casual installer],
- [USE_MAINTAINER_MODE=$enableval],
- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+ [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+ am_maintainer_other[ make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer])],
+ [USE_MAINTAINER_MODE=$enableval],
+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
AC_MSG_RESULT([$USE_MAINTAINER_MODE])
AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
MAINT=$MAINTAINER_MODE_TRUE
@@ -899,18 +932,14 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
]
)
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
-
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
@@ -928,7 +957,7 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@ -955,15 +984,12 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 6
-
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
@@ -971,11 +997,10 @@ AC_DEFUN([AM_MISSING_PROG],
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
-
# AM_MISSING_HAS_RUN
# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
@@ -988,54 +1013,51 @@ if test x"${MISSING+set}" != xset; then
esac
fi
# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
else
am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
+ AC_MSG_WARN(['missing' script is too old or missing])
fi
])
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
+# -*- Autoconf -*-
+# Obsolete and "removed" macros, that must however still report explicit
+# error messages when used, to smooth transition.
+#
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
+AC_DEFUN([AM_CONFIG_HEADER],
+[AC_DIAGNOSE([obsolete],
+['$0': this macro is obsolete.
+You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
+AC_CONFIG_HEADERS($@)])
+
+AC_DEFUN([AM_PROG_CC_STDC],
+[AC_PROG_CC
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+AC_DIAGNOSE([obsolete],
+['$0': this macro is obsolete.
+You should simply use the 'AC][_PROG_CC' macro instead.
+Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
+but upon 'ac_cv_prog_cc_stdc'.])])
+
+AC_DEFUN([AM_C_PROTOTYPES],
+ [AC_FATAL([automatic de-ANSI-fication support has been removed])])
+AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
-
# _AM_MANGLE_OPTION(NAME)
# -----------------------
AC_DEFUN([_AM_MANGLE_OPTION],
@@ -1045,7 +1067,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
# --------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
# _AM_SET_OPTIONS(OPTIONS)
# ------------------------
@@ -1059,24 +1081,82 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+ [whether $CC understands -c and -o together],
+ [am_cv_prog_cc_c_o],
+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -1087,32 +1167,40 @@ case `pwd` in
esac
case $srcdir in
*[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
esac
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+ alias in your environment])
+ fi
+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$[2]" = conftest.file
)
then
@@ -1122,31 +1210,50 @@ else
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+ [AC_MSG_CHECKING([that generated files are newer than configure])
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
-# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
-
# AM_SILENT_RULES([DEFAULT])
# --------------------------
# Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[ --enable-silent-rules less verbose build output (undo: `make V=1')
- --disable-silent-rules verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no) AM_DEFAULT_VERBOSITY=1;;
-*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+ [--enable-silent-rules],
+ [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+ [--disable-silent-rules],
+ [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
esac
dnl
-dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
dnl do not support nested variable expansions.
dnl See automake bug#9928 and bug#10237.
am_make=${MAKE-make}
@@ -1164,7 +1271,7 @@ else
am_cv_make_support_nested_variables=no
fi])
if test $am_cv_make_support_nested_variables = yes; then
- dnl Using `$V' instead of `$(V)' breaks IRIX make.
+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
AM_V='$(V)'
AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
else
@@ -1181,44 +1288,40 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# AM_PROG_INSTALL_STRIP
# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
# is unlikely to handle the host's binaries.
# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
# STRIPPROG with the value of the STRIP variable (set by the user).
AC_DEFUN([AM_PROG_INSTALL_STRIP],
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
-
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -1232,18 +1335,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
-
# _AM_PROG_TAR(FORMAT)
# --------------------
# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
#
# Substitute a variable $(am__tar) that is a command
# writing to stdout a FORMAT-tarball containing the directory
@@ -1253,76 +1354,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Substitute a variable $(am__untar) that extract such
# a tarball read from stdin.
# $(am__untar) < result.tar
+#
AC_DEFUN([_AM_PROG_TAR],
[# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
- [m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+
+# We'll loop over all known methods to create a tar archive until one works.
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+ [m4_case([$1],
+ [ustar],
+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+ # There is notably a 21 bits limit for the UID and the GID. In fact,
+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+ # and bug#13588).
+ am_max_uid=2097151 # 2^21 - 1
+ am_max_gid=$am_max_uid
+ # The $UID and $GID variables are not portable, so we need to resort
+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
+ # below are definitely unexpected, so allow the users to see them
+ # (that is, avoid stderr redirection).
+ am_uid=`id -u || echo unknown`
+ am_gid=`id -g || echo unknown`
+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+ if test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi
+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+ if test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi],
+
+ [pax],
+ [],
+
+ [m4_fatal([Unknown tar format])])
+
+ AC_MSG_CHECKING([how to create a $1 tar archive])
+
+ # Go ahead even if we have the value already cached. We do so because we
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+ for _am_tool in $_am_tools; do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar; do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works.
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ AM_RUN_LOG([cat conftest.dir/file])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
diff --git a/build-aux/compile b/build-aux/compile
new file mode 100755
index 0000000..531136b
--- /dev/null
+++ b/build-aux/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey at cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" "" $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine/*)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv "$2"
+ set x "$@" -Fo"$file"
+ shift
+ ;;
+ *)
+ func_file_conv "$2"
+ set x "$@" -Fe"$file"
+ shift
+ ;;
+ esac
+ ;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -I*)
+ func_file_conv "${1#-I}" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -l*)
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
+ -L*)
+ func_cl_dashL "${1#-L}"
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs="$IFS"; IFS=','
+ for flag in $arg; do
+ IFS="$save_ifs"
+ linker_opts="$linker_opts $flag"
+ done
+ IFS="$save_ifs"
+ ;;
+ -Xlinker)
+ eat=1
+ linker_opts="$linker_opts $2"
+ ;;
+ -*)
+ set x "$@" "$1"
+ shift
+ ;;
+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+ func_file_conv "$1"
+ set x "$@" -Tp"$file"
+ shift
+ ;;
+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+ func_file_conv "$1" mingw
+ set x "$@" "$file"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+ done
+ if test -n "$linker_opts"; then
+ linker_opts="-link$linker_opts"
+ fi
+ exec "$@" $linker_opts
+ exit 1
+}
+
+eat=
+
+case $1 in
+ '')
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake at gnu.org>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ # So we strip '-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no '-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # '.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/build-aux/config.guess b/build-aux/config.guess
index f475ceb..dbfb978 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2013-02-12'
+timestamp='2015-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@ timestamp='2013-02-12'
# program. This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
#
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
#
-# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+# Please send patches to <config-patches at gnu.org>.
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+ # If the system lacks a compiler, then just pick glibc.
+ # We could probably try harder.
+ LIBC=gnu
+
+ eval $set_cc_for_build
+ cat <<-EOF > $dummy.c
+ #include <features.h>
+ #if defined(__UCLIBC__)
+ LIBC=uclibc
+ #elif defined(__dietlibc__)
+ LIBC=dietlibc
+ #else
+ LIBC=gnu
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+ ;;
+esac
+
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -558,8 +579,9 @@ EOF
else
IBM_ARCH=powerpc
fi
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
+ if [ -x /usr/bin/lslpp ] ; then
+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
@@ -805,7 +827,7 @@ EOF
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
- i*:MSYS*:*)
+ *:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
@@ -853,21 +875,21 @@ EOF
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -880,59 +902,54 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ arc:Linux:*:* | arceb:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:Linux:*:*)
- LIBC=gnu
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@@ -951,57 +968,63 @@ EOF
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
- or1k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ openrisc*:Linux:*:*)
+ echo or1k-unknown-linux-${LIBC}
exit ;;
- or32:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ or32:Linux:*:* | or1k*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
+ echo sparc-unknown-linux-${LIBC}
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ echo hppa64-unknown-linux-${LIBC}
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+ *) echo hppa-unknown-linux-${LIBC} ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
+ echo powerpc64-unknown-linux-${LIBC}
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
+ echo powerpc-unknown-linux-${LIBC}
+ exit ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-unknown-linux-${LIBC}
+ exit ;;
+ ppcle:Linux:*:*)
+ echo powerpcle-unknown-linux-${LIBC}
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1234,19 +1257,31 @@ EOF
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- case $UNAME_PROCESSOR in
- i386)
- eval $set_cc_for_build
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- UNAME_PROCESSOR="x86_64"
- fi
- fi ;;
- unknown) UNAME_PROCESSOR=powerpc ;;
- esac
+ eval $set_cc_for_build
+ if test "$UNAME_PROCESSOR" = unknown ; then
+ UNAME_PROCESSOR=powerpc
+ fi
+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ case $UNAME_PROCESSOR in
+ i386) UNAME_PROCESSOR=x86_64 ;;
+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
+ esac
+ fi
+ fi
+ elif test "$UNAME_PROCESSOR" = i386 ; then
+ # Avoid executing cc on OS X 10.9, as it ships with a stub
+ # that puts up a graphical alert prompting to install
+ # developer tools. Any system running Mac OS X 10.7 or
+ # later (Darwin 11 and later) is required to have a 64-bit
+ # processor. This is not true of the ARM version of Darwin
+ # that Apple uses in portable devices.
+ UNAME_PROCESSOR=x86_64
+ fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1337,154 +1372,6 @@ EOF
exit ;;
esac
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
- ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
- if (version < 4)
- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- else
- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
- struct utsname un;
-
- uname(&un);
-
- if (strncmp(un.version, "V2", 2) == 0) {
- printf ("i386-sequent-ptx2\n"); exit (0);
- }
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
- printf ("i386-sequent-ptx1\n"); exit (0);
- }
- printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-# include <sys/param.h>
-# if defined (BSD)
-# if BSD == 43
- printf ("vax-dec-bsd4.3\n"); exit (0);
-# else
-# if BSD == 199006
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# endif
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# else
- printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
- printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
- exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
- { echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
- case `getsysinfo -f cpu_type` in
- c1*)
- echo c1-convex-bsd
- exit ;;
- c2*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit ;;
- c34*)
- echo c34-convex-bsd
- exit ;;
- c38*)
- echo c38-convex-bsd
- exit ;;
- c4*)
- echo c4-convex-bsd
- exit ;;
- esac
-fi
-
cat >&2 <<EOF
$0: unable to guess system type
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 872199a..6d2e94c 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2013-02-12'
+timestamp='2015-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ timestamp='2013-02-12'
# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+# Please send patches to <config-patches at gnu.org>.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches at gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -252,19 +252,20 @@ case $basic_machine in
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc \
+ | arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
| be32 | be64 \
| bfin \
- | c4x | clipper \
+ | c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
| epiphany \
- | fido | fr30 | frv \
+ | fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | k1om \
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -282,8 +283,10 @@ case $basic_machine in
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
+ | mipsisa32r6 | mipsisa32r6el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64r6 | mipsisa64r6el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipsr5900 | mipsr5900el \
@@ -295,11 +298,11 @@ case $basic_machine in
| nds32 | nds32le | nds32be \
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
- | open8 \
- | or1k | or32 \
+ | open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
+ | riscv32 | riscv64 \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -310,6 +313,7 @@ case $basic_machine in
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ | visium \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
@@ -324,7 +328,10 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+ leon|leon[3-9])
+ basic_machine=sparc-$basic_machine
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -366,13 +373,13 @@ case $basic_machine in
| aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
- | clipper-* | craynv-* | cydra-* \
+ | c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -381,6 +388,7 @@ case $basic_machine in
| hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | k1om-* \
| le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
@@ -400,8 +408,10 @@ case $basic_machine in
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa32r6-* | mipsisa32r6el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64r6-* | mipsisa64r6el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipsr5900-* | mipsr5900el-* \
@@ -413,6 +423,7 @@ case $basic_machine in
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
+ | or1k*-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -430,6 +441,7 @@ case $basic_machine in
| ubicom32-* \
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
+ | visium-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -767,6 +779,9 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
+ leon-*|leon[3-9]-*)
+ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+ ;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
@@ -794,7 +809,7 @@ case $basic_machine in
os=-mingw64
;;
mingw32)
- basic_machine=i386-pc
+ basic_machine=i686-pc
os=-mingw32
;;
mingw32ce)
@@ -822,6 +837,10 @@ case $basic_machine in
basic_machine=powerpc-unknown
os=-morphos
;;
+ moxiebox)
+ basic_machine=moxie-unknown
+ os=-moxiebox
+ ;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -830,7 +849,7 @@ case $basic_machine in
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
msys)
- basic_machine=i386-pc
+ basic_machine=i686-pc
os=-msys
;;
mvs)
@@ -1367,14 +1386,14 @@ case $os in
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1546,6 +1565,9 @@ case $basic_machine in
c4x-* | tic4x-*)
os=-coff
;;
+ c8051-*)
+ os=-elf
+ ;;
hexagon-*)
os=-elf
;;
@@ -1589,9 +1611,6 @@ case $basic_machine in
mips*-*)
os=-elf
;;
- or1k-*)
- os=-elf
- ;;
or32-*)
os=-coff
;;
diff --git a/build-aux/depcomp b/build-aux/depcomp
index 91d4bf8..4ebd5b3 100755
--- a/build-aux/depcomp
+++ b/build-aux/depcomp
@@ -1,7 +1,7 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2012-10-18.11; # UTC
+scriptversion=2013-05-30.07; # UTC
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
@@ -251,6 +251,41 @@ hp)
exit 1
;;
+sgi)
+ if test "$libtool" = yes; then
+ "$@" "-Wp,-MDupdate,$tmpdepfile"
+ else
+ "$@" -MDupdate "$tmpdepfile"
+ fi
+ stat=$?
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+
+ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
+ echo "$object : \\" > "$depfile"
+ # Clip off the initial element (the dependent). Don't try to be
+ # clever and replace this with sed code, as IRIX sed won't handle
+ # lines with more than a fixed number of characters (4096 in
+ # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
+ # the IRIX cc adds comments like '#:fec' to the end of the
+ # dependency line.
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+ | tr "$nl" ' ' >> "$depfile"
+ echo >> "$depfile"
+ # The second pass generates a dummy entry for each header file.
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+ >> "$depfile"
+ else
+ make_dummy_depfile
+ fi
+ rm -f "$tmpdepfile"
+ ;;
+
xlc)
# This case exists only to let depend.m4 do its work. It works by
# looking at the text of this script. This case will never be run,
@@ -517,6 +552,7 @@ $ {
G
p
}' >> "$depfile"
+ echo >> "$depfile" # make sure the fragment doesn't end with a backslash
rm -f "$tmpdepfile"
;;
diff --git a/build-aux/missing b/build-aux/missing
index 1c8ff70..db98974 100755
--- a/build-aux/missing
+++ b/build-aux/missing
@@ -1,11 +1,10 @@
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2006-05-10.23
+scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,9 +17,7 @@ scriptversion=2006-05-10.23
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -28,66 +25,40 @@ scriptversion=2006-05-10.23
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <bug-automake at gnu.org>."
exit $?
@@ -99,269 +70,146 @@ Send bug reports to <bug-automake at gnu.org>."
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
esac
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case $1 in
- lex|yacc)
- # Not GNU programs, they don't have --version.
- ;;
-
- tar)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $1 in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
-
- autom4te)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison|yacc)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex|flex)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit 1
- fi
- ;;
-
- makeinfo)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- tar)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
- ;;
-esac
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'autom4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
+ ;;
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/config.h.in b/config.h.in
index a6ab777..d66a526 100644
--- a/config.h.in
+++ b/config.h.in
@@ -28,11 +28,11 @@
/* Defined if a `byte' is typedef'd */
#undef HAVE_BYTE_TYPEDEF
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
CoreFoundation framework. */
#undef HAVE_CFLOCALECOPYCURRENT
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
the CoreFoundation framework. */
#undef HAVE_CFPREFERENCESCOPYAPPVALUE
diff --git a/configure b/configure
index 3768206..15c7e72 100755
--- a/configure
+++ b/configure
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gpa 0.9.7.
+# Generated by GNU Autoconf 2.69 for gpa 0.9.9.
#
-# Report bugs to <http://bugs.gnupg.org>.
+# Report bugs to <https://bugs.gnupg.org>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -267,7 +267,7 @@ fi
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf at gnu.org and
-$0: http://bugs.gnupg.org about your system, including any
+$0: https://bugs.gnupg.org about your system, including any
$0: error possibly output before this message. Then install
$0: a modern shell, or manually run the script under such a
$0: shell if you do have one."
@@ -580,9 +580,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='gpa'
PACKAGE_TARNAME='gpa'
-PACKAGE_VERSION='0.9.7'
-PACKAGE_STRING='gpa 0.9.7'
-PACKAGE_BUGREPORT='http://bugs.gnupg.org'
+PACKAGE_VERSION='0.9.9'
+PACKAGE_STRING='gpa 0.9.9'
+PACKAGE_BUGREPORT='https://bugs.gnupg.org'
PACKAGE_URL=''
ac_unique_file="src/gpa.c"
@@ -677,10 +677,6 @@ RANLIB
HAVE_W32_SYSTEM_FALSE
HAVE_W32_SYSTEM_TRUE
LIBZ
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -707,6 +703,10 @@ CC
BUILD_TIMESTAMP
BUILD_FILEVERSION
BUILD_REVISION
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
am__untar
am__tar
AMTAR
@@ -771,9 +771,9 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
+enable_silent_rules
enable_dependency_tracking
enable_maintainer_mode
-enable_silent_rules
with_zlib
enable_card_manager
enable_keyserver_support
@@ -1337,7 +1337,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gpa 0.9.7 to adapt to many kinds of systems.
+\`configure' configures gpa 0.9.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1407,7 +1407,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gpa 0.9.7:";;
+ short | recursive ) echo "Configuration of gpa 0.9.9:";;
esac
cat <<\_ACEOF
@@ -1415,12 +1415,15 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
- --enable-maintainer-mode enable make rules and dependencies not useful
- (and sometimes confusing) to the casual installer
- --enable-silent-rules less verbose build output (undo: `make V=1')
- --disable-silent-rules verbose build output (undo: `make V=0')
+ --enable-silent-rules less verbose build output (undo: "make V=1")
+ --disable-silent-rules verbose build output (undo: "make V=0")
+ --enable-dependency-tracking
+ do not reject slow dependency extractors
+ --disable-dependency-tracking
+ speeds up one-time build
+ --enable-maintainer-mode
+ enable make rules and dependencies not useful (and
+ sometimes confusing) to the casual installer
--disable-card-manager build without the card manager
--disable-keyserver-support
build without keyserver support
@@ -1459,7 +1462,7 @@ Some influential environment variables:
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://bugs.gnupg.org>.
+Report bugs to <https://bugs.gnupg.org>.
_ACEOF
ac_status=$?
fi
@@ -1522,7 +1525,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gpa configure 0.9.7
+gpa configure 0.9.9
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1681,9 +1684,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ------------------------------------ ##
-## Report this to http://bugs.gnupg.org ##
-## ------------------------------------ ##"
+( $as_echo "## ------------------------------------- ##
+## Report this to https://bugs.gnupg.org ##
+## ------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -1891,7 +1894,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gpa $as_me 0.9.7, which was
+It was created by gpa $as_me 0.9.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2279,7 +2282,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
ac_config_headers="$ac_config_headers config.h"
-am__api_version='1.11'
+am__api_version='1.14'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2376,9 +2379,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -2389,32 +2389,40 @@ case `pwd` in
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
esac
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
-alias in your environment" "$LINENO" 5
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+ if test "$2" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$2" = conftest.file
)
then
@@ -2426,6 +2434,16 @@ Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
@@ -2436,8 +2454,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2448,12 +2466,12 @@ if test x"${MISSING+set}" != xset; then
esac
fi
# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
else
am_missing_run=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
if test x"${install_sh}" != xset; then
@@ -2465,10 +2483,10 @@ if test x"${install_sh}" != xset; then
esac
fi
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -2607,12 +2625,6 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; }
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2695,6 +2707,45 @@ else
fi
rmdir .tst 2>/dev/null
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+ enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@ -2717,7 +2768,7 @@ fi
# Define the identity of the package.
PACKAGE='gpa'
- VERSION='0.9.7'
+ VERSION='0.9.9'
cat >>confdefs.h <<_ACEOF
@@ -2745,12 +2796,22 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar pax cpio none'
+
am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
@@ -2758,6 +2819,49 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes. So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present. This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake at gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message. This
+can help us improve future automake versions.
+
+END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+ fi
+fi
+
+
PACKAGE=$PACKAGE_NAME
VERSION=$PACKAGE_VERSION
@@ -2787,7 +2891,7 @@ have_libassuan=no
#
# Provide information about the build.
#
-BUILD_REVISION="8ce9480"
+BUILD_REVISION="d4756cd"
cat >>confdefs.h <<_ACEOF
@@ -2796,7 +2900,7 @@ _ACEOF
BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
-BUILD_FILEVERSION="${BUILD_FILEVERSION}36073"
+BUILD_FILEVERSION="${BUILD_FILEVERSION}54389"
BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
@@ -2829,7 +2933,7 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@ -3662,6 +3766,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -3673,8 +3836,8 @@ else
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
@@ -3709,16 +3872,16 @@ else
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -3727,8 +3890,8 @@ else
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@ -3736,7 +3899,7 @@ else
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@ -4282,10 +4445,10 @@ if test "${enable_silent_rules+set}" = set; then :
enableval=$enable_silent_rules;
fi
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no) AM_DEFAULT_VERBOSITY=1;;
-*) AM_DEFAULT_VERBOSITY=1;;
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=1;;
esac
am_make=${MAKE-make}
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
@@ -5024,6 +5187,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -5035,8 +5257,8 @@ else
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
@@ -5071,16 +5293,16 @@ else
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -5089,8 +5311,8 @@ else
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@ -5098,7 +5320,7 @@ else
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@ -8263,7 +8485,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -8309,7 +8531,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -8333,7 +8555,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -8378,7 +8600,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -8402,7 +8624,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -9234,7 +9456,6 @@ DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
-U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -9249,6 +9470,14 @@ LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -9682,7 +9911,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gpa $as_me 0.9.7, which was
+This file was extended by gpa $as_me 0.9.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -9742,13 +9971,13 @@ $config_headers
Configuration commands:
$config_commands
-Report bugs to <http://bugs.gnupg.org>."
+Report bugs to <https://bugs.gnupg.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gpa config.status 0.9.7
+gpa config.status 0.9.9
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -10490,7 +10719,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
case $ac_file$ac_mode in
"depfiles":C) test x"$AMDEP_TRUE" != x"" || {
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@ -10503,7 +10732,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -10537,21 +10766,19 @@ $as_echo X"$mf" |
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`$as_dirname -- "$file" ||
@@ -10739,6 +10966,6 @@ fi
echo "
GPA v${VERSION} has been configured as follows:
- Revision: 8ce9480 (36073)
+ Revision: d4756cd (54389)
Platform: $host
"
diff --git a/configure.ac b/configure.ac
index 4c35e71..7efcc39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# configure.ac for GPA
# Copyright (C) 2000, 2001 Werner Koch
# Copyright (C) 2002, 2003, 2004 Miguel Coca
-# Copyright (C) 2005-2014 g10 Code GmbH
+# Copyright (C) 2005-2015 g10 Code GmbH
#
# This file is part of GPA.
#
@@ -28,7 +28,7 @@ min_automake_version="1.10"
# (git tag -s gpa-1.n.m) and run "./autogen.sh --force". Please
# bump the version number immediately *after* the release and do
# another commit and push so that the git magic is able to work.
-m4_define([mym4_version], [0.9.7])
+m4_define([mym4_version], [0.9.9])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
@@ -44,7 +44,7 @@ m4_define([mym4_betastring],
m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
-AC_INIT([gpa],[mym4_full_version], [http://bugs.gnupg.org])
+AC_INIT([gpa],[mym4_full_version], [https://bugs.gnupg.org])
NEED_GPG_ERROR_VERSION=1.12
NEED_LIBASSUAN_API=2
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ba58922..a3b6e78 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/check_zlib.m4 \
$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gpg-error.m4 \
@@ -67,12 +94,18 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_ at AM_V@)
am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
AM_V_at = $(am__v_at_ at AM_V@)
am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
am__can_run_installinfo = \
@@ -111,6 +144,7 @@ man1dir = $(mandir)/man1
am__installdirs = "$(DESTDIR)$(man1dir)"
NROFF = nroff
MANS = $(man_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -325,27 +359,14 @@ uninstall-man1:
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
- @list='$(MANS)'; if test -n "$$list"; then \
- list=`for p in $$list; do \
- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
- if test -n "$$list" && \
- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
- echo " typically \`make maintainer-clean' will remove them" >&2; \
- exit 1; \
- else :; fi; \
- else :; fi
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -482,16 +503,17 @@ uninstall-man: uninstall-man1
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-man1 install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-man uninstall-man1
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-man1 install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am uninstall-man \
+ uninstall-man1
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/doc/gpa.1 b/doc/gpa.1
index 454fe29..0245a19 100644
--- a/doc/gpa.1
+++ b/doc/gpa.1
@@ -18,7 +18,8 @@ signatures and to manage the private and public keys.
.SH "OPTIONS"
.TP
.B \-c, \-\-clipboard
-Open the clipboard.
+Open the clipboard. This is the \fIdefault\fP action if no arguments are
+given and a key has already been created.
.TP
.B \-C, \-\-card
Start with the card-manager open.
@@ -47,7 +48,8 @@ Start with the file-manager open. This is the \fIdefault\fP if one or more
\fIFILE(S)\fP are added to the command arguments.
.TP
.B \-k, \-\-keyring
-Start with the keyring editor. This is the \fIdefault\fP.
+Start with the keyring editor. This is the \fIdefault\fP for a new
+installation.
.TP
.B \-o, \-\-options=\fIFILE\fP
Read options from the specified file instead of \fI~/.gnupg/gpa.conf\fP.
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 10343b9..df7ef8e 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
esac; \
- test $$am__dry = yes; \
- }
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = m4
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/check_zlib.m4 \
$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gpg-error.m4 \
@@ -67,12 +94,18 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_ at AM_V@)
am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
AM_V_at = $(am__v_at_ at AM_V@)
am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
am__can_run_installinfo = \
@@ -80,6 +113,7 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -253,11 +287,11 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -392,15 +426,16 @@ uninstall-am:
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/m4/po.m4 b/m4/po.m4
index 47f36a4..3c9884b 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
[
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+ AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
AC_REQUIRE([AM_NLS])dnl
dnl Release version of the gettext macros. This is used to ensure that
diff --git a/pixmaps/Makefile.in b/pixmaps/Makefile.in
index bbbf184..2b3b7a5 100644
--- a/pixmaps/Makefile.in
+++ b/pixmaps/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
esac; \
- test $$am__dry = yes; \
- }
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -52,8 +79,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = pixmaps
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(noinst_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/check_zlib.m4 \
$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gpg-error.m4 \
@@ -69,12 +96,18 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_ at AM_V@)
am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
AM_V_at = $(am__v_at_ at AM_V@)
am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
am__can_run_installinfo = \
@@ -83,6 +116,23 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -263,26 +313,15 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -294,15 +333,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -311,6 +346,21 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -447,16 +497,17 @@ uninstall-am:
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- ctags distclean distclean-generic distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ cscopelist-am ctags ctags-am distclean distclean-generic \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+ uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/po/Makevars b/po/Makevars
index a0df5f8..0d87a0d 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
# or entity, or to disclaim their copyright. The empty string stands for
# the public domain; in this case the translators are expected to disclaim
# their copyright.
-COPYRIGHT_HOLDER =
+COPYRIGHT_HOLDER =
# This is the email address or URL to which the translators shall report
# bugs in the untranslated strings:
@@ -34,7 +34,7 @@ COPYRIGHT_HOLDER =
# It can be your email address, or a mailing list address where translators
# can write to without being subscribed, or the URL of a web page through
# which the translators can contact you.
-MSGID_BUGS_ADDRESS = gpa-dev at gnupg.org
+MSGID_BUGS_ADDRESS = translations at gnupg.org
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
diff --git a/po/ar.gmo b/po/ar.gmo
index fe3049c..150f575 100644
Binary files a/po/ar.gmo and b/po/ar.gmo differ
diff --git a/po/ar.po b/po/ar.po
index ae298fe..5ca57f8 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: GPA\n"
-"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-12-12 08:51+0100\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
+"POT-Creation-Date: 2015-09-09 11:21+0200\n"
"PO-Revision-Date: 2011-12-12 10:14+0100\n"
"Last-Translator: \n"
"Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -387,7 +387,7 @@ msgstr "افتح محرر حلقة المفاتيح (البدئي)"
msgid "Open file manager"
msgstr "افتح مدير الملفات"
-#: src/gpa.c:114 src/gpa.h:84
+#: src/gpa.c:114 src/gpa.h:91
#, fuzzy
msgid "Open the card manager"
msgstr "يفتح مدير الملفات"
@@ -430,34 +430,34 @@ msgstr "واجهة رسومية لأجل GnuPG"
msgid "Please report bugs to <"
msgstr "من فضلك أبلغ عن العلات في <"
-#: src/gpa.h:73
+#: src/gpa.h:80
#, fuzzy
msgid "_Windows"
msgstr "/_نوافذ"
-#: src/gpa.h:76
+#: src/gpa.h:83
msgid "Open the keyring editor"
msgstr "يفتح محرر حلقة المفاتيح"
-#: src/gpa.h:78
+#: src/gpa.h:85
msgid "Open the file manager"
msgstr "يفتح مدير الملفات"
-#: src/gpa.h:80
+#: src/gpa.h:87
msgid "Open the clipboard"
msgstr "يفتح الحافظة"
-#: src/gpa.h:98
+#: src/gpa.h:105
#, fuzzy
msgid "Configure the application"
msgstr "يقص المحدد إلى الحافظة"
-#: src/gpa.h:101
+#: src/gpa.h:108
#, fuzzy
msgid "_Backend Preferences"
msgstr "/تحرير/تفضيلات ال_خلفية..."
-#: src/gpa.h:102
+#: src/gpa.h:109
msgid "Configure the backend programs"
msgstr ""
@@ -742,133 +742,137 @@ msgstr ""
msgid "Verifying message ..."
msgstr "يجري التحقق..."
-#: src/gpasubkeylist.c:88
+#: src/gpasubkeylist.c:90
msgid "Subkey ID"
msgstr "مُعرِّف المفتاح الفرعي"
-#: src/gpasubkeylist.c:94 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "الحالة"
-#: src/gpasubkeylist.c:100
+#: src/gpasubkeylist.c:102
#, fuzzy
msgid "Algo"
msgstr "الخوارزمية"
-#: src/gpasubkeylist.c:107
+#: src/gpasubkeylist.c:110
msgid "Size"
msgstr "الطول"
-#: src/gpasubkeylist.c:113 src/keylist.c:640
+#: src/gpasubkeylist.c:117 src/keylist.c:640
#, fuzzy
msgid "Created"
msgstr "أُنشئ في:"
-#: src/gpasubkeylist.c:120
+#: src/gpasubkeylist.c:124
#, fuzzy
msgid "Expires"
msgstr "منتهية صلاحيته"
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "Can sign"
msgstr "يمكن التوقيع به"
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "Can certify"
msgstr "يمكن الشهادة به"
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "Can encrypt"
msgstr "يمكن التعمية به"
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "Can authenticate"
msgstr "يمكن الاستيثاق به"
-#: src/gpasubkeylist.c:153
+#: src/gpasubkeylist.c:157
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:154
+#: src/gpasubkeylist.c:158
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:160
+#: src/gpasubkeylist.c:164
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:161
+#: src/gpasubkeylist.c:165
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:177 src/gpgmetools.c:706 src/gpgmetools.c:923
+#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
#: src/gpgmetools.c:1042
msgid "Revoked"
msgstr "منقوض"
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
msgid "Expired"
msgstr "منتهية صلاحيته"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
msgid "Disabled"
msgstr "معطل"
-#: src/gpasubkeylist.c:189
+#: src/gpasubkeylist.c:193
msgid "Unsigned"
msgstr "غير موقّع"
-#: src/gpasubkeylist.c:193 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
msgid "Valid"
msgstr "صالح"
-#: src/gpawidgets.c:71 src/gpgmetools.c:754 src/gpgmetools.c:761
-#: src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "اسم المستخدم:"
-#: src/gpawidgets.c:71 src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/keysigndlg.c:103
msgid "User Names:"
msgstr "أسماء المستخدم:"
-#: src/gpawidgets.c:77 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:296
+#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
+#: src/gpa-key-details.c:309
msgid "Key ID:"
msgstr "معرِّف المفتاح:"
-#: src/gpawidgets.c:180
+#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+msgid "Fingerprint:"
+msgstr "البصمة:"
+
+#: src/gpawidgets.c:195
msgid "Expiration"
msgstr "انتهاء الصلاحية"
-#: src/gpawidgets.c:187
+#: src/gpawidgets.c:202
msgid "_indefinitely valid"
msgstr "_صالح بلا نهاية"
-#: src/gpawidgets.c:195
+#: src/gpawidgets.c:210
msgid "expire _after"
msgstr "ينتهي _بعد"
-#: src/gpawidgets.c:215
+#: src/gpawidgets.c:230
msgid "expire o_n:"
msgstr "ينتهي _في:"
-#: src/gpawidgets.c:289
+#: src/gpawidgets.c:304
msgid ""
"!FATAL ERROR!\n"
"Invalid insert mode for expiry date."
@@ -880,7 +884,7 @@ msgstr ""
msgid "(not set)"
msgstr ""
-#: src/gpgmeedit.c:1220
+#: src/gpgmeedit.c:1273
msgid ""
"Keys are already stored on the card.\n"
"Really replace existing keys?"
@@ -1744,16 +1748,16 @@ msgstr "للمفتاح جزءان؛ سرّي وعلني"
msgid "The key has only a public part"
msgstr "لهذا المفتاح جزء علني فقط"
-#: src/gpa-key-details.c:176
+#: src/gpa-key-details.c:182
#, c-format
msgid "%s %u bits"
msgstr "%s %u بتّة"
-#: src/gpa-key-details.c:209
+#: src/gpa-key-details.c:222
msgid "No keys selected"
msgstr "لم تُحدد أي مفاتيح"
-#: src/gpa-key-details.c:212
+#: src/gpa-key-details.c:225
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
@@ -1764,63 +1768,59 @@ msgstr[3] "حُدِّدت %d مفاتيح"
msgstr[4] "حُدِّد %d مفتاحًا"
msgstr[5] "حُدِّد %d مفتاح"
-#: src/gpa-key-details.c:294
+#: src/gpa-key-details.c:307
#, fuzzy
msgid "User name:"
msgstr "اسم المستخدم:"
-#: src/gpa-key-details.c:298 src/keysigndlg.c:106
-msgid "Fingerprint:"
-msgstr "البصمة:"
-
-#: src/gpa-key-details.c:300
+#: src/gpa-key-details.c:313
msgid "Expires at:"
msgstr "ينتهي في:"
-#: src/gpa-key-details.c:302
+#: src/gpa-key-details.c:315
msgid "Owner Trust:"
msgstr "الثقة في المالك:"
-#: src/gpa-key-details.c:304
+#: src/gpa-key-details.c:317
#, fuzzy
msgid "Key validity:"
msgstr "صلاحية المفتاح:"
-#: src/gpa-key-details.c:306
+#: src/gpa-key-details.c:319
#, fuzzy
msgid "Key type:"
msgstr "نوع المفتاح:"
-#: src/gpa-key-details.c:308
+#: src/gpa-key-details.c:321
msgid "Created at:"
msgstr "أُنشئ في:"
-#: src/gpa-key-details.c:311
+#: src/gpa-key-details.c:324
msgid "Details"
msgstr "التفاصيل"
-#: src/gpa-key-details.c:357
+#: src/gpa-key-details.c:370
msgid "Show signatures on user name:"
msgstr "اعرض التوقيعات على اسم المستخدم:"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
#, fuzzy
msgid "Chain"
msgstr "يمكن التوقيع به"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Signatures"
msgstr "التوقيعات"
-#: src/gpa-key-details.c:415
+#: src/gpa-key-details.c:428
msgid "All signatures"
msgstr "كل التوقيعات"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
msgid "Subkeys"
msgstr "المفاتيح الفرعية"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
#, fuzzy
msgid "Key"
msgstr "/ال_مفاتيح"
@@ -1833,21 +1833,21 @@ msgstr "وقّع المفتاح"
msgid "Do you want to sign the following key?"
msgstr "أتريد توقيع المفتاح التالي؟"
-#: src/keysigndlg.c:116
+#: src/keysigndlg.c:119
msgid ""
"Check the name and fingerprint carefully to be sure that it really is the "
"key you want to sign."
msgstr "راجع الاسم والبصمة بحِرص وتأكد من أنه فعلا المفتاح الذي تريد توقيعه."
-#: src/keysigndlg.c:124
+#: src/keysigndlg.c:127
msgid "All user names in this key will be signed."
msgstr "ستُوقّع كل أسماء المستخدمين في هذا المفتاح."
-#: src/keysigndlg.c:130
+#: src/keysigndlg.c:133
msgid "The key will be signed with your default private key."
msgstr "سيُوقّع المفتاح بمفتاحك السرّي البدئي."
-#: src/keysigndlg.c:137
+#: src/keysigndlg.c:140
msgid "Sign only _locally"
msgstr "وقّع _محليّا فقط"
@@ -1861,7 +1861,7 @@ msgid ""
"with the option --disable-x509 ."
msgstr ""
-#: src/options.c:329
+#: src/options.c:340
msgid ""
"The private key you selected as default is no longer available.\n"
"GPA will try to choose a new default key automatically."
diff --git a/po/cs.gmo b/po/cs.gmo
index f1eec58..8c17a21 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index 93a5f72..0493f1c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cs\n"
-"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-12-12 08:51+0100\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
+"POT-Creation-Date: 2015-09-09 11:21+0200\n"
"PO-Revision-Date: 2014-09-11 09:17+0100\n"
"Last-Translator: Zdeněk Hataš <zdenek.hatas at gmail.com>\n"
"Language-Team: czech <cs at li.org>\n"
@@ -370,7 +370,7 @@ msgstr "Otevřít správce klíčů (výchozí)"
msgid "Open file manager"
msgstr "Otevřít správce souborů"
-#: src/gpa.c:114 src/gpa.h:84
+#: src/gpa.c:114 src/gpa.h:91
msgid "Open the card manager"
msgstr "Otevřít správce karet"
@@ -410,31 +410,31 @@ msgstr "Grafické rozhraní pro GnuPG"
msgid "Please report bugs to <"
msgstr "Nahlaste prosím chybu <"
-#: src/gpa.h:73
+#: src/gpa.h:80
msgid "_Windows"
msgstr "_Okna"
-#: src/gpa.h:76
+#: src/gpa.h:83
msgid "Open the keyring editor"
msgstr "Otevřít správce klíčenky"
-#: src/gpa.h:78
+#: src/gpa.h:85
msgid "Open the file manager"
msgstr "Otevřít správce souborů"
-#: src/gpa.h:80
+#: src/gpa.h:87
msgid "Open the clipboard"
msgstr "Otevřít schránku"
-#: src/gpa.h:98
+#: src/gpa.h:105
msgid "Configure the application"
msgstr "Nastavit aplikaci"
-#: src/gpa.h:101
+#: src/gpa.h:108
msgid "_Backend Preferences"
msgstr "Na_stavení backendu"
-#: src/gpa.h:102
+#: src/gpa.h:109
msgid "Configure the backend programs"
msgstr "Nastavit programy backednu"
@@ -713,130 +713,134 @@ msgstr "Zprava je podepisována"
msgid "Verifying message ..."
msgstr "Zpráva je ověřována..."
-#: src/gpasubkeylist.c:88
+#: src/gpasubkeylist.c:90
msgid "Subkey ID"
msgstr "ID podklíče"
-#: src/gpasubkeylist.c:94 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Stav"
-#: src/gpasubkeylist.c:100
+#: src/gpasubkeylist.c:102
msgid "Algo"
msgstr "Algoritmus"
-#: src/gpasubkeylist.c:107
+#: src/gpasubkeylist.c:110
msgid "Size"
msgstr "Velikost"
-#: src/gpasubkeylist.c:113 src/keylist.c:640
+#: src/gpasubkeylist.c:117 src/keylist.c:640
msgid "Created"
msgstr "Vytvořen"
-#: src/gpasubkeylist.c:120
+#: src/gpasubkeylist.c:124
msgid "Expires"
msgstr "Vyprší platnost"
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "S"
msgstr "P"
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "Can sign"
msgstr "Smí podepisovat"
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "C"
msgstr "C"
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "Can certify"
msgstr "Smí certifikovat"
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "E"
msgstr "Š"
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "Can encrypt"
msgstr "Smí šifrovat"
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "A"
msgstr "A"
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "Can authenticate"
msgstr "Smí autentizovat"
-#: src/gpasubkeylist.c:153
+#: src/gpasubkeylist.c:157
msgid "T"
msgstr "K"
-#: src/gpasubkeylist.c:154
+#: src/gpasubkeylist.c:158
msgid "Secret key stored on a smartcard."
msgstr "Soukromý klíč byl uložen na kartě."
-#: src/gpasubkeylist.c:160
+#: src/gpasubkeylist.c:164
msgid "Card S/N"
msgstr "SČ karty"
-#: src/gpasubkeylist.c:161
+#: src/gpasubkeylist.c:165
msgid "Serial number of the smart card."
msgstr "Výrobní číslo čipové karty."
-#: src/gpasubkeylist.c:177 src/gpgmetools.c:706 src/gpgmetools.c:923
+#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
#: src/gpgmetools.c:1042
msgid "Revoked"
msgstr "Zneplatněn"
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
msgid "Expired"
msgstr "Vypršela platnost"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
msgid "Disabled"
msgstr "Deaktivovaný"
-#: src/gpasubkeylist.c:189
+#: src/gpasubkeylist.c:193
msgid "Unsigned"
msgstr "Nepodepsaný"
-#: src/gpasubkeylist.c:193 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
msgid "Valid"
msgstr "Platný"
-#: src/gpawidgets.c:71 src/gpgmetools.c:754 src/gpgmetools.c:761
-#: src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Jméno uživatele:"
-#: src/gpawidgets.c:71 src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/keysigndlg.c:103
msgid "User Names:"
msgstr "Jména uživatelů:"
-#: src/gpawidgets.c:77 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:296
+#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
+#: src/gpa-key-details.c:309
msgid "Key ID:"
msgstr "ID klíče:"
-#: src/gpawidgets.c:180
+#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+msgid "Fingerprint:"
+msgstr "Otisk:"
+
+#: src/gpawidgets.c:195
msgid "Expiration"
msgstr "Platnost do"
-#: src/gpawidgets.c:187
+#: src/gpawidgets.c:202
msgid "_indefinitely valid"
msgstr "_trvale platný"
-#: src/gpawidgets.c:195
+#: src/gpawidgets.c:210
msgid "expire _after"
msgstr "vyprší za"
-#: src/gpawidgets.c:215
+#: src/gpawidgets.c:230
msgid "expire o_n:"
msgstr "_vyprší:"
-#: src/gpawidgets.c:289
+#: src/gpawidgets.c:304
msgid ""
"!FATAL ERROR!\n"
"Invalid insert mode for expiry date."
@@ -848,7 +852,7 @@ msgstr ""
msgid "(not set)"
msgstr "(není nastaveno)"
-#: src/gpgmeedit.c:1220
+#: src/gpgmeedit.c:1273
msgid ""
"Keys are already stored on the card.\n"
"Really replace existing keys?"
@@ -1693,16 +1697,16 @@ msgstr "Klíč má soukromou i veřejnou část"
msgid "The key has only a public part"
msgstr "Klíč má pouze veřejnou část"
-#: src/gpa-key-details.c:176
+#: src/gpa-key-details.c:182
#, c-format
msgid "%s %u bits"
msgstr "%s %u bitů"
-#: src/gpa-key-details.c:209
+#: src/gpa-key-details.c:222
msgid "No keys selected"
msgstr "Žádný klíč nevybrán"
-#: src/gpa-key-details.c:212
+#: src/gpa-key-details.c:225
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
@@ -1710,59 +1714,55 @@ msgstr[0] "%d klíčů vybráno"
msgstr[1] "%d klíčů vybráno"
msgstr[2] "%d klíčů vybráno"
-#: src/gpa-key-details.c:294
+#: src/gpa-key-details.c:307
msgid "User name:"
msgstr "Uživatelské jméno:"
-#: src/gpa-key-details.c:298 src/keysigndlg.c:106
-msgid "Fingerprint:"
-msgstr "Otisk:"
-
-#: src/gpa-key-details.c:300
+#: src/gpa-key-details.c:313
msgid "Expires at:"
msgstr "Vyprší:"
-#: src/gpa-key-details.c:302
+#: src/gpa-key-details.c:315
msgid "Owner Trust:"
msgstr "Důvěra ve vlastníka:"
-#: src/gpa-key-details.c:304
+#: src/gpa-key-details.c:317
msgid "Key validity:"
msgstr "Platnost klíče:"
-#: src/gpa-key-details.c:306
+#: src/gpa-key-details.c:319
msgid "Key type:"
msgstr "Typ klíče:"
-#: src/gpa-key-details.c:308
+#: src/gpa-key-details.c:321
msgid "Created at:"
msgstr "Vytvořen:"
-#: src/gpa-key-details.c:311
+#: src/gpa-key-details.c:324
msgid "Details"
msgstr "Podrobnosti"
-#: src/gpa-key-details.c:357
+#: src/gpa-key-details.c:370
msgid "Show signatures on user name:"
msgstr "Zobrazit podpisy u jména uživatele:"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Chain"
msgstr "Řetěz"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Signatures"
msgstr "Podpisy"
-#: src/gpa-key-details.c:415
+#: src/gpa-key-details.c:428
msgid "All signatures"
msgstr "Všechny podpisy"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
msgid "Subkeys"
msgstr "Podklíče"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
msgid "Key"
msgstr "Klíč"
@@ -1774,7 +1774,7 @@ msgstr "Podepsat klíč"
msgid "Do you want to sign the following key?"
msgstr "Chcete podepsat tento klíč?"
-#: src/keysigndlg.c:116
+#: src/keysigndlg.c:119
msgid ""
"Check the name and fingerprint carefully to be sure that it really is the "
"key you want to sign."
@@ -1782,15 +1782,15 @@ msgstr ""
"Zkontrolujte pečlivě jméno a otisk klíče abyste se ujistili, že je to "
"opravdu klíč který chcete podepsat."
-#: src/keysigndlg.c:124
+#: src/keysigndlg.c:127
msgid "All user names in this key will be signed."
msgstr "Všechna jména uživatele v tomto klíči budou podepsána."
-#: src/keysigndlg.c:130
+#: src/keysigndlg.c:133
msgid "The key will be signed with your default private key."
msgstr "Klíč bude podepsán vašim výchozím soukromým klíčem."
-#: src/keysigndlg.c:137
+#: src/keysigndlg.c:140
msgid "Sign only _locally"
msgstr "Podepsat pouze _lokálně"
@@ -1810,7 +1810,7 @@ msgstr ""
"Nainstalujte prosím CMS nebo spouštějte tento program\n"
"s parametrem --disable-x509 ."
-#: src/options.c:329
+#: src/options.c:340
msgid ""
"The private key you selected as default is no longer available.\n"
"GPA will try to choose a new default key automatically."
diff --git a/po/de.gmo b/po/de.gmo
index d6be27d..2103a21 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 6b18e39..c6a5f73 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gpa\n"
-"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-12-12 08:51+0100\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
+"POT-Creation-Date: 2015-09-09 11:21+0200\n"
"PO-Revision-Date: 2014-12-08 17:36+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
@@ -368,7 +368,7 @@ msgstr "Schlüsselverwaltung öffnen"
msgid "Open file manager"
msgstr "Dateiverwaltung öffnen "
-#: src/gpa.c:114 src/gpa.h:84
+#: src/gpa.c:114 src/gpa.h:91
msgid "Open the card manager"
msgstr "Kartenmanager aufrufen"
@@ -408,31 +408,31 @@ msgstr "Grafische Benutzeroberfläche für GnuPG"
msgid "Please report bugs to <"
msgstr "Fehler bitte berichten an <"
-#: src/gpa.h:73
+#: src/gpa.h:80
msgid "_Windows"
msgstr "_Fenster"
-#: src/gpa.h:76
+#: src/gpa.h:83
msgid "Open the keyring editor"
msgstr "Schlüsselverwaltung öffnen"
-#: src/gpa.h:78
+#: src/gpa.h:85
msgid "Open the file manager"
msgstr "Dateiverwaltung aufrufen"
-#: src/gpa.h:80
+#: src/gpa.h:87
msgid "Open the clipboard"
msgstr "Zwischenablage öffnen"
-#: src/gpa.h:98
+#: src/gpa.h:105
msgid "Configure the application"
msgstr "Konfigurieren des Programms"
-#: src/gpa.h:101
+#: src/gpa.h:108
msgid "_Backend Preferences"
msgstr "\"_Backend\" Einstellungen"
-#: src/gpa.h:102
+#: src/gpa.h:109
msgid "Configure the backend programs"
msgstr "Konfigurien des GnuPG Systems"
@@ -714,130 +714,134 @@ msgstr "Nachricht signieren"
msgid "Verifying message ..."
msgstr "Prüfen einer Nachricht ..."
-#: src/gpasubkeylist.c:88
+#: src/gpasubkeylist.c:90
msgid "Subkey ID"
msgstr "Kennung des untergeordneten Schlüssels"
-#: src/gpasubkeylist.c:94 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Gültigkeit der Beglaubigung"
-#: src/gpasubkeylist.c:100
+#: src/gpasubkeylist.c:102
msgid "Algo"
msgstr "Algo"
-#: src/gpasubkeylist.c:107
+#: src/gpasubkeylist.c:110
msgid "Size"
msgstr "Größe"
-#: src/gpasubkeylist.c:113 src/keylist.c:640
+#: src/gpasubkeylist.c:117 src/keylist.c:640
msgid "Created"
msgstr "Erstellt"
-#: src/gpasubkeylist.c:120
+#: src/gpasubkeylist.c:124
msgid "Expires"
msgstr "Läuft ab"
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "S"
msgstr "S"
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "Can sign"
msgstr "Zum Signieren verwendbar"
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "C"
msgstr "Z"
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "Can certify"
msgstr "Zum Überprüfen verwendbar"
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "E"
msgstr "V"
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "Can encrypt"
msgstr "Zum Verschlüsseln verwendbar"
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "A"
msgstr "A"
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "Can authenticate"
msgstr "Zum Authentifizieren verwendbar"
-#: src/gpasubkeylist.c:153
+#: src/gpasubkeylist.c:157
msgid "T"
msgstr "T"
-#: src/gpasubkeylist.c:154
+#: src/gpasubkeylist.c:158
msgid "Secret key stored on a smartcard."
msgstr "Geheimer Schlüssel befindet sich auf einer Smartcard"
-#: src/gpasubkeylist.c:160
+#: src/gpasubkeylist.c:164
msgid "Card S/N"
msgstr "Kartennummer"
-#: src/gpasubkeylist.c:161
+#: src/gpasubkeylist.c:165
msgid "Serial number of the smart card."
msgstr "Seriennummer der Smartcard"
-#: src/gpasubkeylist.c:177 src/gpgmetools.c:706 src/gpgmetools.c:923
+#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
#: src/gpgmetools.c:1042
msgid "Revoked"
msgstr "Widerrufen"
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
msgid "Expired"
msgstr "Abgelaufen"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
msgid "Disabled"
msgstr "Deaktiviert"
-#: src/gpasubkeylist.c:189
+#: src/gpasubkeylist.c:193
msgid "Unsigned"
msgstr "Nicht beglaubigt"
-#: src/gpasubkeylist.c:193 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
msgid "Valid"
msgstr "Gültig"
-#: src/gpawidgets.c:71 src/gpgmetools.c:754 src/gpgmetools.c:761
-#: src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Benutzerkennung:"
-#: src/gpawidgets.c:71 src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/keysigndlg.c:103
msgid "User Names:"
msgstr "Benutzernamen:"
-#: src/gpawidgets.c:77 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:296
+#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
+#: src/gpa-key-details.c:309
msgid "Key ID:"
msgstr "Schlüsselkennung:"
-#: src/gpawidgets.c:180
+#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+msgid "Fingerprint:"
+msgstr "Fingerabdruck:"
+
+#: src/gpawidgets.c:195
msgid "Expiration"
msgstr "Verfallsdatum"
-#: src/gpawidgets.c:187
+#: src/gpawidgets.c:202
msgid "_indefinitely valid"
msgstr "_unbegrenzt gültig"
-#: src/gpawidgets.c:195
+#: src/gpawidgets.c:210
msgid "expire _after"
msgstr "verfällt _nach"
-#: src/gpawidgets.c:215
+#: src/gpawidgets.c:230
msgid "expire o_n:"
msgstr "_wird ungültig am:"
-#: src/gpawidgets.c:289
+#: src/gpawidgets.c:304
msgid ""
"!FATAL ERROR!\n"
"Invalid insert mode for expiry date."
@@ -849,7 +853,7 @@ msgstr ""
msgid "(not set)"
msgstr "(nicht gesetzt)"
-#: src/gpgmeedit.c:1220
+#: src/gpgmeedit.c:1273
msgid ""
"Keys are already stored on the card.\n"
"Really replace existing keys?"
@@ -1706,75 +1710,71 @@ msgstr "Dieser Schlüssel hat einen öffentlichen und einen geheimen Teil"
msgid "The key has only a public part"
msgstr "Dieser Schlüssel hat nur einen öffentlichen Teil"
-#: src/gpa-key-details.c:176
+#: src/gpa-key-details.c:182
#, c-format
msgid "%s %u bits"
msgstr "%s %u bit"
-#: src/gpa-key-details.c:209
+#: src/gpa-key-details.c:222
msgid "No keys selected"
msgstr "Keine Schlüssel ausgewählt"
-#: src/gpa-key-details.c:212
+#: src/gpa-key-details.c:225
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d Schlüssel ausgewählt"
msgstr[1] "%d Schlüssel ausgewählt"
-#: src/gpa-key-details.c:294
+#: src/gpa-key-details.c:307
msgid "User name:"
msgstr "Benutzerkennung:"
-#: src/gpa-key-details.c:298 src/keysigndlg.c:106
-msgid "Fingerprint:"
-msgstr "Fingerabdruck:"
-
-#: src/gpa-key-details.c:300
+#: src/gpa-key-details.c:313
msgid "Expires at:"
msgstr "ungültig ab:"
-#: src/gpa-key-details.c:302
+#: src/gpa-key-details.c:315
msgid "Owner Trust:"
msgstr "Benutzervertrauen:"
-#: src/gpa-key-details.c:304
+#: src/gpa-key-details.c:317
msgid "Key validity:"
msgstr "Gültigkeit:"
-#: src/gpa-key-details.c:306
+#: src/gpa-key-details.c:319
msgid "Key type:"
msgstr "Art:"
-#: src/gpa-key-details.c:308
+#: src/gpa-key-details.c:321
msgid "Created at:"
msgstr "erzeugt am:"
-#: src/gpa-key-details.c:311
+#: src/gpa-key-details.c:324
msgid "Details"
msgstr "Details"
-#: src/gpa-key-details.c:357
+#: src/gpa-key-details.c:370
msgid "Show signatures on user name:"
msgstr "Signaturen für Benutzerkennung anzeigen:"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Chain"
msgstr "Kette"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Signatures"
msgstr "Signaturen"
-#: src/gpa-key-details.c:415
+#: src/gpa-key-details.c:428
msgid "All signatures"
msgstr "Alle Signaturen"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
msgid "Subkeys"
msgstr "Untergeordnete Schlüssel"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
msgid "Key"
msgstr "Schlüssel"
@@ -1786,7 +1786,7 @@ msgstr "Schlüssel signieren"
msgid "Do you want to sign the following key?"
msgstr "Wollen Sie den folgenden Schlüssel signieren?"
-#: src/keysigndlg.c:116
+#: src/keysigndlg.c:119
msgid ""
"Check the name and fingerprint carefully to be sure that it really is the "
"key you want to sign."
@@ -1794,15 +1794,15 @@ msgstr ""
"Überprüfen Sie sorgfältig den Namen und den Fingerabdruck, damit Sie sicher "
"sind, daß dies der Schlüssel ist, den Sie signieren wollen."
-#: src/keysigndlg.c:124
+#: src/keysigndlg.c:127
msgid "All user names in this key will be signed."
msgstr "Alle Benutzernamen dieses Schlüssels werden signiert."
-#: src/keysigndlg.c:130
+#: src/keysigndlg.c:133
msgid "The key will be signed with your default private key."
msgstr "Der Schlüssel wird mit Ihrem Standard-Schlüssel signiert."
-#: src/keysigndlg.c:137
+#: src/keysigndlg.c:140
msgid "Sign only _locally"
msgstr "Nur _lokal signieren"
@@ -1822,7 +1822,7 @@ msgstr ""
"Bitte installieren Sie eine CMS Crypto-Engine oder starten\n"
"Sie dieses Programm mit der Option --disable-x509 ."
-#: src/options.c:329
+#: src/options.c:340
msgid ""
"The private key you selected as default is no longer available.\n"
"GPA will try to choose a new default key automatically."
diff --git a/po/es.gmo b/po/es.gmo
index b1b9a81..984aea3 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index b9f0f6d..bf28ec7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: GPA 0.7.0\n"
-"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-12-12 08:51+0100\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
+"POT-Creation-Date: 2015-09-09 11:21+0200\n"
"PO-Revision-Date: 2008-03-11 09:35+0100\n"
"Last-Translator: \n"
"Language-Team: Spanish <es at li.org>\n"
@@ -390,7 +390,7 @@ msgstr "Abrir editor del anillo de claves (por defecto)"
msgid "Open file manager"
msgstr "Abrir gestor de archivos"
-#: src/gpa.c:114 src/gpa.h:84
+#: src/gpa.c:114 src/gpa.h:91
#, fuzzy
msgid "Open the card manager"
msgstr "Abrir el gestor de archivos"
@@ -433,34 +433,34 @@ msgstr "Interfaz gráfico a GnuPG"
msgid "Please report bugs to <"
msgstr "Por favor, envíe informes de error a <"
-#: src/gpa.h:73
+#: src/gpa.h:80
#, fuzzy
msgid "_Windows"
msgstr "/_Ventanas"
-#: src/gpa.h:76
+#: src/gpa.h:83
msgid "Open the keyring editor"
msgstr "Abrir el editor de anillo de claves"
-#: src/gpa.h:78
+#: src/gpa.h:85
msgid "Open the file manager"
msgstr "Abrir el gestor de archivos"
-#: src/gpa.h:80
+#: src/gpa.h:87
msgid "Open the clipboard"
msgstr "Abrir el portapapeles"
-#: src/gpa.h:98
+#: src/gpa.h:105
#, fuzzy
msgid "Configure the application"
msgstr "Cortar la selección"
-#: src/gpa.h:101
+#: src/gpa.h:108
#, fuzzy
msgid "_Backend Preferences"
msgstr "/Editar/Pr_eferencias del motor..."
-#: src/gpa.h:102
+#: src/gpa.h:109
msgid "Configure the backend programs"
msgstr ""
@@ -749,133 +749,137 @@ msgstr ""
msgid "Verifying message ..."
msgstr "Verificando..."
-#: src/gpasubkeylist.c:88
+#: src/gpasubkeylist.c:90
msgid "Subkey ID"
msgstr "ID de Subclave"
-#: src/gpasubkeylist.c:94 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Estado"
-#: src/gpasubkeylist.c:100
+#: src/gpasubkeylist.c:102
#, fuzzy
msgid "Algo"
msgstr "Algoritmo"
-#: src/gpasubkeylist.c:107
+#: src/gpasubkeylist.c:110
msgid "Size"
msgstr "Tamaño"
-#: src/gpasubkeylist.c:113 src/keylist.c:640
+#: src/gpasubkeylist.c:117 src/keylist.c:640
#, fuzzy
msgid "Created"
msgstr "Creada el:"
-#: src/gpasubkeylist.c:120
+#: src/gpasubkeylist.c:124
#, fuzzy
msgid "Expires"
msgstr "Caducada"
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "Can sign"
msgstr "Puede firmar"
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "Can certify"
msgstr "Puede certificar"
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "Can encrypt"
msgstr "Puede cifrar"
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "Can authenticate"
msgstr "Puede autenticar"
-#: src/gpasubkeylist.c:153
+#: src/gpasubkeylist.c:157
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:154
+#: src/gpasubkeylist.c:158
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:160
+#: src/gpasubkeylist.c:164
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:161
+#: src/gpasubkeylist.c:165
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:177 src/gpgmetools.c:706 src/gpgmetools.c:923
+#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
#: src/gpgmetools.c:1042
msgid "Revoked"
msgstr "Revocada"
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
msgid "Expired"
msgstr "Caducada"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
msgid "Disabled"
msgstr "Desactivada"
-#: src/gpasubkeylist.c:189
+#: src/gpasubkeylist.c:193
msgid "Unsigned"
msgstr "Sin firmar"
-#: src/gpasubkeylist.c:193 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
msgid "Valid"
msgstr "Válida"
-#: src/gpawidgets.c:71 src/gpgmetools.c:754 src/gpgmetools.c:761
-#: src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Nombre de Usuario:"
-#: src/gpawidgets.c:71 src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/keysigndlg.c:103
msgid "User Names:"
msgstr "Nombres de Usuario:"
-#: src/gpawidgets.c:77 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:296
+#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
+#: src/gpa-key-details.c:309
msgid "Key ID:"
msgstr "ID de Clave:"
-#: src/gpawidgets.c:180
+#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+msgid "Fingerprint:"
+msgstr "Huella dactilar:"
+
+#: src/gpawidgets.c:195
msgid "Expiration"
msgstr "Caducidad"
-#: src/gpawidgets.c:187
+#: src/gpawidgets.c:202
msgid "_indefinitely valid"
msgstr "válida _indefinidamente"
-#: src/gpawidgets.c:195
+#: src/gpawidgets.c:210
msgid "expire _after"
msgstr "caduca _pasado"
-#: src/gpawidgets.c:215
+#: src/gpawidgets.c:230
msgid "expire o_n:"
msgstr "_caduca el:"
-#: src/gpawidgets.c:289
+#: src/gpawidgets.c:304
msgid ""
"!FATAL ERROR!\n"
"Invalid insert mode for expiry date."
@@ -887,7 +891,7 @@ msgstr ""
msgid "(not set)"
msgstr ""
-#: src/gpgmeedit.c:1220
+#: src/gpgmeedit.c:1273
msgid ""
"Keys are already stored on the card.\n"
"Really replace existing keys?"
@@ -1772,79 +1776,75 @@ msgstr "Esta clave tiene tanto una parte secreta como una pública"
msgid "The key has only a public part"
msgstr "Esta clave solo tiene una parte pública"
-#: src/gpa-key-details.c:176
+#: src/gpa-key-details.c:182
#, c-format
msgid "%s %u bits"
msgstr "%s %u bits"
-#: src/gpa-key-details.c:209
+#: src/gpa-key-details.c:222
msgid "No keys selected"
msgstr "No hay claves seleccionadas"
-#: src/gpa-key-details.c:212
+#: src/gpa-key-details.c:225
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d clave seleccionada"
msgstr[1] "%d claves seleccionadas"
-#: src/gpa-key-details.c:294
+#: src/gpa-key-details.c:307
#, fuzzy
msgid "User name:"
msgstr "Nombre de Usuario:"
-#: src/gpa-key-details.c:298 src/keysigndlg.c:106
-msgid "Fingerprint:"
-msgstr "Huella dactilar:"
-
-#: src/gpa-key-details.c:300
+#: src/gpa-key-details.c:313
msgid "Expires at:"
msgstr "Caduca el:"
-#: src/gpa-key-details.c:302
+#: src/gpa-key-details.c:315
msgid "Owner Trust:"
msgstr "Confianza en el usuario:"
-#: src/gpa-key-details.c:304
+#: src/gpa-key-details.c:317
#, fuzzy
msgid "Key validity:"
msgstr "Validez de la Clave:"
-#: src/gpa-key-details.c:306
+#: src/gpa-key-details.c:319
#, fuzzy
msgid "Key type:"
msgstr "Tipo de Clave:"
-#: src/gpa-key-details.c:308
+#: src/gpa-key-details.c:321
msgid "Created at:"
msgstr "Creada el:"
-#: src/gpa-key-details.c:311
+#: src/gpa-key-details.c:324
msgid "Details"
msgstr "Detalles"
-#: src/gpa-key-details.c:357
+#: src/gpa-key-details.c:370
msgid "Show signatures on user name:"
msgstr "Mostrar firmas en el nombre de usuario:"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
#, fuzzy
msgid "Chain"
msgstr "Puede firmar"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Signatures"
msgstr "Firmas"
-#: src/gpa-key-details.c:415
+#: src/gpa-key-details.c:428
msgid "All signatures"
msgstr "Todas las firmas"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
msgid "Subkeys"
msgstr "Subclaves"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
#, fuzzy
msgid "Key"
msgstr "/_Claves"
@@ -1857,7 +1857,7 @@ msgstr "Firmar Clave"
msgid "Do you want to sign the following key?"
msgstr "¿Quiere firmar la siguiente clave?"
-#: src/keysigndlg.c:116
+#: src/keysigndlg.c:119
msgid ""
"Check the name and fingerprint carefully to be sure that it really is the "
"key you want to sign."
@@ -1865,15 +1865,15 @@ msgstr ""
"Comprueba el nombre y huella dactilar cuidadosamente para estar seguro de "
"que esta es la clave que desea firmar."
-#: src/keysigndlg.c:124
+#: src/keysigndlg.c:127
msgid "All user names in this key will be signed."
msgstr "Se firmarán todos los nombres de usuario en esta clave."
-#: src/keysigndlg.c:130
+#: src/keysigndlg.c:133
msgid "The key will be signed with your default private key."
msgstr "Esta clave se firmará con su clave privada por defecto."
-#: src/keysigndlg.c:137
+#: src/keysigndlg.c:140
msgid "Sign only _locally"
msgstr "Firmar solo _localmente"
@@ -1887,7 +1887,7 @@ msgid ""
"with the option --disable-x509 ."
msgstr ""
-#: src/options.c:329
+#: src/options.c:340
msgid ""
"The private key you selected as default is no longer available.\n"
"GPA will try to choose a new default key automatically."
diff --git a/po/fr.gmo b/po/fr.gmo
index 4b7ee2c..d0a51d5 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 2f3953f..64bd599 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: GPA 0.8.0\n"
-"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-12-12 08:51+0100\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
+"POT-Creation-Date: 2015-09-09 11:21+0200\n"
"PO-Revision-Date: 2014-12-08 17:37+0100\n"
"Last-Translator: Eric Lassauge <lassauge at users.sf.net>\n"
"Language-Team: <fr at li.org>\n"
@@ -376,7 +376,7 @@ msgstr "Éditeur de trousseau de clefs (par défaut)"
msgid "Open file manager"
msgstr "Ouvrir le gestionnaire de fichiers"
-#: src/gpa.c:114 src/gpa.h:84
+#: src/gpa.c:114 src/gpa.h:91
#, fuzzy
msgid "Open the card manager"
msgstr "Ouvrir le gestionnaire de fichiers"
@@ -419,31 +419,31 @@ msgstr "Interface graphique pour GnuPG"
msgid "Please report bugs to <"
msgstr "Veuillez envoyer vos rapports de faille à <"
-#: src/gpa.h:73
+#: src/gpa.h:80
msgid "_Windows"
msgstr "F_enêtres"
-#: src/gpa.h:76
+#: src/gpa.h:83
msgid "Open the keyring editor"
msgstr "Ouvrir l'éditeur de trousseau de clefs"
-#: src/gpa.h:78
+#: src/gpa.h:85
msgid "Open the file manager"
msgstr "Ouvrir le gestionnaire de fichiers"
-#: src/gpa.h:80
+#: src/gpa.h:87
msgid "Open the clipboard"
msgstr "Ouvrir le presse-papiers"
-#: src/gpa.h:98
+#: src/gpa.h:105
msgid "Configure the application"
msgstr "Configurer l'application"
-#: src/gpa.h:101
+#: src/gpa.h:108
msgid "_Backend Preferences"
msgstr "Préférences « backends »"
-#: src/gpa.h:102
+#: src/gpa.h:109
msgid "Configure the backend programs"
msgstr "Configurer les programmes « backend »"
@@ -738,133 +738,137 @@ msgstr ""
msgid "Verifying message ..."
msgstr "Vérification…"
-#: src/gpasubkeylist.c:88
+#: src/gpasubkeylist.c:90
msgid "Subkey ID"
msgstr "ID de sous-clef"
-#: src/gpasubkeylist.c:94 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "État"
-#: src/gpasubkeylist.c:100
+#: src/gpasubkeylist.c:102
#, fuzzy
msgid "Algo"
msgstr "Algorithme"
-#: src/gpasubkeylist.c:107
+#: src/gpasubkeylist.c:110
msgid "Size"
msgstr "Taille"
-#: src/gpasubkeylist.c:113 src/keylist.c:640
+#: src/gpasubkeylist.c:117 src/keylist.c:640
#, fuzzy
msgid "Created"
msgstr "Créée le :"
-#: src/gpasubkeylist.c:120
+#: src/gpasubkeylist.c:124
#, fuzzy
msgid "Expires"
msgstr "Expirée"
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "Can sign"
msgstr "Signe"
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "Can certify"
msgstr "Certifie"
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "Can encrypt"
msgstr "Chiffre"
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "Can authenticate"
msgstr "Authentifie"
-#: src/gpasubkeylist.c:153
+#: src/gpasubkeylist.c:157
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:154
+#: src/gpasubkeylist.c:158
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:160
+#: src/gpasubkeylist.c:164
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:161
+#: src/gpasubkeylist.c:165
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:177 src/gpgmetools.c:706 src/gpgmetools.c:923
+#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
#: src/gpgmetools.c:1042
msgid "Revoked"
msgstr "Révoquée"
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
msgid "Expired"
msgstr "Expirée"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
msgid "Disabled"
msgstr "Hors-fonction"
-#: src/gpasubkeylist.c:189
+#: src/gpasubkeylist.c:193
msgid "Unsigned"
msgstr "Non-signé"
-#: src/gpasubkeylist.c:193 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
msgid "Valid"
msgstr "Valide"
-#: src/gpawidgets.c:71 src/gpgmetools.c:754 src/gpgmetools.c:761
-#: src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Nom d'utilisateur :"
-#: src/gpawidgets.c:71 src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/keysigndlg.c:103
msgid "User Names:"
msgstr "Noms d'utilisateur :"
-#: src/gpawidgets.c:77 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:296
+#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
+#: src/gpa-key-details.c:309
msgid "Key ID:"
msgstr "ID de clef :"
-#: src/gpawidgets.c:180
+#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+msgid "Fingerprint:"
+msgstr "Empreinte :"
+
+#: src/gpawidgets.c:195
msgid "Expiration"
msgstr "Expiration"
-#: src/gpawidgets.c:187
+#: src/gpawidgets.c:202
msgid "_indefinitely valid"
msgstr "valide à _perpetuité"
-#: src/gpawidgets.c:195
+#: src/gpawidgets.c:210
msgid "expire _after"
msgstr "expire _après"
-#: src/gpawidgets.c:215
+#: src/gpawidgets.c:230
msgid "expire o_n:"
msgstr "_expire le :"
-#: src/gpawidgets.c:289
+#: src/gpawidgets.c:304
msgid ""
"!FATAL ERROR!\n"
"Invalid insert mode for expiry date."
@@ -876,7 +880,7 @@ msgstr ""
msgid "(not set)"
msgstr ""
-#: src/gpgmeedit.c:1220
+#: src/gpgmeedit.c:1273
msgid ""
"Keys are already stored on the card.\n"
"Really replace existing keys?"
@@ -1738,79 +1742,75 @@ msgstr "La clef a à la fois une partie privée et une partie publique"
msgid "The key has only a public part"
msgstr "La clef a seulement une partie publique"
-#: src/gpa-key-details.c:176
+#: src/gpa-key-details.c:182
#, c-format
msgid "%s %u bits"
msgstr "%s %u bits"
-#: src/gpa-key-details.c:209
+#: src/gpa-key-details.c:222
msgid "No keys selected"
msgstr "Pas de clef sélectionnée"
-#: src/gpa-key-details.c:212
+#: src/gpa-key-details.c:225
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d clef sélectionnée"
msgstr[1] "%d clefs sélectionnées"
-#: src/gpa-key-details.c:294
+#: src/gpa-key-details.c:307
#, fuzzy
msgid "User name:"
msgstr "Nom d'utilisateur :"
-#: src/gpa-key-details.c:298 src/keysigndlg.c:106
-msgid "Fingerprint:"
-msgstr "Empreinte :"
-
-#: src/gpa-key-details.c:300
+#: src/gpa-key-details.c:313
msgid "Expires at:"
msgstr "Expire le :"
-#: src/gpa-key-details.c:302
+#: src/gpa-key-details.c:315
msgid "Owner Trust:"
msgstr "Confiance du propriétaire :"
-#: src/gpa-key-details.c:304
+#: src/gpa-key-details.c:317
#, fuzzy
msgid "Key validity:"
msgstr "Validité :"
-#: src/gpa-key-details.c:306
+#: src/gpa-key-details.c:319
#, fuzzy
msgid "Key type:"
msgstr "Type de clef :"
-#: src/gpa-key-details.c:308
+#: src/gpa-key-details.c:321
msgid "Created at:"
msgstr "Créée le :"
-#: src/gpa-key-details.c:311
+#: src/gpa-key-details.c:324
msgid "Details"
msgstr "Détails"
-#: src/gpa-key-details.c:357
+#: src/gpa-key-details.c:370
msgid "Show signatures on user name:"
msgstr "Afficher les signatures d'un nom d'usager :"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
#, fuzzy
msgid "Chain"
msgstr "Signe"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Signatures"
msgstr "Signatures"
-#: src/gpa-key-details.c:415
+#: src/gpa-key-details.c:428
msgid "All signatures"
msgstr "Toutes les signatures"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
msgid "Subkeys"
msgstr "Sous-clefs"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
#, fuzzy
msgid "Key"
msgstr "_Clefs"
@@ -1823,7 +1823,7 @@ msgstr "Signer clef"
msgid "Do you want to sign the following key?"
msgstr "Voulez-vous signer cette clef ?"
-#: src/keysigndlg.c:116
+#: src/keysigndlg.c:119
msgid ""
"Check the name and fingerprint carefully to be sure that it really is the "
"key you want to sign."
@@ -1831,15 +1831,15 @@ msgstr ""
"Vérifiez le nom et l'empreinte méticuleusement pour être sûr que c'est "
"réellement la clef que vous voulez signer."
-#: src/keysigndlg.c:124
+#: src/keysigndlg.c:127
msgid "All user names in this key will be signed."
msgstr "Tous les noms d'utilisateur dans cette clef seront signés"
-#: src/keysigndlg.c:130
+#: src/keysigndlg.c:133
msgid "The key will be signed with your default private key."
msgstr "La clef sera signée avec votre clef privée par défaut"
-#: src/keysigndlg.c:137
+#: src/keysigndlg.c:140
msgid "Sign only _locally"
msgstr "Signer seulement en _local"
@@ -1853,7 +1853,7 @@ msgid ""
"with the option --disable-x509 ."
msgstr ""
-#: src/options.c:329
+#: src/options.c:340
msgid ""
"The private key you selected as default is no longer available.\n"
"GPA will try to choose a new default key automatically."
diff --git a/po/gpa.pot b/po/gpa.pot
index 645d021..38fd285 100644
--- a/po/gpa.pot
+++ b/po/gpa.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gpa 0.9.7\n"
-"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-12-12 08:51+0100\n"
+"Project-Id-Version: gpa 0.9.9\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
+"POT-Creation-Date: 2015-09-09 11:21+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -366,7 +366,7 @@ msgstr ""
msgid "Open file manager"
msgstr ""
-#: src/gpa.c:114 src/gpa.h:84
+#: src/gpa.c:114 src/gpa.h:91
msgid "Open the card manager"
msgstr ""
@@ -406,31 +406,31 @@ msgstr ""
msgid "Please report bugs to <"
msgstr ""
-#: src/gpa.h:73
+#: src/gpa.h:80
msgid "_Windows"
msgstr ""
-#: src/gpa.h:76
+#: src/gpa.h:83
msgid "Open the keyring editor"
msgstr ""
-#: src/gpa.h:78
+#: src/gpa.h:85
msgid "Open the file manager"
msgstr ""
-#: src/gpa.h:80
+#: src/gpa.h:87
msgid "Open the clipboard"
msgstr ""
-#: src/gpa.h:98
+#: src/gpa.h:105
msgid "Configure the application"
msgstr ""
-#: src/gpa.h:101
+#: src/gpa.h:108
msgid "_Backend Preferences"
msgstr ""
-#: src/gpa.h:102
+#: src/gpa.h:109
msgid "Configure the backend programs"
msgstr ""
@@ -691,130 +691,134 @@ msgstr ""
msgid "Verifying message ..."
msgstr ""
-#: src/gpasubkeylist.c:88
+#: src/gpasubkeylist.c:90
msgid "Subkey ID"
msgstr ""
-#: src/gpasubkeylist.c:94 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr ""
-#: src/gpasubkeylist.c:100
+#: src/gpasubkeylist.c:102
msgid "Algo"
msgstr ""
-#: src/gpasubkeylist.c:107
+#: src/gpasubkeylist.c:110
msgid "Size"
msgstr ""
-#: src/gpasubkeylist.c:113 src/keylist.c:640
+#: src/gpasubkeylist.c:117 src/keylist.c:640
msgid "Created"
msgstr ""
-#: src/gpasubkeylist.c:120
+#: src/gpasubkeylist.c:124
msgid "Expires"
msgstr ""
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "Can sign"
msgstr ""
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "Can certify"
msgstr ""
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "Can encrypt"
msgstr ""
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "Can authenticate"
msgstr ""
-#: src/gpasubkeylist.c:153
+#: src/gpasubkeylist.c:157
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:154
+#: src/gpasubkeylist.c:158
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:160
+#: src/gpasubkeylist.c:164
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:161
+#: src/gpasubkeylist.c:165
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:177 src/gpgmetools.c:706 src/gpgmetools.c:923
+#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
#: src/gpgmetools.c:1042
msgid "Revoked"
msgstr ""
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
msgid "Expired"
msgstr ""
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
msgid "Disabled"
msgstr ""
-#: src/gpasubkeylist.c:189
+#: src/gpasubkeylist.c:193
msgid "Unsigned"
msgstr ""
-#: src/gpasubkeylist.c:193 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
msgid "Valid"
msgstr ""
-#: src/gpawidgets.c:71 src/gpgmetools.c:754 src/gpgmetools.c:761
-#: src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/keysigndlg.c:103
msgid "User Name:"
msgstr ""
-#: src/gpawidgets.c:71 src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/keysigndlg.c:103
msgid "User Names:"
msgstr ""
-#: src/gpawidgets.c:77 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:296
+#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
+#: src/gpa-key-details.c:309
msgid "Key ID:"
msgstr ""
-#: src/gpawidgets.c:180
+#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+msgid "Fingerprint:"
+msgstr ""
+
+#: src/gpawidgets.c:195
msgid "Expiration"
msgstr ""
-#: src/gpawidgets.c:187
+#: src/gpawidgets.c:202
msgid "_indefinitely valid"
msgstr ""
-#: src/gpawidgets.c:195
+#: src/gpawidgets.c:210
msgid "expire _after"
msgstr ""
-#: src/gpawidgets.c:215
+#: src/gpawidgets.c:230
msgid "expire o_n:"
msgstr ""
-#: src/gpawidgets.c:289
+#: src/gpawidgets.c:304
msgid ""
"!FATAL ERROR!\n"
"Invalid insert mode for expiry date."
@@ -824,7 +828,7 @@ msgstr ""
msgid "(not set)"
msgstr ""
-#: src/gpgmeedit.c:1220
+#: src/gpgmeedit.c:1273
msgid ""
"Keys are already stored on the card.\n"
"Really replace existing keys?"
@@ -1588,75 +1592,71 @@ msgstr ""
msgid "The key has only a public part"
msgstr ""
-#: src/gpa-key-details.c:176
+#: src/gpa-key-details.c:182
#, c-format
msgid "%s %u bits"
msgstr ""
-#: src/gpa-key-details.c:209
+#: src/gpa-key-details.c:222
msgid "No keys selected"
msgstr ""
-#: src/gpa-key-details.c:212
+#: src/gpa-key-details.c:225
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] ""
msgstr[1] ""
-#: src/gpa-key-details.c:294
+#: src/gpa-key-details.c:307
msgid "User name:"
msgstr ""
-#: src/gpa-key-details.c:298 src/keysigndlg.c:106
-msgid "Fingerprint:"
-msgstr ""
-
-#: src/gpa-key-details.c:300
+#: src/gpa-key-details.c:313
msgid "Expires at:"
msgstr ""
-#: src/gpa-key-details.c:302
+#: src/gpa-key-details.c:315
msgid "Owner Trust:"
msgstr ""
-#: src/gpa-key-details.c:304
+#: src/gpa-key-details.c:317
msgid "Key validity:"
msgstr ""
-#: src/gpa-key-details.c:306
+#: src/gpa-key-details.c:319
msgid "Key type:"
msgstr ""
-#: src/gpa-key-details.c:308
+#: src/gpa-key-details.c:321
msgid "Created at:"
msgstr ""
-#: src/gpa-key-details.c:311
+#: src/gpa-key-details.c:324
msgid "Details"
msgstr ""
-#: src/gpa-key-details.c:357
+#: src/gpa-key-details.c:370
msgid "Show signatures on user name:"
msgstr ""
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Chain"
msgstr ""
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Signatures"
msgstr ""
-#: src/gpa-key-details.c:415
+#: src/gpa-key-details.c:428
msgid "All signatures"
msgstr ""
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
msgid "Subkeys"
msgstr ""
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
msgid "Key"
msgstr ""
@@ -1668,21 +1668,21 @@ msgstr ""
msgid "Do you want to sign the following key?"
msgstr ""
-#: src/keysigndlg.c:116
+#: src/keysigndlg.c:119
msgid ""
"Check the name and fingerprint carefully to be sure that it really is the "
"key you want to sign."
msgstr ""
-#: src/keysigndlg.c:124
+#: src/keysigndlg.c:127
msgid "All user names in this key will be signed."
msgstr ""
-#: src/keysigndlg.c:130
+#: src/keysigndlg.c:133
msgid "The key will be signed with your default private key."
msgstr ""
-#: src/keysigndlg.c:137
+#: src/keysigndlg.c:140
msgid "Sign only _locally"
msgstr ""
@@ -1696,7 +1696,7 @@ msgid ""
"with the option --disable-x509 ."
msgstr ""
-#: src/options.c:329
+#: src/options.c:340
msgid ""
"The private key you selected as default is no longer available.\n"
"GPA will try to choose a new default key automatically."
diff --git a/po/ja.gmo b/po/ja.gmo
index 0e604f0..8847951 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index daf76e8..46815f0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: GPA 0.6.1-cvs\n"
-"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-12-12 08:51+0100\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
+"POT-Creation-Date: 2015-09-09 11:21+0200\n"
"PO-Revision-Date: 2003-11-03 17:11+0100\n"
"Last-Translator: TAKAHASHI Tamotsu <ttakah at lapis.plala.or.jp>\n"
"Language-Team: Japanese <gnupg-i18n at gnupg.org>\n"
@@ -401,7 +401,7 @@ msgstr "
msgid "Open file manager"
msgstr "�ե�����ޥ͡������"
-#: src/gpa.c:114 src/gpa.h:84
+#: src/gpa.c:114 src/gpa.h:91
#, fuzzy
msgid "Open the card manager"
msgstr "�ե�����ޥ͡������"
@@ -448,37 +448,37 @@ msgstr ""
msgid "Please report bugs to <"
msgstr "���� <"
-#: src/gpa.h:73
+#: src/gpa.h:80
#, fuzzy
msgid "_Windows"
msgstr "/������ɥ� (_W)"
-#: src/gpa.h:76
+#: src/gpa.h:83
#, fuzzy
msgid "Open the keyring editor"
msgstr "��«���ǥ����� (�ǥե����)"
-#: src/gpa.h:78
+#: src/gpa.h:85
#, fuzzy
msgid "Open the file manager"
msgstr "�ե�����ޥ͡������"
-#: src/gpa.h:80
+#: src/gpa.h:87
#, fuzzy
msgid "Open the clipboard"
msgstr "����åץܡ��ɤإ��ԡ� (_C)"
-#: src/gpa.h:98
+#: src/gpa.h:105
#, fuzzy
msgid "Configure the application"
msgstr "����ե������Ź沽����"
-#: src/gpa.h:101
+#: src/gpa.h:108
#, fuzzy
msgid "_Backend Preferences"
msgstr "/�Խ� (E)/���� (_E)"
-#: src/gpa.h:102
+#: src/gpa.h:109
msgid "Configure the backend programs"
msgstr ""
@@ -760,133 +760,137 @@ msgstr ""
msgid "Verifying message ..."
msgstr "������..."
-#: src/gpasubkeylist.c:88
+#: src/gpasubkeylist.c:90
msgid "Subkey ID"
msgstr "���� ID"
-#: src/gpasubkeylist.c:94 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "���ơ�����"
-#: src/gpasubkeylist.c:100
+#: src/gpasubkeylist.c:102
#, fuzzy
msgid "Algo"
msgstr "���르�ꥺ��"
-#: src/gpasubkeylist.c:107
+#: src/gpasubkeylist.c:110
msgid "Size"
msgstr "������"
-#: src/gpasubkeylist.c:113 src/keylist.c:640
+#: src/gpasubkeylist.c:117 src/keylist.c:640
#, fuzzy
msgid "Created"
msgstr "����"
-#: src/gpasubkeylist.c:120
+#: src/gpasubkeylist.c:124
#, fuzzy
msgid "Expires"
msgstr "�����ڤ�"
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "Can sign"
msgstr "��̾��ǽ"
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "Can certify"
msgstr "������ǽ"
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "Can encrypt"
msgstr "�Ź沽��ǽ"
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "Can authenticate"
msgstr "ǧ�ڲ�ǽ"
-#: src/gpasubkeylist.c:153
+#: src/gpasubkeylist.c:157
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:154
+#: src/gpasubkeylist.c:158
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:160
+#: src/gpasubkeylist.c:164
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:161
+#: src/gpasubkeylist.c:165
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:177 src/gpgmetools.c:706 src/gpgmetools.c:923
+#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
#: src/gpgmetools.c:1042
msgid "Revoked"
msgstr "�˴��Ѥ�"
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
msgid "Expired"
msgstr "�����ڤ�"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
msgid "Disabled"
msgstr "̵��"
-#: src/gpasubkeylist.c:189
+#: src/gpasubkeylist.c:193
msgid "Unsigned"
msgstr "��̾�ʤ�"
-#: src/gpasubkeylist.c:193 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
msgid "Valid"
msgstr "ͭ��"
-#: src/gpawidgets.c:71 src/gpgmetools.c:754 src/gpgmetools.c:761
-#: src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "�桼��̾:"
-#: src/gpawidgets.c:71 src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/keysigndlg.c:103
msgid "User Names:"
msgstr "�桼��̾:"
-#: src/gpawidgets.c:77 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:296
+#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
+#: src/gpa-key-details.c:309
msgid "Key ID:"
msgstr "�� ID:"
-#: src/gpawidgets.c:180
+#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+msgid "Fingerprint:"
+msgstr "����:"
+
+#: src/gpawidgets.c:195
msgid "Expiration"
msgstr "����"
-#: src/gpawidgets.c:187
+#: src/gpawidgets.c:202
msgid "_indefinitely valid"
msgstr "̵����ͭ�� (_I)"
-#: src/gpawidgets.c:195
+#: src/gpawidgets.c:210
msgid "expire _after"
msgstr "ͭ���ʴ��� (_A):"
-#: src/gpawidgets.c:215
+#: src/gpawidgets.c:230
msgid "expire o_n:"
msgstr "ͭ�����¤λ��� (_N):"
-#: src/gpawidgets.c:289
+#: src/gpawidgets.c:304
msgid ""
"!FATAL ERROR!\n"
"Invalid insert mode for expiry date."
@@ -898,7 +902,7 @@ msgstr ""
msgid "(not set)"
msgstr ""
-#: src/gpgmeedit.c:1220
+#: src/gpgmeedit.c:1273
msgid ""
"Keys are already stored on the card.\n"
"Really replace existing keys?"
@@ -1763,79 +1767,75 @@ msgstr "
msgid "The key has only a public part"
msgstr "���θ��ϸ����������ʤ�"
-#: src/gpa-key-details.c:176
+#: src/gpa-key-details.c:182
#, c-format
msgid "%s %u bits"
msgstr "%s %u �ӥå�"
-#: src/gpa-key-details.c:209
+#: src/gpa-key-details.c:222
msgid "No keys selected"
msgstr "��������Ƥ��ޤ���"
-#: src/gpa-key-details.c:212
+#: src/gpa-key-details.c:225
#, fuzzy, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d �Ĥθ�������Ƥ��ޤ�"
msgstr[1] "%d �Ĥθ�������Ƥ��ޤ�"
-#: src/gpa-key-details.c:294
+#: src/gpa-key-details.c:307
#, fuzzy
msgid "User name:"
msgstr "�桼��̾:"
-#: src/gpa-key-details.c:298 src/keysigndlg.c:106
-msgid "Fingerprint:"
-msgstr "����:"
-
-#: src/gpa-key-details.c:300
+#: src/gpa-key-details.c:313
msgid "Expires at:"
msgstr "ͭ������:"
-#: src/gpa-key-details.c:302
+#: src/gpa-key-details.c:315
msgid "Owner Trust:"
msgstr "��ͭ�Ԥο�����:"
-#: src/gpa-key-details.c:304
+#: src/gpa-key-details.c:317
#, fuzzy
msgid "Key validity:"
msgstr "����ͭ����:"
-#: src/gpa-key-details.c:306
+#: src/gpa-key-details.c:319
#, fuzzy
msgid "Key type:"
msgstr "��������:"
-#: src/gpa-key-details.c:308
+#: src/gpa-key-details.c:321
msgid "Created at:"
msgstr "������:"
-#: src/gpa-key-details.c:311
+#: src/gpa-key-details.c:324
msgid "Details"
msgstr "�ܺ�"
-#: src/gpa-key-details.c:357
+#: src/gpa-key-details.c:370
msgid "Show signatures on user name:"
msgstr "�桼��̾���Ф����̾��ɽ��"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
#, fuzzy
msgid "Chain"
msgstr "��̾��ǽ"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Signatures"
msgstr "��̾"
-#: src/gpa-key-details.c:415
+#: src/gpa-key-details.c:428
msgid "All signatures"
msgstr "���٤Ƥν�̾"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
msgid "Subkeys"
msgstr "����"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
#, fuzzy
msgid "Key"
msgstr "/�� (_K)"
@@ -1848,21 +1848,21 @@ msgstr "
msgid "Do you want to sign the following key?"
msgstr "�ʲ��θ��˽�̾���ޤ���?"
-#: src/keysigndlg.c:116
+#: src/keysigndlg.c:119
msgid ""
"Check the name and fingerprint carefully to be sure that it really is the "
"key you want to sign."
msgstr "�����ˤ��줬��̾���������ʤΤ���̾���Ȼ����褯���Ƴ�ǧ���Ʋ�������"
-#: src/keysigndlg.c:124
+#: src/keysigndlg.c:127
msgid "All user names in this key will be signed."
msgstr "���θ��ˤ���桼��̾�ϡ����٤ƽ�̾����ޤ���"
-#: src/keysigndlg.c:130
+#: src/keysigndlg.c:133
msgid "The key will be signed with your default private key."
msgstr "���θ��ϥǥե���Ȥ���̩���ǽ�̾����ޤ���"
-#: src/keysigndlg.c:137
+#: src/keysigndlg.c:140
msgid "Sign only _locally"
msgstr "������Ǥ�����̾ (_L)"
@@ -1876,7 +1876,7 @@ msgid ""
"with the option --disable-x509 ."
msgstr ""
-#: src/options.c:329
+#: src/options.c:340
msgid ""
"The private key you selected as default is no longer available.\n"
"GPA will try to choose a new default key automatically."
diff --git a/po/nl.gmo b/po/nl.gmo
index b08fd69..f5eddfd 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index fc7a0eb..d5c50a4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,8 +3,8 @@
msgid ""
msgstr ""
"Project-Id-Version: GPA 0.5.1\n"
-"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-12-12 08:51+0100\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
+"POT-Creation-Date: 2015-09-09 11:21+0200\n"
"PO-Revision-Date: 2003-10-19 14:29+0200\n"
"Last-Translator: Michael Anckaert <michael.anckaert at pi.be>\n"
"Language-Team: DUTCH <nl at li.org>\n"
@@ -397,7 +397,7 @@ msgstr "open keyring editor (standaard)"
msgid "Open file manager"
msgstr "open bestandsbeheerder"
-#: src/gpa.c:114 src/gpa.h:84
+#: src/gpa.c:114 src/gpa.h:91
#, fuzzy
msgid "Open the card manager"
msgstr "Open de bestandsbeheerder"
@@ -444,37 +444,37 @@ msgstr ""
msgid "Please report bugs to <"
msgstr "Rapporteer fouten aub naar <"
-#: src/gpa.h:73
+#: src/gpa.h:80
#, fuzzy
msgid "_Windows"
msgstr "/_Vensters"
-#: src/gpa.h:76
+#: src/gpa.h:83
#, fuzzy
msgid "Open the keyring editor"
msgstr "open keyring editor (standaard)"
-#: src/gpa.h:78
+#: src/gpa.h:85
#, fuzzy
msgid "Open the file manager"
msgstr "Open de bestandsbeheerder"
-#: src/gpa.h:80
+#: src/gpa.h:87
#, fuzzy
msgid "Open the clipboard"
msgstr "Naar _klembord"
-#: src/gpa.h:98
+#: src/gpa.h:105
#, fuzzy
msgid "Configure the application"
msgstr "Versleutel het geselecteerde bestand"
-#: src/gpa.h:101
+#: src/gpa.h:108
#, fuzzy
msgid "_Backend Preferences"
msgstr "/Bewerk/Voork_euren..."
-#: src/gpa.h:102
+#: src/gpa.h:109
msgid "Configure the backend programs"
msgstr ""
@@ -760,133 +760,137 @@ msgstr ""
msgid "Verifying message ..."
msgstr "Aan het verifieren..."
-#: src/gpasubkeylist.c:88
+#: src/gpasubkeylist.c:90
msgid "Subkey ID"
msgstr "Subsleutels ID"
-#: src/gpasubkeylist.c:94 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Status"
-#: src/gpasubkeylist.c:100
+#: src/gpasubkeylist.c:102
#, fuzzy
msgid "Algo"
msgstr "Algoritme"
-#: src/gpasubkeylist.c:107
+#: src/gpasubkeylist.c:110
msgid "Size"
msgstr "Grootte"
-#: src/gpasubkeylist.c:113 src/keylist.c:640
+#: src/gpasubkeylist.c:117 src/keylist.c:640
#, fuzzy
msgid "Created"
msgstr "Maken"
-#: src/gpasubkeylist.c:120
+#: src/gpasubkeylist.c:124
#, fuzzy
msgid "Expires"
msgstr "Vervallen"
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "Can sign"
msgstr "Kan ondertekend worden"
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "Can certify"
msgstr "Kan gecertifieerd worden"
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "Can encrypt"
msgstr "Kan versleuteld worden"
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "Can authenticate"
msgstr "Kan geauthenticeerd worden"
-#: src/gpasubkeylist.c:153
+#: src/gpasubkeylist.c:157
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:154
+#: src/gpasubkeylist.c:158
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:160
+#: src/gpasubkeylist.c:164
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:161
+#: src/gpasubkeylist.c:165
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:177 src/gpgmetools.c:706 src/gpgmetools.c:923
+#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
#: src/gpgmetools.c:1042
msgid "Revoked"
msgstr "Terugtrekken"
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
msgid "Expired"
msgstr "Vervallen"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
msgid "Disabled"
msgstr "Uitgeschakeld"
-#: src/gpasubkeylist.c:189
+#: src/gpasubkeylist.c:193
msgid "Unsigned"
msgstr "Niet ondertekend"
-#: src/gpasubkeylist.c:193 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
msgid "Valid"
msgstr "Geldig"
-#: src/gpawidgets.c:71 src/gpgmetools.c:754 src/gpgmetools.c:761
-#: src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Gebruiker naam:"
-#: src/gpawidgets.c:71 src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/keysigndlg.c:103
msgid "User Names:"
msgstr "Gebruikers Namen:"
-#: src/gpawidgets.c:77 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:296
+#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
+#: src/gpa-key-details.c:309
msgid "Key ID:"
msgstr "Sleutel ID:"
-#: src/gpawidgets.c:180
+#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+msgid "Fingerprint:"
+msgstr "Vingerafdruk:"
+
+#: src/gpawidgets.c:195
msgid "Expiration"
msgstr "Vervaldag"
-#: src/gpawidgets.c:187
+#: src/gpawidgets.c:202
msgid "_indefinitely valid"
msgstr "_oneindig geldig"
-#: src/gpawidgets.c:195
+#: src/gpawidgets.c:210
msgid "expire _after"
msgstr "vervalt _na"
-#: src/gpawidgets.c:215
+#: src/gpawidgets.c:230
msgid "expire o_n:"
msgstr "v_ervalt op"
-#: src/gpawidgets.c:289
+#: src/gpawidgets.c:304
msgid ""
"!FATAL ERROR!\n"
"Invalid insert mode for expiry date."
@@ -898,7 +902,7 @@ msgstr ""
msgid "(not set)"
msgstr ""
-#: src/gpgmeedit.c:1220
+#: src/gpgmeedit.c:1273
msgid ""
"Keys are already stored on the card.\n"
"Really replace existing keys?"
@@ -1771,79 +1775,75 @@ msgstr "De sleutel heeft een geheim en publiek deel"
msgid "The key has only a public part"
msgstr "De sleutel heeft enkel een publiek deel"
-#: src/gpa-key-details.c:176
+#: src/gpa-key-details.c:182
#, c-format
msgid "%s %u bits"
msgstr ""
-#: src/gpa-key-details.c:209
+#: src/gpa-key-details.c:222
msgid "No keys selected"
msgstr "Geen sleutels geselecteerd"
-#: src/gpa-key-details.c:212
+#: src/gpa-key-details.c:225
#, fuzzy, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d sleutels geselecteerd"
msgstr[1] "%d sleutels geselecteerd"
-#: src/gpa-key-details.c:294
+#: src/gpa-key-details.c:307
#, fuzzy
msgid "User name:"
msgstr "Gebruiker naam:"
-#: src/gpa-key-details.c:298 src/keysigndlg.c:106
-msgid "Fingerprint:"
-msgstr "Vingerafdruk:"
-
-#: src/gpa-key-details.c:300
+#: src/gpa-key-details.c:313
msgid "Expires at:"
msgstr "Vervalt op:"
-#: src/gpa-key-details.c:302
+#: src/gpa-key-details.c:315
msgid "Owner Trust:"
msgstr "Eigenaars Vertrouwen:"
-#: src/gpa-key-details.c:304
+#: src/gpa-key-details.c:317
#, fuzzy
msgid "Key validity:"
msgstr "Sleutel geldigheid:"
-#: src/gpa-key-details.c:306
+#: src/gpa-key-details.c:319
#, fuzzy
msgid "Key type:"
msgstr "Sleutel Type:"
-#: src/gpa-key-details.c:308
+#: src/gpa-key-details.c:321
msgid "Created at:"
msgstr "Gemaakt op:"
-#: src/gpa-key-details.c:311
+#: src/gpa-key-details.c:324
msgid "Details"
msgstr "Details"
-#: src/gpa-key-details.c:357
+#: src/gpa-key-details.c:370
msgid "Show signatures on user name:"
msgstr "Controleer ondertekeningen van het geselecteerde bestand"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
#, fuzzy
msgid "Chain"
msgstr "Kan ondertekend worden"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Signatures"
msgstr "Ondertekeningen"
-#: src/gpa-key-details.c:415
+#: src/gpa-key-details.c:428
msgid "All signatures"
msgstr "Ondertekeningen"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
msgid "Subkeys"
msgstr "Subsleutels"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
#, fuzzy
msgid "Key"
msgstr "/_Sleutels"
@@ -1856,7 +1856,7 @@ msgstr "Onderteken Sleutel"
msgid "Do you want to sign the following key?"
msgstr "Wilt u de volgende sleutel ondertekenen?"
-#: src/keysigndlg.c:116
+#: src/keysigndlg.c:119
msgid ""
"Check the name and fingerprint carefully to be sure that it really is the "
"key you want to sign."
@@ -1864,15 +1864,15 @@ msgstr ""
"Controleer de naam en de vingerafdruk zorgvuldig en wees zeker dat dit echt "
"de sleutel is die uw wilt ondertekenen."
-#: src/keysigndlg.c:124
+#: src/keysigndlg.c:127
msgid "All user names in this key will be signed."
msgstr "Alle gebruiker namen in deze sleutel zullen worden ondertekend."
-#: src/keysigndlg.c:130
+#: src/keysigndlg.c:133
msgid "The key will be signed with your default private key."
msgstr "De sleutel zal ondertekend worden met uw standaard geheime sleutel."
-#: src/keysigndlg.c:137
+#: src/keysigndlg.c:140
msgid "Sign only _locally"
msgstr "Onderteken alleen _lokaal"
@@ -1886,7 +1886,7 @@ msgid ""
"with the option --disable-x509 ."
msgstr ""
-#: src/options.c:329
+#: src/options.c:340
msgid ""
"The private key you selected as default is no longer available.\n"
"GPA will try to choose a new default key automatically."
diff --git a/po/pl.gmo b/po/pl.gmo
index 7e5f30a..5eb1722 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index b2c2254..b1e1619 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gpa-0.7\n"
-"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-12-12 08:51+0100\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
+"POT-Creation-Date: 2015-09-09 11:21+0200\n"
"PO-Revision-Date: 2004-08-22 02:23+0200\n"
"Last-Translator: Emilian Nowak <emil5 at go2.pl>\n"
"Language-Team: Polish <pl at li.org>\n"
@@ -394,7 +394,7 @@ msgstr "otwiera edytor zbioru kluczy (domyślne)"
msgid "Open file manager"
msgstr "otwiera okno menedżera plików"
-#: src/gpa.c:114 src/gpa.h:84
+#: src/gpa.c:114 src/gpa.h:91
#, fuzzy
msgid "Open the card manager"
msgstr "Otwiera okno menedżera plików"
@@ -440,37 +440,37 @@ msgstr ""
msgid "Please report bugs to <"
msgstr "Raporty o błędach wysyłaj do <"
-#: src/gpa.h:73
+#: src/gpa.h:80
#, fuzzy
msgid "_Windows"
msgstr "/_Okna"
-#: src/gpa.h:76
+#: src/gpa.h:83
#, fuzzy
msgid "Open the keyring editor"
msgstr "otwiera edytor zbioru kluczy (domyślne)"
-#: src/gpa.h:78
+#: src/gpa.h:85
#, fuzzy
msgid "Open the file manager"
msgstr "Otwiera okno menedżera plików"
-#: src/gpa.h:80
+#: src/gpa.h:87
#, fuzzy
msgid "Open the clipboard"
msgstr "Otwiera okno menedżera plików"
-#: src/gpa.h:98
+#: src/gpa.h:105
#, fuzzy
msgid "Configure the application"
msgstr "Szyfruje wybrany plik"
-#: src/gpa.h:101
+#: src/gpa.h:108
#, fuzzy
msgid "_Backend Preferences"
msgstr "/Edycja/_Ustawienia..."
-#: src/gpa.h:102
+#: src/gpa.h:109
msgid "Configure the backend programs"
msgstr ""
@@ -757,133 +757,137 @@ msgstr ""
msgid "Verifying message ..."
msgstr "Weryfikacja..."
-#: src/gpasubkeylist.c:88
+#: src/gpasubkeylist.c:90
msgid "Subkey ID"
msgstr "Identyfikator podklucza"
-#: src/gpasubkeylist.c:94 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Stan"
-#: src/gpasubkeylist.c:100
+#: src/gpasubkeylist.c:102
#, fuzzy
msgid "Algo"
msgstr "Algorytm"
-#: src/gpasubkeylist.c:107
+#: src/gpasubkeylist.c:110
msgid "Size"
msgstr "Rozmiar"
-#: src/gpasubkeylist.c:113 src/keylist.c:640
+#: src/gpasubkeylist.c:117 src/keylist.c:640
#, fuzzy
msgid "Created"
msgstr "Utworzony dnia:"
-#: src/gpasubkeylist.c:120
+#: src/gpasubkeylist.c:124
#, fuzzy
msgid "Expires"
msgstr "Po terminie ważności"
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "Can sign"
msgstr "Można podpisywać"
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "Can certify"
msgstr "Można poświadczać"
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "Can encrypt"
msgstr "Można szyfrować"
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "Can authenticate"
msgstr "Można autoryzować"
-#: src/gpasubkeylist.c:153
+#: src/gpasubkeylist.c:157
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:154
+#: src/gpasubkeylist.c:158
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:160
+#: src/gpasubkeylist.c:164
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:161
+#: src/gpasubkeylist.c:165
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:177 src/gpgmetools.c:706 src/gpgmetools.c:923
+#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
#: src/gpgmetools.c:1042
msgid "Revoked"
msgstr "Unieważniony"
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
msgid "Expired"
msgstr "Po terminie ważności"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
msgid "Disabled"
msgstr "Wyłączone"
-#: src/gpasubkeylist.c:189
+#: src/gpasubkeylist.c:193
msgid "Unsigned"
msgstr "Brak podpisów"
-#: src/gpasubkeylist.c:193 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
msgid "Valid"
msgstr "Poprawny"
-#: src/gpawidgets.c:71 src/gpgmetools.c:754 src/gpgmetools.c:761
-#: src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Nazwa użytkownika:"
-#: src/gpawidgets.c:71 src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/keysigndlg.c:103
msgid "User Names:"
msgstr "Nazwy użytkownika:"
-#: src/gpawidgets.c:77 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:296
+#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
+#: src/gpa-key-details.c:309
msgid "Key ID:"
msgstr "ID klucza:"
-#: src/gpawidgets.c:180
+#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+msgid "Fingerprint:"
+msgstr "Odcisk klucza:"
+
+#: src/gpawidgets.c:195
msgid "Expiration"
msgstr "Data końca ważności"
-#: src/gpawidgets.c:187
+#: src/gpawidgets.c:202
msgid "_indefinitely valid"
msgstr "_zawsze ważny"
-#: src/gpawidgets.c:195
+#: src/gpawidgets.c:210
msgid "expire _after"
msgstr "traci ważność _po"
-#: src/gpawidgets.c:215
+#: src/gpawidgets.c:230
msgid "expire o_n:"
msgstr "traci ważność _dnia:"
-#: src/gpawidgets.c:289
+#: src/gpawidgets.c:304
msgid ""
"!FATAL ERROR!\n"
"Invalid insert mode for expiry date."
@@ -895,7 +899,7 @@ msgstr ""
msgid "(not set)"
msgstr ""
-#: src/gpgmeedit.c:1220
+#: src/gpgmeedit.c:1273
msgid ""
"Keys are already stored on the card.\n"
"Really replace existing keys?"
@@ -1771,79 +1775,75 @@ msgstr "Klucz posiada zarówno cześć publiczną jak i prywatną"
msgid "The key has only a public part"
msgstr "Klucz posiada tylko część publiczną"
-#: src/gpa-key-details.c:176
+#: src/gpa-key-details.c:182
#, c-format
msgid "%s %u bits"
msgstr "%s %u bit"
-#: src/gpa-key-details.c:209
+#: src/gpa-key-details.c:222
msgid "No keys selected"
msgstr "Nie wybrano żadnego klucza"
-#: src/gpa-key-details.c:212
+#: src/gpa-key-details.c:225
#, fuzzy, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "wybranych kluczy - %d"
msgstr[1] "wybranych kluczy - %d"
-#: src/gpa-key-details.c:294
+#: src/gpa-key-details.c:307
#, fuzzy
msgid "User name:"
msgstr "Nazwa użytkownika:"
-#: src/gpa-key-details.c:298 src/keysigndlg.c:106
-msgid "Fingerprint:"
-msgstr "Odcisk klucza:"
-
-#: src/gpa-key-details.c:300
+#: src/gpa-key-details.c:313
msgid "Expires at:"
msgstr "Traci ważność:"
-#: src/gpa-key-details.c:302
+#: src/gpa-key-details.c:315
msgid "Owner Trust:"
msgstr "Zaufanie do właściciela:"
-#: src/gpa-key-details.c:304
+#: src/gpa-key-details.c:317
#, fuzzy
msgid "Key validity:"
msgstr "Poprawność klucza:"
-#: src/gpa-key-details.c:306
+#: src/gpa-key-details.c:319
#, fuzzy
msgid "Key type:"
msgstr "Rodzaj klucza:"
-#: src/gpa-key-details.c:308
+#: src/gpa-key-details.c:321
msgid "Created at:"
msgstr "Utworzony dnia:"
-#: src/gpa-key-details.c:311
+#: src/gpa-key-details.c:324
msgid "Details"
msgstr "Szczegóły"
-#: src/gpa-key-details.c:357
+#: src/gpa-key-details.c:370
msgid "Show signatures on user name:"
msgstr "Pokaż podpisy danego użytkownika:"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
#, fuzzy
msgid "Chain"
msgstr "Można podpisywać"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Signatures"
msgstr "Podpisy"
-#: src/gpa-key-details.c:415
+#: src/gpa-key-details.c:428
msgid "All signatures"
msgstr "Wszystkie podpisy"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
msgid "Subkeys"
msgstr "Podklucze"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
#, fuzzy
msgid "Key"
msgstr "/_Klucze"
@@ -1856,7 +1856,7 @@ msgstr "Podpisz klucz"
msgid "Do you want to sign the following key?"
msgstr "Czy chcesz podpisać nas"
-#: src/keysigndlg.c:116
+#: src/keysigndlg.c:119
msgid ""
"Check the name and fingerprint carefully to be sure that it really is the "
"key you want to sign."
@@ -1864,16 +1864,16 @@ msgstr ""
"Dokładnie sprawdź nazwę i odcisk klucza, aby mieć pewność, że zamierzasz "
"podpisać właściwy klucz."
-#: src/keysigndlg.c:124
+#: src/keysigndlg.c:127
msgid "All user names in this key will be signed."
msgstr "Wszyscy użytkownicy przypisani do tego klucza zostaną podpisani."
-#: src/keysigndlg.c:130
+#: src/keysigndlg.c:133
msgid "The key will be signed with your default private key."
msgstr ""
"Klucz zostanie podpisany za pomocą twojego domyślnego klucza prywatnego."
-#: src/keysigndlg.c:137
+#: src/keysigndlg.c:140
msgid "Sign only _locally"
msgstr "Podpisz tylko _lokalnie"
@@ -1887,7 +1887,7 @@ msgid ""
"with the option --disable-x509 ."
msgstr ""
-#: src/options.c:329
+#: src/options.c:340
msgid ""
"The private key you selected as default is no longer available.\n"
"GPA will try to choose a new default key automatically."
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 3513d88..964ae90 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8a2e0a6..833b48c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: GPA 0.6.1\n"
-"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-12-12 08:51+0100\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
+"POT-Creation-Date: 2015-09-09 11:21+0200\n"
"PO-Revision-Date: 2003-01-20 18:39+0100\n"
"Last-Translator: Renato Martini <rmartini at cipsga.org.br>\n"
"Language-Team: PORTUGUES <rmartini at cipsga.org.br>\n"
@@ -397,7 +397,7 @@ msgstr "abre editor do chaveiro digital (padr
msgid "Open file manager"
msgstr "abre Gerenciador de arquivos"
-#: src/gpa.c:114 src/gpa.h:84
+#: src/gpa.c:114 src/gpa.h:91
#, fuzzy
msgid "Open the card manager"
msgstr "Abrir Gerenciador de arquivos"
@@ -443,37 +443,37 @@ msgstr ""
msgid "Please report bugs to <"
msgstr "Por favor envie os bugs para <"
-#: src/gpa.h:73
+#: src/gpa.h:80
#, fuzzy
msgid "_Windows"
msgstr "/_Janelas"
-#: src/gpa.h:76
+#: src/gpa.h:83
#, fuzzy
msgid "Open the keyring editor"
msgstr "abre editor do chaveiro digital (padr�o)"
-#: src/gpa.h:78
+#: src/gpa.h:85
#, fuzzy
msgid "Open the file manager"
msgstr "Abrir Gerenciador de arquivos"
-#: src/gpa.h:80
+#: src/gpa.h:87
#, fuzzy
msgid "Open the clipboard"
msgstr "Abrir Gerenciador de arquivos"
-#: src/gpa.h:98
+#: src/gpa.h:105
#, fuzzy
msgid "Configure the application"
msgstr "Encriptar o arquivo selecionado"
-#: src/gpa.h:101
+#: src/gpa.h:108
#, fuzzy
msgid "_Backend Preferences"
msgstr "/Editar/Pr_efer�ncias..."
-#: src/gpa.h:102
+#: src/gpa.h:109
msgid "Configure the backend programs"
msgstr ""
@@ -758,137 +758,141 @@ msgstr ""
msgid "Verifying message ..."
msgstr "Verificar"
-#: src/gpasubkeylist.c:88
+#: src/gpasubkeylist.c:90
#, fuzzy
msgid "Subkey ID"
msgstr "Key ID"
-#: src/gpasubkeylist.c:94 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Status"
-#: src/gpasubkeylist.c:100
+#: src/gpasubkeylist.c:102
#, fuzzy
msgid "Algo"
msgstr "_Algoritmo:"
-#: src/gpasubkeylist.c:107
+#: src/gpasubkeylist.c:110
msgid "Size"
msgstr ""
-#: src/gpasubkeylist.c:113 src/keylist.c:640
+#: src/gpasubkeylist.c:117 src/keylist.c:640
#, fuzzy
msgid "Created"
msgstr "Criado"
-#: src/gpasubkeylist.c:120
+#: src/gpasubkeylist.c:124
#, fuzzy
msgid "Expires"
msgstr "Expirado"
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
#, fuzzy
msgid "Can sign"
msgstr "_assinar"
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "Can certify"
msgstr ""
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
#, fuzzy
msgid "Can encrypt"
msgstr "encriptado"
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "Can authenticate"
msgstr ""
-#: src/gpasubkeylist.c:153
+#: src/gpasubkeylist.c:157
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:154
+#: src/gpasubkeylist.c:158
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:160
+#: src/gpasubkeylist.c:164
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:161
+#: src/gpasubkeylist.c:165
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:177 src/gpgmetools.c:706 src/gpgmetools.c:923
+#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
#: src/gpgmetools.c:1042
msgid "Revoked"
msgstr "Revogado"
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
msgid "Expired"
msgstr "Expirado"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
msgid "Disabled"
msgstr "Desabilitado"
-#: src/gpasubkeylist.c:189
+#: src/gpasubkeylist.c:193
#, fuzzy
msgid "Unsigned"
msgstr "assinado"
-#: src/gpasubkeylist.c:193 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
msgid "Valid"
msgstr "V�lido"
-#: src/gpawidgets.c:71 src/gpgmetools.c:754 src/gpgmetools.c:761
-#: src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Nome do Usu�rio:"
-#: src/gpawidgets.c:71 src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/keysigndlg.c:103
msgid "User Names:"
msgstr "Nomes de Usu�rio:"
-#: src/gpawidgets.c:77 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:296
+#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
+#: src/gpa-key-details.c:309
msgid "Key ID:"
msgstr "Key ID:"
-#: src/gpawidgets.c:180
+#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+msgid "Fingerprint:"
+msgstr "Impress�o digital:"
+
+#: src/gpawidgets.c:195
msgid "Expiration"
msgstr "Expira��o"
-#: src/gpawidgets.c:187
+#: src/gpawidgets.c:202
msgid "_indefinitely valid"
msgstr "_v�lida indefinidamente"
-#: src/gpawidgets.c:195
+#: src/gpawidgets.c:210
msgid "expire _after"
msgstr "expira _ap�s"
-#: src/gpawidgets.c:215
+#: src/gpawidgets.c:230
msgid "expire o_n:"
msgstr "_expira em:"
-#: src/gpawidgets.c:289
+#: src/gpawidgets.c:304
msgid ""
"!FATAL ERROR!\n"
"Invalid insert mode for expiry date."
@@ -900,7 +904,7 @@ msgstr ""
msgid "(not set)"
msgstr ""
-#: src/gpgmeedit.c:1220
+#: src/gpgmeedit.c:1273
msgid ""
"Keys are already stored on the card.\n"
"Really replace existing keys?"
@@ -1768,80 +1772,76 @@ msgstr "A chave tem ao mesmo tempo uma parte privada e p
msgid "The key has only a public part"
msgstr "A chave tem apenas uma parte p�blica"
-#: src/gpa-key-details.c:176
+#: src/gpa-key-details.c:182
#, fuzzy, c-format
msgid "%s %u bits"
msgstr "%s %li bits"
-#: src/gpa-key-details.c:209
+#: src/gpa-key-details.c:222
msgid "No keys selected"
msgstr "Nenhuma chave selecionada"
-#: src/gpa-key-details.c:212
+#: src/gpa-key-details.c:225
#, fuzzy, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d chaves selecionadas"
msgstr[1] "%d chaves selecionadas"
-#: src/gpa-key-details.c:294
+#: src/gpa-key-details.c:307
#, fuzzy
msgid "User name:"
msgstr "Nome do Usu�rio:"
-#: src/gpa-key-details.c:298 src/keysigndlg.c:106
-msgid "Fingerprint:"
-msgstr "Impress�o digital:"
-
-#: src/gpa-key-details.c:300
+#: src/gpa-key-details.c:313
msgid "Expires at:"
msgstr "Expira em:"
-#: src/gpa-key-details.c:302
+#: src/gpa-key-details.c:315
msgid "Owner Trust:"
msgstr "Confian�a no propriet�rio:"
-#: src/gpa-key-details.c:304
+#: src/gpa-key-details.c:317
#, fuzzy
msgid "Key validity:"
msgstr "Validade da chave:"
-#: src/gpa-key-details.c:306
+#: src/gpa-key-details.c:319
#, fuzzy
msgid "Key type:"
msgstr "Tipo de chave:"
-#: src/gpa-key-details.c:308
+#: src/gpa-key-details.c:321
msgid "Created at:"
msgstr "Criada em:"
-#: src/gpa-key-details.c:311
+#: src/gpa-key-details.c:324
msgid "Details"
msgstr "Detalhes"
-#: src/gpa-key-details.c:357
+#: src/gpa-key-details.c:370
msgid "Show signatures on user name:"
msgstr "Mostrar assinaturas no nome do usu�rio:"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
#, fuzzy
msgid "Chain"
msgstr "_assinar"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Signatures"
msgstr "Assinaturas"
-#: src/gpa-key-details.c:415
+#: src/gpa-key-details.c:428
msgid "All signatures"
msgstr "Todas as assinaturas"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
#, fuzzy
msgid "Subkeys"
msgstr "Key ID"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
#, fuzzy
msgid "Key"
msgstr "/_Chaves"
@@ -1854,7 +1854,7 @@ msgstr "Assinar chave"
msgid "Do you want to sign the following key?"
msgstr "Voc� deseja assinar as chaves seguintes?"
-#: src/keysigndlg.c:116
+#: src/keysigndlg.c:119
msgid ""
"Check the name and fingerprint carefully to be sure that it really is the "
"key you want to sign."
@@ -1862,15 +1862,15 @@ msgstr ""
"Verifique o nome e a impress�o digital meticulosamente para estar certo que "
"� realmente a chave que voc� deseja assinar."
-#: src/keysigndlg.c:124
+#: src/keysigndlg.c:127
msgid "All user names in this key will be signed."
msgstr "Todos os nomes de usu�rios ser�o assinados."
-#: src/keysigndlg.c:130
+#: src/keysigndlg.c:133
msgid "The key will be signed with your default private key."
msgstr "A chave ser� assinada com a sua chave privada padr�o"
-#: src/keysigndlg.c:137
+#: src/keysigndlg.c:140
msgid "Sign only _locally"
msgstr "Assinar apenas _localmente"
@@ -1884,7 +1884,7 @@ msgid ""
"with the option --disable-x509 ."
msgstr ""
-#: src/options.c:329
+#: src/options.c:340
msgid ""
"The private key you selected as default is no longer available.\n"
"GPA will try to choose a new default key automatically."
diff --git a/po/ru.gmo b/po/ru.gmo
index 668168d..3296167 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index 1467f7f..909fa03 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: GPA 0.8\n"
-"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-12-12 08:51+0100\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
+"POT-Creation-Date: 2015-09-09 11:21+0200\n"
"PO-Revision-Date: 2011-12-12 10:17+0100\n"
"Last-Translator: Sergei Smirnov <moscow at hro.org>\n"
"Language-Team: Russian <moscow at hro.org>\n"
@@ -388,7 +388,7 @@ msgstr "Открыть менеджер ключей (по умолчанию)"
msgid "Open file manager"
msgstr "Открыть менеджер файлов"
-#: src/gpa.c:114 src/gpa.h:84
+#: src/gpa.c:114 src/gpa.h:91
#, fuzzy
msgid "Open the card manager"
msgstr "Открыть менеджер файлов"
@@ -431,34 +431,34 @@ msgstr "Графическая оболочка к GnuPG"
msgid "Please report bugs to <"
msgstr "Об ошибках сообщайте <"
-#: src/gpa.h:73
+#: src/gpa.h:80
#, fuzzy
msgid "_Windows"
msgstr "/_Окно"
-#: src/gpa.h:76
+#: src/gpa.h:83
msgid "Open the keyring editor"
msgstr "Открыть менеджер ключей"
-#: src/gpa.h:78
+#: src/gpa.h:85
msgid "Open the file manager"
msgstr "Открыть менеджер файлов"
-#: src/gpa.h:80
+#: src/gpa.h:87
msgid "Open the clipboard"
msgstr "Открыть буфер"
-#: src/gpa.h:98
+#: src/gpa.h:105
#, fuzzy
msgid "Configure the application"
msgstr "Вырезать выделенное в буфер"
-#: src/gpa.h:101
+#: src/gpa.h:108
#, fuzzy
msgid "_Backend Preferences"
msgstr "/Правка/Настройки _шифр. программы..."
-#: src/gpa.h:102
+#: src/gpa.h:109
msgid "Configure the backend programs"
msgstr ""
@@ -744,133 +744,137 @@ msgstr ""
msgid "Verifying message ..."
msgstr "Проверка..."
-#: src/gpasubkeylist.c:88
+#: src/gpasubkeylist.c:90
msgid "Subkey ID"
msgstr "ID подключа"
-#: src/gpasubkeylist.c:94 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Статус"
-#: src/gpasubkeylist.c:100
+#: src/gpasubkeylist.c:102
#, fuzzy
msgid "Algo"
msgstr "Алгоритм"
-#: src/gpasubkeylist.c:107
+#: src/gpasubkeylist.c:110
msgid "Size"
msgstr "Размер"
-#: src/gpasubkeylist.c:113 src/keylist.c:640
+#: src/gpasubkeylist.c:117 src/keylist.c:640
#, fuzzy
msgid "Created"
msgstr "Создан:"
-#: src/gpasubkeylist.c:120
+#: src/gpasubkeylist.c:124
#, fuzzy
msgid "Expires"
msgstr "Истек"
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "Can sign"
msgstr "Может подпис."
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "Can certify"
msgstr "Может сертиф."
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "Can encrypt"
msgstr "Может шифр."
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "Can authenticate"
msgstr "Может авториз."
-#: src/gpasubkeylist.c:153
+#: src/gpasubkeylist.c:157
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:154
+#: src/gpasubkeylist.c:158
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:160
+#: src/gpasubkeylist.c:164
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:161
+#: src/gpasubkeylist.c:165
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:177 src/gpgmetools.c:706 src/gpgmetools.c:923
+#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
#: src/gpgmetools.c:1042
msgid "Revoked"
msgstr "Отозван"
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
msgid "Expired"
msgstr "Истек"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
msgid "Disabled"
msgstr "Отключен"
-#: src/gpasubkeylist.c:189
+#: src/gpasubkeylist.c:193
msgid "Unsigned"
msgstr "Неподписан"
-#: src/gpasubkeylist.c:193 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
msgid "Valid"
msgstr "Достоверно"
-#: src/gpawidgets.c:71 src/gpgmetools.c:754 src/gpgmetools.c:761
-#: src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Имя:"
-#: src/gpawidgets.c:71 src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/keysigndlg.c:103
msgid "User Names:"
msgstr "Имена:"
-#: src/gpawidgets.c:77 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:296
+#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
+#: src/gpa-key-details.c:309
msgid "Key ID:"
msgstr "ID ключа:"
-#: src/gpawidgets.c:180
+#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+msgid "Fingerprint:"
+msgstr "Отпечаток:"
+
+#: src/gpawidgets.c:195
msgid "Expiration"
msgstr "Срок годности"
-#: src/gpawidgets.c:187
+#: src/gpawidgets.c:202
msgid "_indefinitely valid"
msgstr "_не вполне достоверен"
-#: src/gpawidgets.c:195
+#: src/gpawidgets.c:210
msgid "expire _after"
msgstr "недействителен после"
-#: src/gpawidgets.c:215
+#: src/gpawidgets.c:230
msgid "expire o_n:"
msgstr "недействителен с:"
-#: src/gpawidgets.c:289
+#: src/gpawidgets.c:304
msgid ""
"!FATAL ERROR!\n"
"Invalid insert mode for expiry date."
@@ -882,7 +886,7 @@ msgstr ""
msgid "(not set)"
msgstr ""
-#: src/gpgmeedit.c:1220
+#: src/gpgmeedit.c:1273
msgid ""
"Keys are already stored on the card.\n"
"Really replace existing keys?"
@@ -1760,16 +1764,16 @@ msgstr "Закрытый и открытый ключи"
msgid "The key has only a public part"
msgstr "Только открытый ключ"
-#: src/gpa-key-details.c:176
+#: src/gpa-key-details.c:182
#, c-format
msgid "%s %u bits"
msgstr "%s %u бит"
-#: src/gpa-key-details.c:209
+#: src/gpa-key-details.c:222
msgid "No keys selected"
msgstr "Не выбран ключ"
-#: src/gpa-key-details.c:212
+#: src/gpa-key-details.c:225
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
@@ -1777,63 +1781,59 @@ msgstr[0] "%d ключ выбран"
msgstr[1] "%d ключа выбрано"
msgstr[2] "%d ключей выбрано"
-#: src/gpa-key-details.c:294
+#: src/gpa-key-details.c:307
#, fuzzy
msgid "User name:"
msgstr "Имя:"
-#: src/gpa-key-details.c:298 src/keysigndlg.c:106
-msgid "Fingerprint:"
-msgstr "Отпечаток:"
-
-#: src/gpa-key-details.c:300
+#: src/gpa-key-details.c:313
msgid "Expires at:"
msgstr "Годен до:"
-#: src/gpa-key-details.c:302
+#: src/gpa-key-details.c:315
msgid "Owner Trust:"
msgstr "Доверие владельцу:"
-#: src/gpa-key-details.c:304
+#: src/gpa-key-details.c:317
#, fuzzy
msgid "Key validity:"
msgstr "Достоверность ключа:"
-#: src/gpa-key-details.c:306
+#: src/gpa-key-details.c:319
#, fuzzy
msgid "Key type:"
msgstr "Тип ключа:"
-#: src/gpa-key-details.c:308
+#: src/gpa-key-details.c:321
msgid "Created at:"
msgstr "Создан:"
-#: src/gpa-key-details.c:311
+#: src/gpa-key-details.c:324
msgid "Details"
msgstr "Подробно"
-#: src/gpa-key-details.c:357
+#: src/gpa-key-details.c:370
msgid "Show signatures on user name:"
msgstr "Показать подписи имени владельца:"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
#, fuzzy
msgid "Chain"
msgstr "Может подпис."
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Signatures"
msgstr "Подписи"
-#: src/gpa-key-details.c:415
+#: src/gpa-key-details.c:428
msgid "All signatures"
msgstr "Все подписи"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
msgid "Subkeys"
msgstr "Подключи"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
#, fuzzy
msgid "Key"
msgstr "/_Ключи"
@@ -1846,7 +1846,7 @@ msgstr "Подпись ключа"
msgid "Do you want to sign the following key?"
msgstr "Подписать этот ключ?"
-#: src/keysigndlg.c:116
+#: src/keysigndlg.c:119
msgid ""
"Check the name and fingerprint carefully to be sure that it really is the "
"key you want to sign."
@@ -1854,15 +1854,15 @@ msgstr ""
"Тщательно сверьте имя и отпечаток ключа. Нужно быть уверенным, что вы "
"подписываете именно тот ключ, который хотите."
-#: src/keysigndlg.c:124
+#: src/keysigndlg.c:127
msgid "All user names in this key will be signed."
msgstr "Все имена в ключе будут подписаны."
-#: src/keysigndlg.c:130
+#: src/keysigndlg.c:133
msgid "The key will be signed with your default private key."
msgstr "Ключ будет подписан вашим закрытым ключом по умолчанию."
-#: src/keysigndlg.c:137
+#: src/keysigndlg.c:140
msgid "Sign only _locally"
msgstr "Подписать только локально"
@@ -1876,7 +1876,7 @@ msgid ""
"with the option --disable-x509 ."
msgstr ""
-#: src/options.c:329
+#: src/options.c:340
msgid ""
"The private key you selected as default is no longer available.\n"
"GPA will try to choose a new default key automatically."
diff --git a/po/sv.gmo b/po/sv.gmo
index a4b0dea..52d2157 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index fc803f7..e1d21e1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gpa\n"
-"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-12-12 08:51+0100\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
+"POT-Creation-Date: 2015-09-09 11:21+0200\n"
"PO-Revision-Date: 2011-12-12 10:13+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -374,7 +374,7 @@ msgstr "Öppna nyckelringsredigeraren (standard)"
msgid "Open file manager"
msgstr "Öppna filhanteraren"
-#: src/gpa.c:114 src/gpa.h:84
+#: src/gpa.c:114 src/gpa.h:91
#, fuzzy
msgid "Open the card manager"
msgstr "Öppna filhanteraren"
@@ -416,31 +416,31 @@ msgstr "Grafiskt användargränssnitt till GnuPG"
msgid "Please report bugs to <"
msgstr "Rapportera fel till <"
-#: src/gpa.h:73
+#: src/gpa.h:80
msgid "_Windows"
msgstr "_Fönster"
-#: src/gpa.h:76
+#: src/gpa.h:83
msgid "Open the keyring editor"
msgstr "Öppna nyckelringsredigeraren"
-#: src/gpa.h:78
+#: src/gpa.h:85
msgid "Open the file manager"
msgstr "Öppna filhanteraren"
-#: src/gpa.h:80
+#: src/gpa.h:87
msgid "Open the clipboard"
msgstr "Öppna urklipp"
-#: src/gpa.h:98
+#: src/gpa.h:105
msgid "Configure the application"
msgstr "Konfigurera programmet"
-#: src/gpa.h:101
+#: src/gpa.h:108
msgid "_Backend Preferences"
msgstr "Inställningar för bakände"
-#: src/gpa.h:102
+#: src/gpa.h:109
msgid "Configure the backend programs"
msgstr "Konfigurera bakändesprogram"
@@ -727,133 +727,137 @@ msgstr "Meddelandesignering"
msgid "Verifying message ..."
msgstr "Validerar meddelande..."
-#: src/gpasubkeylist.c:88
+#: src/gpasubkeylist.c:90
msgid "Subkey ID"
msgstr "Undernyckelsidentitet"
-#: src/gpasubkeylist.c:94 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Status"
-#: src/gpasubkeylist.c:100
+#: src/gpasubkeylist.c:102
#, fuzzy
msgid "Algo"
msgstr "Algoritm"
-#: src/gpasubkeylist.c:107
+#: src/gpasubkeylist.c:110
msgid "Size"
msgstr "Storlek"
-#: src/gpasubkeylist.c:113 src/keylist.c:640
+#: src/gpasubkeylist.c:117 src/keylist.c:640
#, fuzzy
msgid "Created"
msgstr "Skapad den:"
-#: src/gpasubkeylist.c:120
+#: src/gpasubkeylist.c:124
#, fuzzy
msgid "Expires"
msgstr "Utgången"
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "Can sign"
msgstr "Kan signera"
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "Can certify"
msgstr "Kan certifiera"
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "Can encrypt"
msgstr "Kan kryptera"
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "Can authenticate"
msgstr "Kan authentisera"
-#: src/gpasubkeylist.c:153
+#: src/gpasubkeylist.c:157
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:154
+#: src/gpasubkeylist.c:158
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:160
+#: src/gpasubkeylist.c:164
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:161
+#: src/gpasubkeylist.c:165
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:177 src/gpgmetools.c:706 src/gpgmetools.c:923
+#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
#: src/gpgmetools.c:1042
msgid "Revoked"
msgstr "Spärrad"
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
msgid "Expired"
msgstr "Utgången"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
msgid "Disabled"
msgstr "Inaktiverad"
-#: src/gpasubkeylist.c:189
+#: src/gpasubkeylist.c:193
msgid "Unsigned"
msgstr "Osignerad"
-#: src/gpasubkeylist.c:193 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
msgid "Valid"
msgstr "Giltig"
-#: src/gpawidgets.c:71 src/gpgmetools.c:754 src/gpgmetools.c:761
-#: src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Användarnamn:"
-#: src/gpawidgets.c:71 src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/keysigndlg.c:103
msgid "User Names:"
msgstr "Användarnamn:"
-#: src/gpawidgets.c:77 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:296
+#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
+#: src/gpa-key-details.c:309
msgid "Key ID:"
msgstr "Nyckelidentitet:"
-#: src/gpawidgets.c:180
+#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+msgid "Fingerprint:"
+msgstr "Fingeravtryck:"
+
+#: src/gpawidgets.c:195
msgid "Expiration"
msgstr "Utgångstid"
-#: src/gpawidgets.c:187
+#: src/gpawidgets.c:202
msgid "_indefinitely valid"
msgstr "_obegränsad giltighet"
-#: src/gpawidgets.c:195
+#: src/gpawidgets.c:210
msgid "expire _after"
msgstr "utgången _efter"
-#: src/gpawidgets.c:215
+#: src/gpawidgets.c:230
msgid "expire o_n:"
msgstr "utgår _den:"
-#: src/gpawidgets.c:289
+#: src/gpawidgets.c:304
msgid ""
"!FATAL ERROR!\n"
"Invalid insert mode for expiry date."
@@ -865,7 +869,7 @@ msgstr ""
msgid "(not set)"
msgstr ""
-#: src/gpgmeedit.c:1220
+#: src/gpgmeedit.c:1273
msgid ""
"Keys are already stored on the card.\n"
"Really replace existing keys?"
@@ -1714,79 +1718,75 @@ msgstr "Denna nyckel har både en privat och en publik del"
msgid "The key has only a public part"
msgstr "Denna nyckel har endast en publik del"
-#: src/gpa-key-details.c:176
+#: src/gpa-key-details.c:182
#, c-format
msgid "%s %u bits"
msgstr "%s %u bitar"
-#: src/gpa-key-details.c:209
+#: src/gpa-key-details.c:222
msgid "No keys selected"
msgstr "Inga nycklar valda"
-#: src/gpa-key-details.c:212
+#: src/gpa-key-details.c:225
#, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d nyckel markerad"
msgstr[1] "%d nycklar markerade"
-#: src/gpa-key-details.c:294
+#: src/gpa-key-details.c:307
#, fuzzy
msgid "User name:"
msgstr "Användarnamn:"
-#: src/gpa-key-details.c:298 src/keysigndlg.c:106
-msgid "Fingerprint:"
-msgstr "Fingeravtryck:"
-
-#: src/gpa-key-details.c:300
+#: src/gpa-key-details.c:313
msgid "Expires at:"
msgstr "Går ut den:"
-#: src/gpa-key-details.c:302
+#: src/gpa-key-details.c:315
msgid "Owner Trust:"
msgstr "Ägartillit:"
-#: src/gpa-key-details.c:304
+#: src/gpa-key-details.c:317
#, fuzzy
msgid "Key validity:"
msgstr "Nyckelgiltighet:"
-#: src/gpa-key-details.c:306
+#: src/gpa-key-details.c:319
#, fuzzy
msgid "Key type:"
msgstr "Nyckeltyp:"
-#: src/gpa-key-details.c:308
+#: src/gpa-key-details.c:321
msgid "Created at:"
msgstr "Skapad den:"
-#: src/gpa-key-details.c:311
+#: src/gpa-key-details.c:324
msgid "Details"
msgstr "Detaljer"
-#: src/gpa-key-details.c:357
+#: src/gpa-key-details.c:370
msgid "Show signatures on user name:"
msgstr "Visa signaturer på användarnamn:"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
#, fuzzy
msgid "Chain"
msgstr "Kan signera"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Signatures"
msgstr "Signaturer"
-#: src/gpa-key-details.c:415
+#: src/gpa-key-details.c:428
msgid "All signatures"
msgstr "Alla signaturer"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
msgid "Subkeys"
msgstr "Undernycklar"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
#, fuzzy
msgid "Key"
msgstr "_Nycklar"
@@ -1799,7 +1799,7 @@ msgstr "Signera nyckel"
msgid "Do you want to sign the following key?"
msgstr "Vill du signera följande nyckel?"
-#: src/keysigndlg.c:116
+#: src/keysigndlg.c:119
msgid ""
"Check the name and fingerprint carefully to be sure that it really is the "
"key you want to sign."
@@ -1807,15 +1807,15 @@ msgstr ""
"Kontrollera namnet och fingeravtrycket noggrant. Är du säker på att detta är "
"nyckeln du vill signera?"
-#: src/keysigndlg.c:124
+#: src/keysigndlg.c:127
msgid "All user names in this key will be signed."
msgstr "Alla användarnamn i denna nyckel kommer att signeras."
-#: src/keysigndlg.c:130
+#: src/keysigndlg.c:133
msgid "The key will be signed with your default private key."
msgstr "Nyckeln kommer att signeras med din privata standardnyckel."
-#: src/keysigndlg.c:137
+#: src/keysigndlg.c:140
msgid "Sign only _locally"
msgstr "Signera endast _lokalt"
@@ -1829,7 +1829,7 @@ msgid ""
"with the option --disable-x509 ."
msgstr ""
-#: src/options.c:329
+#: src/options.c:340
msgid ""
"The private key you selected as default is no longer available.\n"
"GPA will try to choose a new default key automatically."
diff --git a/po/tr.gmo b/po/tr.gmo
index b35fa6b..6e77409 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index 504271a..ef5e200 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gpa 0.7.0\n"
-"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-12-12 08:51+0100\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
+"POT-Creation-Date: 2015-09-09 11:21+0200\n"
"PO-Revision-Date: 2011-12-12 10:14+0100\n"
"Last-Translator: Mert �etin <mertc at su.sabanciuniv.edu>\n"
"Language-Team: xTc & D�j� Vu\n"
@@ -394,7 +394,7 @@ msgstr "anahtarl
msgid "Open file manager"
msgstr "dosya y�neticisini a�"
-#: src/gpa.c:114 src/gpa.h:84
+#: src/gpa.c:114 src/gpa.h:91
#, fuzzy
msgid "Open the card manager"
msgstr "Dosya Y�neticisini A�"
@@ -440,37 +440,37 @@ msgstr ""
msgid "Please report bugs to <"
msgstr "L�tfen hatalar� <"
-#: src/gpa.h:73
+#: src/gpa.h:80
#, fuzzy
msgid "_Windows"
msgstr "/_Pencereler"
-#: src/gpa.h:76
+#: src/gpa.h:83
#, fuzzy
msgid "Open the keyring editor"
msgstr "anahtarl�k d�zenleyicisini a� (varsay�lan)"
-#: src/gpa.h:78
+#: src/gpa.h:85
#, fuzzy
msgid "Open the file manager"
msgstr "Dosya Y�neticisini A�"
-#: src/gpa.h:80
+#: src/gpa.h:87
#, fuzzy
msgid "Open the clipboard"
msgstr "Dosya Y�neticisini A�"
-#: src/gpa.h:98
+#: src/gpa.h:105
#, fuzzy
msgid "Configure the application"
msgstr "Se�ili dosyay� �ifrele"
-#: src/gpa.h:101
+#: src/gpa.h:108
#, fuzzy
msgid "_Backend Preferences"
msgstr "/D�zen/Te_rcihler..."
-#: src/gpa.h:102
+#: src/gpa.h:109
msgid "Configure the backend programs"
msgstr ""
@@ -755,133 +755,137 @@ msgstr ""
msgid "Verifying message ..."
msgstr "Do�ruluyor..."
-#: src/gpasubkeylist.c:88
+#: src/gpasubkeylist.c:90
msgid "Subkey ID"
msgstr "Altanahtar Kimli�i"
-#: src/gpasubkeylist.c:94 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "Durum"
-#: src/gpasubkeylist.c:100
+#: src/gpasubkeylist.c:102
#, fuzzy
msgid "Algo"
msgstr "Algoritma"
-#: src/gpasubkeylist.c:107
+#: src/gpasubkeylist.c:110
msgid "Size"
msgstr "Boyut"
-#: src/gpasubkeylist.c:113 src/keylist.c:640
+#: src/gpasubkeylist.c:117 src/keylist.c:640
#, fuzzy
msgid "Created"
msgstr "Yarat�lma Tarihi:"
-#: src/gpasubkeylist.c:120
+#: src/gpasubkeylist.c:124
#, fuzzy
msgid "Expires"
msgstr "Sona Ermi�"
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "Can sign"
msgstr "�mzalayabilir"
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "Can certify"
msgstr "Onaylayabilir"
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "Can encrypt"
msgstr "�ifreleyebilir"
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "Can authenticate"
msgstr "Do�rulayabilir"
-#: src/gpasubkeylist.c:153
+#: src/gpasubkeylist.c:157
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:154
+#: src/gpasubkeylist.c:158
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:160
+#: src/gpasubkeylist.c:164
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:161
+#: src/gpasubkeylist.c:165
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:177 src/gpgmetools.c:706 src/gpgmetools.c:923
+#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
#: src/gpgmetools.c:1042
msgid "Revoked"
msgstr "Feshedilmi�"
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
msgid "Expired"
msgstr "Sona Ermi�"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
msgid "Disabled"
msgstr "Ge�ersiz K�l�nm��"
-#: src/gpasubkeylist.c:189
+#: src/gpasubkeylist.c:193
msgid "Unsigned"
msgstr "�mzalanmam��"
-#: src/gpasubkeylist.c:193 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
msgid "Valid"
msgstr "Ge�erli"
-#: src/gpawidgets.c:71 src/gpgmetools.c:754 src/gpgmetools.c:761
-#: src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "Kullan�c� Ad�:"
-#: src/gpawidgets.c:71 src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/keysigndlg.c:103
msgid "User Names:"
msgstr "Kullan�c� Adlar�:"
-#: src/gpawidgets.c:77 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:296
+#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
+#: src/gpa-key-details.c:309
msgid "Key ID:"
msgstr "Anahtar Kimli�i:"
-#: src/gpawidgets.c:180
+#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+msgid "Fingerprint:"
+msgstr "Parmakizi:"
+
+#: src/gpawidgets.c:195
msgid "Expiration"
msgstr "Sona Erme"
-#: src/gpawidgets.c:187
+#: src/gpawidgets.c:202
msgid "_indefinitely valid"
msgstr "_s�n�rs�zca ge�erli"
-#: src/gpawidgets.c:195
+#: src/gpawidgets.c:210
msgid "expire _after"
msgstr "�u _tarihten sonra sona er"
-#: src/gpawidgets.c:215
+#: src/gpawidgets.c:230
msgid "expire o_n:"
msgstr "�u ta_rihte sona er:"
-#: src/gpawidgets.c:289
+#: src/gpawidgets.c:304
msgid ""
"!FATAL ERROR!\n"
"Invalid insert mode for expiry date."
@@ -893,7 +897,7 @@ msgstr ""
msgid "(not set)"
msgstr ""
-#: src/gpgmeedit.c:1220
+#: src/gpgmeedit.c:1273
msgid ""
"Keys are already stored on the card.\n"
"Really replace existing keys?"
@@ -1764,79 +1768,75 @@ msgstr "Anahtar hem genel hem de
msgid "The key has only a public part"
msgstr "Anahtar sadece genel b�l�me sahip"
-#: src/gpa-key-details.c:176
+#: src/gpa-key-details.c:182
#, c-format
msgid "%s %u bits"
msgstr "%s %u bit"
-#: src/gpa-key-details.c:209
+#: src/gpa-key-details.c:222
msgid "No keys selected"
msgstr "Hi�bir anahtar se�ilmedi"
-#: src/gpa-key-details.c:212
+#: src/gpa-key-details.c:225
#, fuzzy, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d anahtar se�ildi"
msgstr[1] "%d anahtar se�ildi"
-#: src/gpa-key-details.c:294
+#: src/gpa-key-details.c:307
#, fuzzy
msgid "User name:"
msgstr "Kullan�c� Ad�:"
-#: src/gpa-key-details.c:298 src/keysigndlg.c:106
-msgid "Fingerprint:"
-msgstr "Parmakizi:"
-
-#: src/gpa-key-details.c:300
+#: src/gpa-key-details.c:313
msgid "Expires at:"
msgstr "Bitim tarihi:"
-#: src/gpa-key-details.c:302
+#: src/gpa-key-details.c:315
msgid "Owner Trust:"
msgstr "Sahibine G�ven:"
-#: src/gpa-key-details.c:304
+#: src/gpa-key-details.c:317
#, fuzzy
msgid "Key validity:"
msgstr "Anahtar Ge�erlili�i"
-#: src/gpa-key-details.c:306
+#: src/gpa-key-details.c:319
#, fuzzy
msgid "Key type:"
msgstr "Anahtar Tipi:"
-#: src/gpa-key-details.c:308
+#: src/gpa-key-details.c:321
msgid "Created at:"
msgstr "Yarat�lma Tarihi:"
-#: src/gpa-key-details.c:311
+#: src/gpa-key-details.c:324
msgid "Details"
msgstr "Detaylar"
-#: src/gpa-key-details.c:357
+#: src/gpa-key-details.c:370
msgid "Show signatures on user name:"
msgstr "�u kullan�c� ad�ndaki imzalar� g�ster:"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
#, fuzzy
msgid "Chain"
msgstr "�mzalayabilir"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Signatures"
msgstr "�mzalar"
-#: src/gpa-key-details.c:415
+#: src/gpa-key-details.c:428
msgid "All signatures"
msgstr "T�m imzalar"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
msgid "Subkeys"
msgstr "Altanahtarlar"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
#, fuzzy
msgid "Key"
msgstr "/_Anahtarlar"
@@ -1849,7 +1849,7 @@ msgstr "Anahtar
msgid "Do you want to sign the following key?"
msgstr "Bu anahtar� imzalamak istedi�iniza emin misiniz?"
-#: src/keysigndlg.c:116
+#: src/keysigndlg.c:119
msgid ""
"Check the name and fingerprint carefully to be sure that it really is the "
"key you want to sign."
@@ -1857,15 +1857,15 @@ msgstr ""
"Bu anahtar�n ger�ekten imzalamak istedi�iniz anahtar oldu�una emin olmak "
"i�in l�tfen ismini ve parmakizini dikkatli kontrol edin."
-#: src/keysigndlg.c:124
+#: src/keysigndlg.c:127
msgid "All user names in this key will be signed."
msgstr "Bu anahtardaki b�t�n kullan�c� isimleri imzalanacakt�r."
-#: src/keysigndlg.c:130
+#: src/keysigndlg.c:133
msgid "The key will be signed with your default private key."
msgstr "Bu anahtar sizin varsay�lan �zel anahtar�n�zla imzalanacakt�r."
-#: src/keysigndlg.c:137
+#: src/keysigndlg.c:140
msgid "Sign only _locally"
msgstr "Sadece _yerel olarak imzala"
@@ -1879,7 +1879,7 @@ msgid ""
"with the option --disable-x509 ."
msgstr ""
-#: src/options.c:329
+#: src/options.c:340
msgid ""
"The private key you selected as default is no longer available.\n"
"GPA will try to choose a new default key automatically."
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 446108f..2658988 100644
Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3673aac..f8f2847 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gpa-0.7.0\n"
-"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2014-12-12 08:51+0100\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
+"POT-Creation-Date: 2015-09-09 11:21+0200\n"
"PO-Revision-Date: 2003-10-20 11:55+0200\n"
"Last-Translator: Shell Hung <shell at linux.org.hk>\n"
"Language-Team: Hong Kong Linux User Group <info at linux.org.hk>\n"
@@ -393,7 +393,7 @@ msgstr "
msgid "Open file manager"
msgstr "�}���ɮz��"
-#: src/gpa.c:114 src/gpa.h:84
+#: src/gpa.c:114 src/gpa.h:91
#, fuzzy
msgid "Open the card manager"
msgstr "�}���ɮz��"
@@ -439,37 +439,37 @@ msgstr ""
msgid "Please report bugs to <"
msgstr "�^������ <"
-#: src/gpa.h:73
+#: src/gpa.h:80
#, fuzzy
msgid "_Windows"
msgstr "/����"
-#: src/gpa.h:76
+#: src/gpa.h:83
#, fuzzy
msgid "Open the keyring editor"
msgstr "�}���_��s�边 (�w�])"
-#: src/gpa.h:78
+#: src/gpa.h:85
#, fuzzy
msgid "Open the file manager"
msgstr "�}���ɮz��"
-#: src/gpa.h:80
+#: src/gpa.h:87
#, fuzzy
msgid "Open the clipboard"
msgstr "�}���ɮz��"
-#: src/gpa.h:98
+#: src/gpa.h:105
#, fuzzy
msgid "Configure the application"
msgstr "�[�K�w����ɮ�"
-#: src/gpa.h:101
+#: src/gpa.h:108
#, fuzzy
msgid "_Backend Preferences"
msgstr "/�s��/�]�w (&E)"
-#: src/gpa.h:102
+#: src/gpa.h:109
msgid "Configure the backend programs"
msgstr ""
@@ -751,133 +751,137 @@ msgstr ""
msgid "Verifying message ..."
msgstr "���Ҥ�..."
-#: src/gpasubkeylist.c:88
+#: src/gpasubkeylist.c:90
msgid "Subkey ID"
msgstr "�l�_�Ǹ�"
-#: src/gpasubkeylist.c:94 src/siglist.c:149 src/verifydlg.c:342
+#: src/gpasubkeylist.c:96 src/siglist.c:149 src/verifydlg.c:342
msgid "Status"
msgstr "���A"
-#: src/gpasubkeylist.c:100
+#: src/gpasubkeylist.c:102
#, fuzzy
msgid "Algo"
msgstr "�[�K�⦡"
-#: src/gpasubkeylist.c:107
+#: src/gpasubkeylist.c:110
msgid "Size"
msgstr "�j�p"
-#: src/gpasubkeylist.c:113 src/keylist.c:640
+#: src/gpasubkeylist.c:117 src/keylist.c:640
#, fuzzy
msgid "Created"
msgstr "�إߦb :"
-#: src/gpasubkeylist.c:120
+#: src/gpasubkeylist.c:124
#, fuzzy
msgid "Expires"
msgstr "�w�g�L��"
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "S"
msgstr ""
-#: src/gpasubkeylist.c:129
+#: src/gpasubkeylist.c:133
msgid "Can sign"
msgstr "���\ñ�p"
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "C"
msgstr ""
-#: src/gpasubkeylist.c:135
+#: src/gpasubkeylist.c:139
msgid "Can certify"
msgstr "���\����"
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "E"
msgstr ""
-#: src/gpasubkeylist.c:141
+#: src/gpasubkeylist.c:145
msgid "Can encrypt"
msgstr "���\�[�K"
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "A"
msgstr ""
-#: src/gpasubkeylist.c:147
+#: src/gpasubkeylist.c:151
msgid "Can authenticate"
msgstr "���\�o��"
-#: src/gpasubkeylist.c:153
+#: src/gpasubkeylist.c:157
msgid "T"
msgstr ""
-#: src/gpasubkeylist.c:154
+#: src/gpasubkeylist.c:158
msgid "Secret key stored on a smartcard."
msgstr ""
-#: src/gpasubkeylist.c:160
+#: src/gpasubkeylist.c:164
msgid "Card S/N"
msgstr ""
-#: src/gpasubkeylist.c:161
+#: src/gpasubkeylist.c:165
msgid "Serial number of the smart card."
msgstr ""
-#: src/gpasubkeylist.c:177 src/gpgmetools.c:706 src/gpgmetools.c:923
+#: src/gpasubkeylist.c:181 src/gpgmetools.c:706 src/gpgmetools.c:923
#: src/gpgmetools.c:1042
msgid "Revoked"
msgstr "����"
-#: src/gpasubkeylist.c:181 src/gpgmetools.c:708 src/gpgmetools.c:1038
+#: src/gpasubkeylist.c:185 src/gpgmetools.c:708 src/gpgmetools.c:1038
msgid "Expired"
msgstr "�w�g�L��"
-#: src/gpasubkeylist.c:185 src/gpgmetools.c:710
+#: src/gpasubkeylist.c:189 src/gpgmetools.c:710
msgid "Disabled"
msgstr "�w�g����"
-#: src/gpasubkeylist.c:189
+#: src/gpasubkeylist.c:193
msgid "Unsigned"
msgstr "�S��ñ�p"
-#: src/gpasubkeylist.c:193 src/gpgmetools.c:1029 src/verifydlg.c:215
+#: src/gpasubkeylist.c:197 src/gpgmetools.c:1029 src/verifydlg.c:215
msgid "Valid"
msgstr "���T"
-#: src/gpawidgets.c:71 src/gpgmetools.c:754 src/gpgmetools.c:761
-#: src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/gpgmetools.c:754 src/gpgmetools.c:761
+#: src/keysigndlg.c:103
msgid "User Name:"
msgstr "�Ϊ̦W�� :"
-#: src/gpawidgets.c:71 src/keysigndlg.c:100
+#: src/gpawidgets.c:75 src/keysigndlg.c:103
msgid "User Names:"
msgstr "�Ϊ̦W�� :"
-#: src/gpawidgets.c:77 src/gpgmetools.c:755 src/gpgmetools.c:762
-#: src/gpa-key-details.c:296
+#: src/gpawidgets.c:81 src/gpgmetools.c:755 src/gpgmetools.c:762
+#: src/gpa-key-details.c:309
msgid "Key ID:"
msgstr "�K�_ ID:"
-#: src/gpawidgets.c:180
+#: src/gpawidgets.c:91 src/gpa-key-details.c:311 src/keysigndlg.c:109
+msgid "Fingerprint:"
+msgstr "����:"
+
+#: src/gpawidgets.c:195
msgid "Expiration"
msgstr "���Ĵ�"
-#: src/gpawidgets.c:187
+#: src/gpawidgets.c:202
msgid "_indefinitely valid"
msgstr "�����T���X�k (&i)"
-#: src/gpawidgets.c:195
+#: src/gpawidgets.c:210
msgid "expire _after"
msgstr "���Ħ� (&a)"
-#: src/gpawidgets.c:215
+#: src/gpawidgets.c:230
msgid "expire o_n:"
msgstr "���Ĵ��� (&n):"
-#: src/gpawidgets.c:289
+#: src/gpawidgets.c:304
msgid ""
"!FATAL ERROR!\n"
"Invalid insert mode for expiry date."
@@ -889,7 +893,7 @@ msgstr ""
msgid "(not set)"
msgstr ""
-#: src/gpgmeedit.c:1220
+#: src/gpgmeedit.c:1273
msgid ""
"Keys are already stored on the card.\n"
"Really replace existing keys?"
@@ -1745,79 +1749,75 @@ msgstr "
msgid "The key has only a public part"
msgstr "�o�K�_�u�����@����"
-#: src/gpa-key-details.c:176
+#: src/gpa-key-details.c:182
#, c-format
msgid "%s %u bits"
msgstr "%s %u ��"
-#: src/gpa-key-details.c:209
+#: src/gpa-key-details.c:222
msgid "No keys selected"
msgstr "�S����ܱK�_"
-#: src/gpa-key-details.c:212
+#: src/gpa-key-details.c:225
#, fuzzy, c-format
msgid "%d key selected"
msgid_plural "%d keys selected"
msgstr[0] "%d �K�_�Q���"
msgstr[1] "%d �K�_�Q���"
-#: src/gpa-key-details.c:294
+#: src/gpa-key-details.c:307
#, fuzzy
msgid "User name:"
msgstr "�Ϊ̦W�� :"
-#: src/gpa-key-details.c:298 src/keysigndlg.c:106
-msgid "Fingerprint:"
-msgstr "����:"
-
-#: src/gpa-key-details.c:300
+#: src/gpa-key-details.c:313
msgid "Expires at:"
msgstr "���Ĵ���:"
-#: src/gpa-key-details.c:302
+#: src/gpa-key-details.c:315
msgid "Owner Trust:"
msgstr "�֦��̫H��:"
-#: src/gpa-key-details.c:304
+#: src/gpa-key-details.c:317
#, fuzzy
msgid "Key validity:"
msgstr "�{�����_:"
-#: src/gpa-key-details.c:306
+#: src/gpa-key-details.c:319
#, fuzzy
msgid "Key type:"
msgstr "�K�_����:"
-#: src/gpa-key-details.c:308
+#: src/gpa-key-details.c:321
msgid "Created at:"
msgstr "�إߦb :"
-#: src/gpa-key-details.c:311
+#: src/gpa-key-details.c:324
msgid "Details"
msgstr "�Ա�"
-#: src/gpa-key-details.c:357
+#: src/gpa-key-details.c:370
msgid "Show signatures on user name:"
msgstr "�b�Ϊ̦W�����ñ�p:"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
#, fuzzy
msgid "Chain"
msgstr "���\ñ�p"
-#: src/gpa-key-details.c:393
+#: src/gpa-key-details.c:406
msgid "Signatures"
msgstr "ñ�p"
-#: src/gpa-key-details.c:415
+#: src/gpa-key-details.c:428
msgid "All signatures"
msgstr "�Ҧ�ñ�p"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
msgid "Subkeys"
msgstr "�l�_"
-#: src/gpa-key-details.c:477
+#: src/gpa-key-details.c:490
#, fuzzy
msgid "Key"
msgstr "/�_��"
@@ -1830,21 +1830,21 @@ msgstr "ñ
msgid "Do you want to sign the following key?"
msgstr "�z�Ʊ�ñ�p�H�U���K�_ ?"
-#: src/keysigndlg.c:116
+#: src/keysigndlg.c:119
msgid ""
"Check the name and fingerprint carefully to be sure that it really is the "
"key you want to sign."
msgstr "�ˬd�K�_���W�٤Ϋ����H�T�w�S�����~."
-#: src/keysigndlg.c:124
+#: src/keysigndlg.c:127
msgid "All user names in this key will be signed."
msgstr "�Ҧ��b�o���_�U���Ϊ̳��@ñ�p."
-#: src/keysigndlg.c:130
+#: src/keysigndlg.c:133
msgid "The key will be signed with your default private key."
msgstr "�o�K�_�|�H�z���p�_ñ�p."
-#: src/keysigndlg.c:137
+#: src/keysigndlg.c:140
msgid "Sign only _locally"
msgstr "�u�O���a�W��ñ�p (&l)"
@@ -1858,7 +1858,7 @@ msgid ""
"with the option --disable-x509 ."
msgstr ""
-#: src/options.c:329
+#: src/options.c:340
msgid ""
"The private key you selected as default is no longer available.\n"
"GPA will try to choose a new default key automatically."
diff --git a/src/Makefile.in b/src/Makefile.in
index b422a34..86d9d78 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -37,23 +36,51 @@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -76,8 +103,8 @@ bin_PROGRAMS = gpa$(EXEEXT) $(am__EXEEXT_1)
@HAVE_W32_SYSTEM_TRUE at am__append_1 = launch-gpa
noinst_PROGRAMS = dndtest$(EXEEXT)
subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/versioninfo.rc.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(srcdir)/versioninfo.rc.in $(top_srcdir)/build-aux/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/check_zlib.m4 \
$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gpg-error.m4 \
@@ -218,6 +245,18 @@ launch_gpa_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
launch_gpa_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(launch_gpa_LDFLAGS) \
$(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
@@ -226,18 +265,14 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_ at AM_V@)
am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_ at AM_V@)
-am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_ at AM_V@)
-am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(dndtest_SOURCES) $(gpa_SOURCES) $(launch_gpa_SOURCES)
DIST_SOURCES = $(dndtest_SOURCES) $(am__gpa_SOURCES_DIST) \
$(am__launch_gpa_SOURCES_DIST)
@@ -274,6 +309,23 @@ am__uninstall_files_from_dir = { \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
DATA = $(pkgdata_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -594,10 +646,11 @@ install-binPROGRAMS: $(bin_PROGRAMS)
fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p; \
- then echo "$$p"; echo "$$p"; else :; fi; \
+ while read p p1; do if test -f $$p \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
-e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
sed 'N;N;N;s,\n, ,g' | \
$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -618,7 +671,8 @@ uninstall-binPROGRAMS:
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' `; \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -628,12 +682,15 @@ clean-binPROGRAMS:
clean-noinstPROGRAMS:
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+
dndtest$(EXEEXT): $(dndtest_OBJECTS) $(dndtest_DEPENDENCIES) $(EXTRA_dndtest_DEPENDENCIES)
@rm -f dndtest$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(dndtest_OBJECTS) $(dndtest_LDADD) $(LIBS)
+
gpa$(EXEEXT): $(gpa_OBJECTS) $(gpa_DEPENDENCIES) $(EXTRA_gpa_DEPENDENCIES)
@rm -f gpa$(EXEEXT)
$(AM_V_CCLD)$(gpa_LINK) $(gpa_OBJECTS) $(gpa_LDADD) $(LIBS)
+
launch-gpa$(EXEEXT): $(launch_gpa_OBJECTS) $(launch_gpa_DEPENDENCIES) $(EXTRA_launch_gpa_DEPENDENCIES)
@rm -f launch-gpa$(EXEEXT)
$(AM_V_CCLD)$(launch_gpa_LINK) $(launch_gpa_OBJECTS) $(launch_gpa_LDADD) $(LIBS)
@@ -751,14 +808,14 @@ distclean-compile:
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c $<
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
@@ -781,26 +838,15 @@ uninstall-pkgdataDATA:
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -812,15 +858,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -829,6 +871,21 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -976,18 +1033,19 @@ uninstall-am: uninstall-binPROGRAMS uninstall-pkgdataDATA
.MAKE: all check install install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic clean-noinstPROGRAMS ctags distclean \
- distclean-compile distclean-generic distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-binPROGRAMS install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkgdataDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
- ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+ clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-pkgdataDATA install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-pkgdataDATA
diff --git a/src/confdialog.c b/src/confdialog.c
index 005d55d..74ced87 100644
--- a/src/confdialog.c
+++ b/src/confdialog.c
@@ -1591,7 +1591,7 @@ gpa_configure_keyserver (GtkWidget *parent)
gtk_dialog_add_buttons (GTK_DIALOG (msgbox),
_("_Yes"), GTK_RESPONSE_YES,
_("_No"), GTK_RESPONSE_NO, NULL);
- if (gtk_dialog_run (GTK_DIALOG (msgbox)) == GTK_RESPONSE_NO)
+ if (gtk_dialog_run (GTK_DIALOG (msgbox)) != GTK_RESPONSE_YES)
{
gtk_widget_destroy (msgbox);
return NULL;
diff --git a/src/gpa-key-details.c b/src/gpa-key-details.c
index 38d5d3c..abb3b1a 100644
--- a/src/gpa-key-details.c
+++ b/src/gpa-key-details.c
@@ -38,7 +38,7 @@
#include "certchain.h"
#include "gpasubkeylist.h"
#include "gpa-key-details.h"
-
+#include "gtktools.h"
/* Object's class definition. */
@@ -173,9 +173,17 @@ details_page_fill_key (GpaKeyDetails *kdt, gpgme_key_t key)
gtk_label_set_text (GTK_LABEL (kdt->detail_key_trust),
gpa_key_validity_string (key));
+#if GPGME_VERSION_NUMBER >= 0x010601 /* GPGME >= 1.6.1 */
+ text = gpgme_pubkey_algo_string (key->subkeys);
+ gtk_label_set_text (GTK_LABEL (kdt->detail_key_type), text? text : "?");
+ gpgme_free (text);
+#endif /* GPGME >= 1.6.1 */
+
text = g_strdup_printf (_("%s %u bits"),
- gpgme_pubkey_algo_name (key->subkeys->pubkey_algo),
- key->subkeys->length);
+ gpgme_pubkey_algo_name (key->subkeys->pubkey_algo)?
+ gpgme_pubkey_algo_name (key->subkeys->pubkey_algo):
+ (key->subkeys->curve? "ECC" : "?"),
+ key->subkeys->length);
if (key->subkeys->curve)
{
char *text2;
@@ -183,9 +191,14 @@ details_page_fill_key (GpaKeyDetails *kdt, gpgme_key_t key)
g_free (text);
text = text2;
}
+#if GPGME_VERSION_NUMBER >= 0x010601 /* GPGME >= 1.6.1 */
+ gpa_add_tooltip (kdt->detail_key_type, text);
+#else
gtk_label_set_text (GTK_LABEL (kdt->detail_key_type), text);
+#endif
g_free (text);
+
gtk_label_set_text (GTK_LABEL (kdt->detail_owner_trust),
gpa_key_ownertrust_string (key));
diff --git a/src/gpa.c b/src/gpa.c
index d9db079..6dbc5cd 100644
--- a/src/gpa.c
+++ b/src/gpa.c
@@ -1,6 +1,6 @@
/* gpa.c - The GNU Privacy Assistant main file.
Copyright (C) 2000-2002 G-N-U GmbH.
- Copyright (C) 2005, 2008, 2012, 2014 g10 Code GmbH.
+ Copyright (C) 2005, 2008, 2012, 2014, 2015 g10 Code GmbH.
This file is part of GPA
@@ -87,7 +87,7 @@ static gpa_args_t args;
/* The copyright notice. */
static const char *copyright =
"Copyright (C) 2000-2002 Miguel Coca, G-N-U GmbH, Intevation GmbH.\n"
-"Copyright (C) 2005-2014 g10 Code GmbH.\n"
+"Copyright (C) 2005-2015 g10 Code GmbH.\n"
"This program comes with ABSOLUTELY NO WARRANTY.\n"
"This is free software, and you are welcome to redistribute it\n"
"under certain conditions. See the file COPYING for details.\n";
@@ -524,24 +524,10 @@ main (int argc, char *argv[])
that the agent has been startet. */
gpa_start_agent ();
- /* Handle command line options. */
- cms_hack = !args.disable_x509;
-
- /* Start the key manger by default. */
- if (!args.start_key_manager
- && !args.start_file_manager
- && !args.start_clipboard
- && !args.start_settings
- && !args.start_card_manager
- )
- args.start_key_manager = TRUE;
-
- /* Note: We can not use GPGME's engine info, as that returns NULL
- (default) for home_dir. Consider improving GPGME to get it from
- there, or using gpgconf (via GPGME). */
gnupg_homedir = default_homedir ();
- /* FIXME: GnuPG can not create a key if its home directory is
- missing. We help it out here. Should be fixed in GnuPG. */
+
+ /* GnuPG can not create a key if its home directory is missing. We
+ help it out here. Should be fixed in GnuPG. */
if (! g_file_test (gnupg_homedir, G_FILE_TEST_IS_DIR))
g_mkdir (gnupg_homedir, 0700);
@@ -562,6 +548,26 @@ main (int argc, char *argv[])
return 0;
}
+ /* Handle command line options. */
+ cms_hack = !args.disable_x509;
+
+ /* Start the default component. */
+ if (!args.start_key_manager
+ && !args.start_file_manager
+ && !args.start_clipboard
+ && !args.start_settings
+ && !args.start_card_manager
+ )
+ {
+ /* The default action is to start the clipboard. However, if we
+ have not yet created a key we remind the user by starting
+ with the key manager dialog. */
+ if (key_manager_maybe_firsttime ())
+ args.start_key_manager = TRUE;
+ else
+ args.start_clipboard = TRUE;
+ }
+
/* Check whether we need to start a server or to simply open a
window in an already running server. */
diff --git a/src/gpa.h b/src/gpa.h
index 56583fa..deebed1 100644
--- a/src/gpa.h
+++ b/src/gpa.h
@@ -46,6 +46,13 @@
#include "options.h" /* ditto */
+/* Global constants. */
+#define GPA_MAX_UID_WIDTH 50 /* # of chars after wich a user id is
+ truncated in dialog boxes. */
+
+
+
+/* Some variable declarations. */
extern GtkWidget *global_windowMain;
extern GtkWidget *global_windowTip;
extern GList *global_defaultRecipients;
diff --git a/src/gpaexportserverop.c b/src/gpaexportserverop.c
index 4691423..de3f781 100644
--- a/src/gpaexportserverop.c
+++ b/src/gpaexportserverop.c
@@ -157,7 +157,7 @@ confirm_send (GtkWidget *parent, const gchar *server)
gtk_dialog_add_buttons (GTK_DIALOG (msgbox),
_("_Yes"), GTK_RESPONSE_YES,
_("_No"), GTK_RESPONSE_NO, NULL);
- if (gtk_dialog_run (GTK_DIALOG (msgbox)) == GTK_RESPONSE_NO)
+ if (gtk_dialog_run (GTK_DIALOG (msgbox)) != GTK_RESPONSE_YES)
{
gtk_widget_destroy (msgbox);
return FALSE;
diff --git a/src/gpasubkeylist.c b/src/gpasubkeylist.c
index 78e933b..fccef74 100644
--- a/src/gpasubkeylist.c
+++ b/src/gpasubkeylist.c
@@ -40,7 +40,9 @@ static gboolean query_tooltip_cb (GtkWidget *wdiget, int x, int y,
typedef enum
{
SUBKEY_ID,
+#if GPGME_VERSION_NUMBER < 0x010601 /* GPGME < 1.6.1 */
SUBKEY_SIZE,
+#endif
SUBKEY_ALGO,
SUBKEY_CREATED,
SUBKEY_EXPIRE,
@@ -103,11 +105,13 @@ gpa_subkey_list_new (void)
NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
+#if GPGME_VERSION_NUMBER < 0x010601 /* GPGME < 1.6.1 */
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("Size"), renderer,
"text", SUBKEY_SIZE,
NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
+#endif
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("Created"),
@@ -204,6 +208,10 @@ gpa_subkey_list_set_key (GtkWidget *list, gpgme_key_t key)
gpgme_subkey_t subkey, secsubkey;
gpgme_key_t seckey;
gchar *p, *size, *expires;
+#if GPGME_VERSION_NUMBER >= 0x010601 /* GPGME >= 1.6.1 */
+ char *algostr_buf;
+#endif
+ const char *algostr;
/* Empty the list */
gtk_list_store_clear (store);
@@ -242,12 +250,21 @@ gpa_subkey_list_set_key (GtkWidget *list, gpgme_key_t key)
if (*expires != '>' && (p = strchr (expires, ' ')))
*p = 0;
+#if GPGME_VERSION_NUMBER >= 0x010601 /* GPGME >= 1.6.1 */
+ algostr_buf = gpgme_pubkey_algo_string (key->subkeys);
+ algostr = algostr_buf? algostr_buf : "?";
+#else /* GPGME < 1.6.1 */
+ algostr = gpgme_pubkey_algo_name (subkey->pubkey_algo),
+#endif /* GPGME < 1.6.1 */
+
gtk_list_store_set
(store, &iter,
SUBKEY_ID, subkey->keyid+8,
+#if GPGME_VERSION_NUMBER < 0x010601 /* GPGME < 1.6.1 */
SUBKEY_SIZE, size,
+#endif
SUBKEY_ALGO,
- gpgme_pubkey_algo_name (subkey->pubkey_algo),
+ algostr,
SUBKEY_CREATED,
gpa_creation_date_string (subkey->timestamp),
SUBKEY_EXPIRE,
@@ -262,6 +279,9 @@ gpa_subkey_list_set_key (GtkWidget *list, gpgme_key_t key)
-1);
g_free (size);
g_free (expires);
+#if GPGME_VERSION_NUMBER >= 0x010601 /* GPGME >= 1.6.1 */
+ gpgme_free (algostr_buf);
+#endif
}
}
}
diff --git a/src/gpawidgets.c b/src/gpawidgets.c
index 131970d..20deb8c 100644
--- a/src/gpawidgets.c
+++ b/src/gpawidgets.c
@@ -32,7 +32,7 @@
#include "convert.h"
/* A table showing some basic information about the key, such as the
- key id and the user name. */
+ key id and the user name. */
GtkWidget *
gpa_key_info_new (gpgme_key_t key)
{
@@ -41,7 +41,7 @@ gpa_key_info_new (gpgme_key_t key)
gchar *string;
gpgme_user_id_t uid;
- table = gtk_table_new (2, 2, FALSE);
+ table = gtk_table_new (3, 2, FALSE);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 10);
gtk_table_set_row_spacing (GTK_TABLE (table), 0, 0);
@@ -61,7 +61,11 @@ gpa_key_info_new (gpgme_key_t key)
uid = uid->next;
}
label = gtk_label_new (string);
+ gpa_add_tooltip (label, string);
g_free (string);
+ gtk_label_set_max_width_chars (GTK_LABEL (label), GPA_MAX_UID_WIDTH);
+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+
gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1,
GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
@@ -69,7 +73,7 @@ gpa_key_info_new (gpgme_key_t key)
/* User Name */
label = gtk_label_new (key->uids->next == NULL
? _("User Name:") : _("User Names:") );
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL,
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL,
0, 0);
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.0);
@@ -83,8 +87,19 @@ gpa_key_info_new (gpgme_key_t key)
GTK_FILL|GTK_EXPAND, 0, 0, 0);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ /* Fingerprint */
+ label = gtk_label_new (_("Fingerprint:"));
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+
+ string = gpa_gpgme_key_format_fingerprint (key->subkeys->fpr);
+ label = gtk_label_new (string);
+ g_free (string);
+ gtk_table_attach (GTK_TABLE (table), label, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+
return table;
-}
+}
/* A Frame to select an expiry date. */
@@ -132,7 +147,7 @@ gpa_expiry_frame_after (GtkToggleButton * radioAfter, gpointer param)
gtk_widget_set_sensitive (frame->entryAfter, TRUE);
gtk_widget_set_sensitive (frame->comboAfter, TRUE);
- gtk_widget_grab_focus (frame->entryAfter);
+ gtk_widget_grab_focus (frame->entryAfter);
}
@@ -152,7 +167,7 @@ static void
expire_date_toggled_cb (GtkToggleButton *togglebutton, gpointer user_data)
{
GtkWidget *calendar = user_data;
-
+
gtk_widget_set_sensitive (calendar,
gtk_toggle_button_get_active (togglebutton));
}
@@ -203,7 +218,7 @@ gpa_expiry_frame_new (GDate * expiryDate)
comboAfter = gtk_combo_box_new_text ();
frame->comboAfter = comboAfter;
for (i = 3; i >= 0; i--)
- gtk_combo_box_prepend_text (GTK_COMBO_BOX (comboAfter),
+ gtk_combo_box_prepend_text (GTK_COMBO_BOX (comboAfter),
gpa_unit_expiry_time_string (i));
gtk_combo_box_set_active (GTK_COMBO_BOX (comboAfter), 0);
gtk_box_pack_start (GTK_BOX (hboxAfter), comboAfter, FALSE, FALSE, 0);
@@ -282,7 +297,7 @@ gpa_expiry_frame_get_expiration(GtkWidget * expiry_frame, GDate ** date,
&year, &month, &day);
*date = g_date_new_dmy (day, month+1, year);
result = TRUE;
- }
+ }
else
{
/* this should never happen */
@@ -322,7 +337,7 @@ gpa_expiry_frame_validate(GtkWidget * expiry_frame)
{
/* This case is always correct. */
result = NULL;
- }
+ }
return result;
}
-
+
diff --git a/src/gpgmeedit.c b/src/gpgmeedit.c
index 7ff9a05..5f6768f 100644
--- a/src/gpgmeedit.c
+++ b/src/gpgmeedit.c
@@ -193,6 +193,16 @@ struct edit_parms_s
};
+/* Parse the args of an ERROR status line and return its error
+ code. */
+static gpg_error_t
+parse_status_error (const char *args)
+{
+ size_t n = strcspn (args, " \t");
+ return (gpg_error_t)strtoul (args+n, NULL, 10);
+}
+
+
/* The edit callback proper */
static gpg_error_t
edit_fnc (void *opaque, gpgme_status_code_t status,
@@ -279,6 +289,14 @@ edit_fnc (void *opaque, gpgme_status_code_t status,
gpgme_io_write (fd, "\n", 1);
}
}
+ else if (parms->err == gpg_error (GPG_ERR_EAGAIN))
+ {
+ parms->err = 0;
+ if (debug_edit_fsm)
+ g_debug ("edit_fnc: newstate=%d again, default response", parms->state);
+ /* Send an empty line as default response. */
+ gpgme_io_write (fd, "\n", 1);
+ }
else
{
if (debug_edit_fsm)
@@ -647,6 +665,12 @@ edit_sign_fnc_transit (int current_state, gpgme_status_code_t status,
next_state = SIGN_ERROR;
*err = gpg_error (GPG_ERR_UNUSABLE_PUBKEY);
}
+ else if (status == GPGME_STATUS_GET_LINE
+ || status == GPGME_STATUS_GET_BOOL)
+ {
+ next_state = current_state;
+ *err = gpg_error (GPG_ERR_EAGAIN);
+ }
else
{
next_state = SIGN_ERROR;
@@ -677,6 +701,12 @@ edit_sign_fnc_transit (int current_state, gpgme_status_code_t status,
next_state = SIGN_ERROR;
*err = gpg_error (GPG_ERR_UNUSABLE_PUBKEY);
}
+ else if (status == GPGME_STATUS_GET_LINE
+ || status == GPGME_STATUS_GET_BOOL)
+ {
+ next_state = current_state;
+ *err = gpg_error (GPG_ERR_EAGAIN);
+ }
else
{
next_state = SIGN_ERROR;
@@ -689,6 +719,12 @@ edit_sign_fnc_transit (int current_state, gpgme_status_code_t status,
{
next_state = SIGN_SET_CHECK_LEVEL;
}
+ else if (status == GPGME_STATUS_GET_LINE
+ || status == GPGME_STATUS_GET_BOOL)
+ {
+ next_state = current_state;
+ *err = gpg_error (GPG_ERR_EAGAIN);
+ }
else
{
next_state = SIGN_ERROR;
@@ -701,6 +737,12 @@ edit_sign_fnc_transit (int current_state, gpgme_status_code_t status,
{
next_state = SIGN_CONFIRM;
}
+ else if (status == GPGME_STATUS_GET_LINE
+ || status == GPGME_STATUS_GET_BOOL)
+ {
+ next_state = current_state;
+ *err = gpg_error (GPG_ERR_EAGAIN);
+ }
else
{
next_state = SIGN_ERROR;
@@ -713,6 +755,17 @@ edit_sign_fnc_transit (int current_state, gpgme_status_code_t status,
{
next_state = SIGN_QUIT;
}
+ else if (status == GPGME_STATUS_GET_LINE
+ || status == GPGME_STATUS_GET_BOOL)
+ {
+ next_state = current_state;
+ *err = gpg_error (GPG_ERR_EAGAIN);
+ }
+ else if (status == GPGME_STATUS_ERROR)
+ {
+ next_state = SIGN_ERROR;
+ *err = parse_status_error (args);
+ }
else
{
next_state = SIGN_ERROR;
diff --git a/src/gpgmetools.c b/src/gpgmetools.c
index e2e6ec1..83c4a69 100644
--- a/src/gpgmetools.c
+++ b/src/gpgmetools.c
@@ -174,7 +174,7 @@ check_overwriting (const char *filename, GtkWidget *parent)
gtk_dialog_add_buttons (GTK_DIALOG (msgbox),
_("_Yes"), GTK_RESPONSE_YES,
_("_No"), GTK_RESPONSE_NO, NULL);
- if (gtk_dialog_run (GTK_DIALOG (msgbox)) == GTK_RESPONSE_NO)
+ if (gtk_dialog_run (GTK_DIALOG (msgbox)) != GTK_RESPONSE_YES)
{
gtk_widget_destroy (msgbox);
return FALSE;
diff --git a/src/helpmenu.c b/src/helpmenu.c
index 0b1b123..55e1f54 100644
--- a/src/helpmenu.c
+++ b/src/helpmenu.c
@@ -72,8 +72,8 @@ gpa_help_about (GtkAction *action, GtkWindow *window)
static const gchar copyright[] =
"Copyright \xc2\xa9 2000-2002 G-N-U GmbH\n"
"Copyright \xc2\xa9 2002-2003 Miguel Coca\n"
- "Copyright \xc2\xa9 2005-2014 g10 Code GmbH";
- static const gchar website[] = "https://www.gnupg.org/related_software/gpa/";
+ "Copyright \xc2\xa9 2005-2015 g10 Code GmbH";
+ static const gchar website[] = "https://gnupg.org/related_software/gpa/";
static const gchar website_label[] = "www.gnupg.org";
char *comment;
GdkPixbuf *logo;
diff --git a/src/keymanager.c b/src/keymanager.c
index d78eb94..2cef4ab 100644
--- a/src/keymanager.c
+++ b/src/keymanager.c
@@ -762,7 +762,7 @@ key_manager_mapped (gpointer param)
/* FIXME: We assume that the only reason a user might not have a
default key is because he has no private keys. */
if (! asked_about_key_generation
- && ! gpa_options_get_default_key (gpa_options_get_instance()))
+ && ! gpa_options_have_default_key (gpa_options_get_instance()))
{
GtkWidget *dialog;
GtkResponseType response;
@@ -787,7 +787,7 @@ key_manager_mapped (gpointer param)
else if (!asked_about_key_backup
&& !gpa_options_get_backup_generated
(gpa_options_get_instance ())
- && !gpa_options_get_default_key (gpa_options_get_instance()))
+ && !gpa_options_have_default_key (gpa_options_get_instance()))
{
GtkWidget *dialog;
GtkResponseType response;
@@ -1570,3 +1570,25 @@ gpa_key_manager_is_open (void)
{
return !!this_instance;
}
+
+
+/* Return true if we should ask for a first time key generation.
+ *
+ * This function basically duplicates the conditions from
+ * key_manager_mapped. However that function mus be used from a
+ * key_manager context and can't easily be used from other GPA
+ * components. */
+gboolean
+key_manager_maybe_firsttime (void)
+{
+ if (!gpa_options_get_simplified_ui (gpa_options_get_instance ()))
+ return FALSE;
+
+ if (!gpa_options_have_default_key (gpa_options_get_instance()))
+ return TRUE;
+
+ if (!gpa_options_get_backup_generated (gpa_options_get_instance ()))
+ return TRUE;
+
+ return FALSE;
+}
diff --git a/src/keymanager.h b/src/keymanager.h
index 26ed0b5..c9d6197 100644
--- a/src/keymanager.h
+++ b/src/keymanager.h
@@ -14,7 +14,7 @@
* License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef KEYMANAGER_H
@@ -52,5 +52,7 @@ GtkWidget *gpa_key_manager_get_instance (gboolean *r_created);
gboolean gpa_key_manager_is_open (void);
+gboolean key_manager_maybe_firsttime (void);
+
#endif /*KEYMANAGER_H*/
diff --git a/src/keysigndlg.c b/src/keysigndlg.c
index 04f1bc2..868e282 100644
--- a/src/keysigndlg.c
+++ b/src/keysigndlg.c
@@ -89,7 +89,10 @@ gpa_key_sign_run_dialog (GtkWidget * parent, gpgme_key_t key,
/* One user ID on each line. */
string = gpa_gpgme_key_get_userid (uid);
label = gtk_label_new (string);
+ gpa_add_tooltip (label, string);
g_free (string);
+ gtk_label_set_max_width_chars (GTK_LABEL (label), GPA_MAX_UID_WIDTH);
+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_box_pack_start_defaults (GTK_BOX(uid_box), label);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
}
@@ -106,7 +109,7 @@ gpa_key_sign_run_dialog (GtkWidget * parent, gpgme_key_t key,
label = gtk_label_new (_("Fingerprint:"));
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
-
+
string = gpa_gpgme_key_format_fingerprint (key->subkeys->fpr);
label = gtk_label_new (string);
g_free (string);
@@ -143,7 +146,7 @@ gpa_key_sign_run_dialog (GtkWidget * parent, gpgme_key_t key,
response = gtk_dialog_run (GTK_DIALOG (window));
if (response == GTK_RESPONSE_YES)
{
- *sign_locally = check &&
+ *sign_locally = check &&
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
gtk_widget_destroy (window);
return TRUE;
diff --git a/src/options.c b/src/options.c
index fc67c46..35ab58d 100644
--- a/src/options.c
+++ b/src/options.c
@@ -270,6 +270,17 @@ gpa_options_get_default_key (GpaOptions *options)
}
+/* Return whether a default key is somehow known. This is either the
+ default key's fingerprint from gpa.conf or the default key from the
+ options dialog. */
+gboolean
+gpa_options_have_default_key (GpaOptions *options)
+{
+ return ((options->default_key_fpr && *options->default_key_fpr)
+ || options->default_key);
+}
+
+
/* Return the default key gpg would use, or at least a first
* approximation. Currently this means the first secret key in the keyring.
* If there's no secret key at all, return NULL
diff --git a/src/options.h b/src/options.h
index 41ffdd4..6a8ee55 100644
--- a/src/options.h
+++ b/src/options.h
@@ -93,6 +93,9 @@ gpgme_key_t gpa_options_get_default_key (GpaOptions *options);
/* Try to find a reasonable value for the default key if there wasn't one */
void gpa_options_update_default_key (GpaOptions *options);
+/* Return whether a default key is known. */
+gboolean gpa_options_have_default_key (GpaOptions *options);
+
/* Specify the default keyserver */
void gpa_options_set_default_keyserver (GpaOptions *options,
const gchar *keyserver);
diff --git a/src/server.c b/src/server.c
index 0c7209a..5f75202 100644
--- a/src/server.c
+++ b/src/server.c
@@ -484,7 +484,7 @@ prepare_io_streams (assuan_context_t ctx,
#endif
if (!ctrl->input_channel)
{
- g_debug ("error creating input channel");
+ /* g_debug ("error creating input channel"); */
err = gpg_error (GPG_ERR_EIO);
goto leave;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpa.git
More information about the Pkg-gnupg-commit
mailing list