[Pkg-privacy-commits] [seahorse-nautilus] 06/26: Import Upstream version 3.11.92
Carlos Maddela
maddela-guest at moszumanska.debian.org
Tue Jan 10 22:14:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
maddela-guest pushed a commit to branch master
in repository seahorse-nautilus.
commit 9080080a8cf8b453302de50903d48b55b3a9072f
Author: Carlos Maddela <e7appew at gmail.com>
Date: Sun Jan 8 06:52:22 2017 +1100
Import Upstream version 3.11.92
---
ChangeLog | 479 ++++++++++++++++++++++++++
Makefile.am | 4 +
Makefile.in | 235 +++++++------
NEWS | 17 +
aclocal.m4 | 338 ++++++++++---------
compile | 99 ++++--
config.guess | 57 ++--
config.sub | 94 ++++--
configure | 258 +++++++++-----
configure.ac | 4 +-
data/Makefile.in | 90 +++--
data/org.gnome.seahorse.nautilus.gschema.xml | 2 +-
depcomp | 487 ++++++++++++++++-----------
install-sh | 14 +-
m4/libtool.m4 | 12 +-
missing | 414 ++++++++---------------
nautilus-ext/Makefile.in | 145 +++++---
po/cs.po | 92 ++---
po/de.po | 279 +++++++++------
po/el.po | 248 ++++++++------
po/es.po | 99 +++---
po/fi.po | 291 +++++++++-------
po/gl.po | 291 +++++++++-------
po/hu.po | 185 +++++-----
po/id.po | 298 +++++++++-------
po/it.po | 300 ++++++++++-------
po/lt.po | 203 ++++++-----
po/lv.po | 289 +++++++++-------
po/pl.po | 94 +++---
po/pt_BR.po | 99 +++---
po/sl.po | 98 +++---
po/sr.po | 94 +++---
po/sr at latin.po | 94 +++---
tool/Makefile.in | 182 +++++-----
tool/seahorse-libdialogs.h | 5 +-
tool/seahorse-notification.c | 14 +-
tool/seahorse-operation.c | 5 +-
tool/seahorse-operation.h | 5 +-
tool/seahorse-passphrase.c | 5 +-
tool/seahorse-passphrase.h | 5 +-
tool/seahorse-pgp-encrypted.desktop.in | 2 +-
tool/seahorse-pgp-keys.desktop.in | 2 +-
tool/seahorse-pgp-operation.c | 5 +-
tool/seahorse-pgp-operation.h | 5 +-
tool/seahorse-pgp-signature.desktop.in | 2 +-
tool/seahorse-progress.c | 5 +-
tool/seahorse-progress.h | 5 +-
tool/seahorse-tool-files.c | 5 +-
tool/seahorse-tool-progress.c | 7 +-
tool/seahorse-tool.1 | 6 +
tool/seahorse-tool.c | 52 +--
tool/seahorse-tool.h | 6 +-
tool/seahorse-util.c | 5 +-
tool/seahorse-util.h | 5 +-
tool/seahorse-vfs-data.c | 5 +-
tool/seahorse-vfs-data.h | 5 +-
tool/seahorse-widget.c | 5 +-
tool/seahorse-widget.h | 5 +-
58 files changed, 3685 insertions(+), 2471 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index eb6b6bd..7a3f4e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,484 @@
# Generated automatically. Do not edit.
+commit 6102fcc74501085f573a3ae9dfa100078701c8f3
+Author: Stef Walter <stefw at redhat.com>
+Date: 2014-03-16
+
+ Release version 3.11.92
+
+ NEWS | 6 ++++++
+ configure.ac | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+commit 002dac51a5a485dd8ebe047fe726e4f419442840
+Author: Aurimas Černius <aurisc4 at gmail.com>
+Date: 2014-03-02
+
+ Updated Lithuanian translation
+
+ po/lt.po | 211 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 111 insertions(+), 100 deletions(-)
+
+commit 342181cd9312993b75663ae436aaa547f4b78303
+Author: Gabor Kelemen <kelemeng at gnome.hu>
+Date: 2014-02-04
+
+ Updated Hungarian translation
+
+ po/hu.po | 220 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 117 insertions(+), 103 deletions(-)
+
+commit 438bc521b5abdbe2ba63fd41caf32f9d719829f3
+Author: Benjamin Steinwender <b at stbe.at>
+Date: 2014-02-02
+
+ Updated German translation
+
+ po/de.po | 176 ++++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 95 insertions(+), 81 deletions(-)
+
+commit bdbdaae1ebcef49d74c2c121a8c4822bc150fe44
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date: 2014-01-23
+
+ Updated FSF's address
+
+ tool/seahorse-libdialogs.h | 5 +----
+ tool/seahorse-notification.c | 5 +----
+ tool/seahorse-operation.c | 5 +----
+ tool/seahorse-operation.h | 5 +----
+ tool/seahorse-passphrase.c | 5 +----
+ tool/seahorse-passphrase.h | 5 +----
+ tool/seahorse-pgp-operation.c | 5 +----
+ tool/seahorse-pgp-operation.h | 5 +----
+ tool/seahorse-progress.c | 5 +----
+ tool/seahorse-progress.h | 5 +----
+ tool/seahorse-tool-files.c | 5 +----
+ tool/seahorse-tool-progress.c | 5 +----
+ tool/seahorse-tool.c | 5 +----
+ tool/seahorse-tool.h | 5 +----
+ tool/seahorse-util.c | 5 +----
+ tool/seahorse-util.h | 5 +----
+ tool/seahorse-vfs-data.c | 5 +----
+ tool/seahorse-vfs-data.h | 5 +----
+ tool/seahorse-widget.c | 5 +----
+ tool/seahorse-widget.h | 5 +----
+ 20 files changed, 20 insertions(+), 80 deletions(-)
+
+commit 905ad1f48f373eaaa677b3f327ecc4dde47e2a5d
+Author: Мирослав Николић <miroslavnikolic at rocketmail.com>
+Date: 2014-01-28
+
+ Updated Serbian translation
+
+ po/sr.po | 40 +++++++++++++++++++++++++---------------
+ po/sr at latin.po | 40 +++++++++++++++++++++++++---------------
+ 2 files changed, 50 insertions(+), 30 deletions(-)
+
+commit a5a56d4a94a189c4a711f6fdeac4156114385eaf
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date: 2014-01-03
+
+ Updated Polish translation
+
+ po/pl.po | 40 +++++++++++++++++++++++++---------------
+ 1 file changed, 25 insertions(+), 15 deletions(-)
+
+commit b30c131388e5a52f49e2faa31b955662aae17d10
+Author: Andika Triwidada <andika at gmail.com>
+Date: 2014-01-02
+
+ Updated Indonesian translation
+
+ po/id.po | 34 ++++++++++++++++++++++------------
+ 1 file changed, 22 insertions(+), 12 deletions(-)
+
+commit d99bf62c39f55b53b747b0b5ceea33945d35f74a
+Author: Milo Casagrande <milo at ubuntu.com>
+Date: 2013-12-24
+
+ [l10n] Updated Italian translation.
+
+ po/it.po | 39 ++++++++++++++++++++++++---------------
+ 1 file changed, 24 insertions(+), 15 deletions(-)
+
+commit 42cf9629ef57f38cb93412ef0a074e89edb4b73e
+Author: Matej Urbančič <mateju at svn.gnome.org>
+Date: 2013-12-22
+
+ Updated Slovenian translation
+
+ po/sl.po | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+commit 93ff111bdbce0a8aa29ebdca605943e7b35763de
+Author: Marek Černocký <marek at manet.cz>
+Date: 2013-12-02
+
+ Updated Czech translation
+
+ po/cs.po | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+commit 234de0ab18621cc35cb9f6f3eea3340417b78bb1
+Author: Rafael Ferreira <rafael.f.f1 at gmail.com>
+Date: 2013-11-25
+
+ Updated Brazilian Portuguese translation
+
+ po/pt_BR.po | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+commit 612132612ed2bb99f16c53bfffe7f36caea91f20
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date: 2013-11-25
+
+ Updated Spanish translation
+
+ po/es.po | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+commit 5d40010698c29da7318e2d102444429ee227295d
+Author: Michael Catanzaro <mcatanzaro at gnome.org>
+Date: 2013-11-22
+
+ Revert "Revert "Fix typo" due to string freeze break. Will reapply to master after branched."
+
+ This reverts commit 37eb5ca2573ffb6732938d655dbbb5f692669308.
+
+ Because master has been branched.
+
+ data/org.gnome.seahorse.nautilus.gschema.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 082f4f164a4ed73cb10a171020746b84679c1bde
+Author: Matthias Clasen <mclasen at redhat.com>
+Date: 2013-11-01
+
+ Update seahorse-tool.1
+
+ The -n option was missing.
+
+ tool/seahorse-tool.1 | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+commit dbffffbca8d65827c7a131798668d71377af45ac
+Author: Matej Urbančič <mateju at svn.gnome.org>
+Date: 2013-10-20
+
+ Updated Slovenian translation
+
+ po/sl.po | 34 ++++++++++++++++++++++------------
+ 1 file changed, 22 insertions(+), 12 deletions(-)
+
+commit d75a58af114bfe951374185e3df17d3d11357fb6
+Author: Enrico Nicoletto <liverig at gmail.com>
+Date: 2013-10-19
+
+ Fixed Noun in Brazilian Portuguese translation
+
+ po/pt_BR.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 05e31d2180b4a217b4afad7266106011b91c26d1
+Author: Enrico Nicoletto <liverig at gmail.com>
+Date: 2013-10-19
+
+ Updated Brazilian Portuguese translation
+
+ po/pt_BR.po | 37 +++++++++++++++++++++++--------------
+ 1 file changed, 23 insertions(+), 14 deletions(-)
+
+commit 1d36fb7151a0489bf0889fb25ad8d6ed49d5b617
+Author: Marek Černocký <marek at manet.cz>
+Date: 2013-10-18
+
+ Updated Czech translation
+
+ po/cs.po | 32 ++++++++++++++++++++------------
+ 1 file changed, 20 insertions(+), 12 deletions(-)
+
+commit a055b4a10c1aa94271603d790ab0a5c174fca7fa
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date: 2013-10-18
+
+ Updated Spanish translation
+
+ po/es.po | 36 +++++++++++++++++++++++-------------
+ 1 file changed, 23 insertions(+), 13 deletions(-)
+
+commit d440ec13198fb75f75996709bde32e4121ff8c9e
+Author: Jérémy Bobbio <lunar at debian.org>
+Date: 2013-09-23
+
+ Warn when signatures are valid but untrusted
+
+ When verifying a signature seahorse-tool currently behave just the same if the
+ signing key is trusted or not. Given that the only the uid of the key is given
+ in the notification, this opens the door to some attacks.
+
+ Display two different messages depending on the validity
+ level of the signing key.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=708640
+
+ tool/seahorse-notification.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+commit 4508a6c99f7ebafa1e6e9ec90e170a91ee958c49
+Author: Stef Walter <stefw at redhat.com>
+Date: 2013-10-17
+
+ Release version 3.10.1
+
+ NEWS | 3 +++
+ configure.ac | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+commit e2496365e167f60b68c801edca8252e7e3b83669
+Author: Marek Černocký <marek at manet.cz>
+Date: 2013-10-03
+
+ Updated Czech translation
+
+ po/cs.po | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 37eb5ca2573ffb6732938d655dbbb5f692669308
+Author: Andika Triwidada <andika at gmail.com>
+Date: 2013-09-28
+
+ Revert "Fix typo" due to string freeze break. Will reapply to master after branched.
+
+ This reverts commit eb786447fdc02ad008c2188052e95215d3c8ea73.
+
+ data/org.gnome.seahorse.nautilus.gschema.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a8e7512e6c11b13ad2043761ade6fe06cb6fe6d6
+Author: Marek Černocký <marek at manet.cz>
+Date: 2013-09-27
+
+ Updated Czech translation
+
+ po/cs.po | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 818984f943d7ff5609a9c5f0bbc86edcc74ef63e
+Author: Andika Triwidada <andika at gmail.com>
+Date: 2013-09-27
+
+ Updated Indonesian translation
+
+ po/id.po | 282 ++++++++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 160 insertions(+), 122 deletions(-)
+
+commit eb786447fdc02ad008c2188052e95215d3c8ea73
+Author: Andika Triwidada <andika at gmail.com>
+Date: 2013-09-27
+
+ Fix typo
+
+ data/org.gnome.seahorse.nautilus.gschema.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 9591c5b4feb41ba049f96be1153925bb294ab27f
+Author: Stef Walter <stefw at redhat.com>
+Date: 2013-09-23
+
+ Release version 3.10.0
+
+ NEWS | 3 +++
+ configure.ac | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+commit 75b17c898463958e696f2c2893219e384b711db7
+Author: Stef Walter <stefw at redhat.com>
+Date: 2013-08-26
+
+ Release version 3.9.90
+
+ Makefile.am | 4 ++++
+ NEWS | 5 +++++
+ configure.ac | 2 +-
+ 3 files changed, 10 insertions(+), 1 deletion(-)
+
+commit f740fa5fe6f73da71ae64857fcaef0d2f445f807
+Author: Rūdolfs Mazurs <rudolfsm at src.gnome.org>
+Date: 2013-09-21
+
+ Updated Latvian translatio
+
+ po/lv.po | 289 +++++++++++++++++++++++++++++++++++++--------------------------
+ 1 file changed, 170 insertions(+), 119 deletions(-)
+
+commit 336d01dcc2fa55c1d3a94a2632cdca6c6f2dfc22
+Author: Gabor Kelemen <kelemeng at gnome.hu>
+Date: 2013-09-20
+
+ Updated Hungarian translation
+
+ po/hu.po | 69 +++++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 36 insertions(+), 33 deletions(-)
+
+commit 05e76745415c000f2894d09becc87af92cbfd4b0
+Author: Fran Diéguez <fran.dieguez at mabishu.com>
+Date: 2013-09-15
+
+ Updated Galician translations
+
+ po/gl.po | 291 +++++++++++++++++++++++++++++++++++++--------------------------
+ 1 file changed, 170 insertions(+), 121 deletions(-)
+
+commit 9b0620725ad282c0447bf42802f689f7e5801468
+Author: Ville-Pekka Vainio <vpvainio at iki.fi>
+Date: 2013-09-14
+
+ Finnish translation update by Jiri Grönroos
+
+ po/fi.po | 291 +++++++++++++++++++++++++++++++++++++--------------------------
+ 1 file changed, 172 insertions(+), 119 deletions(-)
+
+commit a6881b5e82c3312b867373d79832aa909d507bfb
+Author: Мирослав Николић <miroslavnikolic at rocketmail.com>
+Date: 2013-09-09
+
+ Updated Serbian translation
+
+ po/sr.po | 60 +++++++++++++++++++++++++++++-----------------------------
+ po/sr at latin.po | 60 +++++++++++++++++++++++++++++-----------------------------
+ 2 files changed, 60 insertions(+), 60 deletions(-)
+
+commit 78bf647de9e54bd14742b998ec69a358d130f3e3
+Author: Milo Casagrande <milo at ubuntu.com>
+Date: 2013-08-26
+
+ [l10n] Updated Italian translation.
+
+ po/it.po | 61 +++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 31 insertions(+), 30 deletions(-)
+
+commit 9bfb48cdcbc174707ecb111ef5fb68b53f3d31e9
+Author: Rafael Ferreira <rafael.f.f1 at gmail.com>
+Date: 2013-08-20
+
+ Updated Brazilian Portuguese translation
+
+ po/pt_BR.po | 65 ++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 34 insertions(+), 31 deletions(-)
+
+commit 47d5aa768bd1d89a791b4a3c74b7081f93fd0eed
+Author: Marek Černocký <marek at manet.cz>
+Date: 2013-08-19
+
+ Updated Czech translation
+
+ po/cs.po | 60 ++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 30 insertions(+), 30 deletions(-)
+
+commit 28f534f206975a5cb692accc80576a06a1e68698
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date: 2013-08-19
+
+ Updated Spanish translation
+
+ po/es.po | 68 ++++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 36 insertions(+), 32 deletions(-)
+
+commit 0eb84e14f72e16bbc475242c79249e428ba6c13b
+Author: Aurimas Černius <aurisc4 at gmail.com>
+Date: 2013-08-18
+
+ Updated Lithuanian translation
+
+ po/lt.po | 100 ++++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 54 insertions(+), 46 deletions(-)
+
+commit 5f2b5277f589b01a0aa01584b91d808d2d21fd6f
+Author: Matej Urbančič <mateju at svn.gnome.org>
+Date: 2013-08-17
+
+ Updated Slovenian translation
+
+ po/sl.po | 63 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 33 insertions(+), 30 deletions(-)
+
+commit 6e8755f98b75b337d2627940a0e02c019ef8c2d7
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date: 2013-08-17
+
+ Updated Polish translation
+
+ po/pl.po | 62 +++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 31 insertions(+), 31 deletions(-)
+
+commit c41f07cf5785b2d755b85f20bf0546c6ce2ebb02
+Author: Stef Walter <stefw at redhat.com>
+Date: 2013-08-16
+
+ Add correct flag for reaping the progress child
+
+ This fixes the WARNING about ECHILD that comes from some versions
+ of glib. The WARNING was removed in later versions of glib, but this
+ is also a good fix.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=697895
+
+ tool/seahorse-tool-progress.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 742113bb3ae0658dad3fc93da782577ec2b9ec71
+Author: Stef Walter <stefw at redhat.com>
+Date: 2013-08-16
+
+ Require a newer version of libcryptui for symmetric encryption
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit ae25bf97523f0f51f9167330ebd448b9db6bddf1
+Author: Jérémy Bobbio <lunar at debian.org>
+Date: 2013-06-11
+
+ Add support for symmetric encryption in seahorse-tool
+
+ This needs a libcryptui recent enough to have
+ cryptui_need_to_get_keys_or_symmetric() and
+ cryptui_prompt_recipients_with_symmetric().
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=325803
+
+ tool/seahorse-tool.c | 47 +++++++++++++++++++++++++----------------------
+ tool/seahorse-tool.h | 1 +
+ 2 files changed, 26 insertions(+), 22 deletions(-)
+
+commit acbbcc08ef27943276addc21371f8369036cc346
+Author: Dimitris Spingos <dmtrs32 at gmail.com>
+Date: 2013-07-15
+
+ Updated Greek translation
+
+ po/el.po | 248 ++++++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 149 insertions(+), 99 deletions(-)
+
+commit 37efbebb0a0cf1a5cee5d09a6311476b78e7f008
+Author: Christian Kirbach <christian.kirbach at gmail.com>
+Date: 2013-07-10
+
+ Updated German translation
+
+ po/de.po | 231 ++++++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 139 insertions(+), 92 deletions(-)
+
+commit 893d70a8f9dc6cddde00a47a72395bae239988e4
+Author: Milo Casagrande <milo at ubuntu.com>
+Date: 2013-03-26
+
+ [l10n] Updated Italian translation.
+
+ po/it.po | 226 +++++++++++++++++++++++++++++++++++++--------------------------
+ 1 file changed, 132 insertions(+), 94 deletions(-)
+
commit 6819a7dcbe6d81a549a98209f4c8cdc545c252ab
Author: Stef Walter <stefw at gnome.org>
Date: 2013-03-25
diff --git a/Makefile.am b/Makefile.am
index f06ea43..4eccb91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,3 +40,7 @@ dist-hook:
else \
echo A git clone is required to generate a ChangeLog >&2; \
fi
+
+upload-release: $(DIST_ARCHIVES)
+ scp $(DIST_ARCHIVES) master.gnome.org:
+ ssh master.gnome.org ftpadmin install $(DIST_ARCHIVES)
diff --git a/Makefile.in b/Makefile.in
index 91a3e8d..e556b08 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.2 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2012 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,
@@ -14,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; \
- test $$am__dry = yes; \
- }
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -50,11 +78,11 @@ 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 AUTHORS COPYING ChangeLog INSTALL NEWS \
- THANKS compile config.guess config.sub depcomp install-sh \
- ltmain.sh missing mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(srcdir)/config.h.in mkinstalldirs AUTHORS COPYING ChangeLog \
+ INSTALL NEWS README THANKS compile config.guess config.sub \
+ depcomp install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -82,13 +110,14 @@ 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;; \
@@ -96,9 +125,30 @@ am__can_run_installinfo = \
esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
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
@@ -412,14 +462,13 @@ distclean-libtool:
# (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) $(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+$(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//`; \
case "$@" in \
@@ -440,31 +489,13 @@ $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; 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
-cscopelist-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
- done
-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)
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -480,12 +511,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; \
@@ -497,15 +523,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
@@ -514,18 +536,16 @@ 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
-cscope.files: clean-cscope cscopelist-recursive cscopelist
-
-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
case "$(srcdir)" in \
[\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
*) sdir=$(subdir)/$(srcdir) ;; \
@@ -662,9 +682,9 @@ 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,^[^:\\/]:[\\/],/,'` \
@@ -832,27 +852,24 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
- cscopelist-recursive ctags-recursive install-am install-strip \
- tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-cscope \
- clean-generic clean-libtool cscope cscopelist \
- cscopelist-recursive ctags ctags-recursive dist dist-all \
- dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \
- dist-xz dist-zip distcheck distclean distclean-generic \
- distclean-hdr distclean-libtool distclean-tags distcleancheck \
- distdir distuninstallcheck dvi dvi-am html html-am info \
- info-am install install-am install-data install-data-am \
- install-dvi install-dvi-am install-exec install-exec-am \
- install-html install-html-am install-info install-info-am \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am
+.MAKE: $(am__recursive_targets) all install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--refresh check check-am clean clean-cscope clean-generic \
+ clean-libtool cscope cscopelist-am ctags ctags-am dist \
+ dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
+ dist-tarZ dist-xz dist-zip distcheck distclean \
+ distclean-generic distclean-hdr distclean-libtool \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am
dist-hook:
@@ -869,6 +886,10 @@ dist-hook:
echo A git clone is required to generate a ChangeLog >&2; \
fi
+upload-release: $(DIST_ARCHIVES)
+ scp $(DIST_ARCHIVES) master.gnome.org:
+ ssh master.gnome.org ftpadmin install $(DIST_ARCHIVES)
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/NEWS b/NEWS
index e6c9c01..93c0dc4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+seahorse-nautilus 3.11.92
+ * Warn when signatures are valid but untrusted [#708640]
+ * License update
+ * Documentation fixes
+ * Updated translations
+
+seahorse-nautilus 3.10.1
+ * Updated translations
+
+seahorse-nautilus 3.10.0
+ (no changes since previous release)
+
+seahorse-nautilus 3.9.90
+ * Add correct flag for reaping the progress child [#697895]
+ * Add support for symmetric encryption in seahorse-tool [#325803]
+ * Updated translations
+
seahorse-nautilus 3.8.0
(no changes since previous release)
diff --git a/aclocal.m4 b/aclocal.m4
index 077844d..51737a0 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.12.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
-# Copyright (C) 1996-2012 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,
@@ -11,6 +11,7 @@
# 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],,
@@ -336,7 +337,6 @@ msgstr ""
dnl
glib_DEFUN([GLIB_GNU_GETTEXT],
[AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
GLIB_LC_MESSAGES
GLIB_WITH_NLS
@@ -541,7 +541,7 @@ m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
)
# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -773,24 +773,37 @@ m4_popdef([pkg_default])
m4_popdef([pkg_description])
]) dnl PKG_NOARCH_INSTALLDIR
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
+# 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 8
-
# 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.12'
+[am__api_version='1.13'
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.12.2], [],
+m4_if([$1], [1.13.4], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -806,21 +819,19 @@ 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.12.2])dnl
+[AM_AUTOMAKE_VERSION([1.13.4])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-2012 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 2
-
# 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/../..'.
@@ -868,14 +879,12 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2012 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 10
-
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
@@ -901,13 +910,12 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2012 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 17
# 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,
@@ -1093,19 +1101,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2012 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 6
# _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
@@ -1134,7 +1141,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
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"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
@@ -1168,27 +1175,14 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
-# Copyright (C) 1996-2012 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-2012 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 19
-
# 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.
@@ -1204,7 +1198,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
@@ -1234,8 +1228,7 @@ AC_SUBST([CYGPATH_W])
dnl Distinguish between old-style and new-style calls.
m4_ifval([$2],
[AC_DIAGNOSE([obsolete],
-[$0: two- and three-arguments forms are deprecated. For more info, see:
-http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
+ [$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])],
@@ -1289,18 +1282,15 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
[_AM_DEPENDENCIES([OBJC])],
[m4_define([AC_PROG_OBJC],
m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-dnl Support for Objective C++ was only introduced in Autoconf 2.65,
-dnl but we still cater to Autoconf 2.62.
-m4_ifdef([AC_PROG_OBJCXX],
-[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
[_AM_DEPENDENCIES([OBJCXX])],
[m4_define([AC_PROG_OBJCXX],
- m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
+ 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
@@ -1334,14 +1324,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-2012 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 8
-
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
@@ -1357,14 +1345,12 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2012 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],
@@ -1381,14 +1367,12 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2012 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 7
-
# AM_MAINTAINER_MODE([DEFAULT-MODE])
# ----------------------------------
# Control maintainer-specific portions of Makefiles.
@@ -1416,18 +1400,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-2012 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_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
@@ -1470,14 +1450,12 @@ AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
-# Copyright (C) 1999-2012 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 6
-
# AM_PROG_CC_C_O
# --------------
# Like AC_PROG_CC_C_O, but changed for automake.
@@ -1506,14 +1484,12 @@ m4_define([AC_PROG_CC],
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2012 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 7
-
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
@@ -1521,11 +1497,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
@@ -1538,24 +1513,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])
fi
])
+# -*- 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.
+
+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-2012 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 6
-
# _AM_MANGLE_OPTION(NAME)
# -----------------------
AC_DEFUN([_AM_MANGLE_OPTION],
@@ -1579,14 +1581,12 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 2001-2012 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_RUN_LOG(COMMAND)
# -------------------
# Run COMMAND, save the exit status in ac_status, and log it.
@@ -1600,14 +1600,12 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2012 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 9
-
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
@@ -1683,14 +1681,12 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2012 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 3
-
# AM_SILENT_RULES([DEFAULT])
# --------------------------
# Enable less verbose build rules; with the default set to DEFAULT
@@ -1745,14 +1741,12 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2012 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 2
-
# AM_PROG_INSTALL_STRIP
# ---------------------
# One issue with vendor 'install' (even GNU) is that you can't
@@ -1775,14 +1769,12 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2012 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.
@@ -1796,14 +1788,12 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-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 3
-
# _AM_PROG_TAR(FORMAT)
# --------------------
# Check how to create a tarball in format FORMAT.
@@ -1817,76 +1807,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/compile b/compile
index b1f4749..531136b 100755
--- a/compile
+++ b/compile
@@ -1,10 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-01-04.17; # UTC
+scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# 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
@@ -79,6 +78,53 @@ func_file_conv ()
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 ()
@@ -109,43 +155,34 @@ func_cl_wrapper ()
;;
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*)
- lib=${1#-l}
- 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
- set x "$@" "$dir/$lib.dll.lib"
- break
- fi
- if test -f "$dir/$lib.lib"; then
- found=yes
- set x "$@" "$dir/$lib.lib"
- break
- fi
- done
- IFS=$save_IFS
-
- test "$found" != yes && set x "$@" "$lib.lib"
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
shift
;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
-L*)
- func_file_conv "${1#-L}"
- 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 "${1#-L}"
;;
-static)
shared=false
diff --git a/config.guess b/config.guess
index 49ba16f..1804e9f 100755
--- a/config.guess
+++ b/config.guess
@@ -2,13 +2,13 @@
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2012-01-01'
+timestamp='2012-12-29'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -17,26 +17,22 @@ timestamp='2012-01-01'
# 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
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches at gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -57,8 +53,8 @@ GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -202,6 +198,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit ;;
+ *:Bitrig:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -304,7 +304,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -803,6 +803,9 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
+ *:MINGW64*:*)
+ echo ${UNAME_MACHINE}-pc-mingw64
+ exit ;;
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
@@ -863,6 +866,13 @@ EOF
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ aarch64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -1196,6 +1206,9 @@ EOF
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
echo i586-pc-haiku
exit ;;
+ x86_64:Haiku:*:*)
+ echo x86_64-unknown-haiku
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
@@ -1251,7 +1264,7 @@ EOF
NEO-?:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
+ NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
NSR-?:NONSTOP_KERNEL:*:*)
@@ -1320,11 +1333,11 @@ EOF
i*86:AROS:*:*)
echo ${UNAME_MACHINE}-pc-aros
exit ;;
+ x86_64:VMkernel:*:*)
+ echo ${UNAME_MACHINE}-unknown-esx
+ exit ;;
esac
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
diff --git a/config.sub b/config.sub
index d6b6b3c..52f04bc 100755
--- a/config.sub
+++ b/config.sub
@@ -2,37 +2,32 @@
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2012-01-01'
+timestamp='2012-12-29'
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine. It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, 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
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches at gnu.org.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -76,8 +71,8 @@ version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -125,13 +120,17 @@ esac
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
@@ -154,7 +153,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze)
+ -apple | -axis | -knuth | -cray | -microblaze*)
os=
basic_machine=$1
;;
@@ -223,6 +222,12 @@ case $os in
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
+ -lynx*178)
+ os=-lynxos178
+ ;;
+ -lynx*5)
+ os=-lynxos5
+ ;;
-lynx*)
os=-lynxos
;;
@@ -247,11 +252,14 @@ case $basic_machine in
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | be32 | be64 \
+ | arc \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | avr | avr32 \
+ | be32 | be64 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
@@ -264,7 +272,7 @@ case $basic_machine in
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -319,7 +327,7 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -332,7 +340,10 @@ case $basic_machine in
strongarm | thumb | xscale)
basic_machine=arm-unknown
;;
-
+ xgate)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
xscaleeb)
basic_machine=armeb-unknown
;;
@@ -355,6 +366,7 @@ case $basic_machine in
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
@@ -376,7 +388,8 @@ case $basic_machine in
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | microblaze-* | microblazeel-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -775,9 +788,13 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze)
+ microblaze*)
basic_machine=microblaze-xilinx
;;
+ mingw64)
+ basic_machine=x86_64-pc
+ os=-mingw64
+ ;;
mingw32)
basic_machine=i386-pc
os=-mingw32
@@ -991,7 +1008,7 @@ case $basic_machine in
;;
ppc64) basic_machine=powerpc64-unknown
;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
@@ -1006,7 +1023,11 @@ case $basic_machine in
basic_machine=i586-unknown
os=-pw32
;;
- rdos)
+ rdos | rdos64)
+ basic_machine=x86_64-pc
+ os=-rdos
+ ;;
+ rdos32)
basic_machine=i386-pc
os=-rdos
;;
@@ -1339,15 +1360,15 @@ case $os in
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -openbsd* | -solidbsd* \
+ | -bitrig* | -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-uclibc* \
+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1530,6 +1551,9 @@ case $basic_machine in
c4x-* | tic4x-*)
os=-coff
;;
+ hexagon-*)
+ os=-elf
+ ;;
tic54x-*)
os=-coff
;;
diff --git a/configure b/configure
index a4ce035..d346197 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for seahorse-nautilus 3.8.0.
+# Generated by GNU Autoconf 2.69 for seahorse-nautilus 3.11.92.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse-plugins&component=Nautilus>.
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='seahorse-nautilus'
PACKAGE_TARNAME='seahorse-nautilus'
-PACKAGE_VERSION='3.8.0'
-PACKAGE_STRING='seahorse-nautilus 3.8.0'
+PACKAGE_VERSION='3.11.92'
+PACKAGE_STRING='seahorse-nautilus 3.11.92'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse-plugins&component=Nautilus'
PACKAGE_URL=''
@@ -1414,7 +1414,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 seahorse-nautilus 3.8.0 to adapt to many kinds of systems.
+\`configure' configures seahorse-nautilus 3.11.92 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1485,7 +1485,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of seahorse-nautilus 3.8.0:";;
+ short | recursive ) echo "Configuration of seahorse-nautilus 3.11.92:";;
esac
cat <<\_ACEOF
@@ -1633,7 +1633,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-seahorse-nautilus configure 3.8.0
+seahorse-nautilus configure 3.11.92
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2056,7 +2056,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 seahorse-nautilus $as_me 3.8.0, which was
+It was created by seahorse-nautilus $as_me 3.11.92, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2407,7 +2407,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# -----------------------------------------------------------------------------
-am__api_version='1.12'
+am__api_version='1.13'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2620,8 +2620,8 @@ 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
@@ -2861,6 +2861,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."
@@ -2883,7 +2922,7 @@ fi
# Define the identity of the package.
PACKAGE='seahorse-nautilus'
- VERSION='3.8.0'
+ VERSION='3.11.92'
cat >>confdefs.h <<_ACEOF
@@ -2924,92 +2963,132 @@ mkdir_p='$(MKDIR_P)'
AMTAR='$${TAR-tar}'
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
-$as_echo_n "checking how to create a ustar tar archive... " >&6; }
-# 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 plaintar pax cpio none'
-_am_tools=${am_cv_prog_tar_ustar-$_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
- { echo "$as_me:$LINENO: $_am_tar --version" >&5
+
+# 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`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
+$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
+ if test $am_uid -le $am_max_uid; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ _am_tools=none
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
+$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
+ if test $am_gid -le $am_max_gid; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ _am_tools=none
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+$as_echo_n "checking how to create a ustar tar archive... " >&6; }
+
+ # 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_ustar-$_am_tools}
+
+ for _am_tool in $_am_tools; do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar; do
+ { echo "$as_me:$LINENO: $_am_tar --version" >&5
($_am_tar --version) >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && break
- done
- am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=ustar -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 ustar -w "$$tardir"'
- am__tar_='pax -L -x ustar -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
- am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
- am__untar='cpio -i -H ustar -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
+ done
+ am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=ustar -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 ustar -w "$$tardir"'
+ am__tar_='pax -L -x ustar -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
+ am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
+ am__untar='cpio -i -H ustar -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_ustar}" && break
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_ustar}" && break
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
+ # tar/untar a dummy directory, and stop if the command works.
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
(tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
- rm -rf conftest.dir
- if test -s conftest.tar; then
- { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
($am__untar <conftest.tar) >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
+ { echo "$as_me:$LINENO: cat conftest.dir/file" >&5
+ (cat conftest.dir/file) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
+ rm -rf conftest.dir
-if ${am_cv_prog_tar_ustar+:} false; then :
+ if ${am_cv_prog_tar_ustar+:} false; then :
$as_echo_n "(cached) " >&6
else
am_cv_prog_tar_ustar=$_am_tool
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
$as_echo "$am_cv_prog_tar_ustar" >&6; }
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
$as_echo_n "checking whether build environment is sane... " >&6; }
# Reject unsafe characters in $srcdir or the absolute working directory
@@ -7914,7 +7993,7 @@ ia64-*-hpux*)
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7932,7 +8011,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpc64le-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -7951,7 +8033,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -15269,12 +15354,12 @@ if test -n "$LIBCRYPTUI_CFLAGS"; then
pkg_cv_LIBCRYPTUI_CFLAGS="$LIBCRYPTUI_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cryptui-0.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cryptui-0.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cryptui-0.0 >= 3.9.90\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cryptui-0.0 >= 3.9.90") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBCRYPTUI_CFLAGS=`$PKG_CONFIG --cflags "cryptui-0.0" 2>/dev/null`
+ pkg_cv_LIBCRYPTUI_CFLAGS=`$PKG_CONFIG --cflags "cryptui-0.0 >= 3.9.90" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15286,12 +15371,12 @@ if test -n "$LIBCRYPTUI_LIBS"; then
pkg_cv_LIBCRYPTUI_LIBS="$LIBCRYPTUI_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cryptui-0.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cryptui-0.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cryptui-0.0 >= 3.9.90\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cryptui-0.0 >= 3.9.90") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBCRYPTUI_LIBS=`$PKG_CONFIG --libs "cryptui-0.0" 2>/dev/null`
+ pkg_cv_LIBCRYPTUI_LIBS=`$PKG_CONFIG --libs "cryptui-0.0 >= 3.9.90" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15312,14 +15397,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBCRYPTUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cryptui-0.0" 2>&1`
+ LIBCRYPTUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cryptui-0.0 >= 3.9.90" 2>&1`
else
- LIBCRYPTUI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cryptui-0.0" 2>&1`
+ LIBCRYPTUI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cryptui-0.0 >= 3.9.90" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBCRYPTUI_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (cryptui-0.0) were not met:
+ as_fn_error $? "Package requirements (cryptui-0.0 >= 3.9.90) were not met:
$LIBCRYPTUI_PKG_ERRORS
@@ -15772,7 +15857,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$//'
@@ -16228,7 +16312,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 seahorse-nautilus $as_me 3.8.0, which was
+This file was extended by seahorse-nautilus $as_me 3.11.92, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16294,7 +16378,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-seahorse-nautilus config.status 3.8.0
+seahorse-nautilus config.status 3.11.92
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -17310,7 +17394,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
@@ -17361,7 +17445,7 @@ $as_echo X"$mf" |
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"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
diff --git a/configure.ac b/configure.ac
index 46de4e7..471b34d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.63])
-AC_INIT([seahorse-nautilus], [3.8.0],
+AC_INIT([seahorse-nautilus], [3.11.92],
[http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse-plugins&component=Nautilus],
[seahorse-nautilus])
@@ -172,7 +172,7 @@ SEAHORSE_LIBS="$SEAHORSE_LIBS $DBUS_LIBS"
# -----------------------------------------------------------------------------
# Libcryptui
-PKG_CHECK_MODULES([LIBCRYPTUI], cryptui-0.0)
+PKG_CHECK_MODULES([LIBCRYPTUI], cryptui-0.0 >= 3.9.90)
SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $LIBCRYPTUI_CFLAGS"
SEAHORSE_LIBS="$SEAHORSE_LIBS $LIBCRYPTUI_LIBS"
diff --git a/data/Makefile.in b/data/Makefile.in
index a95c1a1..5a3fb3e 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.2 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2012 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,
@@ -15,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; \
- 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 +79,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
@@ -112,6 +140,7 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(convertdir)"
DATA = $(convert_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -357,11 +386,9 @@ uninstall-convertDATA:
@list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(convertdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
cscope cscopelist:
@@ -502,16 +529,17 @@ uninstall-am: uninstall-convertDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-convertDATA install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-convertDATA
+ cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-convertDATA install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-convertDATA
@GSETTINGS_RULES@
diff --git a/data/org.gnome.seahorse.nautilus.gschema.xml b/data/org.gnome.seahorse.nautilus.gschema.xml
index 634c458..8f134a9 100644
--- a/data/org.gnome.seahorse.nautilus.gschema.xml
+++ b/data/org.gnome.seahorse.nautilus.gschema.xml
@@ -3,7 +3,7 @@
<key name="package-extension" type="s">
<default>'.zip'</default>
<summary>File extension for packages</summary>
- <description>File extension for packages when handling mulitple files.</description>
+ <description>File extension for packages when handling multiple files.</description>
</key>
<key name="separate-files" type="b">
<default>false</default>
diff --git a/depcomp b/depcomp
index bd0ac08..4ebd5b3 100755
--- a/depcomp
+++ b/depcomp
@@ -1,10 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2011-12-04.11; # UTC
+scriptversion=2013-05-30.07; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -28,9 +27,9 @@ scriptversion=2011-12-04.11; # UTC
case $1 in
'')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
-h | --h*)
cat <<\EOF
Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -40,8 +39,8 @@ as side-effects.
Environment variables:
depmode Dependency tracking mode.
- source Source file read by `PROGRAMS ARGS'.
- object Object file output by `PROGRAMS ARGS'.
+ source Source file read by 'PROGRAMS ARGS'.
+ object Object file output by 'PROGRAMS ARGS'.
DEPDIR directory where to store dependencies.
depfile Dependency file to output.
tmpdepfile Temporary file to use when outputting dependencies.
@@ -57,6 +56,66 @@ EOF
;;
esac
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'. Note that this directory component will
+# be either empty or ending with a '/' character. This is deliberate.
+set_dir_from ()
+{
+ case $1 in
+ */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+ *) dir=;;
+ esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+ base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+ echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+ # If the compiler actually managed to produce a dependency file,
+ # post-process it.
+ if test -f "$tmpdepfile"; then
+ # Each line is of the form 'foo.o: dependency.h'.
+ # Do two passes, one to just change these to
+ # $object: dependency.h
+ # and one to simply output
+ # dependency.h:
+ # which is needed to avoid the deleted-header problem.
+ { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+ sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+ } > "$depfile"
+ rm -f "$tmpdepfile"
+ else
+ make_dummy_depfile
+ fi
+}
+
+# A tabulation character.
+tab=' '
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
@@ -69,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
# Some modes work just like other modes, but use different flags. We
# parameterize here, but still list the modes in the big case below,
# to make depend.m4 easier to write. Note that we *cannot* use a case
@@ -80,26 +142,32 @@ if test "$depmode" = hp; then
fi
if test "$depmode" = dashXmstdout; then
- # This is just like dashmstdout with a different argument.
- dashmflag=-xM
- depmode=dashmstdout
+ # This is just like dashmstdout with a different argument.
+ dashmflag=-xM
+ depmode=dashmstdout
fi
cygpath_u="cygpath -u -f -"
if test "$depmode" = msvcmsys; then
- # This is just like msvisualcpp but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u='sed s,\\\\,/,g'
- depmode=msvisualcpp
+ # This is just like msvisualcpp but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvisualcpp
fi
if test "$depmode" = msvc7msys; then
- # This is just like msvc7 but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u='sed s,\\\\,/,g'
- depmode=msvc7
+ # This is just like msvc7 but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+ gccflag=-qmakedep=gcc,-MF
+ depmode=gcc
fi
case "$depmode" in
@@ -122,8 +190,7 @@ gcc3)
done
"$@"
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
@@ -131,13 +198,17 @@ gcc3)
;;
gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
## - Don't want to use -MD because we'd like the dependencies to end
## up in a subdir. Having to rename by hand is ugly.
## (We might end up doing this anyway to support other compilers.)
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
+## -MM, not -M (despite what the docs say). Also, it might not be
+## supported by the other compilers which use the 'gcc' depmode.
## - Using -M directly means running the compiler twice (even worse
## than renaming).
if test -z "$gccflag"; then
@@ -145,33 +216,31 @@ gcc)
fi
"$@" -Wp,"$gccflag$tmpdepfile"
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+ # The second -e expression handles DOS-style file names with drive
+ # letters.
sed -e 's/^[^:]*: / /' \
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
## The problem is that when a header file which appears in a .P file
## is deleted, the dependency causes make to die (because there is
## typically no way to rebuild the header). We avoid this by adding
## dummy dependencies for each header file. Too bad gcc doesn't do
## this for us directly.
- tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'. On the theory
+## Some versions of gcc put a space before the ':'. On the theory
## that the space means something, we add a space to the output as
## well. hp depmode also adds that space, but also prefixes the VPATH
## to the object. Take care to not repeat it in the output.
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
- | sed -e 's/$/ :/' >> "$depfile"
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -189,8 +258,7 @@ sgi)
"$@" -MDupdate "$tmpdepfile"
fi
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
@@ -198,43 +266,41 @@ sgi)
if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
echo "$object : \\" > "$depfile"
-
# Clip off the initial element (the dependent). Don't try to be
# clever and replace this with sed code, as IRIX sed won't handle
# lines with more than a fixed number of characters (4096 in
# 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
+ # the IRIX cc adds comments like '#:fec' to the end of the
# dependency line.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
-' ' ' >> "$depfile"
+ 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 ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> "$depfile"
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+ >> "$depfile"
else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
+ make_dummy_depfile
fi
rm -f "$tmpdepfile"
;;
+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,
+ # since it is checked for above.
+ exit 1
+ ;;
+
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
# in a .u file. In older versions, this file always lives in the
- # current directory. Also, the AIX compiler puts `$object:' at the
+ # current directory. Also, the AIX compiler puts '$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ set_dir_from "$object"
+ set_base_from "$object"
if test "$libtool" = yes; then
tmpdepfile1=$dir$base.u
tmpdepfile2=$base.u
@@ -247,9 +313,7 @@ aix)
"$@" -M
fi
stat=$?
-
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
@@ -258,44 +322,100 @@ aix)
do
test -f "$tmpdepfile" && break
done
- if test -f "$tmpdepfile"; then
- # Each line is of the form `foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
+ aix_post_process_depfile
+ ;;
+
+tcc)
+ # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+ # FIXME: That version still under development at the moment of writing.
+ # Make that this statement remains true also for stable, released
+ # versions.
+ # It will wrap lines (doesn't matter whether long or short) with a
+ # trailing '\', as in:
+ #
+ # foo.o : \
+ # foo.c \
+ # foo.h \
+ #
+ # It will put a trailing '\' even on the last line, and will use leading
+ # spaces rather than leading tabs (at least since its commit 0394caf7
+ # "Emit spaces for -MD").
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile"
+ exit $stat
fi
+ rm -f "$depfile"
+ # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+ # We have to change lines of the first kind to '$object: \'.
+ sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+ # And for each line of the second kind, we have to emit a 'dep.h:'
+ # dummy dependency, to avoid the deleted-header problem.
+ sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
rm -f "$tmpdepfile"
;;
-icc)
- # Intel's C compiler understands `-MD -MF file'. However on
- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
- # ICC 7.0 will fill foo.d with something like
- # foo.o: sub/foo.c
- # foo.o: sub/foo.h
- # which is wrong. We want:
- # sub/foo.o: sub/foo.c
- # sub/foo.o: sub/foo.h
- # sub/foo.c:
- # sub/foo.h:
- # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file. A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+ # Portland's C compiler understands '-MD'.
+ # Will always output deps to 'file.d' where file is the root name of the
+ # source file under compilation, even if file resides in a subdirectory.
+ # The object file name does not affect the name of the '.d' file.
+ # pgcc 10.2 will output
# foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using \ :
+ # and will wrap long lines using '\' :
# foo.o: sub/foo.c ... \
# sub/foo.h ... \
# ...
+ set_dir_from "$object"
+ # Use the source, not the object, to determine the base name, since
+ # that's sadly what pgcc will do too.
+ set_base_from "$source"
+ tmpdepfile=$base.d
+
+ # For projects that build the same source file twice into different object
+ # files, the pgcc approach of using the *source* file root name can cause
+ # problems in parallel builds. Use a locking strategy to avoid stomping on
+ # the same $tmpdepfile.
+ lockdir=$base.d-lock
+ trap "
+ echo '$0: caught signal, cleaning up...' >&2
+ rmdir '$lockdir'
+ exit 1
+ " 1 2 13 15
+ numtries=100
+ i=$numtries
+ while test $i -gt 0; do
+ # mkdir is a portable test-and-set.
+ if mkdir "$lockdir" 2>/dev/null; then
+ # This process acquired the lock.
+ "$@" -MD
+ stat=$?
+ # Release the lock.
+ rmdir "$lockdir"
+ break
+ else
+ # If the lock is being held by a different process, wait
+ # until the winning process is done or we timeout.
+ while test -d "$lockdir" && test $i -gt 0; do
+ sleep 1
+ i=`expr $i - 1`
+ done
+ fi
+ i=`expr $i - 1`
+ done
+ trap - 1 2 13 15
+ if test $i -le 0; then
+ echo "$0: failed to acquire lock after $numtries attempts" >&2
+ echo "$0: check lockdir '$lockdir'" >&2
+ exit 1
+ fi
- "$@" -MD -MF "$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
@@ -307,8 +427,8 @@ icc)
sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
# Some versions of the HPUX 10.20 sed can't process this invocation
# correctly. Breaking it into two sed invocations is a workaround.
- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
- sed -e 's/$/ :/' >> "$depfile"
+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -319,9 +439,8 @@ hp2)
# 'foo.d', which lands next to the object file, wherever that
# happens to be.
# Much of this is similar to the tru64 case; see comments there.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ set_dir_from "$object"
+ set_base_from "$object"
if test "$libtool" = yes; then
tmpdepfile1=$dir$base.d
tmpdepfile2=$dir.libs/$base.d
@@ -332,8 +451,7 @@ hp2)
"$@" +Maked
fi
stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile1" "$tmpdepfile2"
exit $stat
fi
@@ -343,77 +461,61 @@ hp2)
test -f "$tmpdepfile" && break
done
if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add `dependent.h:' lines.
+ sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add 'dependent.h:' lines.
sed -ne '2,${
- s/^ *//
- s/ \\*$//
- s/$/:/
- p
- }' "$tmpdepfile" >> "$depfile"
+ s/^ *//
+ s/ \\*$//
+ s/$/:/
+ p
+ }' "$tmpdepfile" >> "$depfile"
else
- echo "#dummy" > "$depfile"
+ make_dummy_depfile
fi
rm -f "$tmpdepfile" "$tmpdepfile2"
;;
tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in `foo.d' instead, so we check for that too.
- # Subdirectories are respected.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
- if test "$libtool" = yes; then
- # With Tru64 cc, shared objects can also be used to make a
- # static library. This mechanism is used in libtool 1.4 series to
- # handle both shared and static libraries in a single compilation.
- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
- #
- # With libtool 1.5 this exception was removed, and libtool now
- # generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
- # automatically cleaned when .libs/ is deleted, while ignoring
- # the former would cause a distcleancheck panic.
- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
- tmpdepfile2=$dir$base.o.d # libtool 1.5
- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
- "$@" -Wc,-MD
- else
- tmpdepfile1=$dir$base.o.d
- tmpdepfile2=$dir$base.d
- tmpdepfile3=$dir$base.d
- tmpdepfile4=$dir$base.d
- "$@" -MD
- fi
-
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+ # dependencies in 'foo.d' instead, so we check for that too.
+ # Subdirectories are respected.
+ set_dir_from "$object"
+ set_base_from "$object"
+
+ if test "$libtool" = yes; then
+ # Libtool generates 2 separate objects for the 2 libraries. These
+ # two compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+ # automatically cleaned when .libs/ is deleted, while ignoring
+ # the former would cause a distcleancheck panic.
+ tmpdepfile1=$dir$base.o.d # libtool 1.5
+ tmpdepfile2=$dir.libs/$base.o.d # Likewise.
+ tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504
+ "$@" -Wc,-MD
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ tmpdepfile3=$dir$base.d
+ "$@" -MD
+ fi
+
+ stat=$?
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ # Same post-processing that is required for AIX mode.
+ aix_post_process_depfile
+ ;;
msvc7)
if test "$libtool" = yes; then
@@ -424,8 +526,7 @@ msvc7)
"$@" $showIncludes > "$tmpdepfile"
stat=$?
grep -v '^Note: including file: ' "$tmpdepfile"
- if test "$stat" = 0; then :
- else
+ if test $stat -ne 0; then
rm -f "$tmpdepfile"
exit $stat
fi
@@ -443,14 +544,15 @@ msvc7)
p
}' | $cygpath_u | sort -u | sed -n '
s/ /\\ /g
-s/\(.*\)/ \1 \\/p
+s/\(.*\)/'"$tab"'\1 \\/p
s/.\(.*\) \\/\1:/
H
$ {
- s/.*/ /
+ s/.*/'"$tab"'/
G
p
}' >> "$depfile"
+ echo >> "$depfile" # make sure the fragment doesn't end with a backslash
rm -f "$tmpdepfile"
;;
@@ -478,7 +580,7 @@ dashmstdout)
shift
fi
- # Remove `-o $object'.
+ # Remove '-o $object'.
IFS=" "
for arg
do
@@ -498,18 +600,18 @@ dashmstdout)
done
test -z "$dashmflag" && dashmflag=-M
- # Require at least two characters before searching for `:'
+ # Require at least two characters before searching for ':'
# in the target name. This is to cope with DOS-style filenames:
- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+ # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
"$@" $dashmflag |
- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+ sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
- tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process this sed invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -562,11 +664,12 @@ makedepend)
# makedepend may prepend the VPATH from the source file name to the object.
# No need to regex-escape $object, excess matching of '.' is harmless.
sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
- sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process the last invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ sed '1,2d' "$tmpdepfile" \
+ | tr ' ' "$nl" \
+ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile" "$tmpdepfile".bak
;;
@@ -583,7 +686,7 @@ cpp)
shift
fi
- # Remove `-o $object'.
+ # Remove '-o $object'.
IFS=" "
for arg
do
@@ -602,10 +705,10 @@ cpp)
esac
done
- "$@" -E |
- sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
- sed '$ s: \\$::' > "$tmpdepfile"
+ "$@" -E \
+ | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ | sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
cat < "$tmpdepfile" >> "$depfile"
@@ -637,23 +740,23 @@ msvisualcpp)
shift
;;
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
- set fnord "$@"
- shift
- shift
- ;;
+ set fnord "$@"
+ shift
+ shift
+ ;;
*)
- set fnord "$@" "$arg"
- shift
- shift
- ;;
+ set fnord "$@" "$arg"
+ shift
+ shift
+ ;;
esac
done
"$@" -E 2>/dev/null |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
- echo " " >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+ echo "$tab" >> "$depfile"
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
diff --git a/install-sh b/install-sh
index a9244eb..377bb86 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2011-01-19.21; # UTC
+scriptversion=2011-11-20.07; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@ scriptversion=2011-01-19.21; # UTC
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
@@ -156,7 +156,7 @@ while test $# -ne 0; do
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
- # Protect names problematic for `test' and other utilities.
+ # Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
@@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi
shift # arg
dst_arg=$arg
- # Protect names problematic for `test' and other utilities.
+ # Protect names problematic for 'test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
@@ -202,7 +202,7 @@ if test $# -eq 0; then
echo "$0: no input file specified." >&2
exit 1
fi
- # It's OK to call `install-sh -d' without argument.
+ # It's OK to call 'install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
@@ -240,7 +240,7 @@ fi
for src
do
- # Protect names problematic for `test' and other utilities.
+ # Protect names problematic for 'test' and other utilities.
case $src in
-* | [=\(\)!]) src=./$src;;
esac
@@ -354,7 +354,7 @@ do
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writeable bit of parent directory when it shouldn't.
+ # other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 56666f0..f12cfdf 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1312,7 +1312,7 @@ ia64-*-hpux*)
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -1326,7 +1326,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpc64le-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1345,7 +1348,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
diff --git a/missing b/missing
index 86a8fc3..cdea514 100755
--- a/missing
+++ b/missing
@@ -1,11 +1,10 @@
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard 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
@@ -26,68 +25,40 @@ scriptversion=2012-01-06.13; # UTC
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <bug-automake at gnu.org>."
exit $?
@@ -99,228 +70,141 @@ 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
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
-
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG=\${$#}
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG=\${$#}
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'automa4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
;;
-esac
-
-exit 0
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/nautilus-ext/Makefile.in b/nautilus-ext/Makefile.in
index 1ba67e1..f34c264 100644
--- a/nautilus-ext/Makefile.in
+++ b/nautilus-ext/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.2 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2012 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,
@@ -15,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; \
- 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,8 +79,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = nautilus-ext
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -148,6 +176,23 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
+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)
@@ -369,6 +414,7 @@ $(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):
+
install-nautilus_extensionLTLIBRARIES: $(nautilus_extension_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(nautilus_extension_LTLIBRARIES)'; test -n "$(nautilus_extensiondir)" || list=; \
@@ -403,6 +449,7 @@ clean-nautilus_extensionLTLIBRARIES:
echo rm -f $${locs}; \
rm -f $${locs}; \
}
+
libnautilus-seahorse.la: $(libnautilus_seahorse_la_OBJECTS) $(libnautilus_seahorse_la_DEPENDENCIES) $(EXTRA_libnautilus_seahorse_la_DEPENDENCIES)
$(AM_V_CCLD)$(libnautilus_seahorse_la_LINK) -rpath $(nautilus_extensiondir) $(libnautilus_seahorse_la_OBJECTS) $(libnautilus_seahorse_la_LIBADD) $(LIBS)
@@ -442,26 +489,15 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-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; \
@@ -473,15 +509,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
@@ -490,9 +522,10 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
-cscopelist: $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
case "$(srcdir)" in \
[\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
*) sdir=$(subdir)/$(srcdir) ;; \
@@ -648,20 +681,20 @@ uninstall-am: uninstall-nautilus_extensionLTLIBRARIES
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-nautilus_extensionLTLIBRARIES cscopelist \
- ctags distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-nautilus_extensionLTLIBRARIES \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man \
install-nautilus_extensionLTLIBRARIES install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am \
+ tags tags-am uninstall uninstall-am \
uninstall-nautilus_extensionLTLIBRARIES
diff --git a/po/cs.po b/po/cs.po
index 94d0246..f127c62 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -16,10 +16,10 @@ msgstr ""
"Project-Id-Version: seahorse-plugins\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=seahorse-nautilus&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-12-03 23:46+0000\n"
-"PO-Revision-Date: 2013-01-23 21:56+0100\n"
+"POT-Creation-Date: 2013-11-23 05:06+0000\n"
+"PO-Revision-Date: 2013-12-02 14:31+0100\n"
"Last-Translator: Marek Černocký <marek at manet.cz>\n"
-"Language-Team: čeština <gnome-cs-list at gnome.org>\n"
+"Language-Team: Czech <gnome-cs-list at gnome.org>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +32,7 @@ msgid "File extension for packages"
msgstr "Přípona souboru pro balíčky"
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
-msgid "File extension for packages when handling mulitple files."
+msgid "File extension for packages when handling multiple files."
msgstr "Přípona souboru pro balíčky, když se pracuje s více soubory."
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
@@ -180,33 +180,43 @@ msgstr "Podepsáno klíčem <i><key id='%s'/> <b>Klíč odvolán</b></i> dne %s.
msgid "Revoked Signature"
msgstr "Odvolaný podpis"
-#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:627
+#: ../tool/seahorse-notification.c:628
+msgid "Good Signature"
+msgstr "Správný podpis"
+
+#: ../tool/seahorse-notification.c:629
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s."
msgstr "Podepsáno klíčem <i><key id='%s'/></i> dne %s."
-#: ../tool/seahorse-notification.c:628
-msgid "Good Signature"
-msgstr "Správný podpis"
+#: ../tool/seahorse-notification.c:631
+msgid "Untrusted Valid Signature"
+msgstr "Nedůvěryhodný platný podpis"
-#: ../tool/seahorse-notification.c:633
+#: ../tool/seahorse-notification.c:632
+#, c-format
+msgid "Valid but <b>untrusted</b> signature by <i><key id='%s'/></i> on %s."
+msgstr ""
+"Podepsáno platným, ale <b>nedůvěryhodným</b> klíčem <i><key id='%s'/></i> "
+"dne %s."
+
+#: ../tool/seahorse-notification.c:638
msgid "Signing key not in keyring."
msgstr "Podpisový klíč v klíčence chybí."
-#: ../tool/seahorse-notification.c:634
+#: ../tool/seahorse-notification.c:639
msgid "Unknown Signature"
msgstr "Neznámý podpis"
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:643
msgid "Bad or forged signature. The signed data was modified."
msgstr "Špatný nebo padělaný podpis. Podepsaná data byla změněna."
-#: ../tool/seahorse-notification.c:639
+#: ../tool/seahorse-notification.c:644
msgid "Bad Signature"
msgstr "Špatný podpis"
-#: ../tool/seahorse-notification.c:647
+#: ../tool/seahorse-notification.c:652
msgid "Couldn't verify signature."
msgstr "Nebylo možno ověřit podpis."
@@ -297,50 +307,50 @@ msgstr "Číst seznam URI ze standardního vstupu"
msgid "file..."
msgstr "soubor…"
-#: ../tool/seahorse-tool.c:169
-msgid "Choose Recipients"
-msgstr "Vyberte příjemce"
+#: ../tool/seahorse-tool.c:171
+msgid "Encryption settings"
+msgstr "Nastavení šifrování"
-#: ../tool/seahorse-tool.c:234 ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:236 ../tool/seahorse-tool.c:350
msgid "Couldn't load keys"
msgstr "Nebylo možno načíst klíče"
-#: ../tool/seahorse-tool.c:252
+#: ../tool/seahorse-tool.c:253
#, c-format
msgid "Choose Encrypted File Name for '%s'"
msgstr "Zvolte název zašifrovaného souboru pro „%s“"
-#: ../tool/seahorse-tool.c:325
+#: ../tool/seahorse-tool.c:328
msgid "Choose Signer"
msgstr "Zvolte podpisový klíč"
-#: ../tool/seahorse-tool.c:367
+#: ../tool/seahorse-tool.c:370
#, c-format
msgid "Choose Signature File Name for '%s'"
msgstr "Zvolte název souboru s podpisem pro „%s“"
-#: ../tool/seahorse-tool.c:407
+#: ../tool/seahorse-tool.c:410
msgid "Import is complete"
msgstr "Import byl dokončen"
-#: ../tool/seahorse-tool.c:440
+#: ../tool/seahorse-tool.c:443
msgid "Importing keys ..."
msgstr "Importují se klíče…"
-#: ../tool/seahorse-tool.c:470
+#: ../tool/seahorse-tool.c:473
msgid "Import Failed"
msgstr "Import selhal"
-#: ../tool/seahorse-tool.c:471
+#: ../tool/seahorse-tool.c:474
msgid "Keys were found but not imported."
msgstr "Klíče nalezeny, ale nebyly importovány."
-#: ../tool/seahorse-tool.c:494
+#: ../tool/seahorse-tool.c:497
#, c-format
msgid "Imported key"
msgstr "Importován klíč"
-#: ../tool/seahorse-tool.c:496
+#: ../tool/seahorse-tool.c:499
#, c-format
msgid "Imported %d key"
msgid_plural "Imported %d keys"
@@ -349,12 +359,12 @@ msgstr[1] "Importovány %d klíče"
msgstr[2] "Importováno %d klíčů"
#. File to decrypt to
-#: ../tool/seahorse-tool.c:518
+#: ../tool/seahorse-tool.c:521
#, c-format
msgid "Choose Decrypted File Name for '%s'"
msgstr "Zvolte název dešifrovaného souboru pro „%s“"
-#: ../tool/seahorse-tool.c:575
+#: ../tool/seahorse-tool.c:578
#, c-format
msgid "Choose Original File for '%s'"
msgstr "Zvolte původní soubor pro „%s“"
@@ -364,56 +374,56 @@ msgstr "Zvolte původní soubor pro „%s“"
#. * The last thing we want to do is cascade a big pile of error
#. * dialogs at the user.
#.
-#: ../tool/seahorse-tool.c:648
+#: ../tool/seahorse-tool.c:651
#, c-format
msgid "No valid signatures found"
msgstr "Nebyl nalezen žádný platný podpis"
-#: ../tool/seahorse-tool.c:695
+#: ../tool/seahorse-tool.c:698
msgid "File Encryption Tool"
msgstr "Nástroj pro šifrování souborů"
-#: ../tool/seahorse-tool.c:713
+#: ../tool/seahorse-tool.c:716
msgid "Encrypting"
msgstr "Šifrování"
-#: ../tool/seahorse-tool.c:714
+#: ../tool/seahorse-tool.c:717
#, c-format
msgid "Couldn't encrypt file: %s"
msgstr "Nebylo možno zašifrovat soubor: %s"
-#: ../tool/seahorse-tool.c:722
+#: ../tool/seahorse-tool.c:725
msgid "Signing"
msgstr "Podepsání"
-#: ../tool/seahorse-tool.c:723
+#: ../tool/seahorse-tool.c:726
#, c-format
msgid "Couldn't sign file: %s"
msgstr "Nebylo možno podepsat soubor: %s"
-#: ../tool/seahorse-tool.c:728
+#: ../tool/seahorse-tool.c:731
msgid "Importing"
msgstr "Import"
-#: ../tool/seahorse-tool.c:729
+#: ../tool/seahorse-tool.c:732
#, c-format
msgid "Couldn't import keys from file: %s"
msgstr "Nebylo možno importovat klíče ze souboru: %s"
-#: ../tool/seahorse-tool.c:735
+#: ../tool/seahorse-tool.c:738
msgid "Decrypting"
msgstr "Dešifrování"
-#: ../tool/seahorse-tool.c:736
+#: ../tool/seahorse-tool.c:739
#, c-format
msgid "Couldn't decrypt file: %s"
msgstr "Nebylo možno dešifrovat soubor: %s"
-#: ../tool/seahorse-tool.c:741
+#: ../tool/seahorse-tool.c:744
msgid "Verifying"
msgstr "Ověření"
-#: ../tool/seahorse-tool.c:742
+#: ../tool/seahorse-tool.c:745
#, c-format
msgid "Couldn't verify file: %s"
msgstr "Nebylo možno ověřit soubor: %s"
diff --git a/po/de.po b/po/de.po
index 21e4fea..0d7692c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,20 +4,65 @@
# Henrik Kröger <henrikkroeger at googlemail.com>, 2007.
# Philipp Kerling <k.philipp at gmail.com>, 2008.
# Mario Blättermann <mariobl at freenet.de>, 2010, 2011.
+# Benjamin Steinwender <b at stbe.at>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: seahorse-plugins master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 11:29+0200\n"
-"PO-Revision-Date: 2011-09-16 22:16+0100\n"
-"Last-Translator: Mario Blättermann <mariobl at freenet.de>\n"
+"POT-Creation-Date: 2014-02-02 14:16+0100\n"
+"PO-Revision-Date: 2014-02-02 14:20+0100\n"
+"Last-Translator: Benjamin Steinwender <b at stbe.at>\n"
"Language-Team: German <gnome-de at gnome.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:1
+msgid "File extension for packages"
+msgstr "Dateierweiterung für Pakete"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
+msgid "File extension for packages when handling multiple files."
+msgstr "Dateierweiterung für Pakete beim Bearbeiten mehrerer Dateien."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
+msgid "Handle multiple files separately"
+msgstr "Mehrere Dateien getrennt behandeln"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:4
+msgid ""
+"When handling multiple files, don't package them but process separately."
+msgstr ""
+"Beim Bearbeiten mehrerer Dateien diese nicht paketieren, sondern getrennt "
+"bearbeiten."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
+msgid "Use armor mode when encrypting"
+msgstr "Geschützten Modus beim Verschlüsseln verwenden"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:6
+msgid "Use PGP ASCII armor mode when encrypting or signing files."
+msgstr "Geschützten PGP-Textmodus beim Verschlüsseln oder Signieren verwenden"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:1
+msgid "Width of the window"
+msgstr "Breite des Fensters"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:2
+msgid "Width (in pixels) of the window."
+msgstr "Breite (in Pixel) des Fensters."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:3
+msgid "Height of the window"
+msgstr "Höhe des Fensters"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:4
+msgid "Height (in pixels) of the window."
+msgstr "Höhe (in Pixel) des Fensters."
#: ../nautilus-ext/seahorse-nautilus.c:158
msgid "Encrypt..."
@@ -40,20 +85,16 @@ msgstr[0] "Die ausgewählte Datei signieren"
msgstr[1] "Die ausgewählten Dateien signieren"
#: ../tool/seahorse-multi-encrypt.xml.h:1
-msgid "<b>You have selected multiple files or folders</b>"
-msgstr "<b>Sie haben mehrere Dateien oder Ordner ausgewählt.</b>"
+msgid "Encrypt Multiple Files"
+msgstr "Mehrere Dateien verschlüsseln"
#: ../tool/seahorse-multi-encrypt.xml.h:2
-msgid ""
-"Because the files are located remotely, each file will be encrypted "
-"separately."
-msgstr ""
-"Da die Dateien nicht lokal gespeichert sind, werden sie einzeln "
-"verschlüsselt."
+msgid "<b>You have selected multiple files or folders</b>"
+msgstr "<b>Sie haben mehrere Dateien oder Ordner ausgewählt.</b>"
#: ../tool/seahorse-multi-encrypt.xml.h:3
-msgid "Encrypt Multiple Files"
-msgstr "Mehrere Dateien verschlüsseln"
+msgid "encrypted-package"
+msgstr "verschlüsseltes Paket"
#: ../tool/seahorse-multi-encrypt.xml.h:4
msgid "Encrypt each file separately"
@@ -64,31 +105,35 @@ msgid "Encrypt packed together in a package"
msgstr "In einem Paket zusammenfassen und verschlüsseln"
#: ../tool/seahorse-multi-encrypt.xml.h:6
-msgid "Package Name:"
-msgstr "Paketname:"
-
-#: ../tool/seahorse-multi-encrypt.xml.h:7
msgid "Packaging:"
msgstr "Verpackung:"
+#: ../tool/seahorse-multi-encrypt.xml.h:7
+msgid "Package Name:"
+msgstr "Paketname:"
+
#: ../tool/seahorse-multi-encrypt.xml.h:8
-msgid "encrypted-package"
-msgstr "verschlüsseltes Paket"
+msgid ""
+"Because the files are located remotely, each file will be encrypted "
+"separately."
+msgstr ""
+"Da die Dateien nicht lokal gespeichert sind, werden sie einzeln "
+"verschlüsselt."
-#: ../tool/seahorse-notification.c:580 ../tool/seahorse-notification.c:605
+#: ../tool/seahorse-notification.c:569
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] "Schlüssel importiert."
msgstr[1] "Schlüssel importiert."
-#: ../tool/seahorse-notification.c:584 ../tool/seahorse-notification.c:604
+#: ../tool/seahorse-notification.c:573
#, c-format
msgid "Imported %i key"
msgid_plural "Imported %i keys"
msgstr[0] "%i Schlüssel importiert."
msgstr[1] "%i Schlüssel importiert."
-#: ../tool/seahorse-notification.c:586
+#: ../tool/seahorse-notification.c:575
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -96,61 +141,71 @@ msgstr[0] "Ein Schlüssel importiert für"
msgstr[1] "Mehrere Schlüssel importiert für"
#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:623
+#: ../tool/seahorse-notification.c:603
#, c-format
msgid "Signed by <i><key id='%s'/> <b>expired</b></i> on %s."
msgstr "Signiert von <i><key id='%s'/> <b>abgelaufen</b></i> am %s."
-#: ../tool/seahorse-notification.c:624
+#: ../tool/seahorse-notification.c:604
msgid "Invalid Signature"
msgstr "Ungültige Signatur"
-#: ../tool/seahorse-notification.c:630
+#: ../tool/seahorse-notification.c:610
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
msgstr "Signiert von <i><key id='%s'/></i> am %s. <b>Abgelaufen</b>."
-#: ../tool/seahorse-notification.c:631
+#: ../tool/seahorse-notification.c:611
msgid "Expired Signature"
msgstr "Abgelaufene Signatur"
-#: ../tool/seahorse-notification.c:637
+#: ../tool/seahorse-notification.c:617
#, c-format
msgid "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
msgstr "Signiert von <i><key id='%s'/>. <b>Widerrufen</b></i> am %s."
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:618
msgid "Revoked Signature"
msgstr "Widerrufene Signatur"
-#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:644
+#: ../tool/seahorse-notification.c:625
+msgid "Good Signature"
+msgstr "Gültige Signatur"
+
+#: ../tool/seahorse-notification.c:626
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s."
msgstr "Signiert von <i><key id='%s'/></i> am %s."
-#: ../tool/seahorse-notification.c:645
-msgid "Good Signature"
-msgstr "Gültige Signatur"
+#: ../tool/seahorse-notification.c:628
+msgid "Untrusted Valid Signature"
+msgstr "Nicht vertrauenswürdige, gültige Signatur"
+
+#: ../tool/seahorse-notification.c:629
+#, c-format
+msgid "Valid but <b>untrusted</b> signature by <i><key id='%s'/></i> on %s."
+msgstr ""
+"Gültige, jedoch <b>nicht vertrauenswürdige</b> Signatur von <i><key id='%s'/"
+"></i> am %s."
-#: ../tool/seahorse-notification.c:650
+#: ../tool/seahorse-notification.c:635
msgid "Signing key not in keyring."
msgstr "Der Schlüssel der Signatur befindet sich nicht im Schlüsselbund."
-#: ../tool/seahorse-notification.c:651
+#: ../tool/seahorse-notification.c:636
msgid "Unknown Signature"
msgstr "Unbekannte Signatur"
-#: ../tool/seahorse-notification.c:655
+#: ../tool/seahorse-notification.c:640
msgid "Bad or forged signature. The signed data was modified."
msgstr ""
"Fehlerhafte oder gefälschte Signatur. Die signierten Daten wurden verändert."
-#: ../tool/seahorse-notification.c:656
+#: ../tool/seahorse-notification.c:641
msgid "Bad Signature"
msgstr "Fehlerhafte Signatur"
-#: ../tool/seahorse-notification.c:664
+#: ../tool/seahorse-notification.c:649
msgid "Couldn't verify signature."
msgstr "Die Signatur konnte nicht überprüft werden."
@@ -158,42 +213,41 @@ msgstr "Die Signatur konnte nicht überprüft werden."
msgid "Notification Messages"
msgstr "Nachrichten"
-#: ../tool/seahorse-passphrase.c:200
-msgid "Passphrase"
-msgstr "Kennwort"
-
-#: ../tool/seahorse-passphrase.c:203
-msgid "Password:"
-msgstr "Passwort:"
-
-#. The second and main entry
-#: ../tool/seahorse-passphrase.c:267
-msgid "Confirm:"
-msgstr "Wiederholung:"
-
-#: ../tool/seahorse-passphrase.c:355
+#: ../tool/seahorse-passphrase.c:111
#, c-format
msgid "Wrong passphrase."
msgstr "Falsches Kennwort."
-#: ../tool/seahorse-passphrase.c:359
+#: ../tool/seahorse-passphrase.c:115
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Geben Sie ein neues Kennwort für »%s« ein."
-#: ../tool/seahorse-passphrase.c:361
+#: ../tool/seahorse-passphrase.c:117
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Geben Sie das Kennwort für »%s« ein."
-#: ../tool/seahorse-passphrase.c:364
+#: ../tool/seahorse-passphrase.c:120
msgid "Enter new passphrase"
msgstr "Geben Sie ein neues Kennwort ein"
-#: ../tool/seahorse-passphrase.c:366
+#: ../tool/seahorse-passphrase.c:122
msgid "Enter passphrase"
msgstr "Geben Sie das Kennwort ein"
+#: ../tool/seahorse-passphrase.c:127
+msgid "Passphrase"
+msgstr "Kennwort"
+
+#: ../tool/seahorse-passphrase.c:135
+msgid "Ok"
+msgstr "OK"
+
+#: ../tool/seahorse-passphrase.c:136
+msgid "Cancel"
+msgstr "Abbrechen"
+
#: ../tool/seahorse-pgp-encrypted.desktop.in.in.h:1
msgid "Decrypt File"
msgstr "Datei entschlüsseln"
@@ -210,47 +264,47 @@ msgstr "Signatur-Datei überprüfen"
msgid "Progress Title"
msgstr "Fortschrittstitel"
-#: ../tool/seahorse-tool.c:61
+#: ../tool/seahorse-tool.c:58
msgid "Import keys from the file"
msgstr "Schlüssel aus der Datei importieren"
-#: ../tool/seahorse-tool.c:63
+#: ../tool/seahorse-tool.c:60
msgid "Encrypt file"
msgstr "Datei verschlüsseln"
-#: ../tool/seahorse-tool.c:65
+#: ../tool/seahorse-tool.c:62
msgid "Sign file with default key"
msgstr "Datei mit voreingestelltem Schlüssel signieren"
-#: ../tool/seahorse-tool.c:67
+#: ../tool/seahorse-tool.c:64
msgid "Encrypt and sign file with default key"
msgstr "Datei mit voreingestelltem Schlüssel verschlüsseln und signieren"
-#: ../tool/seahorse-tool.c:69
+#: ../tool/seahorse-tool.c:66
msgid "Decrypt encrypted file"
msgstr "Eine Datei entschlüsseln"
-#: ../tool/seahorse-tool.c:71
+#: ../tool/seahorse-tool.c:68
msgid "Verify signature file"
msgstr "Signatur-Datei überprüfen"
-#: ../tool/seahorse-tool.c:73
+#: ../tool/seahorse-tool.c:70
msgid "Read list of URIs on standard in"
msgstr "Adressliste (URIs) von Standard-Eingabe lesen"
-#: ../tool/seahorse-tool.c:75
+#: ../tool/seahorse-tool.c:72
msgid "file..."
msgstr "Datei …"
-#: ../tool/seahorse-tool.c:169
-msgid "Choose Recipients"
-msgstr "Empfänger wählen"
+#: ../tool/seahorse-tool.c:168
+msgid "Encryption settings"
+msgstr "Verschlüsselungseinstellungen"
-#: ../tool/seahorse-tool.c:234 ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:233 ../tool/seahorse-tool.c:347
msgid "Couldn't load keys"
msgstr "Schlüssel konnten nicht geladen werden"
-#: ../tool/seahorse-tool.c:252
+#: ../tool/seahorse-tool.c:250
#, c-format
msgid "Choose Encrypted File Name for '%s'"
msgstr "Name für die verschlüsselte Datei für »%s« auswählen"
@@ -313,7 +367,7 @@ msgstr "Original-Datei für »%s« auswählen"
msgid "No valid signatures found"
msgstr "Keine gültigen Signaturen gefunden."
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:695
msgid "File Encryption Tool"
msgstr "Programm zur Datei-Verschlüsselung"
@@ -362,81 +416,81 @@ msgstr "Überprüfen"
msgid "Couldn't verify file: %s"
msgstr "Die Datei konnte nicht überprüft werden: %s"
-#: ../tool/seahorse-tool-files.c:120
+#: ../tool/seahorse-tool-files.c:116
msgid "Ace (.ace)"
msgstr "Ace (.ace)"
-#: ../tool/seahorse-tool-files.c:121
+#: ../tool/seahorse-tool-files.c:117
msgid "Ar (.ar)"
msgstr "Ar (.ar)"
-#: ../tool/seahorse-tool-files.c:122
+#: ../tool/seahorse-tool-files.c:118
msgid "Arj (.arj)"
msgstr "Arj (.arj)"
-#: ../tool/seahorse-tool-files.c:129
+#: ../tool/seahorse-tool-files.c:125
msgid "Ear (.ear)"
msgstr "Ear (.ear)"
-#: ../tool/seahorse-tool-files.c:130
+#: ../tool/seahorse-tool-files.c:126
msgid "Self-extracting zip (.exe)"
msgstr "Selbstentpackende Zip-Datei (.exe)"
-#: ../tool/seahorse-tool-files.c:132
+#: ../tool/seahorse-tool-files.c:128
msgid "Jar (.jar)"
msgstr "Jar (.jar)"
-#: ../tool/seahorse-tool-files.c:133
+#: ../tool/seahorse-tool-files.c:129
msgid "Lha (.lzh)"
msgstr "Lha (.lzh)"
-#: ../tool/seahorse-tool-files.c:135
+#: ../tool/seahorse-tool-files.c:131
msgid "Rar (.rar)"
msgstr "Rar (.rar)"
-#: ../tool/seahorse-tool-files.c:137
+#: ../tool/seahorse-tool-files.c:133
msgid "Tar uncompressed (.tar)"
msgstr "Unkomprimiertes Tar (.tar)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:134
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Mit bzip komprimiertes Tar (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:135
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Mit bzip2 komprimiertes Tar (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:136
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Mit gzip komprimiertes Tar (.tar.gz)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Mit lzop komprimiertes Tar (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:142
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Mit compress komprimiertes Tar (.tar.Z)"
-#: ../tool/seahorse-tool-files.c:144
+#: ../tool/seahorse-tool-files.c:140
msgid "War (.war)"
msgstr "War (.war)"
-#: ../tool/seahorse-tool-files.c:145
+#: ../tool/seahorse-tool-files.c:141
msgid "Zip (.zip)"
msgstr "Zip (.zip)"
-#: ../tool/seahorse-tool-files.c:146
+#: ../tool/seahorse-tool-files.c:142
msgid "Zoo (.zoo)"
msgstr "Zoo (.zoo)"
-#: ../tool/seahorse-tool-files.c:147
+#: ../tool/seahorse-tool-files.c:143
msgid "7-Zip (.7z)"
msgstr "7-Zip (.7z)"
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:327
+#: ../tool/seahorse-tool-files.c:325
#, c-format
msgid "You have selected %d file "
msgid_plural "You have selected %d files "
@@ -445,7 +499,7 @@ msgstr[1] "Sie haben %d Dateien "
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:332
+#: ../tool/seahorse-tool-files.c:330
#, c-format
msgid "and %d folder"
msgid_plural "and %d folders"
@@ -454,70 +508,70 @@ msgstr[1] "und %d Ordner ausgewählt."
#. TRANSLATOR: "%s%s" are "You have selected %d files and %d folders"
#. * Swap order with "%2$s%1$s" if needed
-#: ../tool/seahorse-tool-files.c:337
+#: ../tool/seahorse-tool-files.c:335
#, c-format
msgid "<b>%s%s</b>"
msgstr "<b>%s%s</b>"
-#: ../tool/seahorse-tool-files.c:345
+#: ../tool/seahorse-tool-files.c:343
#, c-format
msgid "You have selected %d file"
msgid_plural "You have selected %d files"
msgstr[0] "Sie haben %d Datei ausgewählt."
msgstr[1] "Sie haben %d Dateien ausgewählt."
-#: ../tool/seahorse-tool-files.c:350
+#: ../tool/seahorse-tool-files.c:348
#, c-format
msgid "You have selected %d folder"
msgid_plural "You have selected %d folders"
msgstr[0] "Sie haben %d Ordner ausgewählt."
msgstr[1] "Sie haben %d Ordner ausgewählt."
-#: ../tool/seahorse-tool-files.c:868
+#: ../tool/seahorse-tool-files.c:863
msgid "Preparing..."
msgstr "Vorbereiten …"
-#: ../tool/seahorse-tool-files.c:877 ../tool/seahorse-tool-files.c:900
+#: ../tool/seahorse-tool-files.c:872 ../tool/seahorse-tool-files.c:895
msgid "Couldn't list files"
msgstr "Dateien konnten nicht aufgelistet werden."
-#: ../tool/seahorse-tool-files.c:887 ../tool/seahorse-util.c:647
+#: ../tool/seahorse-tool-files.c:882 ../tool/seahorse-util.c:396
msgid "Couldn't package files"
msgstr "Die Dateien konnten nicht gepackt werden."
-#: ../tool/seahorse-util.c:173
+#: ../tool/seahorse-util.c:170
msgid "Decryption failed. You probably do not have the decryption key."
msgstr ""
"Die Entschlüsselung ist gescheitert. Vermutlich fehlt Ihnen der dazugehörige "
"Schlüssel."
-#: ../tool/seahorse-util.c:223
+#: ../tool/seahorse-util.c:197
msgid "%Y-%m-%d"
msgstr "%d.%m.%Y"
-#: ../tool/seahorse-util.c:642
+#: ../tool/seahorse-util.c:391
msgid "Couldn't run file-roller"
msgstr "Der Archivmanager konnte nicht gestartet werden."
-#: ../tool/seahorse-util.c:648
+#: ../tool/seahorse-util.c:397
msgid "The file-roller process did not complete successfully"
msgstr "Der Archivmanager konnte nicht erfolgreich ausgeführt werden."
#. Filter for PGP keys. We also include *.asc, as in many
#. cases that extension is associated with text/plain
-#: ../tool/seahorse-util.c:708
+#: ../tool/seahorse-util.c:433
msgid "All key files"
msgstr "Schlüsseldateien"
-#: ../tool/seahorse-util.c:715 ../tool/seahorse-util.c:755
+#: ../tool/seahorse-util.c:440 ../tool/seahorse-util.c:480
msgid "All files"
msgstr "Alle Dateien"
-#: ../tool/seahorse-util.c:748
+#: ../tool/seahorse-util.c:473
msgid "Archive files"
msgstr "Archivdateien"
-#: ../tool/seahorse-util.c:777
+#: ../tool/seahorse-util.c:502
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -527,11 +581,18 @@ msgstr ""
"\n"
"Möchten Sie diese Datei durch eine neue Datei ersetzen?"
-#: ../tool/seahorse-util.c:780
+#: ../tool/seahorse-util.c:505
msgid "_Replace"
msgstr "_Ersetzen"
-#: ../tool/seahorse-widget.c:365
-#, c-format
-msgid "Could not display help: %s"
-msgstr "Die Hilfe konnte nicht aufgerufen werden: %s"
+#~ msgid "Choose Recipients"
+#~ msgstr "Empfänger wählen"
+
+#~ msgid "Password:"
+#~ msgstr "Passwort:"
+
+#~ msgid "Confirm:"
+#~ msgstr "Wiederholung:"
+
+#~ msgid "Could not display help: %s"
+#~ msgstr "Die Hilfe konnte nicht aufgerufen werden: %s"
diff --git a/po/el.po b/po/el.po
index 8a63f98..ded8570 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,25 +1,72 @@
# translation of el.po to Greek
# Copyright (C) 2007 THE el'S COPYRIGHT HOLDER
# This file is distributed under the same license as the el package.
-#
-#
# Kostas Papadimas <pkst at gnome.org>, 2007.
# Dimitrios Typaldos <dtfedora at yahoo.com>, 2007.
# Simos Xenitellis <simos at gnome.org>, 2008, 2009.
+# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32 at gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 11:29+0200\n"
-"PO-Revision-Date: 2009-03-28 19:04+0000\n"
-"Last-Translator: Simos Xenitellis <simos at gnome.org>\n"
-"Language-Team: Greek <team at gnome.gr>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product"
+"=seahorse-nautilus&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-12-03 23:46+0000\n"
+"PO-Revision-Date: 2013-07-15 08:14+0300\n"
+"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32 at gmail.com>\n"
+"Language-Team: team at gnome.gr\n"
"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\n"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:1
+msgid "File extension for packages"
+msgstr "Επέκταση αρχείου για πακέτα"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
+msgid "File extension for packages when handling mulitple files."
+msgstr "Επέκταση αρχείου για πακέτα κατά τον χειρισμό πολλαπλών αρχείων."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
+#| msgid "Encrypt each file separately"
+msgid "Handle multiple files separately"
+msgstr "Χειρισμός πολλαπλών αρχείων ξεχωριστά"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:4
+msgid ""
+"When handling multiple files, don't package them but process separately."
+msgstr ""
+"Κατά τον χειρισμό πολλαπλών αρχείων, να μην τα συσκευάζετε, αλλά να τα "
+"επεξεργάζεστε χωριστά."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
+msgid "Use armor mode when encrypting"
+msgstr "Χρήση της λειτουργίας θωράκισης κατά την κρυπτογράφηση"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:6
+msgid "Use PGP ASCII armor mode when encrypting or signing files."
+msgstr ""
+"Χρήση της λειτουργίας θωράκισης PGP ASCII κατά την κρυπτογράφηση ή υπογραφή "
+"αρχείων."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:1
+msgid "Width of the window"
+msgstr "Πλάτος του παραθύρου"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:2
+msgid "Width (in pixels) of the window."
+msgstr "Πλάτος (σε εικονοστοιχεία) του παραθύρου."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:3
+msgid "Height of the window"
+msgstr "Ύψος του παραθύρου"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:4
+msgid "Height (in pixels) of the window."
+msgstr "Ύψος (σε εικονοστοιχεία) του παραθύρου."
#: ../nautilus-ext/seahorse-nautilus.c:158
msgid "Encrypt..."
@@ -42,20 +89,16 @@ msgstr[0] "Υπογραφή επιλεγμένου αρχείου"
msgstr[1] "Υπογραφή επιλεγμένων αρχείων"
#: ../tool/seahorse-multi-encrypt.xml.h:1
-msgid "<b>You have selected multiple files or folders</b>"
-msgstr "<b>Επιλέχτηκαν πολλαπλά αρχεία ή φάκελοι</b>"
+msgid "Encrypt Multiple Files"
+msgstr "Κρυπτογράφηση πολλαπλών αρχείων"
#: ../tool/seahorse-multi-encrypt.xml.h:2
-msgid ""
-"Because the files are located remotely, each file will be encrypted "
-"separately."
-msgstr ""
-"Καθώς τα αρχεία είναι σε απομακρυσμένα συστήματα, το κάθε αρχείο θα "
-"κρυπτογραφηθεί ξεχωριστά."
+msgid "<b>You have selected multiple files or folders</b>"
+msgstr "<b>Επιλέχτηκαν πολλαπλά αρχεία ή φάκελοι</b>"
#: ../tool/seahorse-multi-encrypt.xml.h:3
-msgid "Encrypt Multiple Files"
-msgstr "Κρυπτογράφηση πολλαπλών αρχείων"
+msgid "encrypted-package"
+msgstr "κρυπτογραφημένο πακέτο"
#: ../tool/seahorse-multi-encrypt.xml.h:4
msgid "Encrypt each file separately"
@@ -66,31 +109,35 @@ msgid "Encrypt packed together in a package"
msgstr "Κρυπτογράφηση πακετοποιημένων στοιχείων σε ένα πρόγραμμα"
#: ../tool/seahorse-multi-encrypt.xml.h:6
-msgid "Package Name:"
-msgstr "Όνομα πακέτου:"
-
-#: ../tool/seahorse-multi-encrypt.xml.h:7
msgid "Packaging:"
msgstr "Πακετοποίηση:"
+#: ../tool/seahorse-multi-encrypt.xml.h:7
+msgid "Package Name:"
+msgstr "Όνομα πακέτου:"
+
#: ../tool/seahorse-multi-encrypt.xml.h:8
-msgid "encrypted-package"
-msgstr "κρυπτογραφημένο πακέτο"
+msgid ""
+"Because the files are located remotely, each file will be encrypted "
+"separately."
+msgstr ""
+"Καθώς τα αρχεία είναι σε απομακρυσμένα συστήματα, το κάθε αρχείο θα "
+"κρυπτογραφηθεί ξεχωριστά."
-#: ../tool/seahorse-notification.c:580 ../tool/seahorse-notification.c:605
+#: ../tool/seahorse-notification.c:572
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] "Το κλειδί εισήχθει"
msgstr[1] "Τα κλειδιά εισήχθησαν"
-#: ../tool/seahorse-notification.c:584 ../tool/seahorse-notification.c:604
+#: ../tool/seahorse-notification.c:576
#, c-format
msgid "Imported %i key"
msgid_plural "Imported %i keys"
msgstr[0] "Εισήχθει %i κλειδί"
msgstr[1] "Εισήχθησαν %i κλειδιά"
-#: ../tool/seahorse-notification.c:586
+#: ../tool/seahorse-notification.c:578
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -98,62 +145,62 @@ msgstr[0] "Εισήχθει κλειδί για"
msgstr[1] "Εισήχθησαν κλειδιά για"
#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:623
+#: ../tool/seahorse-notification.c:606
#, c-format
msgid "Signed by <i><key id='%s'/> <b>expired</b></i> on %s."
msgstr "Υπογράφηκε από <i><key id='%s'/> <b>έληξε</b></i> στις %s."
-#: ../tool/seahorse-notification.c:624
+#: ../tool/seahorse-notification.c:607
msgid "Invalid Signature"
msgstr "Μη έγκυρη υπογραφή"
-#: ../tool/seahorse-notification.c:630
+#: ../tool/seahorse-notification.c:613
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
msgstr "Υπογράφηκε από <i><key id='%s'/></i> στις %s <b>Έληξε</b>."
-#: ../tool/seahorse-notification.c:631
+#: ../tool/seahorse-notification.c:614
msgid "Expired Signature"
msgstr "Ληγμένη υπογραφή"
-#: ../tool/seahorse-notification.c:637
+#: ../tool/seahorse-notification.c:620
#, c-format
msgid "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
msgstr "Υπογράφηκε από <i><key id='%s'/> <b>Ανακαλέστηκε</b></i> στις %s."
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:621
msgid "Revoked Signature"
msgstr "Υπογραφή που έχει ανακληθεί"
#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:644
+#: ../tool/seahorse-notification.c:627
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s."
msgstr "Υπογράφηκε από <i><key id='%s'/></i> στις %s."
-#: ../tool/seahorse-notification.c:645
+#: ../tool/seahorse-notification.c:628
msgid "Good Signature"
msgstr "Καλή υπογραφή"
-#: ../tool/seahorse-notification.c:650
+#: ../tool/seahorse-notification.c:633
msgid "Signing key not in keyring."
msgstr "Κλειδί υπογραφής δε βρίσκεται στη κλειδοθήκη."
-#: ../tool/seahorse-notification.c:651
+#: ../tool/seahorse-notification.c:634
msgid "Unknown Signature"
msgstr "Άγνωστη υπογραφή"
-#: ../tool/seahorse-notification.c:655
+#: ../tool/seahorse-notification.c:638
msgid "Bad or forged signature. The signed data was modified."
msgstr ""
"Κακή ή πλαστογραφημένη υπογραφή. Τα υπογεγραμμένα δεδομένα έχουν "
"τροποποιηθεί."
-#: ../tool/seahorse-notification.c:656
+#: ../tool/seahorse-notification.c:639
msgid "Bad Signature"
msgstr "Κακή υπογραφή"
-#: ../tool/seahorse-notification.c:664
+#: ../tool/seahorse-notification.c:647
msgid "Couldn't verify signature."
msgstr "Αδύνατη η επιβεβαίωση υπογραφής."
@@ -161,42 +208,41 @@ msgstr "Αδύνατη η επιβεβαίωση υπογραφής."
msgid "Notification Messages"
msgstr "Μηνύματα ειδοποίησης"
-#: ../tool/seahorse-passphrase.c:200
-msgid "Passphrase"
-msgstr "Συνθηματικό"
-
-#: ../tool/seahorse-passphrase.c:203
-msgid "Password:"
-msgstr "Κωδικός:"
-
-#. The second and main entry
-#: ../tool/seahorse-passphrase.c:267
-msgid "Confirm:"
-msgstr "Επιβεβαίωση:"
-
-#: ../tool/seahorse-passphrase.c:355
+#: ../tool/seahorse-passphrase.c:114
#, c-format
msgid "Wrong passphrase."
msgstr "Λανθασμένο συνθηματικό."
-#: ../tool/seahorse-passphrase.c:359
+#: ../tool/seahorse-passphrase.c:118
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Εισαγωγή νέου συνθηματικού για '%s'"
-#: ../tool/seahorse-passphrase.c:361
+#: ../tool/seahorse-passphrase.c:120
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Εισαγωγή συνθηματικού για '%s'"
-#: ../tool/seahorse-passphrase.c:364
+#: ../tool/seahorse-passphrase.c:123
msgid "Enter new passphrase"
msgstr "Εισαγωγή νέου συνθηματικού"
-#: ../tool/seahorse-passphrase.c:366
+#: ../tool/seahorse-passphrase.c:125
msgid "Enter passphrase"
msgstr "Εισαγωγή συνθηματικού"
+#: ../tool/seahorse-passphrase.c:130
+msgid "Passphrase"
+msgstr "Συνθηματικό"
+
+#: ../tool/seahorse-passphrase.c:138
+msgid "Ok"
+msgstr "Eντάξει"
+
+#: ../tool/seahorse-passphrase.c:139
+msgid "Cancel"
+msgstr "Ακύρωση"
+
#: ../tool/seahorse-pgp-encrypted.desktop.in.in.h:1
msgid "Decrypt File"
msgstr "Αποκρυπτογράφηση αρχείου"
@@ -316,7 +362,7 @@ msgstr "Επιλογή αυθεντικού αρχείου για '%s'"
msgid "No valid signatures found"
msgstr "Δε βρέθηκαν έγκυρες υπογραφές"
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:695
msgid "File Encryption Tool"
msgstr "Εργαλείο κρυπτογράφησης αρχείων"
@@ -365,81 +411,81 @@ msgstr "Γίνεται διαπίστωση"
msgid "Couldn't verify file: %s"
msgstr "Αδύνατη η διαπίστωση αρχείου: %s"
-#: ../tool/seahorse-tool-files.c:120
+#: ../tool/seahorse-tool-files.c:119
msgid "Ace (.ace)"
msgstr "Ace (.ace)"
-#: ../tool/seahorse-tool-files.c:121
+#: ../tool/seahorse-tool-files.c:120
msgid "Ar (.ar)"
msgstr "Ar (.ar)"
-#: ../tool/seahorse-tool-files.c:122
+#: ../tool/seahorse-tool-files.c:121
msgid "Arj (.arj)"
msgstr "Arj (.arj)"
-#: ../tool/seahorse-tool-files.c:129
+#: ../tool/seahorse-tool-files.c:128
msgid "Ear (.ear)"
msgstr "Ear (.ear)"
-#: ../tool/seahorse-tool-files.c:130
+#: ../tool/seahorse-tool-files.c:129
msgid "Self-extracting zip (.exe)"
msgstr "Αυτο-εξαγόμενο zip (.exe)"
-#: ../tool/seahorse-tool-files.c:132
+#: ../tool/seahorse-tool-files.c:131
msgid "Jar (.jar)"
msgstr "Jar (.jar)"
-#: ../tool/seahorse-tool-files.c:133
+#: ../tool/seahorse-tool-files.c:132
msgid "Lha (.lzh)"
msgstr "Lha (.lzh)"
-#: ../tool/seahorse-tool-files.c:135
+#: ../tool/seahorse-tool-files.c:134
msgid "Rar (.rar)"
msgstr "Rar (.rar)"
-#: ../tool/seahorse-tool-files.c:137
+#: ../tool/seahorse-tool-files.c:136
msgid "Tar uncompressed (.tar)"
msgstr "Tar χωρίς συμπίεση (.tar)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Tar που έχει συμπιεστεί με bzip (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Tar που έχει συμπιεστεί με bzip2 (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:139
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Tar που έχει συμπιεστεί με gzip (.tar.gz)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:140
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Tar που έχει συμπιεστεί με lzop (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:142
+#: ../tool/seahorse-tool-files.c:141
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Tar που έχει συμπιεστεί με compress (.tar.Z)"
-#: ../tool/seahorse-tool-files.c:144
+#: ../tool/seahorse-tool-files.c:143
msgid "War (.war)"
msgstr "War (.war)"
-#: ../tool/seahorse-tool-files.c:145
+#: ../tool/seahorse-tool-files.c:144
msgid "Zip (.zip)"
msgstr "Zip (.zip)"
-#: ../tool/seahorse-tool-files.c:146
+#: ../tool/seahorse-tool-files.c:145
msgid "Zoo (.zoo)"
msgstr "Zoo (.zoo)"
-#: ../tool/seahorse-tool-files.c:147
+#: ../tool/seahorse-tool-files.c:146
msgid "7-Zip (.7z)"
msgstr "7-Zip (.7z)"
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:327
+#: ../tool/seahorse-tool-files.c:328
#, c-format
msgid "You have selected %d file "
msgid_plural "You have selected %d files "
@@ -448,7 +494,7 @@ msgstr[1] "Έχουν επιλεγεί %d αρχεία"
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:332
+#: ../tool/seahorse-tool-files.c:333
#, c-format
msgid "and %d folder"
msgid_plural "and %d folders"
@@ -457,34 +503,34 @@ msgstr[1] "και %d φάκελοι"
#. TRANSLATOR: "%s%s" are "You have selected %d files and %d folders"
#. * Swap order with "%2$s%1$s" if needed
-#: ../tool/seahorse-tool-files.c:337
+#: ../tool/seahorse-tool-files.c:338
#, c-format
msgid "<b>%s%s</b>"
msgstr "<b>%s%s</b>"
-#: ../tool/seahorse-tool-files.c:345
-#, fuzzy, c-format
+#: ../tool/seahorse-tool-files.c:346
+#, c-format
msgid "You have selected %d file"
msgid_plural "You have selected %d files"
msgstr[0] "Έχει επιλεγεί %d αρχείο"
msgstr[1] "Έχουν επιλεγεί %d αρχεία"
-#: ../tool/seahorse-tool-files.c:350
+#: ../tool/seahorse-tool-files.c:351
#, c-format
msgid "You have selected %d folder"
msgid_plural "You have selected %d folders"
msgstr[0] "Έχει επιλεγεί %d φάκελος"
msgstr[1] "Έχουν επιλεγεί %d φάκελοι"
-#: ../tool/seahorse-tool-files.c:868
+#: ../tool/seahorse-tool-files.c:866
msgid "Preparing..."
msgstr "Γίνεται προετοιμασία..."
-#: ../tool/seahorse-tool-files.c:877 ../tool/seahorse-tool-files.c:900
+#: ../tool/seahorse-tool-files.c:875 ../tool/seahorse-tool-files.c:898
msgid "Couldn't list files"
msgstr "Αδύνατη η εμφάνιση λίστας των αρχείων"
-#: ../tool/seahorse-tool-files.c:887 ../tool/seahorse-util.c:647
+#: ../tool/seahorse-tool-files.c:885 ../tool/seahorse-util.c:399
msgid "Couldn't package files"
msgstr "Αδύνατη η πακετοποίηση αρχείων"
@@ -494,33 +540,33 @@ msgstr ""
"Η αποκρυπτογράφηση απέτυχε. Προφανώς δε διαθέτετε το κλειδί "
"αποκρυπτογράφησης."
-#: ../tool/seahorse-util.c:223
+#: ../tool/seahorse-util.c:200
msgid "%Y-%m-%d"
msgstr "%Y-%m-%d"
-#: ../tool/seahorse-util.c:642
+#: ../tool/seahorse-util.c:394
msgid "Couldn't run file-roller"
msgstr "Αδυναμία εκτέλεσης file-roller"
-#: ../tool/seahorse-util.c:648
+#: ../tool/seahorse-util.c:400
msgid "The file-roller process did not complete successfully"
msgstr "Η διεργασία file-roller δεν ολοκληρώθηκε με επιτυχία"
#. Filter for PGP keys. We also include *.asc, as in many
#. cases that extension is associated with text/plain
-#: ../tool/seahorse-util.c:708
+#: ../tool/seahorse-util.c:436
msgid "All key files"
msgstr "Όλα τα αρχεία κλειδιών"
-#: ../tool/seahorse-util.c:715 ../tool/seahorse-util.c:755
+#: ../tool/seahorse-util.c:443 ../tool/seahorse-util.c:483
msgid "All files"
msgstr "Όλα τα αρχεία"
-#: ../tool/seahorse-util.c:748
+#: ../tool/seahorse-util.c:476
msgid "Archive files"
msgstr "Αρχειοθέτηση αρχείων"
-#: ../tool/seahorse-util.c:777
+#: ../tool/seahorse-util.c:505
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -530,11 +576,15 @@ msgstr ""
"\n"
"Επιθυμείτε να το αντικαταστήσετε με ένα νέο αρχείο;"
-#: ../tool/seahorse-util.c:780
+#: ../tool/seahorse-util.c:508
msgid "_Replace"
msgstr "_Αντικατάσταση"
-#: ../tool/seahorse-widget.c:365
-#, c-format
-msgid "Could not display help: %s"
-msgstr "Αδύνατη η προβολή βοήθειας: %s"
+#~ msgid "Password:"
+#~ msgstr "Κωδικός:"
+
+#~ msgid "Confirm:"
+#~ msgstr "Επιβεβαίωση:"
+
+#~ msgid "Could not display help: %s"
+#~ msgstr "Αδύνατη η προβολή βοήθειας: %s"
diff --git a/po/es.po b/po/es.po
index 07e9090..7493749 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,30 +7,31 @@
# This file is distributed under the same license as the Seahorse package.
#
# Jorge González <jorgegonz at svn.gnome.org>, 2007, 2008, 201, 2011.
-# Daniel Mustieles <daniel.mustieles at gmail.com>, 2012.
+# Daniel Mustieles <daniel.mustieles at gmail.com>, 2012, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: seahorse-plugins.master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=seahorse-nautilus&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-12-04 12:41+0000\n"
-"PO-Revision-Date: 2012-12-31 11:12+0100\n"
+"POT-Creation-Date: 2013-11-23 05:06+0000\n"
+"PO-Revision-Date: 2013-11-25 16:49+0100\n"
"Last-Translator: Daniel Mustieles <daniel.mustieles at gmail.com>\n"
-"Language-Team: Español; Castellano <gnome-es-list at gnome.org>\n"
+"Language-Team: Español <gnome-es-list at gnome.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Gtranslator 2.91.5\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:1
msgid "File extension for packages"
msgstr "Extensión de los archivos para paquetes"
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
-msgid "File extension for packages when handling mulitple files."
+#| msgid "File extension for packages when handling mulitple files."
+msgid "File extension for packages when handling multiple files."
msgstr "Extensión de los archivos para paquetes al manejar varios archivos."
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
@@ -172,33 +173,42 @@ msgstr "Firmado por <i><key id='%s'/> <b>Revocado</b></i> el %s."
msgid "Revoked Signature"
msgstr "Firma revocada"
-#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:627
+#: ../tool/seahorse-notification.c:628
+msgid "Good Signature"
+msgstr "Firma buena"
+
+#: ../tool/seahorse-notification.c:629
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s."
msgstr "Firmado por <i><key id='%s'/></i> el %s."
-#: ../tool/seahorse-notification.c:628
-msgid "Good Signature"
-msgstr "Firma buena"
+#: ../tool/seahorse-notification.c:631
+msgid "Untrusted Valid Signature"
+msgstr "Firma válida no confiable"
-#: ../tool/seahorse-notification.c:633
+#: ../tool/seahorse-notification.c:632
+#, c-format
+msgid "Valid but <b>untrusted</b> signature by <i><key id='%s'/></i> on %s."
+msgstr ""
+"Firma de <i><key id='%s'/></i> válida pero <b>no es de confianza</b> en %s."
+
+#: ../tool/seahorse-notification.c:638
msgid "Signing key not in keyring."
msgstr "La clave de la firma no está en el depósito."
-#: ../tool/seahorse-notification.c:634
+#: ../tool/seahorse-notification.c:639
msgid "Unknown Signature"
msgstr "Firma desconocida"
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:643
msgid "Bad or forged signature. The signed data was modified."
msgstr "Firma mala o falsificada. Los datos de la firma se modificaron."
-#: ../tool/seahorse-notification.c:639
+#: ../tool/seahorse-notification.c:644
msgid "Bad Signature"
msgstr "Firma mala"
-#: ../tool/seahorse-notification.c:647
+#: ../tool/seahorse-notification.c:652
msgid "Couldn't verify signature."
msgstr "No se pudo verificar la firma."
@@ -289,50 +299,50 @@ msgstr "Leer lista de URI estándar en"
msgid "file..."
msgstr "archivo…"
-#: ../tool/seahorse-tool.c:169
-msgid "Choose Recipients"
-msgstr "Elija los destinatarios"
+#: ../tool/seahorse-tool.c:171
+msgid "Encryption settings"
+msgstr "Configuración del cifrado"
-#: ../tool/seahorse-tool.c:234 ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:236 ../tool/seahorse-tool.c:350
msgid "Couldn't load keys"
msgstr "No se pueden cargar las claves"
-#: ../tool/seahorse-tool.c:252
+#: ../tool/seahorse-tool.c:253
#, c-format
msgid "Choose Encrypted File Name for '%s'"
msgstr "Elija un nombre de archivo cifrado para «%s»"
-#: ../tool/seahorse-tool.c:325
+#: ../tool/seahorse-tool.c:328
msgid "Choose Signer"
msgstr "Elegir clave de firma"
-#: ../tool/seahorse-tool.c:367
+#: ../tool/seahorse-tool.c:370
#, c-format
msgid "Choose Signature File Name for '%s'"
msgstr "Elija un nombre para el archivo de firma de «%s»"
-#: ../tool/seahorse-tool.c:407
+#: ../tool/seahorse-tool.c:410
msgid "Import is complete"
msgstr "La importación está completada"
-#: ../tool/seahorse-tool.c:440
+#: ../tool/seahorse-tool.c:443
msgid "Importing keys ..."
msgstr "Importando claves…"
-#: ../tool/seahorse-tool.c:470
+#: ../tool/seahorse-tool.c:473
msgid "Import Failed"
msgstr "No se pudo importar"
-#: ../tool/seahorse-tool.c:471
+#: ../tool/seahorse-tool.c:474
msgid "Keys were found but not imported."
msgstr "Se encontraron claves, pero no se importaron."
-#: ../tool/seahorse-tool.c:494
+#: ../tool/seahorse-tool.c:497
#, c-format
msgid "Imported key"
msgstr "Clave importada"
-#: ../tool/seahorse-tool.c:496
+#: ../tool/seahorse-tool.c:499
#, c-format
msgid "Imported %d key"
msgid_plural "Imported %d keys"
@@ -340,12 +350,12 @@ msgstr[0] "%d clave importada"
msgstr[1] "%d claves importadas"
#. File to decrypt to
-#: ../tool/seahorse-tool.c:518
+#: ../tool/seahorse-tool.c:521
#, c-format
msgid "Choose Decrypted File Name for '%s'"
msgstr "Elija el nombre de archivo descifrado para «%s»"
-#: ../tool/seahorse-tool.c:575
+#: ../tool/seahorse-tool.c:578
#, c-format
msgid "Choose Original File for '%s'"
msgstr "Elija el archivo original para «%s»"
@@ -355,56 +365,56 @@ msgstr "Elija el archivo original para «%s»"
#. * The last thing we want to do is cascade a big pile of error
#. * dialogs at the user.
#.
-#: ../tool/seahorse-tool.c:648
+#: ../tool/seahorse-tool.c:651
#, c-format
msgid "No valid signatures found"
msgstr "No se encontraron firmas no válidas"
-#: ../tool/seahorse-tool.c:695
+#: ../tool/seahorse-tool.c:698
msgid "File Encryption Tool"
msgstr "Herramienta de cifrado de archivos"
-#: ../tool/seahorse-tool.c:713
+#: ../tool/seahorse-tool.c:716
msgid "Encrypting"
msgstr "Cifrando"
-#: ../tool/seahorse-tool.c:714
+#: ../tool/seahorse-tool.c:717
#, c-format
msgid "Couldn't encrypt file: %s"
msgstr "No se pudo cifrar el archivo: «%s»"
-#: ../tool/seahorse-tool.c:722
+#: ../tool/seahorse-tool.c:725
msgid "Signing"
msgstr "Firmado"
-#: ../tool/seahorse-tool.c:723
+#: ../tool/seahorse-tool.c:726
#, c-format
msgid "Couldn't sign file: %s"
msgstr "No se pudo firmar el archivo: «%s»"
-#: ../tool/seahorse-tool.c:728
+#: ../tool/seahorse-tool.c:731
msgid "Importing"
msgstr "Importación"
-#: ../tool/seahorse-tool.c:729
+#: ../tool/seahorse-tool.c:732
#, c-format
msgid "Couldn't import keys from file: %s"
msgstr "No se pudieron importar claves del archivo: «%s»"
-#: ../tool/seahorse-tool.c:735
+#: ../tool/seahorse-tool.c:738
msgid "Decrypting"
msgstr "Descifrado"
-#: ../tool/seahorse-tool.c:736
+#: ../tool/seahorse-tool.c:739
#, c-format
msgid "Couldn't decrypt file: %s"
msgstr "No se pudo descifrar el archivo: «%s»"
-#: ../tool/seahorse-tool.c:741
+#: ../tool/seahorse-tool.c:744
msgid "Verifying"
msgstr "Verificación"
-#: ../tool/seahorse-tool.c:742
+#: ../tool/seahorse-tool.c:745
#, c-format
msgid "Couldn't verify file: %s"
msgstr "No se pudo verificar el archivo: «%s»"
@@ -576,6 +586,9 @@ msgstr ""
msgid "_Replace"
msgstr "_Reemplazar"
+#~ msgid "Choose Recipients"
+#~ msgstr "Elija los destinatarios"
+
#~ msgid "Password:"
#~ msgstr "Contraseña:"
diff --git a/po/fi.po b/po/fi.po
index 8fa9af1..f2ce6bc 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,20 +3,66 @@
# Jarmo Kielosto <jarmoki at kolumbus.fi>, 2000.
# Tommi Vainikainen <thv at iki.fi>, 2008, 2011.
# Ilkka Tuohela <hile at iki.fi>, 2004-2008.
+# Jiri Grönroos <jiri.gronroos+l10n at iki.fi>, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: seahorse\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 11:29+0200\n"
-"PO-Revision-Date: 2011-09-26 09:31+0300\n"
-"Last-Translator: Tommi Vainikainen <thv at iki.fi>\n"
-"Language-Team: Finnish <gnome-fi-laatu at lists.sourceforge.net>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=seahorse-nautilus&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-08-16 17:26+0000\n"
+"PO-Revision-Date: 2013-09-12 21:26+0300\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos+l10n at iki.fi>\n"
+"Language-Team: suomi <gnome-fi-laatu at lists.sourceforge.net>\n"
"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:1
+msgid "File extension for packages"
+msgstr "Tiedostopääte paketeille"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
+msgid "File extension for packages when handling mulitple files."
+msgstr ""
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
+#| msgid "Encrypt each file separately"
+msgid "Handle multiple files separately"
+msgstr "Käsittele useat tiedostot erikseen"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:4
+msgid ""
+"When handling multiple files, don't package them but process separately."
+msgstr ""
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
+msgid "Use armor mode when encrypting"
+msgstr "Käytä panssaroitua tilaa salatessa"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:6
+msgid "Use PGP ASCII armor mode when encrypting or signing files."
+msgstr ""
+"Käytä PGP ASCII -panssaritilaa tiedostoja salatessa tai allekirjoittaessa."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:1
+msgid "Width of the window"
+msgstr "Ikkunan leveys"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:2
+msgid "Width (in pixels) of the window."
+msgstr "Ikkunan leveys pikseleissä."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:3
+msgid "Height of the window"
+msgstr "Ikkunan korkeus"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:4
+msgid "Height (in pixels) of the window."
+msgstr "Ikkunan korkeus pikseleissä."
#: ../nautilus-ext/seahorse-nautilus.c:158
msgid "Encrypt..."
@@ -39,19 +85,16 @@ msgstr[0] "Allekirjoita valittu tiedosto"
msgstr[1] "Allekirjoita valitut tiedostot"
#: ../tool/seahorse-multi-encrypt.xml.h:1
-msgid "<b>You have selected multiple files or folders</b>"
-msgstr "<b>Valitsit useita tiedostoja tai kansioita</b>"
+msgid "Encrypt Multiple Files"
+msgstr "Salaa useita tiedostoja"
#: ../tool/seahorse-multi-encrypt.xml.h:2
-msgid ""
-"Because the files are located remotely, each file will be encrypted "
-"separately."
-msgstr ""
-"Koska tiedostot ovat etäpalvelimella, kukin tiedosto salataan erikseen."
+msgid "<b>You have selected multiple files or folders</b>"
+msgstr "<b>Valitsit useita tiedostoja tai kansioita</b>"
#: ../tool/seahorse-multi-encrypt.xml.h:3
-msgid "Encrypt Multiple Files"
-msgstr "Salaa useita tiedostoja"
+msgid "encrypted-package"
+msgstr "salattu-paketti"
#: ../tool/seahorse-multi-encrypt.xml.h:4
msgid "Encrypt each file separately"
@@ -62,31 +105,34 @@ msgid "Encrypt packed together in a package"
msgstr "Paketoi tiedostot ja salaa paketti"
#: ../tool/seahorse-multi-encrypt.xml.h:6
-msgid "Package Name:"
-msgstr "Paketin nimi:"
-
-#: ../tool/seahorse-multi-encrypt.xml.h:7
msgid "Packaging:"
msgstr "Pakataan:"
+#: ../tool/seahorse-multi-encrypt.xml.h:7
+msgid "Package Name:"
+msgstr "Paketin nimi:"
+
#: ../tool/seahorse-multi-encrypt.xml.h:8
-msgid "encrypted-package"
-msgstr "salattu-paketti"
+msgid ""
+"Because the files are located remotely, each file will be encrypted "
+"separately."
+msgstr ""
+"Koska tiedostot ovat etäpalvelimella, kukin tiedosto salataan erikseen."
-#: ../tool/seahorse-notification.c:580 ../tool/seahorse-notification.c:605
+#: ../tool/seahorse-notification.c:572
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] "Tuotiin avain"
msgstr[1] "Tuotiin avaimia"
-#: ../tool/seahorse-notification.c:584 ../tool/seahorse-notification.c:604
+#: ../tool/seahorse-notification.c:576
#, c-format
msgid "Imported %i key"
msgid_plural "Imported %i keys"
msgstr[0] "Tuotiin %d avain"
msgstr[1] "Tuotiin %d avainta"
-#: ../tool/seahorse-notification.c:586
+#: ../tool/seahorse-notification.c:578
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -94,62 +140,62 @@ msgstr[0] "Tuotiin avain käyttäjälle"
msgstr[1] "Tuotiin avaimia käyttäjälle"
#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:623
+#: ../tool/seahorse-notification.c:606
#, c-format
msgid "Signed by <i><key id='%s'/> <b>expired</b></i> on %s."
msgstr "Allekirjoittanut <i><key id='%s'/> <b>vanhentunut</b></i> %s."
-#: ../tool/seahorse-notification.c:624
+#: ../tool/seahorse-notification.c:607
msgid "Invalid Signature"
msgstr "Virheellinen allekirjoitus"
-#: ../tool/seahorse-notification.c:630
+#: ../tool/seahorse-notification.c:613
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
msgstr ""
"Allekirjoittanut <i><key id='%s'/></i> päiväyksellä %s, <b>vanhentunut</b>."
-#: ../tool/seahorse-notification.c:631
+#: ../tool/seahorse-notification.c:614
msgid "Expired Signature"
msgstr "Vanhentunut allekirjoitus"
-#: ../tool/seahorse-notification.c:637
+#: ../tool/seahorse-notification.c:620
#, c-format
msgid "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
msgstr "Allekirjoittanut <i><key id='%s'/> <b>Mitätöity</b></i> %s."
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:621
msgid "Revoked Signature"
msgstr "Mitätöity allekirjoitus"
#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:644
+#: ../tool/seahorse-notification.c:627
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s."
msgstr "Allekirjoittanut <i><key id='%s'/></i> %s."
-#: ../tool/seahorse-notification.c:645
+#: ../tool/seahorse-notification.c:628
msgid "Good Signature"
msgstr "Hyväksytty allekirjoitus"
-#: ../tool/seahorse-notification.c:650
+#: ../tool/seahorse-notification.c:633
msgid "Signing key not in keyring."
msgstr "Allekirjoitusavain ei ole avainnipussa."
-#: ../tool/seahorse-notification.c:651
+#: ../tool/seahorse-notification.c:634
msgid "Unknown Signature"
msgstr "Tuntematon allekirjoitus"
-#: ../tool/seahorse-notification.c:655
+#: ../tool/seahorse-notification.c:638
msgid "Bad or forged signature. The signed data was modified."
msgstr ""
"Väärä tai väärennetty allekirjoitus. Allekirjoitettuja tietoja on muutettu."
-#: ../tool/seahorse-notification.c:656
+#: ../tool/seahorse-notification.c:639
msgid "Bad Signature"
msgstr "Väärä allekirjoitus"
-#: ../tool/seahorse-notification.c:664
+#: ../tool/seahorse-notification.c:647
msgid "Couldn't verify signature."
msgstr "Allekirjoitusta ei voitu varmistaa"
@@ -157,42 +203,41 @@ msgstr "Allekirjoitusta ei voitu varmistaa"
msgid "Notification Messages"
msgstr "Huomautusviestit"
-#: ../tool/seahorse-passphrase.c:200
-msgid "Passphrase"
-msgstr "Tunnuslause"
-
-#: ../tool/seahorse-passphrase.c:203
-msgid "Password:"
-msgstr "Salasana:"
-
-#. The second and main entry
-#: ../tool/seahorse-passphrase.c:267
-msgid "Confirm:"
-msgstr "Vahvista:"
-
-#: ../tool/seahorse-passphrase.c:355
+#: ../tool/seahorse-passphrase.c:114
#, c-format
msgid "Wrong passphrase."
msgstr "Väärä tunnuslause."
-#: ../tool/seahorse-passphrase.c:359
+#: ../tool/seahorse-passphrase.c:118
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Anna uusi tunnuslause avaimelle ”%s”"
-#: ../tool/seahorse-passphrase.c:361
+#: ../tool/seahorse-passphrase.c:120
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Anna tunnuslause avaimelle ”%s”"
-#: ../tool/seahorse-passphrase.c:364
+#: ../tool/seahorse-passphrase.c:123
msgid "Enter new passphrase"
msgstr "Anna uusi tunnuslause"
-#: ../tool/seahorse-passphrase.c:366
+#: ../tool/seahorse-passphrase.c:125
msgid "Enter passphrase"
msgstr "Anna tunnuslause"
+#: ../tool/seahorse-passphrase.c:130
+msgid "Passphrase"
+msgstr "Tunnuslause"
+
+#: ../tool/seahorse-passphrase.c:138
+msgid "Ok"
+msgstr "OK"
+
+#: ../tool/seahorse-passphrase.c:139
+msgid "Cancel"
+msgstr "Peru"
+
#: ../tool/seahorse-pgp-encrypted.desktop.in.in.h:1
msgid "Decrypt File"
msgstr "Pura tiedosto"
@@ -241,50 +286,51 @@ msgstr "Luo lista URI-osoitteista oletussyötteestä"
msgid "file..."
msgstr "tiedosto…"
-#: ../tool/seahorse-tool.c:169
-msgid "Choose Recipients"
-msgstr "Valitse vastaanottajat"
+#: ../tool/seahorse-tool.c:171
+#| msgid "Encrypting"
+msgid "Encryption settings"
+msgstr "Salauksen asetukset"
-#: ../tool/seahorse-tool.c:234 ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:236 ../tool/seahorse-tool.c:350
msgid "Couldn't load keys"
msgstr "Avaimia ei voitu ladata"
-#: ../tool/seahorse-tool.c:252
+#: ../tool/seahorse-tool.c:253
#, c-format
msgid "Choose Encrypted File Name for '%s'"
msgstr "Valitse salattu tiedostonimi tiedostolle ”%s”"
-#: ../tool/seahorse-tool.c:325
+#: ../tool/seahorse-tool.c:328
msgid "Choose Signer"
msgstr "Valitse allekirjoittaja"
-#: ../tool/seahorse-tool.c:367
+#: ../tool/seahorse-tool.c:370
#, c-format
msgid "Choose Signature File Name for '%s'"
msgstr "Valitse allekirjoitustiedoston nimi kohteelle ”%s”"
-#: ../tool/seahorse-tool.c:407
+#: ../tool/seahorse-tool.c:410
msgid "Import is complete"
msgstr "Tuonti valmis"
-#: ../tool/seahorse-tool.c:440
+#: ../tool/seahorse-tool.c:443
msgid "Importing keys ..."
msgstr "Tuodaan avaimia…"
-#: ../tool/seahorse-tool.c:470
+#: ../tool/seahorse-tool.c:473
msgid "Import Failed"
msgstr "Tuonti epäonnistui"
-#: ../tool/seahorse-tool.c:471
+#: ../tool/seahorse-tool.c:474
msgid "Keys were found but not imported."
msgstr "Avaimia löytyi mutta niitä ei tuotu."
-#: ../tool/seahorse-tool.c:494
+#: ../tool/seahorse-tool.c:497
#, c-format
msgid "Imported key"
msgstr "Tuotiin avain"
-#: ../tool/seahorse-tool.c:496
+#: ../tool/seahorse-tool.c:499
#, c-format
msgid "Imported %d key"
msgid_plural "Imported %d keys"
@@ -292,12 +338,12 @@ msgstr[0] "Tuotiin %d avain"
msgstr[1] "Tuotiin %d avainta"
#. File to decrypt to
-#: ../tool/seahorse-tool.c:518
+#: ../tool/seahorse-tool.c:521
#, c-format
msgid "Choose Decrypted File Name for '%s'"
msgstr "Valitse salaamaton tiedostonimi tiedostolle ”%s”"
-#: ../tool/seahorse-tool.c:575
+#: ../tool/seahorse-tool.c:578
#, c-format
msgid "Choose Original File for '%s'"
msgstr "Valitse alkuperäinen tiedosto tiedostolle ”%s”"
@@ -307,135 +353,135 @@ msgstr "Valitse alkuperäinen tiedosto tiedostolle ”%s”"
#. * The last thing we want to do is cascade a big pile of error
#. * dialogs at the user.
#.
-#: ../tool/seahorse-tool.c:648
+#: ../tool/seahorse-tool.c:651
#, c-format
msgid "No valid signatures found"
msgstr "Kelvollisia allekirjoituksia ei löydy"
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:698
msgid "File Encryption Tool"
msgstr "Tiedostojen salaustyökalu"
-#: ../tool/seahorse-tool.c:713
+#: ../tool/seahorse-tool.c:716
msgid "Encrypting"
msgstr "Salaus"
-#: ../tool/seahorse-tool.c:714
+#: ../tool/seahorse-tool.c:717
#, c-format
msgid "Couldn't encrypt file: %s"
msgstr "Tiedostoa ei voitu salata: %s"
-#: ../tool/seahorse-tool.c:722
+#: ../tool/seahorse-tool.c:725
msgid "Signing"
msgstr "Allekirjoitus"
-#: ../tool/seahorse-tool.c:723
+#: ../tool/seahorse-tool.c:726
#, c-format
msgid "Couldn't sign file: %s"
msgstr "Tiedostoa ei voitu allekirjoittaa: %s"
-#: ../tool/seahorse-tool.c:728
+#: ../tool/seahorse-tool.c:731
msgid "Importing"
msgstr "Tuonti"
-#: ../tool/seahorse-tool.c:729
+#: ../tool/seahorse-tool.c:732
#, c-format
msgid "Couldn't import keys from file: %s"
msgstr "Avaimia ei voitu tuoda tiedostosta: %s"
-#: ../tool/seahorse-tool.c:735
+#: ../tool/seahorse-tool.c:738
msgid "Decrypting"
msgstr "Salauksen purku"
-#: ../tool/seahorse-tool.c:736
+#: ../tool/seahorse-tool.c:739
#, c-format
msgid "Couldn't decrypt file: %s"
msgstr "Tiedoston salausta ei voitu purkaa: %s"
-#: ../tool/seahorse-tool.c:741
+#: ../tool/seahorse-tool.c:744
msgid "Verifying"
msgstr "Varmista"
-#: ../tool/seahorse-tool.c:742
+#: ../tool/seahorse-tool.c:745
#, c-format
msgid "Couldn't verify file: %s"
msgstr "Tiedostoa ei voitu varmistaa: %s"
-#: ../tool/seahorse-tool-files.c:120
+#: ../tool/seahorse-tool-files.c:119
msgid "Ace (.ace)"
msgstr "Ace (.ace)"
-#: ../tool/seahorse-tool-files.c:121
+#: ../tool/seahorse-tool-files.c:120
msgid "Ar (.ar)"
msgstr "Ar (.ar)"
-#: ../tool/seahorse-tool-files.c:122
+#: ../tool/seahorse-tool-files.c:121
msgid "Arj (.arj)"
msgstr "Arj (.arj)"
-#: ../tool/seahorse-tool-files.c:129
+#: ../tool/seahorse-tool-files.c:128
msgid "Ear (.ear)"
msgstr "Ear (.ear)"
-#: ../tool/seahorse-tool-files.c:130
+#: ../tool/seahorse-tool-files.c:129
msgid "Self-extracting zip (.exe)"
msgstr "Itsepurkautuva zip (.exe)"
-#: ../tool/seahorse-tool-files.c:132
+#: ../tool/seahorse-tool-files.c:131
msgid "Jar (.jar)"
msgstr "Jar (.jar)"
-#: ../tool/seahorse-tool-files.c:133
+#: ../tool/seahorse-tool-files.c:132
msgid "Lha (.lzh)"
msgstr "Lha (.lzh)"
-#: ../tool/seahorse-tool-files.c:135
+#: ../tool/seahorse-tool-files.c:134
msgid "Rar (.rar)"
msgstr "Rar (.rar)"
-#: ../tool/seahorse-tool-files.c:137
+#: ../tool/seahorse-tool-files.c:136
msgid "Tar uncompressed (.tar)"
msgstr "Pakkaamaton tar (.tar)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Bzip-pakattu tar (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Bzip2-pakattu tar (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:139
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Gzip-pakattu tar (tar.gz)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:140
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Lzop-pakattu tar (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:142
+#: ../tool/seahorse-tool-files.c:141
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Compress-pakattu tar (.tar.Z)"
-#: ../tool/seahorse-tool-files.c:144
+#: ../tool/seahorse-tool-files.c:143
msgid "War (.war)"
msgstr "War (.war)"
-#: ../tool/seahorse-tool-files.c:145
+#: ../tool/seahorse-tool-files.c:144
msgid "Zip (.zip)"
msgstr "Zip (.zip)"
-#: ../tool/seahorse-tool-files.c:146
+#: ../tool/seahorse-tool-files.c:145
msgid "Zoo (.zoo)"
msgstr "Zoo (.zoo)"
-#: ../tool/seahorse-tool-files.c:147
+#: ../tool/seahorse-tool-files.c:146
msgid "7-Zip (.7z)"
msgstr "7-Zip (.7z)"
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:327
+#: ../tool/seahorse-tool-files.c:328
#, c-format
msgid "You have selected %d file "
msgid_plural "You have selected %d files "
@@ -444,7 +490,7 @@ msgstr[1] "Olet valinnut %d tiedostoa "
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:332
+#: ../tool/seahorse-tool-files.c:333
#, c-format
msgid "and %d folder"
msgid_plural "and %d folders"
@@ -453,34 +499,34 @@ msgstr[1] "ja %d kansiota"
#. TRANSLATOR: "%s%s" are "You have selected %d files and %d folders"
#. * Swap order with "%2$s%1$s" if needed
-#: ../tool/seahorse-tool-files.c:337
+#: ../tool/seahorse-tool-files.c:338
#, c-format
msgid "<b>%s%s</b>"
msgstr "<b>%s%s</b>"
-#: ../tool/seahorse-tool-files.c:345
+#: ../tool/seahorse-tool-files.c:346
#, c-format
msgid "You have selected %d file"
msgid_plural "You have selected %d files"
msgstr[0] "Olet valinnut %d tiedoston"
msgstr[1] "Olet valinnut %d tiedostoa"
-#: ../tool/seahorse-tool-files.c:350
+#: ../tool/seahorse-tool-files.c:351
#, c-format
msgid "You have selected %d folder"
msgid_plural "You have selected %d folders"
msgstr[0] "Olet valinnut %d kansion"
msgstr[1] "Olet valinnut %d kansiota"
-#: ../tool/seahorse-tool-files.c:868
+#: ../tool/seahorse-tool-files.c:866
msgid "Preparing..."
msgstr "Valmistellaan…"
-#: ../tool/seahorse-tool-files.c:877 ../tool/seahorse-tool-files.c:900
+#: ../tool/seahorse-tool-files.c:875 ../tool/seahorse-tool-files.c:898
msgid "Couldn't list files"
msgstr "Tiedostoja ei voitu listata"
-#: ../tool/seahorse-tool-files.c:887 ../tool/seahorse-util.c:647
+#: ../tool/seahorse-tool-files.c:885 ../tool/seahorse-util.c:399
msgid "Couldn't package files"
msgstr "Tiedostoja ei voitu paketoida"
@@ -488,33 +534,33 @@ msgstr "Tiedostoja ei voitu paketoida"
msgid "Decryption failed. You probably do not have the decryption key."
msgstr "Salauksen purku ei onnistunut. Sinulla ei ehkä ole purkuavainta."
-#: ../tool/seahorse-util.c:223
+#: ../tool/seahorse-util.c:200
msgid "%Y-%m-%d"
msgstr "%Y-%m-%d"
-#: ../tool/seahorse-util.c:642
+#: ../tool/seahorse-util.c:394
msgid "Couldn't run file-roller"
msgstr "Ohjelmaa file-roller ei voitu suorittaa"
-#: ../tool/seahorse-util.c:648
+#: ../tool/seahorse-util.c:400
msgid "The file-roller process did not complete successfully"
msgstr "Prosessi file-roller ei päättynyt onnistuneesti"
#. Filter for PGP keys. We also include *.asc, as in many
#. cases that extension is associated with text/plain
-#: ../tool/seahorse-util.c:708
+#: ../tool/seahorse-util.c:436
msgid "All key files"
msgstr "Kaikki avaintiedostot"
-#: ../tool/seahorse-util.c:715 ../tool/seahorse-util.c:755
+#: ../tool/seahorse-util.c:443 ../tool/seahorse-util.c:483
msgid "All files"
msgstr "Kaikki tiedostot"
-#: ../tool/seahorse-util.c:748
+#: ../tool/seahorse-util.c:476
msgid "Archive files"
msgstr "Arkistotiedostot"
-#: ../tool/seahorse-util.c:777
+#: ../tool/seahorse-util.c:505
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -524,11 +570,18 @@ msgstr ""
"\n"
"Haluatko korvata sen uudella tiedostolla?"
-#: ../tool/seahorse-util.c:780
+#: ../tool/seahorse-util.c:508
msgid "_Replace"
msgstr "Ko_rvaa"
-#: ../tool/seahorse-widget.c:365
-#, c-format
-msgid "Could not display help: %s"
-msgstr "Ohjetta ei voitu näyttää: %s"
+#~ msgid "Password:"
+#~ msgstr "Salasana:"
+
+#~ msgid "Confirm:"
+#~ msgstr "Vahvista:"
+
+#~ msgid "Choose Recipients"
+#~ msgstr "Valitse vastaanottajat"
+
+#~ msgid "Could not display help: %s"
+#~ msgstr "Ohjetta ei voitu näyttää: %s"
diff --git a/po/gl.po b/po/gl.po
index 0bc6727..43faaf0 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3,21 +3,64 @@
# This file is distributed under the same license as the seahorse-plugins package.
# Mancomún - Centro de Referencia e Servizos de Software Libre <g11n at mancomun.org>, 2009.
# Fran Diéguez <frandieguez at ubuntu.com>, 2010, 2011.
-# Fran Dieguez <frandieguez at gnome.org>, 2011.
-#
+# Fran Dieguez <frandieguez at gnome.org>, 2011, 2013.
msgid ""
msgstr ""
"Project-Id-Version: gl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 11:29+0200\n"
-"PO-Revision-Date: 2011-09-04 20:06+0200\n"
+"POT-Creation-Date: 2013-09-15 17:47+0200\n"
+"PO-Revision-Date: 2013-09-15 17:50+0200\n"
"Last-Translator: Fran Dieguez <frandieguez at gnome.org>\n"
-"Language-Team: Galego <gnome-l10n-gl at gnome.org>\n"
+"Language-Team: gnome-l10n-gl at gnome.org\n"
"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bits\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:1
+msgid "File extension for packages"
+msgstr "Extensión de ficheiro para os paquetes"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
+msgid "File extension for packages when handling mulitple files."
+msgstr "A extensión de ficheiro para os paquetes ao xestionar varios ficheiros."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
+msgid "Handle multiple files separately"
+msgstr "Xestionar varios ficheiros de forma separada"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:4
+msgid ""
+"When handling multiple files, don't package them but process separately."
+msgstr ""
+"Ao xestionar varios ficheiros, non empaquetalos e procesalos de forma "
+"separada."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
+msgid "Use armor mode when encrypting"
+msgstr "Usar o modo armor ao cifrar"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:6
+msgid "Use PGP ASCII armor mode when encrypting or signing files."
+msgstr "Usar o modo armor PGP ASCII ao cifrar ou asinar ficheiros."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:1
+msgid "Width of the window"
+msgstr "Largura da xanela"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:2
+msgid "Width (in pixels) of the window."
+msgstr "Anchura (en pixeles) da xanela."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:3
+msgid "Height of the window"
+msgstr "Altura da xanela"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:4
+msgid "Height (in pixels) of the window."
+msgstr "Altura (en pixeles) da xanela."
#: ../nautilus-ext/seahorse-nautilus.c:158
msgid "Encrypt..."
@@ -40,20 +83,16 @@ msgstr[0] "Asinar o ficheiro seleccionado"
msgstr[1] "Asinar os ficheiros seleccionados"
#: ../tool/seahorse-multi-encrypt.xml.h:1
-msgid "<b>You have selected multiple files or folders</b>"
-msgstr "<b>Seleccionou varios ficheiros ou cartafoles</b>"
+msgid "Encrypt Multiple Files"
+msgstr "Cifrar varios ficheiros"
#: ../tool/seahorse-multi-encrypt.xml.h:2
-msgid ""
-"Because the files are located remotely, each file will be encrypted "
-"separately."
-msgstr ""
-"Como os ficheiros están situados de forma remota, cada ficheiro será cifrado "
-"de forma separada."
+msgid "<b>You have selected multiple files or folders</b>"
+msgstr "<b>Seleccionou varios ficheiros ou cartafoles</b>"
#: ../tool/seahorse-multi-encrypt.xml.h:3
-msgid "Encrypt Multiple Files"
-msgstr "Cifrar varios ficheiros"
+msgid "encrypted-package"
+msgstr "paquete-cifrado"
#: ../tool/seahorse-multi-encrypt.xml.h:4
msgid "Encrypt each file separately"
@@ -64,31 +103,35 @@ msgid "Encrypt packed together in a package"
msgstr "Cifralo todo xunto nun paquete"
#: ../tool/seahorse-multi-encrypt.xml.h:6
-msgid "Package Name:"
-msgstr "Nome do paquete:"
-
-#: ../tool/seahorse-multi-encrypt.xml.h:7
msgid "Packaging:"
msgstr "Empaquetado:"
+#: ../tool/seahorse-multi-encrypt.xml.h:7
+msgid "Package Name:"
+msgstr "Nome do paquete:"
+
#: ../tool/seahorse-multi-encrypt.xml.h:8
-msgid "encrypted-package"
-msgstr "paquete-cifrado"
+msgid ""
+"Because the files are located remotely, each file will be encrypted "
+"separately."
+msgstr ""
+"Como os ficheiros están situados de forma remota, cada ficheiro será cifrado "
+"de forma separada."
-#: ../tool/seahorse-notification.c:580 ../tool/seahorse-notification.c:605
+#: ../tool/seahorse-notification.c:572
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] "Chave importada"
msgstr[1] "Chaves importadas"
-#: ../tool/seahorse-notification.c:584 ../tool/seahorse-notification.c:604
+#: ../tool/seahorse-notification.c:576
#, c-format
msgid "Imported %i key"
msgid_plural "Imported %i keys"
msgstr[0] "Chave %i importada"
msgstr[1] "Chaves %i importadas"
-#: ../tool/seahorse-notification.c:586
+#: ../tool/seahorse-notification.c:578
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -96,61 +139,61 @@ msgstr[0] "Chave importada para"
msgstr[1] "Chaves importadas para"
#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:623
+#: ../tool/seahorse-notification.c:606
#, c-format
msgid "Signed by <i><key id='%s'/> <b>expired</b></i> on %s."
msgstr "Asinado por <i><key id='%s'/> <b>venceu</b></i> en %s."
-#: ../tool/seahorse-notification.c:624
+#: ../tool/seahorse-notification.c:607
msgid "Invalid Signature"
msgstr "A sinatura non é válida"
-#: ../tool/seahorse-notification.c:630
+#: ../tool/seahorse-notification.c:613
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
msgstr "Asinado por <i><key id='%s'/></i> en %s <b>Venceu</b>."
-#: ../tool/seahorse-notification.c:631
+#: ../tool/seahorse-notification.c:614
msgid "Expired Signature"
msgstr "Sinatura caducada"
-#: ../tool/seahorse-notification.c:637
+#: ../tool/seahorse-notification.c:620
#, c-format
msgid "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
msgstr "Asinado por <i><key id='%s'/> <b>Revogada</b></i> en %s."
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:621
msgid "Revoked Signature"
msgstr "Sinatura revogada"
#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:644
+#: ../tool/seahorse-notification.c:627
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s."
msgstr "Asinado por <i><key id='%s'/></i> en %s."
-#: ../tool/seahorse-notification.c:645
+#: ../tool/seahorse-notification.c:628
msgid "Good Signature"
msgstr "Sinatura correcta"
-#: ../tool/seahorse-notification.c:650
+#: ../tool/seahorse-notification.c:633
msgid "Signing key not in keyring."
msgstr "A chave de sinatura non está no anel de chaves."
-#: ../tool/seahorse-notification.c:651
+#: ../tool/seahorse-notification.c:634
msgid "Unknown Signature"
msgstr "Sinatura descoñecida"
-#: ../tool/seahorse-notification.c:655
+#: ../tool/seahorse-notification.c:638
msgid "Bad or forged signature. The signed data was modified."
msgstr ""
"A sinatura é incorrecta ou está falsificada. Modificouse a data da sinatura."
-#: ../tool/seahorse-notification.c:656
+#: ../tool/seahorse-notification.c:639
msgid "Bad Signature"
msgstr "Sinatura incorrecta"
-#: ../tool/seahorse-notification.c:664
+#: ../tool/seahorse-notification.c:647
msgid "Couldn't verify signature."
msgstr "Non foi posíbel verificar a sinatura."
@@ -158,42 +201,41 @@ msgstr "Non foi posíbel verificar a sinatura."
msgid "Notification Messages"
msgstr "Mensaxes de notificación"
-#: ../tool/seahorse-passphrase.c:200
-msgid "Passphrase"
-msgstr "Frase de paso"
-
-#: ../tool/seahorse-passphrase.c:203
-msgid "Password:"
-msgstr "Contrasinal:"
-
-#. The second and main entry
-#: ../tool/seahorse-passphrase.c:267
-msgid "Confirm:"
-msgstr "Confirmar:"
-
-#: ../tool/seahorse-passphrase.c:355
+#: ../tool/seahorse-passphrase.c:114
#, c-format
msgid "Wrong passphrase."
msgstr "Frase de paso incorrecta."
-#: ../tool/seahorse-passphrase.c:359
+#: ../tool/seahorse-passphrase.c:118
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Introduza unha frase de paso nova para '%s'"
-#: ../tool/seahorse-passphrase.c:361
+#: ../tool/seahorse-passphrase.c:120
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Introduza unha frase de paso para '%s'"
-#: ../tool/seahorse-passphrase.c:364
+#: ../tool/seahorse-passphrase.c:123
msgid "Enter new passphrase"
msgstr "Introduza unha frase de paso nova"
-#: ../tool/seahorse-passphrase.c:366
+#: ../tool/seahorse-passphrase.c:125
msgid "Enter passphrase"
msgstr "Introduza unha frase de paso"
+#: ../tool/seahorse-passphrase.c:130
+msgid "Passphrase"
+msgstr "Frase de paso"
+
+#: ../tool/seahorse-passphrase.c:138
+msgid "Ok"
+msgstr "Aceptar"
+
+#: ../tool/seahorse-passphrase.c:139
+msgid "Cancel"
+msgstr "Cancelar"
+
#: ../tool/seahorse-pgp-encrypted.desktop.in.in.h:1
msgid "Decrypt File"
msgstr "Descifrar ficheiro"
@@ -242,50 +284,50 @@ msgstr "Ler a lista de URIs estándar en"
msgid "file..."
msgstr "ficheiro…"
-#: ../tool/seahorse-tool.c:169
-msgid "Choose Recipients"
-msgstr "Seleccione os destinatarios"
+#: ../tool/seahorse-tool.c:171
+msgid "Encryption settings"
+msgstr "Configuración da cifraxe"
-#: ../tool/seahorse-tool.c:234 ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:236 ../tool/seahorse-tool.c:350
msgid "Couldn't load keys"
msgstr "Non foi posíbel cargar as chaves"
-#: ../tool/seahorse-tool.c:252
+#: ../tool/seahorse-tool.c:253
#, c-format
msgid "Choose Encrypted File Name for '%s'"
msgstr "Seleccione un nome de ficheiro cifrado para '%s'"
-#: ../tool/seahorse-tool.c:325
+#: ../tool/seahorse-tool.c:328
msgid "Choose Signer"
msgstr "Seleccione o asinante"
-#: ../tool/seahorse-tool.c:367
+#: ../tool/seahorse-tool.c:370
#, c-format
msgid "Choose Signature File Name for '%s'"
msgstr "Seleccione un nome para o ficheiro de sinatura de '%s'"
-#: ../tool/seahorse-tool.c:407
+#: ../tool/seahorse-tool.c:410
msgid "Import is complete"
msgstr "Terminou a importación"
-#: ../tool/seahorse-tool.c:440
+#: ../tool/seahorse-tool.c:443
msgid "Importing keys ..."
msgstr "Importando chaves…"
-#: ../tool/seahorse-tool.c:470
+#: ../tool/seahorse-tool.c:473
msgid "Import Failed"
msgstr "Produciuse un fallo ao importar"
-#: ../tool/seahorse-tool.c:471
+#: ../tool/seahorse-tool.c:474
msgid "Keys were found but not imported."
msgstr "Atopáronse as chaves mais non se importaron."
-#: ../tool/seahorse-tool.c:494
+#: ../tool/seahorse-tool.c:497
#, c-format
msgid "Imported key"
msgstr "Chave importada"
-#: ../tool/seahorse-tool.c:496
+#: ../tool/seahorse-tool.c:499
#, c-format
msgid "Imported %d key"
msgid_plural "Imported %d keys"
@@ -293,12 +335,12 @@ msgstr[0] "%d chave importada"
msgstr[1] "%d chaves importadas"
#. File to decrypt to
-#: ../tool/seahorse-tool.c:518
+#: ../tool/seahorse-tool.c:521
#, c-format
msgid "Choose Decrypted File Name for '%s'"
msgstr "Seleccione o nome de ficheiro descifrado para '%s'"
-#: ../tool/seahorse-tool.c:575
+#: ../tool/seahorse-tool.c:578
#, c-format
msgid "Choose Original File for '%s'"
msgstr "Seleccione o ficheiro orixinal para '%s'"
@@ -308,135 +350,135 @@ msgstr "Seleccione o ficheiro orixinal para '%s'"
#. * The last thing we want to do is cascade a big pile of error
#. * dialogs at the user.
#.
-#: ../tool/seahorse-tool.c:648
+#: ../tool/seahorse-tool.c:651
#, c-format
msgid "No valid signatures found"
msgstr "Non se atoparon sinaturas válidas"
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:698
msgid "File Encryption Tool"
msgstr "Ferramenta de cifrado de ficheiros"
-#: ../tool/seahorse-tool.c:713
+#: ../tool/seahorse-tool.c:716
msgid "Encrypting"
msgstr "Cifrando"
-#: ../tool/seahorse-tool.c:714
+#: ../tool/seahorse-tool.c:717
#, c-format
msgid "Couldn't encrypt file: %s"
msgstr "Non foi posíbel cifrar o ficheiro: %s"
-#: ../tool/seahorse-tool.c:722
+#: ../tool/seahorse-tool.c:725
msgid "Signing"
msgstr "Asinando"
-#: ../tool/seahorse-tool.c:723
+#: ../tool/seahorse-tool.c:726
#, c-format
msgid "Couldn't sign file: %s"
msgstr "Non foi posíbel asinar o ficheiro: %s"
-#: ../tool/seahorse-tool.c:728
+#: ../tool/seahorse-tool.c:731
msgid "Importing"
msgstr "Importando"
-#: ../tool/seahorse-tool.c:729
+#: ../tool/seahorse-tool.c:732
#, c-format
msgid "Couldn't import keys from file: %s"
msgstr "Non foi posíbel importar chaves do ficheiro: %s"
-#: ../tool/seahorse-tool.c:735
+#: ../tool/seahorse-tool.c:738
msgid "Decrypting"
msgstr "Descrifrando"
-#: ../tool/seahorse-tool.c:736
+#: ../tool/seahorse-tool.c:739
#, c-format
msgid "Couldn't decrypt file: %s"
msgstr "Non foi posíbel descifrar o ficheiro: %s"
-#: ../tool/seahorse-tool.c:741
+#: ../tool/seahorse-tool.c:744
msgid "Verifying"
msgstr "Verificando"
-#: ../tool/seahorse-tool.c:742
+#: ../tool/seahorse-tool.c:745
#, c-format
msgid "Couldn't verify file: %s"
msgstr "Non foi posíbel verificar o ficheiro: %s"
-#: ../tool/seahorse-tool-files.c:120
+#: ../tool/seahorse-tool-files.c:119
msgid "Ace (.ace)"
msgstr "Ace (.ace)"
-#: ../tool/seahorse-tool-files.c:121
+#: ../tool/seahorse-tool-files.c:120
msgid "Ar (.ar)"
msgstr "Ar (.ar)"
-#: ../tool/seahorse-tool-files.c:122
+#: ../tool/seahorse-tool-files.c:121
msgid "Arj (.arj)"
msgstr "Arj (.arj)"
-#: ../tool/seahorse-tool-files.c:129
+#: ../tool/seahorse-tool-files.c:128
msgid "Ear (.ear)"
msgstr "Ear (.ear)"
-#: ../tool/seahorse-tool-files.c:130
+#: ../tool/seahorse-tool-files.c:129
msgid "Self-extracting zip (.exe)"
msgstr "Zip autoextraíbel (.exe)"
-#: ../tool/seahorse-tool-files.c:132
+#: ../tool/seahorse-tool-files.c:131
msgid "Jar (.jar)"
msgstr "Jar (.jar)"
-#: ../tool/seahorse-tool-files.c:133
+#: ../tool/seahorse-tool-files.c:132
msgid "Lha (.lzh)"
msgstr "Lha (.lzh)"
-#: ../tool/seahorse-tool-files.c:135
+#: ../tool/seahorse-tool-files.c:134
msgid "Rar (.rar)"
msgstr "Rar (.rar)"
-#: ../tool/seahorse-tool-files.c:137
+#: ../tool/seahorse-tool-files.c:136
msgid "Tar uncompressed (.tar)"
msgstr "Tar sen comprimir (.tar)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Tar comprimido con bzip (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Tar comprimido con bzip2 (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:139
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Tar comprimido con gzip (.tar.gz)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:140
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Tar comprimido con lzop (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:142
+#: ../tool/seahorse-tool-files.c:141
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Tar comprimido con compress (.tar.Z)"
-#: ../tool/seahorse-tool-files.c:144
+#: ../tool/seahorse-tool-files.c:143
msgid "War (.war)"
msgstr "War (.war)"
-#: ../tool/seahorse-tool-files.c:145
+#: ../tool/seahorse-tool-files.c:144
msgid "Zip (.zip)"
msgstr "Zip (.zip)"
-#: ../tool/seahorse-tool-files.c:146
+#: ../tool/seahorse-tool-files.c:145
msgid "Zoo (.zoo)"
msgstr "Zoo (.zoo)"
-#: ../tool/seahorse-tool-files.c:147
+#: ../tool/seahorse-tool-files.c:146
msgid "7-Zip (.7z)"
msgstr "7-Zip (.7z)"
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:327
+#: ../tool/seahorse-tool-files.c:328
#, c-format
msgid "You have selected %d file "
msgid_plural "You have selected %d files "
@@ -445,7 +487,7 @@ msgstr[1] "Seleccionou %d ficheiros "
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:332
+#: ../tool/seahorse-tool-files.c:333
#, c-format
msgid "and %d folder"
msgid_plural "and %d folders"
@@ -454,34 +496,34 @@ msgstr[1] "e %d cartafoles"
#. TRANSLATOR: "%s%s" are "You have selected %d files and %d folders"
#. * Swap order with "%2$s%1$s" if needed
-#: ../tool/seahorse-tool-files.c:337
+#: ../tool/seahorse-tool-files.c:338
#, c-format
msgid "<b>%s%s</b>"
msgstr "<b>%s%s</b>"
-#: ../tool/seahorse-tool-files.c:345
+#: ../tool/seahorse-tool-files.c:346
#, c-format
msgid "You have selected %d file"
msgid_plural "You have selected %d files"
msgstr[0] "Seleccionou %d ficheiro"
msgstr[1] "Seleccionou %d ficheiros"
-#: ../tool/seahorse-tool-files.c:350
+#: ../tool/seahorse-tool-files.c:351
#, c-format
msgid "You have selected %d folder"
msgid_plural "You have selected %d folders"
msgstr[0] "Seleccionou %d cartafol"
msgstr[1] "Seleccionou %d cartafoles"
-#: ../tool/seahorse-tool-files.c:868
+#: ../tool/seahorse-tool-files.c:866
msgid "Preparing..."
msgstr "Preparando…"
-#: ../tool/seahorse-tool-files.c:877 ../tool/seahorse-tool-files.c:900
+#: ../tool/seahorse-tool-files.c:875 ../tool/seahorse-tool-files.c:898
msgid "Couldn't list files"
msgstr "Non foi posíbel listar os ficheiros"
-#: ../tool/seahorse-tool-files.c:887 ../tool/seahorse-util.c:647
+#: ../tool/seahorse-tool-files.c:885 ../tool/seahorse-util.c:399
msgid "Couldn't package files"
msgstr "Non foi posíbel empaquetar os ficheiros"
@@ -489,33 +531,33 @@ msgstr "Non foi posíbel empaquetar os ficheiros"
msgid "Decryption failed. You probably do not have the decryption key."
msgstr "O descifrado fallou. Probabelmente non posúa a chave de descifrado."
-#: ../tool/seahorse-util.c:223
+#: ../tool/seahorse-util.c:200
msgid "%Y-%m-%d"
msgstr "%d-%m-%Y"
-#: ../tool/seahorse-util.c:642
+#: ../tool/seahorse-util.c:394
msgid "Couldn't run file-roller"
msgstr "Non foi posíbel executar o File Roller"
-#: ../tool/seahorse-util.c:648
+#: ../tool/seahorse-util.c:400
msgid "The file-roller process did not complete successfully"
msgstr "O proceso file-roller non terminou con éxito"
#. Filter for PGP keys. We also include *.asc, as in many
#. cases that extension is associated with text/plain
-#: ../tool/seahorse-util.c:708
+#: ../tool/seahorse-util.c:436
msgid "All key files"
msgstr "Todos os ficheiros de chave"
-#: ../tool/seahorse-util.c:715 ../tool/seahorse-util.c:755
+#: ../tool/seahorse-util.c:443 ../tool/seahorse-util.c:483
msgid "All files"
msgstr "Todos os ficheiros"
-#: ../tool/seahorse-util.c:748
+#: ../tool/seahorse-util.c:476
msgid "Archive files"
msgstr "Arquivar ficheiros"
-#: ../tool/seahorse-util.c:777
+#: ../tool/seahorse-util.c:505
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -525,11 +567,18 @@ msgstr ""
"\n"
"Quere substituílo por un novo?"
-#: ../tool/seahorse-util.c:780
+#: ../tool/seahorse-util.c:508
msgid "_Replace"
msgstr "_Substituír"
-#: ../tool/seahorse-widget.c:365
-#, c-format
-msgid "Could not display help: %s"
-msgstr "Non foi posíbel mostrar a axuda: %s"
+#~ msgid "Password:"
+#~ msgstr "Contrasinal:"
+
+#~ msgid "Confirm:"
+#~ msgstr "Confirmar:"
+
+#~ msgid "Choose Recipients"
+#~ msgstr "Seleccione os destinatarios"
+
+#~ msgid "Could not display help: %s"
+#~ msgstr "Non foi posíbel mostrar a axuda: %s"
diff --git a/po/hu.po b/po/hu.po
index 9e6900a..255d9c9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,18 +1,19 @@
-# Hungarian translation of Seahorse-plugins
-# Copyright (C) 2003, 2005, 2007, 2008, 2010, 2011. Free Software Foundation, Inc.
-# This file is distributed under the same license as the Seahorse-plugins package.
+# Hungarian translation of seahorse-plugins
+# Copyright (C) 2003, 2005, 2007, 2008, 2010, 2011, 2012, 2013, 2014. Free Software Foundation, Inc.
+# This file is distributed under the same license as the seahorse-plugins package.
#
# Péter Mátó <atya at andrews dot hu>, 2003.
# Andras Timar <timar at gnome dot hu>, 2003.
-# Gabor Kelemen <kelemeng at gnome dot hu>, 2005, 2007, 2008, 2010, 2011, 2013.
+# Gabor Kelemen <kelemeng at gnome dot hu>, 2005, 2007, 2008, 2010, 2011, 2013, 2014.
msgid ""
msgstr ""
"Project-Id-Version: seahorse-plugins master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-18 15:31+0100\n"
-"PO-Revision-Date: 2013-02-18 16:09+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=seahorse-nautilus&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-02-03 12:10+0000\n"
+"PO-Revision-Date: 2014-02-04 00:15+0100\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
-"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
+"Language-Team: Hungarian <openscope at googlegroups dot com>\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +26,8 @@ msgid "File extension for packages"
msgstr "Csomagok fájlkiterjesztése"
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
-msgid "File extension for packages when handling mulitple files."
+#| msgid "File extension for packages when handling mulitple files."
+msgid "File extension for packages when handling multiple files."
msgstr "Csomagok fájlkiterjesztése több fájl kezelésekor."
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
@@ -117,20 +119,20 @@ msgid ""
msgstr ""
"Mivel a fájlok távoli helyen vannak, minden fájl külön-külön lesz titkosítva."
-#: ../tool/seahorse-notification.c:572
+#: ../tool/seahorse-notification.c:569
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] "Kulcs importálva"
msgstr[1] "Kulcs importálva"
-#: ../tool/seahorse-notification.c:576
+#: ../tool/seahorse-notification.c:573
#, c-format
msgid "Imported %i key"
msgid_plural "Imported %i keys"
msgstr[0] "%i kulcs importálva"
msgstr[1] "%i kulcs importálva"
-#: ../tool/seahorse-notification.c:578
+#: ../tool/seahorse-notification.c:575
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -138,61 +140,73 @@ msgstr[0] "Kulcs importálva:"
msgstr[1] "Kulcsok importálva:"
#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:606
+#: ../tool/seahorse-notification.c:603
#, c-format
msgid "Signed by <i><key id='%s'/> <b>expired</b></i> on %s."
msgstr "Aláírva <i><kulcsazonosító=„%s”/> által, <b>lejárt</b></i> ekkor: %s."
-#: ../tool/seahorse-notification.c:607
+#: ../tool/seahorse-notification.c:604
msgid "Invalid Signature"
msgstr "Érvénytelen aláírás"
-#: ../tool/seahorse-notification.c:613
+#: ../tool/seahorse-notification.c:610
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
msgstr "Aláírva <i><kulcsazonosító='%s'/> által</i> ekkor: %s, <b>lejárt</b>."
-#: ../tool/seahorse-notification.c:614
+#: ../tool/seahorse-notification.c:611
msgid "Expired Signature"
msgstr "Lejárt aláírás"
-#: ../tool/seahorse-notification.c:620
+#: ../tool/seahorse-notification.c:617
#, c-format
msgid "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
msgstr ""
"Aláírva <i><kulcsazonosító='%s'/> által, <b>visszavonva</b></i> ekkor: %s."
-#: ../tool/seahorse-notification.c:621
+#: ../tool/seahorse-notification.c:618
msgid "Revoked Signature"
msgstr "Visszavont aláírás"
-#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:627
+#: ../tool/seahorse-notification.c:625
+msgid "Good Signature"
+msgstr "Jó aláírás"
+
+#: ../tool/seahorse-notification.c:626
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s."
msgstr "Aláírva <i><kulcsazonosító='%s'/> által</i> ekkor: %s."
#: ../tool/seahorse-notification.c:628
-msgid "Good Signature"
-msgstr "Jó aláírás"
+#| msgid "Invalid Signature"
+msgid "Untrusted Valid Signature"
+msgstr "Nem megbízható érvényes aláírás"
+
+#: ../tool/seahorse-notification.c:629
+#, c-format
+#| msgid "Signed by <i><key id='%s'/></i> on %s."
+msgid "Valid but <b>untrusted</b> signature by <i><key id='%s'/></i> on %s."
+msgstr ""
+"Érvényes, de <b>nem megbízható</b> aláírás <i><kulcsazonosító='%s'/> által</i>"
+" ekkor: %s."
-#: ../tool/seahorse-notification.c:633
+#: ../tool/seahorse-notification.c:635
msgid "Signing key not in keyring."
msgstr "Az aláíró kulcs nincs a kulcstartón."
-#: ../tool/seahorse-notification.c:634
+#: ../tool/seahorse-notification.c:636
msgid "Unknown Signature"
msgstr "Ismeretlen aláírás"
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:640
msgid "Bad or forged signature. The signed data was modified."
msgstr "Rossz vagy hamisított aláírás. Az aláírt adatok módosultak."
-#: ../tool/seahorse-notification.c:639
+#: ../tool/seahorse-notification.c:641
msgid "Bad Signature"
msgstr "Rossz aláírás"
-#: ../tool/seahorse-notification.c:647
+#: ../tool/seahorse-notification.c:649
msgid "Couldn't verify signature."
msgstr "Nem ellenőrizhető az aláírás."
@@ -200,38 +214,38 @@ msgstr "Nem ellenőrizhető az aláírás."
msgid "Notification Messages"
msgstr "Értesítési üzenetek"
-#: ../tool/seahorse-passphrase.c:114
+#: ../tool/seahorse-passphrase.c:111
#, c-format
msgid "Wrong passphrase."
msgstr "Rossz jelmondat."
-#: ../tool/seahorse-passphrase.c:118
+#: ../tool/seahorse-passphrase.c:115
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Írja be az új jelmondatot %s számára"
-#: ../tool/seahorse-passphrase.c:120
+#: ../tool/seahorse-passphrase.c:117
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Írja be a jelmondatot %s számára"
-#: ../tool/seahorse-passphrase.c:123
+#: ../tool/seahorse-passphrase.c:120
msgid "Enter new passphrase"
msgstr "Írja be az új jelmondatot"
-#: ../tool/seahorse-passphrase.c:125
+#: ../tool/seahorse-passphrase.c:122
msgid "Enter passphrase"
msgstr "Írja be a jelmondatot"
-#: ../tool/seahorse-passphrase.c:130
+#: ../tool/seahorse-passphrase.c:127
msgid "Passphrase"
msgstr "Jelmondat"
-#: ../tool/seahorse-passphrase.c:138
+#: ../tool/seahorse-passphrase.c:135
msgid "Ok"
msgstr "OK"
-#: ../tool/seahorse-passphrase.c:139
+#: ../tool/seahorse-passphrase.c:136
msgid "Cancel"
msgstr "Mégse"
@@ -251,47 +265,47 @@ msgstr "Aláírás ellenőrzése"
msgid "Progress Title"
msgstr "Folyamat címe"
-#: ../tool/seahorse-tool.c:61
+#: ../tool/seahorse-tool.c:58
msgid "Import keys from the file"
msgstr "Kulcsok importálása fájlból"
-#: ../tool/seahorse-tool.c:63
+#: ../tool/seahorse-tool.c:60
msgid "Encrypt file"
msgstr "Fájl titkosítása"
-#: ../tool/seahorse-tool.c:65
+#: ../tool/seahorse-tool.c:62
msgid "Sign file with default key"
msgstr "Fájl aláírása az alapértelmezett kulccsal"
-#: ../tool/seahorse-tool.c:67
+#: ../tool/seahorse-tool.c:64
msgid "Encrypt and sign file with default key"
msgstr "Fájl aláírása és titkosítása az alapértelmezett kulccsal"
-#: ../tool/seahorse-tool.c:69
+#: ../tool/seahorse-tool.c:66
msgid "Decrypt encrypted file"
msgstr "Titkosított fájl visszafejtése"
-#: ../tool/seahorse-tool.c:71
+#: ../tool/seahorse-tool.c:68
msgid "Verify signature file"
msgstr "Aláírásfájl ellenőrzése"
-#: ../tool/seahorse-tool.c:73
+#: ../tool/seahorse-tool.c:70
msgid "Read list of URIs on standard in"
msgstr "URI lista olvasása a szabványos bemenetről"
-#: ../tool/seahorse-tool.c:75
+#: ../tool/seahorse-tool.c:72
msgid "file..."
msgstr "fájl…"
-#: ../tool/seahorse-tool.c:169
-msgid "Choose Recipients"
-msgstr "Válassza ki a címzetteket"
+#: ../tool/seahorse-tool.c:168
+msgid "Encryption settings"
+msgstr "Titkosítás beállításai"
-#: ../tool/seahorse-tool.c:234 ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:233 ../tool/seahorse-tool.c:347
msgid "Couldn't load keys"
msgstr "Nem sikerült betölteni a kulcsokat"
-#: ../tool/seahorse-tool.c:252
+#: ../tool/seahorse-tool.c:250
#, c-format
msgid "Choose Encrypted File Name for '%s'"
msgstr "Válassza ki a titkosított fájl nevét ehhez: „%s”"
@@ -403,81 +417,81 @@ msgstr "Ellenőrzés"
msgid "Couldn't verify file: %s"
msgstr "Nem ellenőrizhető a fájl: %s"
-#: ../tool/seahorse-tool-files.c:119
+#: ../tool/seahorse-tool-files.c:116
msgid "Ace (.ace)"
msgstr "Ace (.ace)"
-#: ../tool/seahorse-tool-files.c:120
+#: ../tool/seahorse-tool-files.c:117
msgid "Ar (.ar)"
msgstr "Ar (.ar)"
-#: ../tool/seahorse-tool-files.c:121
+#: ../tool/seahorse-tool-files.c:118
msgid "Arj (.arj)"
msgstr "Arj (.arj)"
-#: ../tool/seahorse-tool-files.c:128
+#: ../tool/seahorse-tool-files.c:125
msgid "Ear (.ear)"
msgstr "Ear (.ear)"
-#: ../tool/seahorse-tool-files.c:129
+#: ../tool/seahorse-tool-files.c:126
msgid "Self-extracting zip (.exe)"
msgstr "Önkibontó zip (exe)"
-#: ../tool/seahorse-tool-files.c:131
+#: ../tool/seahorse-tool-files.c:128
msgid "Jar (.jar)"
msgstr "Jar (.jar)"
-#: ../tool/seahorse-tool-files.c:132
+#: ../tool/seahorse-tool-files.c:129
msgid "Lha (.lzh)"
msgstr "Lha (.lzh)"
-#: ../tool/seahorse-tool-files.c:134
+#: ../tool/seahorse-tool-files.c:131
msgid "Rar (.rar)"
msgstr "Rar (.rar)"
-#: ../tool/seahorse-tool-files.c:136
+#: ../tool/seahorse-tool-files.c:133
msgid "Tar uncompressed (.tar)"
msgstr "Nem tömörített tar (.tar)"
-#: ../tool/seahorse-tool-files.c:137
+#: ../tool/seahorse-tool-files.c:134
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Bzip-pel tömörített tar (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:135
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Bzip2-vel tömörített tar (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:136
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Gzip-pel tömörített tar (.tar.gz)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Lzop-pal tömörített tar (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Compress-szel tömörített tar (.tar.Z)"
-#: ../tool/seahorse-tool-files.c:143
+#: ../tool/seahorse-tool-files.c:140
msgid "War (.war)"
msgstr "War (.war)"
-#: ../tool/seahorse-tool-files.c:144
+#: ../tool/seahorse-tool-files.c:141
msgid "Zip (.zip)"
msgstr "Zip (.zip)"
-#: ../tool/seahorse-tool-files.c:145
+#: ../tool/seahorse-tool-files.c:142
msgid "Zoo (.zoo)"
msgstr "Zoo (.zoo)"
-#: ../tool/seahorse-tool-files.c:146
+#: ../tool/seahorse-tool-files.c:143
msgid "7-Zip (.7z)"
msgstr "7-Zip (.7z)"
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:328
+#: ../tool/seahorse-tool-files.c:325
#, c-format
msgid "You have selected %d file "
msgid_plural "You have selected %d files "
@@ -486,7 +500,7 @@ msgstr[1] "%d fájlt "
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:333
+#: ../tool/seahorse-tool-files.c:330
#, c-format
msgid "and %d folder"
msgid_plural "and %d folders"
@@ -495,70 +509,70 @@ msgstr[1] "és %d mappát választott ki"
#. TRANSLATOR: "%s%s" are "You have selected %d files and %d folders"
#. * Swap order with "%2$s%1$s" if needed
-#: ../tool/seahorse-tool-files.c:338
+#: ../tool/seahorse-tool-files.c:335
#, c-format
msgid "<b>%s%s</b>"
msgstr "<b>%s%s</b>"
-#: ../tool/seahorse-tool-files.c:346
+#: ../tool/seahorse-tool-files.c:343
#, c-format
msgid "You have selected %d file"
msgid_plural "You have selected %d files"
msgstr[0] "%d fájlt választott ki"
msgstr[1] "%d fájlt választott ki"
-#: ../tool/seahorse-tool-files.c:351
+#: ../tool/seahorse-tool-files.c:348
#, c-format
msgid "You have selected %d folder"
msgid_plural "You have selected %d folders"
msgstr[0] "%d mappát választott ki"
msgstr[1] "%d mappát választott ki"
-#: ../tool/seahorse-tool-files.c:866
+#: ../tool/seahorse-tool-files.c:863
msgid "Preparing..."
msgstr "Előkészítés…"
-#: ../tool/seahorse-tool-files.c:875 ../tool/seahorse-tool-files.c:898
+#: ../tool/seahorse-tool-files.c:872 ../tool/seahorse-tool-files.c:895
msgid "Couldn't list files"
msgstr "A fájlok felsorolása meghiúsult"
-#: ../tool/seahorse-tool-files.c:885 ../tool/seahorse-util.c:399
+#: ../tool/seahorse-tool-files.c:882 ../tool/seahorse-util.c:396
msgid "Couldn't package files"
msgstr "Nem sikerült csomagolni a fájlokat"
-#: ../tool/seahorse-util.c:173
+#: ../tool/seahorse-util.c:170
msgid "Decryption failed. You probably do not have the decryption key."
msgstr ""
"A visszafejtés meghiúsult. Valószínűleg nem rendelkezik a visszafejtési "
-"kulcssal."
+"kulccsal."
-#: ../tool/seahorse-util.c:200
+#: ../tool/seahorse-util.c:197
msgid "%Y-%m-%d"
msgstr "%Y. %m. %d"
-#: ../tool/seahorse-util.c:394
+#: ../tool/seahorse-util.c:391
msgid "Couldn't run file-roller"
msgstr "Nem sikerült futtatni a file-rollert"
-#: ../tool/seahorse-util.c:400
+#: ../tool/seahorse-util.c:397
msgid "The file-roller process did not complete successfully"
msgstr "A file-roller folyamat sikertelenül fejeződött be"
#. Filter for PGP keys. We also include *.asc, as in many
#. cases that extension is associated with text/plain
-#: ../tool/seahorse-util.c:436
+#: ../tool/seahorse-util.c:433
msgid "All key files"
msgstr "Minden kulcsfájl"
-#: ../tool/seahorse-util.c:443 ../tool/seahorse-util.c:483
+#: ../tool/seahorse-util.c:440 ../tool/seahorse-util.c:480
msgid "All files"
msgstr "Minden fájl"
-#: ../tool/seahorse-util.c:476
+#: ../tool/seahorse-util.c:473
msgid "Archive files"
msgstr "Archív fájlok"
-#: ../tool/seahorse-util.c:505
+#: ../tool/seahorse-util.c:502
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -568,10 +582,13 @@ msgstr ""
"\n"
"Le akarja cserélni az új fájllal?"
-#: ../tool/seahorse-util.c:508
+#: ../tool/seahorse-util.c:505
msgid "_Replace"
msgstr "_Csere"
+#~ msgid "Choose Recipients"
+#~ msgstr "Válassza ki a címzetteket"
+
#~ msgid "Password:"
#~ msgstr "Jelszó:"
diff --git a/po/id.po b/po/id.po
index 2a6d836..dc9e6ec 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,23 +1,67 @@
# Translation of seahorse-plugins into Indonesian
# Copyright (C) 2010 THE seahorse-plugins'S COPYRIGHT HOLDER
# This file is distributed under the same license as the seahorse-plugin package.
-# Andika Triwidada <andika at gmail.com>, 2010, 2011.
+# Andika Triwidada <andika at gmail.com>, 2010, 2011, 2013.
#
msgid ""
msgstr ""
-"Project-Id-Version: seahorse-plugins\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 11:29+0200\n"
-"PO-Revision-Date: 2011-09-06 13:36+0700\n"
+"Project-Id-Version: seahorse-nautilus master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=seahorse-nautilus&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-12-19 16:22+0000\n"
+"PO-Revision-Date: 2014-01-02 10:58+0700\n"
"Last-Translator: Andika Triwidada <andika at gmail.com>\n"
"Language-Team: GNOME Indonesian Translation Team <gnome at i15n.org>\n"
-"Language: \n"
+"Language: id_ID\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Poedit-Language: Indonesian\n"
-"X-Poedit-Country: Indonesia\n"
+"X-Generator: Poedit 1.5.7\n"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:1
+msgid "File extension for packages"
+msgstr "Ekstensi berkas bagi paket"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
+msgid "File extension for packages when handling multiple files."
+msgstr "Ekstensi berkas bagi paket ketika menangani banyak berkas."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
+msgid "Handle multiple files separately"
+msgstr "Tangani berkas berganda secara terpisah"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:4
+msgid ""
+"When handling multiple files, don't package them but process separately."
+msgstr ""
+"Ketika menangani berkas berganda, jangan paketkan mereka tapi proses secara "
+"terpisah."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
+msgid "Use armor mode when encrypting"
+msgstr "Pakai mode armor ketika menyandikan"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:6
+msgid "Use PGP ASCII armor mode when encrypting or signing files."
+msgstr ""
+"Pakai mode armor ASCII PGP ketika menyandikan atau menandatangani berkas."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:1
+msgid "Width of the window"
+msgstr "Lebar jendela"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:2
+msgid "Width (in pixels) of the window."
+msgstr "Lebar jendela (dalam piksel)."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:3
+msgid "Height of the window"
+msgstr "Tinggi jendela"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:4
+msgid "Height (in pixels) of the window."
+msgstr "Tinggi jendela (dalam piksel)."
#: ../nautilus-ext/seahorse-nautilus.c:158
msgid "Encrypt..."
@@ -38,18 +82,16 @@ msgid_plural "Sign the selected files"
msgstr[0] "Tanda tangani berkas yang dipilih"
#: ../tool/seahorse-multi-encrypt.xml.h:1
-msgid "<b>You have selected multiple files or folders</b>"
-msgstr "<b>Anda telah memilih beberapa berkas atau folder</b>"
+msgid "Encrypt Multiple Files"
+msgstr "Sandikan Beberapa Berkas"
#: ../tool/seahorse-multi-encrypt.xml.h:2
-msgid ""
-"Because the files are located remotely, each file will be encrypted "
-"separately."
-msgstr "Karena berkas di lokasi jauh, setiap berkas akan disandikan terpisah."
+msgid "<b>You have selected multiple files or folders</b>"
+msgstr "<b>Anda telah memilih beberapa berkas atau folder</b>"
#: ../tool/seahorse-multi-encrypt.xml.h:3
-msgid "Encrypt Multiple Files"
-msgstr "Sandikan Beberapa Berkas"
+msgid "encrypted-package"
+msgstr "encrypted-package"
#: ../tool/seahorse-multi-encrypt.xml.h:4
msgid "Encrypt each file separately"
@@ -60,91 +102,103 @@ msgid "Encrypt packed together in a package"
msgstr "Sandikan bersama dalam satu paket"
#: ../tool/seahorse-multi-encrypt.xml.h:6
-msgid "Package Name:"
-msgstr "Nama Paket:"
-
-#: ../tool/seahorse-multi-encrypt.xml.h:7
msgid "Packaging:"
msgstr "Pemaketan:"
+#: ../tool/seahorse-multi-encrypt.xml.h:7
+msgid "Package Name:"
+msgstr "Nama Paket:"
+
#: ../tool/seahorse-multi-encrypt.xml.h:8
-msgid "encrypted-package"
-msgstr "encrypted-package"
+msgid ""
+"Because the files are located remotely, each file will be encrypted "
+"separately."
+msgstr "Karena berkas di lokasi jauh, setiap berkas akan disandikan terpisah."
-#: ../tool/seahorse-notification.c:580 ../tool/seahorse-notification.c:605
+#: ../tool/seahorse-notification.c:572
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] "Kunci Diimpor"
-#: ../tool/seahorse-notification.c:584 ../tool/seahorse-notification.c:604
+#: ../tool/seahorse-notification.c:576
#, c-format
msgid "Imported %i key"
msgid_plural "Imported %i keys"
msgstr[0] "Diimpor %i kunci"
-#: ../tool/seahorse-notification.c:586
+#: ../tool/seahorse-notification.c:578
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
msgstr[0] "Kunci yang diimpor bagi"
#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:623
+#: ../tool/seahorse-notification.c:606
#, c-format
msgid "Signed by <i><key id='%s'/> <b>expired</b></i> on %s."
msgstr "Ditandatangani oleh <i><key id='%s'/> <b>kadaluarsa</b></i> pada %s."
-#: ../tool/seahorse-notification.c:624
+#: ../tool/seahorse-notification.c:607
msgid "Invalid Signature"
msgstr "Tanda Tangan Tak Valid"
-#: ../tool/seahorse-notification.c:630
+#: ../tool/seahorse-notification.c:613
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
msgstr ""
"Ditandatangani oleh <i><key id='%s'/></i> pada %s <b>Telah Kadaluarsa</b>."
-#: ../tool/seahorse-notification.c:631
+#: ../tool/seahorse-notification.c:614
msgid "Expired Signature"
msgstr "Tanda Tangan Kadaluarsa"
-#: ../tool/seahorse-notification.c:637
+#: ../tool/seahorse-notification.c:620
#, c-format
msgid "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
msgstr "Ditandatangani oleh <i><key id='%s'/> <b>Dicabut</b></i> pada %s."
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:621
msgid "Revoked Signature"
msgstr "Tanda Tangan Yang Dicabut"
-#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:644
+#: ../tool/seahorse-notification.c:628
+msgid "Good Signature"
+msgstr "Tanda Tangan Baik"
+
+#: ../tool/seahorse-notification.c:629
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s."
msgstr "Ditandatangani oleh <i><key id='%s'/></i> pada %s."
-#: ../tool/seahorse-notification.c:645
-msgid "Good Signature"
-msgstr "Tanda Tangan Baik"
+#: ../tool/seahorse-notification.c:631
+msgid "Untrusted Valid Signature"
+msgstr "Tanda Tangan Valid Tak Dipercaya"
+
+#: ../tool/seahorse-notification.c:632
+#, c-format
+msgid "Valid but <b>untrusted</b> signature by <i><key id='%s'/></i> on %s."
+msgstr ""
+"Tanda tangan yang valid tapi <b>tak dipercaya</b> oleh <i><key id='%s'/></i> "
+"pada %s."
-#: ../tool/seahorse-notification.c:650
+#: ../tool/seahorse-notification.c:638
msgid "Signing key not in keyring."
msgstr "Kunci penandatangan tidak ada di ring kunci."
-#: ../tool/seahorse-notification.c:651
+#: ../tool/seahorse-notification.c:639
msgid "Unknown Signature"
msgstr "Tanda Tangan Tak Dikenal"
-#: ../tool/seahorse-notification.c:655
+#: ../tool/seahorse-notification.c:643
msgid "Bad or forged signature. The signed data was modified."
msgstr ""
"Tanda tangan buruk atau dipalsukan. Data yang ditandatangani telah diubah."
-#: ../tool/seahorse-notification.c:656
+#: ../tool/seahorse-notification.c:644
msgid "Bad Signature"
msgstr "Tanda Tangan Buruk"
-#: ../tool/seahorse-notification.c:664
+#: ../tool/seahorse-notification.c:652
msgid "Couldn't verify signature."
msgstr "Tidak dapat menguji kebenaran tanda tangan."
@@ -152,42 +206,41 @@ msgstr "Tidak dapat menguji kebenaran tanda tangan."
msgid "Notification Messages"
msgstr "Pesan Pemberitahuan"
-#: ../tool/seahorse-passphrase.c:200
-msgid "Passphrase"
-msgstr "Frase Sandi"
-
-#: ../tool/seahorse-passphrase.c:203
-msgid "Password:"
-msgstr "Kata Sandi:"
-
-#. The second and main entry
-#: ../tool/seahorse-passphrase.c:267
-msgid "Confirm:"
-msgstr "Konfirmasi:"
-
-#: ../tool/seahorse-passphrase.c:355
+#: ../tool/seahorse-passphrase.c:114
#, c-format
msgid "Wrong passphrase."
msgstr "Frasa sandi salah."
-#: ../tool/seahorse-passphrase.c:359
+#: ../tool/seahorse-passphrase.c:118
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Masukkan frasa sandi baru bagi '%s'"
-#: ../tool/seahorse-passphrase.c:361
+#: ../tool/seahorse-passphrase.c:120
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Masukkan frasa sandi untuk '%s'"
-#: ../tool/seahorse-passphrase.c:364
+#: ../tool/seahorse-passphrase.c:123
msgid "Enter new passphrase"
msgstr "Masukkan frasa sandi baru"
-#: ../tool/seahorse-passphrase.c:366
+#: ../tool/seahorse-passphrase.c:125
msgid "Enter passphrase"
msgstr "Masukkan frasa sandi"
+#: ../tool/seahorse-passphrase.c:130
+msgid "Passphrase"
+msgstr "Frase Sandi"
+
+#: ../tool/seahorse-passphrase.c:138
+msgid "Ok"
+msgstr "Ok"
+
+#: ../tool/seahorse-passphrase.c:139
+msgid "Cancel"
+msgstr "Batal"
+
#: ../tool/seahorse-pgp-encrypted.desktop.in.in.h:1
msgid "Decrypt File"
msgstr "Awa Sandikan Berkas"
@@ -236,62 +289,62 @@ msgstr "Baca daftar URI dari stdin"
msgid "file..."
msgstr "berkas..."
-#: ../tool/seahorse-tool.c:169
-msgid "Choose Recipients"
-msgstr "Pilih Penerima"
+#: ../tool/seahorse-tool.c:171
+msgid "Encryption settings"
+msgstr "Pengaturan penyandian"
-#: ../tool/seahorse-tool.c:234 ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:236 ../tool/seahorse-tool.c:350
msgid "Couldn't load keys"
msgstr "Tak bisa memuat kunci"
-#: ../tool/seahorse-tool.c:252
+#: ../tool/seahorse-tool.c:253
#, c-format
msgid "Choose Encrypted File Name for '%s'"
msgstr "Pilih Nama Berkas Tersandi bagi '%s'"
-#: ../tool/seahorse-tool.c:325
+#: ../tool/seahorse-tool.c:328
msgid "Choose Signer"
msgstr "Pilih Penanda Tangan"
-#: ../tool/seahorse-tool.c:367
+#: ../tool/seahorse-tool.c:370
#, c-format
msgid "Choose Signature File Name for '%s'"
msgstr "Pilih Nama Berkas Tanda Tangan bagi '%s'"
-#: ../tool/seahorse-tool.c:407
+#: ../tool/seahorse-tool.c:410
msgid "Import is complete"
msgstr "Impor tak lengkap"
-#: ../tool/seahorse-tool.c:440
+#: ../tool/seahorse-tool.c:443
msgid "Importing keys ..."
msgstr "Mengimpor kunci..."
-#: ../tool/seahorse-tool.c:470
+#: ../tool/seahorse-tool.c:473
msgid "Import Failed"
msgstr "Impor Gagal"
-#: ../tool/seahorse-tool.c:471
+#: ../tool/seahorse-tool.c:474
msgid "Keys were found but not imported."
msgstr "Kunci ditemukan tapi tak diimpor."
-#: ../tool/seahorse-tool.c:494
+#: ../tool/seahorse-tool.c:497
#, c-format
msgid "Imported key"
msgstr "Kunci diimpor"
-#: ../tool/seahorse-tool.c:496
+#: ../tool/seahorse-tool.c:499
#, c-format
msgid "Imported %d key"
msgid_plural "Imported %d keys"
msgstr[0] "Diimpor %d kunci"
#. File to decrypt to
-#: ../tool/seahorse-tool.c:518
+#: ../tool/seahorse-tool.c:521
#, c-format
msgid "Choose Decrypted File Name for '%s'"
msgstr "Pilih Nama Berkas Terawa Sandi bagi '%s'"
-#: ../tool/seahorse-tool.c:575
+#: ../tool/seahorse-tool.c:578
#, c-format
msgid "Choose Original File for '%s'"
msgstr "Pilih Berkas Asli bagi '%s'"
@@ -301,135 +354,135 @@ msgstr "Pilih Berkas Asli bagi '%s'"
#. * The last thing we want to do is cascade a big pile of error
#. * dialogs at the user.
#.
-#: ../tool/seahorse-tool.c:648
+#: ../tool/seahorse-tool.c:651
#, c-format
msgid "No valid signatures found"
msgstr "Tak ditemukan tanda tangan yang valid"
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:698
msgid "File Encryption Tool"
msgstr "Perkakas Penyandian Berkas"
-#: ../tool/seahorse-tool.c:713
+#: ../tool/seahorse-tool.c:716
msgid "Encrypting"
msgstr "Menyandikan"
-#: ../tool/seahorse-tool.c:714
+#: ../tool/seahorse-tool.c:717
#, c-format
msgid "Couldn't encrypt file: %s"
msgstr "Tak bisa menyandikan berkas: %s"
-#: ../tool/seahorse-tool.c:722
+#: ../tool/seahorse-tool.c:725
msgid "Signing"
msgstr "Menandatangani"
-#: ../tool/seahorse-tool.c:723
+#: ../tool/seahorse-tool.c:726
#, c-format
msgid "Couldn't sign file: %s"
msgstr "Tak bisa menandatangani berkas: %s"
-#: ../tool/seahorse-tool.c:728
+#: ../tool/seahorse-tool.c:731
msgid "Importing"
msgstr "Mengimpor"
-#: ../tool/seahorse-tool.c:729
+#: ../tool/seahorse-tool.c:732
#, c-format
msgid "Couldn't import keys from file: %s"
msgstr "Tak bisa mengimpor kunci dari berkas: %s"
-#: ../tool/seahorse-tool.c:735
+#: ../tool/seahorse-tool.c:738
msgid "Decrypting"
msgstr "Mengawa Sandi"
-#: ../tool/seahorse-tool.c:736
+#: ../tool/seahorse-tool.c:739
#, c-format
msgid "Couldn't decrypt file: %s"
msgstr "Tak bisa mengawa sandi berkas: %s"
-#: ../tool/seahorse-tool.c:741
+#: ../tool/seahorse-tool.c:744
msgid "Verifying"
msgstr "Memeriksa"
-#: ../tool/seahorse-tool.c:742
+#: ../tool/seahorse-tool.c:745
#, c-format
msgid "Couldn't verify file: %s"
msgstr "Tak bisa memeriksa berkas: %s"
-#: ../tool/seahorse-tool-files.c:120
+#: ../tool/seahorse-tool-files.c:119
msgid "Ace (.ace)"
msgstr "Ace (.ace)"
-#: ../tool/seahorse-tool-files.c:121
+#: ../tool/seahorse-tool-files.c:120
msgid "Ar (.ar)"
msgstr "Ar (.ar)"
-#: ../tool/seahorse-tool-files.c:122
+#: ../tool/seahorse-tool-files.c:121
msgid "Arj (.arj)"
msgstr "Arj (.arj)"
-#: ../tool/seahorse-tool-files.c:129
+#: ../tool/seahorse-tool-files.c:128
msgid "Ear (.ear)"
msgstr "Ear (.ear)"
-#: ../tool/seahorse-tool-files.c:130
+#: ../tool/seahorse-tool-files.c:129
msgid "Self-extracting zip (.exe)"
msgstr "Zip mengekstrak sendiri (.exe)"
-#: ../tool/seahorse-tool-files.c:132
+#: ../tool/seahorse-tool-files.c:131
msgid "Jar (.jar)"
msgstr "Jar (.jar)"
-#: ../tool/seahorse-tool-files.c:133
+#: ../tool/seahorse-tool-files.c:132
msgid "Lha (.lzh)"
msgstr "Lha (.lzh)"
-#: ../tool/seahorse-tool-files.c:135
+#: ../tool/seahorse-tool-files.c:134
msgid "Rar (.rar)"
msgstr "Rar (.rar)"
-#: ../tool/seahorse-tool-files.c:137
+#: ../tool/seahorse-tool-files.c:136
msgid "Tar uncompressed (.tar)"
msgstr "Tar tidak dikompres (.tar)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Tar dikompres dengan bzip (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Tar dikompres dengan bzip2 (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:139
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Tar dikompres dengan gzip (.tar.gz)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:140
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Tar dikompres dengan lzop (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:142
+#: ../tool/seahorse-tool-files.c:141
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Tar dikompres dengan compress (.tar.Z)"
-#: ../tool/seahorse-tool-files.c:144
+#: ../tool/seahorse-tool-files.c:143
msgid "War (.war)"
msgstr "War (.war)"
-#: ../tool/seahorse-tool-files.c:145
+#: ../tool/seahorse-tool-files.c:144
msgid "Zip (.zip)"
msgstr "Zip (.zip)"
-#: ../tool/seahorse-tool-files.c:146
+#: ../tool/seahorse-tool-files.c:145
msgid "Zoo (.zoo)"
msgstr "Zoo (.zoo)"
-#: ../tool/seahorse-tool-files.c:147
+#: ../tool/seahorse-tool-files.c:146
msgid "7-Zip (.7z)"
msgstr "7-Zip (.7z)"
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:327
+#: ../tool/seahorse-tool-files.c:328
#, c-format
msgid "You have selected %d file "
msgid_plural "You have selected %d files "
@@ -437,7 +490,7 @@ msgstr[0] "Anda telah memilih %d berkas "
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:332
+#: ../tool/seahorse-tool-files.c:333
#, c-format
msgid "and %d folder"
msgid_plural "and %d folders"
@@ -445,32 +498,32 @@ msgstr[0] "dan %d folder"
#. TRANSLATOR: "%s%s" are "You have selected %d files and %d folders"
#. * Swap order with "%2$s%1$s" if needed
-#: ../tool/seahorse-tool-files.c:337
+#: ../tool/seahorse-tool-files.c:338
#, c-format
msgid "<b>%s%s</b>"
msgstr "<b>%s%s</b>"
-#: ../tool/seahorse-tool-files.c:345
+#: ../tool/seahorse-tool-files.c:346
#, c-format
msgid "You have selected %d file"
msgid_plural "You have selected %d files"
msgstr[0] "Anda telah memilih %d berkas "
-#: ../tool/seahorse-tool-files.c:350
+#: ../tool/seahorse-tool-files.c:351
#, c-format
msgid "You have selected %d folder"
msgid_plural "You have selected %d folders"
msgstr[0] "Anda telah memilih %d folder"
-#: ../tool/seahorse-tool-files.c:868
+#: ../tool/seahorse-tool-files.c:866
msgid "Preparing..."
msgstr "Mempersiapkan..."
-#: ../tool/seahorse-tool-files.c:877 ../tool/seahorse-tool-files.c:900
+#: ../tool/seahorse-tool-files.c:875 ../tool/seahorse-tool-files.c:898
msgid "Couldn't list files"
msgstr "Tak bisa mendaftar berkas"
-#: ../tool/seahorse-tool-files.c:887 ../tool/seahorse-util.c:647
+#: ../tool/seahorse-tool-files.c:885 ../tool/seahorse-util.c:399
msgid "Couldn't package files"
msgstr "Tak bisa memaketkan berkas"
@@ -479,33 +532,33 @@ msgid "Decryption failed. You probably do not have the decryption key."
msgstr ""
"Pengawa-sandian gagal. Anda barangkali tidak memiliki kunci pengawa-sandian."
-#: ../tool/seahorse-util.c:223
+#: ../tool/seahorse-util.c:200
msgid "%Y-%m-%d"
msgstr "%Y-%m-%d"
-#: ../tool/seahorse-util.c:642
+#: ../tool/seahorse-util.c:394
msgid "Couldn't run file-roller"
msgstr "Tak bisa menjalankan file-roller"
-#: ../tool/seahorse-util.c:648
+#: ../tool/seahorse-util.c:400
msgid "The file-roller process did not complete successfully"
msgstr "Proses file-roller tidak selesai dengan sukses"
#. Filter for PGP keys. We also include *.asc, as in many
#. cases that extension is associated with text/plain
-#: ../tool/seahorse-util.c:708
+#: ../tool/seahorse-util.c:436
msgid "All key files"
msgstr "Semua berkas kunci"
-#: ../tool/seahorse-util.c:715 ../tool/seahorse-util.c:755
+#: ../tool/seahorse-util.c:443 ../tool/seahorse-util.c:483
msgid "All files"
msgstr "Semua berkas"
-#: ../tool/seahorse-util.c:748
+#: ../tool/seahorse-util.c:476
msgid "Archive files"
msgstr "Berkas arsip"
-#: ../tool/seahorse-util.c:777
+#: ../tool/seahorse-util.c:505
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -515,11 +568,6 @@ msgstr ""
"\n"
"Anda ingin menggantikannya dengan suatu berkas baru?"
-#: ../tool/seahorse-util.c:780
+#: ../tool/seahorse-util.c:508
msgid "_Replace"
msgstr "_Ganti nama"
-
-#: ../tool/seahorse-widget.c:365
-#, c-format
-msgid "Could not display help: %s"
-msgstr "Tidak dapat menampilkan bantuan: %s"
diff --git a/po/it.po b/po/it.po
index 1377c77..68f6709 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,26 +1,71 @@
-# Italian translation of seahorse-plugins
-# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 The Free Software Foundation, Inc.
+# Italian translation of seahorse-nautilus
+# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2013 The Free Software Foundation, Inc.
# This file is distributed under the same license as the seahorse package.
# Luigi maselli <metnik at tiscali.it>, 2003
#
# keyserver -> server di chiavi come nel Manuale GNU sulla privacy
# passphrase -> invariato come nel Manuale GNU sulla privacy
# password keyring -> lascio solo portachiavi anche per uniformarsi col vecchio portachiavi di GNOME
-# Milo Casagrande <milo at ubuntu.com>, 2006-2009, 2010, 2011.
+# Milo Casagrande <milo at ubuntu.com>, 2006-2009, 2010, 2011, 2013.
#
msgid ""
msgstr ""
-"Project-Id-Version: seahorse-plugin\n"
+"Project-Id-Version: seahorse-nautilus\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 11:29+0200\n"
-"PO-Revision-Date: 2011-08-31 21:03+0200\n"
+"POT-Creation-Date: 2013-12-24 10:30+0100\n"
+"PO-Revision-Date: 2013-12-24 10:32+0100\n"
"Last-Translator: Milo Casagrande <milo at ubuntu.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:1
+msgid "File extension for packages"
+msgstr "Estensione file per pacchetti"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
+msgid "File extension for packages when handling multiple files."
+msgstr "Estensione file per pacchetti quando vengono gestiti molteplici file."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
+msgid "Handle multiple files separately"
+msgstr "Gestione separata di molti file"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:4
+msgid ""
+"When handling multiple files, don't package them but process separately."
+msgstr ""
+"Quando vengono gestiti molteplici file, non crea un pacchetto ma li elabora "
+"separatamente."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
+msgid "Use armor mode when encrypting"
+msgstr "Utilizza la modalità armor durante la cifratura"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:6
+msgid "Use PGP ASCII armor mode when encrypting or signing files."
+msgstr ""
+"Usa la modalità PGP ASCII armor durante la cifratura o la firma di file."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:1
+msgid "Width of the window"
+msgstr "Larghezza della finestra"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:2
+msgid "Width (in pixels) of the window."
+msgstr "Larghezza in pixel della finestra."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:3
+msgid "Height of the window"
+msgstr "Altezza della finestra."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:4
+msgid "Height (in pixels) of the window."
+msgstr "Altezza in pixel della finestra."
#: ../nautilus-ext/seahorse-nautilus.c:158
msgid "Encrypt..."
@@ -43,20 +88,16 @@ msgstr[0] "Firma il file selezionato"
msgstr[1] "Firma i file selezionati"
#: ../tool/seahorse-multi-encrypt.xml.h:1
-msgid "<b>You have selected multiple files or folders</b>"
-msgstr "<b>Sono stati selezionati più file o cartelle</b>"
+msgid "Encrypt Multiple Files"
+msgstr "Cifra file multipli"
#: ../tool/seahorse-multi-encrypt.xml.h:2
-msgid ""
-"Because the files are located remotely, each file will be encrypted "
-"separately."
-msgstr ""
-"Dato che i file sono archiviati in remoto, ogni file viene cifrato "
-"separatamente."
+msgid "<b>You have selected multiple files or folders</b>"
+msgstr "<b>Sono stati selezionati più file o cartelle</b>"
#: ../tool/seahorse-multi-encrypt.xml.h:3
-msgid "Encrypt Multiple Files"
-msgstr "Cifra file multipli"
+msgid "encrypted-package"
+msgstr "pacchetto-cifrato"
#: ../tool/seahorse-multi-encrypt.xml.h:4
msgid "Encrypt each file separately"
@@ -67,31 +108,35 @@ msgid "Encrypt packed together in a package"
msgstr "Cifra impacchettati in un pacchetto"
#: ../tool/seahorse-multi-encrypt.xml.h:6
-msgid "Package Name:"
-msgstr "Nome pacchetto:"
-
-#: ../tool/seahorse-multi-encrypt.xml.h:7
msgid "Packaging:"
msgstr "Pacchetto:"
+#: ../tool/seahorse-multi-encrypt.xml.h:7
+msgid "Package Name:"
+msgstr "Nome pacchetto:"
+
#: ../tool/seahorse-multi-encrypt.xml.h:8
-msgid "encrypted-package"
-msgstr "pacchetto-cifrato"
+msgid ""
+"Because the files are located remotely, each file will be encrypted "
+"separately."
+msgstr ""
+"Dato che i file sono archiviati in remoto, ogni file viene cifrato "
+"separatamente."
-#: ../tool/seahorse-notification.c:580 ../tool/seahorse-notification.c:605
+#: ../tool/seahorse-notification.c:572
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] "Chiave importata"
msgstr[1] "Chiavi importate"
-#: ../tool/seahorse-notification.c:584 ../tool/seahorse-notification.c:604
+#: ../tool/seahorse-notification.c:576
#, c-format
msgid "Imported %i key"
msgid_plural "Imported %i keys"
msgstr[0] "%i chiave importata"
msgstr[1] "%i chiavi importate"
-#: ../tool/seahorse-notification.c:586
+#: ../tool/seahorse-notification.c:578
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -99,60 +144,69 @@ msgstr[0] "Importata una chiave per"
msgstr[1] "Importate chiavi per"
#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:623
+#: ../tool/seahorse-notification.c:606
#, c-format
msgid "Signed by <i><key id='%s'/> <b>expired</b></i> on %s."
msgstr "Firmato da <i><key id='%s'/>, <b>scaduta</b></i> il %s."
-#: ../tool/seahorse-notification.c:624
+#: ../tool/seahorse-notification.c:607
msgid "Invalid Signature"
msgstr "Firma non valida"
-#: ../tool/seahorse-notification.c:630
+#: ../tool/seahorse-notification.c:613
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
msgstr "Firmato da <i><key id='%s'/></i> il %s, <b>scaduta</b>."
-#: ../tool/seahorse-notification.c:631
+#: ../tool/seahorse-notification.c:614
msgid "Expired Signature"
msgstr "Firma scaduta"
-#: ../tool/seahorse-notification.c:637
+#: ../tool/seahorse-notification.c:620
#, c-format
msgid "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
msgstr "Firmato da <i><key id='%s'/>, <b>revocata</b></i> il %s."
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:621
msgid "Revoked Signature"
msgstr "Firma revocata"
-#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:644
+#: ../tool/seahorse-notification.c:628
+msgid "Good Signature"
+msgstr "Firma valida"
+
+#: ../tool/seahorse-notification.c:629
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s."
msgstr "Firmato da <i><key id='%s'/></i> il %s."
-#: ../tool/seahorse-notification.c:645
-msgid "Good Signature"
-msgstr "Firma valida"
+#: ../tool/seahorse-notification.c:631
+msgid "Untrusted Valid Signature"
+msgstr "Firma valida non affidabile"
+
+#: ../tool/seahorse-notification.c:632
+#, c-format
+msgid "Valid but <b>untrusted</b> signature by <i><key id='%s'/></i> on %s."
+msgstr ""
+"Firma valida, ma <b>non affidabile</b>, da <i><key id='%s'/></i> il %s."
-#: ../tool/seahorse-notification.c:650
+#: ../tool/seahorse-notification.c:638
msgid "Signing key not in keyring."
msgstr "Chiave di firma non presente nel portachiavi."
-#: ../tool/seahorse-notification.c:651
+#: ../tool/seahorse-notification.c:639
msgid "Unknown Signature"
msgstr "Firma sconosciuta"
-#: ../tool/seahorse-notification.c:655
+#: ../tool/seahorse-notification.c:643
msgid "Bad or forged signature. The signed data was modified."
msgstr "Firma errata o contraffatta. I dati firmati sono stati modificati."
-#: ../tool/seahorse-notification.c:656
+#: ../tool/seahorse-notification.c:644
msgid "Bad Signature"
msgstr "Firma errata"
-#: ../tool/seahorse-notification.c:664
+#: ../tool/seahorse-notification.c:652
msgid "Couldn't verify signature."
msgstr "Impossibile verificare la firma."
@@ -160,42 +214,41 @@ msgstr "Impossibile verificare la firma."
msgid "Notification Messages"
msgstr "Messaggi di notifica"
-#: ../tool/seahorse-passphrase.c:200
-msgid "Passphrase"
-msgstr "Passphrase"
-
-#: ../tool/seahorse-passphrase.c:203
-msgid "Password:"
-msgstr "Password:"
-
-#. The second and main entry
-#: ../tool/seahorse-passphrase.c:267
-msgid "Confirm:"
-msgstr "Conferma:"
-
-#: ../tool/seahorse-passphrase.c:355
+#: ../tool/seahorse-passphrase.c:114
#, c-format
msgid "Wrong passphrase."
msgstr "Passphrase non corretta."
-#: ../tool/seahorse-passphrase.c:359
+#: ../tool/seahorse-passphrase.c:118
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Inserire una nuova passphrase per «%s»"
-#: ../tool/seahorse-passphrase.c:361
+#: ../tool/seahorse-passphrase.c:120
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Inserire passphrase per «%s»"
-#: ../tool/seahorse-passphrase.c:364
+#: ../tool/seahorse-passphrase.c:123
msgid "Enter new passphrase"
msgstr "Inserire una nuova passphrase"
-#: ../tool/seahorse-passphrase.c:366
+#: ../tool/seahorse-passphrase.c:125
msgid "Enter passphrase"
msgstr "Inserire passphrase"
+#: ../tool/seahorse-passphrase.c:130
+msgid "Passphrase"
+msgstr "Passphrase"
+
+#: ../tool/seahorse-passphrase.c:138
+msgid "Ok"
+msgstr "Ok"
+
+#: ../tool/seahorse-passphrase.c:139
+msgid "Cancel"
+msgstr "Annulla"
+
#: ../tool/seahorse-pgp-encrypted.desktop.in.in.h:1
msgid "Decrypt File"
msgstr "Decifra file"
@@ -244,50 +297,50 @@ msgstr "Leggi l'elenco di URI dallo standard input"
msgid "file..."
msgstr "file..."
-#: ../tool/seahorse-tool.c:169
-msgid "Choose Recipients"
-msgstr "Scegli destinatari"
+#: ../tool/seahorse-tool.c:171
+msgid "Encryption settings"
+msgstr "Impostazioni di cifratura"
-#: ../tool/seahorse-tool.c:234 ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:236 ../tool/seahorse-tool.c:350
msgid "Couldn't load keys"
msgstr "Impossibile caricare le chiavi"
-#: ../tool/seahorse-tool.c:252
+#: ../tool/seahorse-tool.c:253
#, c-format
msgid "Choose Encrypted File Name for '%s'"
msgstr "Scegliere il nome del file cifrato per «%s»"
-#: ../tool/seahorse-tool.c:325
+#: ../tool/seahorse-tool.c:328
msgid "Choose Signer"
msgstr "Scegli firmatario"
-#: ../tool/seahorse-tool.c:367
+#: ../tool/seahorse-tool.c:370
#, c-format
msgid "Choose Signature File Name for '%s'"
msgstr "Scegliere il nome del file della firma per «%s»"
-#: ../tool/seahorse-tool.c:407
+#: ../tool/seahorse-tool.c:410
msgid "Import is complete"
msgstr "Importazione completata"
-#: ../tool/seahorse-tool.c:440
+#: ../tool/seahorse-tool.c:443
msgid "Importing keys ..."
msgstr "Importazione chiavi..."
-#: ../tool/seahorse-tool.c:470
+#: ../tool/seahorse-tool.c:473
msgid "Import Failed"
msgstr "Importazione non riuscita"
-#: ../tool/seahorse-tool.c:471
+#: ../tool/seahorse-tool.c:474
msgid "Keys were found but not imported."
msgstr "Chiavi trovate ma non importate."
-#: ../tool/seahorse-tool.c:494
+#: ../tool/seahorse-tool.c:497
#, c-format
msgid "Imported key"
msgstr "Chiave importata"
-#: ../tool/seahorse-tool.c:496
+#: ../tool/seahorse-tool.c:499
#, c-format
msgid "Imported %d key"
msgid_plural "Imported %d keys"
@@ -295,12 +348,12 @@ msgstr[0] "Importata %d chiave"
msgstr[1] "Importate %d chiavi"
#. File to decrypt to
-#: ../tool/seahorse-tool.c:518
+#: ../tool/seahorse-tool.c:521
#, c-format
msgid "Choose Decrypted File Name for '%s'"
msgstr "Scegliere il nome del file decifrato per «%s»"
-#: ../tool/seahorse-tool.c:575
+#: ../tool/seahorse-tool.c:578
#, c-format
msgid "Choose Original File for '%s'"
msgstr "Scegliere il file originale per «%s»"
@@ -310,135 +363,135 @@ msgstr "Scegliere il file originale per «%s»"
#. * The last thing we want to do is cascade a big pile of error
#. * dialogs at the user.
#.
-#: ../tool/seahorse-tool.c:648
+#: ../tool/seahorse-tool.c:651
#, c-format
msgid "No valid signatures found"
msgstr "Nessuna firma valida trovata"
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:698
msgid "File Encryption Tool"
msgstr "Strumento di cifratura dei file"
-#: ../tool/seahorse-tool.c:713
+#: ../tool/seahorse-tool.c:716
msgid "Encrypting"
msgstr "Cifratura"
-#: ../tool/seahorse-tool.c:714
+#: ../tool/seahorse-tool.c:717
#, c-format
msgid "Couldn't encrypt file: %s"
msgstr "Impossibile cifrare il file: %s"
-#: ../tool/seahorse-tool.c:722
+#: ../tool/seahorse-tool.c:725
msgid "Signing"
msgstr "Firma"
-#: ../tool/seahorse-tool.c:723
+#: ../tool/seahorse-tool.c:726
#, c-format
msgid "Couldn't sign file: %s"
msgstr "Impossibile firmare il file: %s"
-#: ../tool/seahorse-tool.c:728
+#: ../tool/seahorse-tool.c:731
msgid "Importing"
msgstr "Importazione"
-#: ../tool/seahorse-tool.c:729
+#: ../tool/seahorse-tool.c:732
#, c-format
msgid "Couldn't import keys from file: %s"
msgstr "Impossibile importare le chiavi dal file: %s"
-#: ../tool/seahorse-tool.c:735
+#: ../tool/seahorse-tool.c:738
msgid "Decrypting"
msgstr "Decifrazione"
-#: ../tool/seahorse-tool.c:736
+#: ../tool/seahorse-tool.c:739
#, c-format
msgid "Couldn't decrypt file: %s"
msgstr "Impossibile decifrare il file: %s"
-#: ../tool/seahorse-tool.c:741
+#: ../tool/seahorse-tool.c:744
msgid "Verifying"
msgstr "Verifica"
-#: ../tool/seahorse-tool.c:742
+#: ../tool/seahorse-tool.c:745
#, c-format
msgid "Couldn't verify file: %s"
msgstr "Impossibile verificare il file: %s"
-#: ../tool/seahorse-tool-files.c:120
+#: ../tool/seahorse-tool-files.c:119
msgid "Ace (.ace)"
msgstr "Ace (.ace)"
-#: ../tool/seahorse-tool-files.c:121
+#: ../tool/seahorse-tool-files.c:120
msgid "Ar (.ar)"
msgstr "Ar (.ar)"
-#: ../tool/seahorse-tool-files.c:122
+#: ../tool/seahorse-tool-files.c:121
msgid "Arj (.arj)"
msgstr "Arj (.arj)"
-#: ../tool/seahorse-tool-files.c:129
+#: ../tool/seahorse-tool-files.c:128
msgid "Ear (.ear)"
msgstr "Ear (.ear)"
-#: ../tool/seahorse-tool-files.c:130
+#: ../tool/seahorse-tool-files.c:129
msgid "Self-extracting zip (.exe)"
msgstr "Zip auto-estraente (.exe)"
-#: ../tool/seahorse-tool-files.c:132
+#: ../tool/seahorse-tool-files.c:131
msgid "Jar (.jar)"
msgstr "Jar (.jar)"
-#: ../tool/seahorse-tool-files.c:133
+#: ../tool/seahorse-tool-files.c:132
msgid "Lha (.lzh)"
msgstr "Lha (.lzh)"
-#: ../tool/seahorse-tool-files.c:135
+#: ../tool/seahorse-tool-files.c:134
msgid "Rar (.rar)"
msgstr "Rar (.rar)"
-#: ../tool/seahorse-tool-files.c:137
+#: ../tool/seahorse-tool-files.c:136
msgid "Tar uncompressed (.tar)"
msgstr "Tar non compresso (.tar)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Tar compresso con bzip (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Tar compresso con bzip2 (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:139
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Tar compresso con gzip (.tar.gz)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:140
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Tar compresso con lzop (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:142
+#: ../tool/seahorse-tool-files.c:141
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Tar compresso con compress (.tar.Z)"
-#: ../tool/seahorse-tool-files.c:144
+#: ../tool/seahorse-tool-files.c:143
msgid "War (.war)"
msgstr "War (.war)"
-#: ../tool/seahorse-tool-files.c:145
+#: ../tool/seahorse-tool-files.c:144
msgid "Zip (.zip)"
msgstr "Zip (.zip)"
-#: ../tool/seahorse-tool-files.c:146
+#: ../tool/seahorse-tool-files.c:145
msgid "Zoo (.zoo)"
msgstr "Zoo (.zoo)"
-#: ../tool/seahorse-tool-files.c:147
+#: ../tool/seahorse-tool-files.c:146
msgid "7-Zip (.7z)"
msgstr "7-Zip (.7z)"
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:327
+#: ../tool/seahorse-tool-files.c:328
#, c-format
msgid "You have selected %d file "
msgid_plural "You have selected %d files "
@@ -447,7 +500,7 @@ msgstr[1] "%d file "
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:332
+#: ../tool/seahorse-tool-files.c:333
#, c-format
msgid "and %d folder"
msgid_plural "and %d folders"
@@ -456,34 +509,34 @@ msgstr[1] "e %d cartelle selezionati"
#. TRANSLATOR: "%s%s" are "You have selected %d files and %d folders"
#. * Swap order with "%2$s%1$s" if needed
-#: ../tool/seahorse-tool-files.c:337
+#: ../tool/seahorse-tool-files.c:338
#, c-format
msgid "<b>%s%s</b>"
msgstr "<b>%s%s</b>"
-#: ../tool/seahorse-tool-files.c:345
+#: ../tool/seahorse-tool-files.c:346
#, c-format
msgid "You have selected %d file"
msgid_plural "You have selected %d files"
msgstr[0] "È stato selezionato %d file "
msgstr[1] "Sono stati selezionati %d file "
-#: ../tool/seahorse-tool-files.c:350
+#: ../tool/seahorse-tool-files.c:351
#, c-format
msgid "You have selected %d folder"
msgid_plural "You have selected %d folders"
msgstr[0] "%d cartella selezionata"
msgstr[1] "%d cartelle selezionate"
-#: ../tool/seahorse-tool-files.c:868
+#: ../tool/seahorse-tool-files.c:866
msgid "Preparing..."
msgstr "Preparazione..."
-#: ../tool/seahorse-tool-files.c:877 ../tool/seahorse-tool-files.c:900
+#: ../tool/seahorse-tool-files.c:875 ../tool/seahorse-tool-files.c:898
msgid "Couldn't list files"
msgstr "Impossibile elencare i file"
-#: ../tool/seahorse-tool-files.c:887 ../tool/seahorse-util.c:647
+#: ../tool/seahorse-tool-files.c:885 ../tool/seahorse-util.c:399
msgid "Couldn't package files"
msgstr "Impossibile archiviare i file"
@@ -493,33 +546,33 @@ msgstr ""
"Decifrazione non riuscita. Probabilmente non è presente la chiave di "
"decifrazione."
-#: ../tool/seahorse-util.c:223
+#: ../tool/seahorse-util.c:200
msgid "%Y-%m-%d"
msgstr "%d/%m/%Y"
-#: ../tool/seahorse-util.c:642
+#: ../tool/seahorse-util.c:394
msgid "Couldn't run file-roller"
msgstr "Impossibile avviare file-roller"
-#: ../tool/seahorse-util.c:648
+#: ../tool/seahorse-util.c:400
msgid "The file-roller process did not complete successfully"
msgstr "Il processo di file-roller non è terminato con successo"
#. Filter for PGP keys. We also include *.asc, as in many
#. cases that extension is associated with text/plain
-#: ../tool/seahorse-util.c:708
+#: ../tool/seahorse-util.c:436
msgid "All key files"
msgstr "Tutti i file chiave"
-#: ../tool/seahorse-util.c:715 ../tool/seahorse-util.c:755
+#: ../tool/seahorse-util.c:443 ../tool/seahorse-util.c:483
msgid "All files"
msgstr "Tutti i file"
-#: ../tool/seahorse-util.c:748
+#: ../tool/seahorse-util.c:476
msgid "Archive files"
msgstr "File archivio"
-#: ../tool/seahorse-util.c:777
+#: ../tool/seahorse-util.c:505
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -529,11 +582,6 @@ msgstr ""
"\n"
"Sostituirlo con il nuovo file?"
-#: ../tool/seahorse-util.c:780
+#: ../tool/seahorse-util.c:508
msgid "_Replace"
msgstr "_Sostituisci"
-
-#: ../tool/seahorse-widget.c:365
-#, c-format
-msgid "Could not display help: %s"
-msgstr "Impossibile visualizzare l'aiuto: %s"
diff --git a/po/lt.po b/po/lt.po
index 3559ca0..b795e89 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,20 +6,24 @@
# Gintautas Miliauskas <gintas at akl.lt>, 2007.
# Vytautas Liuolia <vytautas.liuolia at gmail.com>, 2008.
# Žygimantas Beručka <zygis at gnome.org>, 2010.
+# Aurimas Černius <aurisc4 at gmail.com>, 2013, 2014.
+#
msgid ""
msgstr ""
"Project-Id-Version: seahorse HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse-nautilus&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-12-03 23:46+0000\n"
-"PO-Revision-Date: 2012-12-20 22:58+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=seahorse-nautilus&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-03-02 11:27+0000\n"
+"PO-Revision-Date: 2014-03-02 23:23+0200\n"
"Last-Translator: Aurimas Černius <aurisc4 at gmail.com>\n"
-"Language-Team: Lithuanian <gnome-lt at lists.akl.lt>\n"
+"Language-Team: Lietuvių <gnome-lt at lists.akl.lt>\n"
"Language: lt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Virtaal 0.6.1\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Gtranslator 2.91.6\n"
"X-Poedit-Language: Lithuanian\n"
"X-Poedit-Country: LITHUANIA\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -29,17 +33,19 @@ msgid "File extension for packages"
msgstr "Failo plėtinys paketams"
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
-msgid "File extension for packages when handling mulitple files."
+#| msgid "File extension for packages when handling mulitple files."
+msgid "File extension for packages when handling multiple files."
msgstr "Failo plėtinys paketams apdorojant daug failų."
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
-#| msgid "Encrypt each file separately"
msgid "Handle multiple files separately"
msgstr "Apdoroti kiekvieną failą atskirai"
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:4
-msgid "When handling multiple files, don't package them but process separately."
-msgstr "Apdorojant daug failų, nepakuokite jų, bet apdorokite kiekvieną atskirai."
+msgid ""
+"When handling multiple files, don't package them but process separately."
+msgstr ""
+"Apdorojant daug failų, nepakuokite jų, bet apdorokite kiekvieną atskirai."
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
msgid "Use armor mode when encrypting"
@@ -116,17 +122,21 @@ msgid "Package Name:"
msgstr "Paketo failo vardas:"
#: ../tool/seahorse-multi-encrypt.xml.h:8
-msgid "Because the files are located remotely, each file will be encrypted separately."
-msgstr "Kadangi failai yra ne jūsų kompiuteryje, kiekvienas iš jų bus užšifruotas atskirai."
+msgid ""
+"Because the files are located remotely, each file will be encrypted "
+"separately."
+msgstr ""
+"Kadangi failai yra ne jūsų kompiuteryje, kiekvienas iš jų bus užšifruotas "
+"atskirai."
-#: ../tool/seahorse-notification.c:572
+#: ../tool/seahorse-notification.c:569
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] "Raktas importuotas"
msgstr[1] "Raktai importuoti"
msgstr[2] "Raktų importuota"
-#: ../tool/seahorse-notification.c:576
+#: ../tool/seahorse-notification.c:573
#, c-format
msgid "Imported %i key"
msgid_plural "Imported %i keys"
@@ -134,7 +144,7 @@ msgstr[0] "Importuotas %i raktas"
msgstr[1] "Importuoti %i raktai"
msgstr[2] "Importuota %i raktų"
-#: ../tool/seahorse-notification.c:578
+#: ../tool/seahorse-notification.c:575
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -143,60 +153,74 @@ msgstr[1] "Importuoti raktai"
msgstr[2] "Importuota raktų"
#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:606
+#: ../tool/seahorse-notification.c:603
#, c-format
msgid "Signed by <i><key id='%s'/> <b>expired</b></i> on %s."
msgstr "Pasirašė <i><key id='%s'/>, <b>galiojimas baigėsi:</b></i> %s."
-#: ../tool/seahorse-notification.c:607
+#: ../tool/seahorse-notification.c:604
msgid "Invalid Signature"
msgstr "Netinkamas parašas"
-#: ../tool/seahorse-notification.c:613
+#: ../tool/seahorse-notification.c:610
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
-msgstr "Pasirašė <i><key id='%s'/></i>, pasirašymo data: %s, <b>baigėsi galiojimas</b>."
+msgstr ""
+"Pasirašė <i><key id='%s'/></i>, pasirašymo data: %s, <b>baigėsi galiojimas</"
+"b>."
-#: ../tool/seahorse-notification.c:614
+#: ../tool/seahorse-notification.c:611
msgid "Expired Signature"
msgstr "Nebegaliojantis parašas"
-#: ../tool/seahorse-notification.c:620
+#: ../tool/seahorse-notification.c:617
#, c-format
msgid "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
msgstr "Pasirašė <i><key id='%s'/>, <b>paskelbta negaliojančiu:</b></i> %s."
-#: ../tool/seahorse-notification.c:621
+#: ../tool/seahorse-notification.c:618
msgid "Revoked Signature"
msgstr "Parašas paskelbtas negaliojančiu"
-#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:627
+#: ../tool/seahorse-notification.c:625
+msgid "Good Signature"
+msgstr "Parašas geras"
+
+#: ../tool/seahorse-notification.c:626
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s."
msgstr "Pasirašė <i><key id='%s'/></i>, pasirašymo data: %s."
#: ../tool/seahorse-notification.c:628
-msgid "Good Signature"
-msgstr "Parašas geras"
+#| msgid "Invalid Signature"
+msgid "Untrusted Valid Signature"
+msgstr "Nepatikimas parašas"
-#: ../tool/seahorse-notification.c:633
+#: ../tool/seahorse-notification.c:629
+#, c-format
+#| msgid "Signed by <i><key id='%s'/></i> on %s."
+msgid "Valid but <b>untrusted</b> signature by <i><key id='%s'/></i> on %s."
+msgstr ""
+"Tinkamas bet <b>nepatikimas</b> <i><key id='%s'/></i> parašas, pasirašymo "
+"data: %s."
+
+#: ../tool/seahorse-notification.c:635
msgid "Signing key not in keyring."
msgstr "Pasirašymo rakto nėra raktinėje."
-#: ../tool/seahorse-notification.c:634
+#: ../tool/seahorse-notification.c:636
msgid "Unknown Signature"
msgstr "Nežinomas parašas"
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:640
msgid "Bad or forged signature. The signed data was modified."
msgstr "Blogas arba padirbtas parašas. Pasirašymo data buvo pakeista."
-#: ../tool/seahorse-notification.c:639
+#: ../tool/seahorse-notification.c:641
msgid "Bad Signature"
msgstr "Blogas parašas"
-#: ../tool/seahorse-notification.c:647
+#: ../tool/seahorse-notification.c:649
msgid "Couldn't verify signature."
msgstr "Parašo nepavyko patikrinti."
@@ -204,38 +228,38 @@ msgstr "Parašo nepavyko patikrinti."
msgid "Notification Messages"
msgstr "Informaciniai pranešimai"
-#: ../tool/seahorse-passphrase.c:114
+#: ../tool/seahorse-passphrase.c:111
#, c-format
msgid "Wrong passphrase."
msgstr "Neteisinga slaptafrazė."
-#: ../tool/seahorse-passphrase.c:118
+#: ../tool/seahorse-passphrase.c:115
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Įveskite naują slaptafrazę raktui „%s“"
-#: ../tool/seahorse-passphrase.c:120
+#: ../tool/seahorse-passphrase.c:117
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Įveskite slaptafrazę raktui „%s“"
-#: ../tool/seahorse-passphrase.c:123
+#: ../tool/seahorse-passphrase.c:120
msgid "Enter new passphrase"
msgstr "Įveskite naują slaptafrazę"
-#: ../tool/seahorse-passphrase.c:125
+#: ../tool/seahorse-passphrase.c:122
msgid "Enter passphrase"
msgstr "Įveskite slaptafrazę"
-#: ../tool/seahorse-passphrase.c:130
+#: ../tool/seahorse-passphrase.c:127
msgid "Passphrase"
msgstr "Slaptafrazė"
-#: ../tool/seahorse-passphrase.c:138
+#: ../tool/seahorse-passphrase.c:135
msgid "Ok"
msgstr "Gerai"
-#: ../tool/seahorse-passphrase.c:139
+#: ../tool/seahorse-passphrase.c:136
msgid "Cancel"
msgstr "Atsisakyti"
@@ -255,48 +279,47 @@ msgstr "Patikrinti parašą "
msgid "Progress Title"
msgstr "Eigos antraštė"
-#: ../tool/seahorse-tool.c:61
+#: ../tool/seahorse-tool.c:58
msgid "Import keys from the file"
msgstr "Importuoti raktus iš failo"
-#: ../tool/seahorse-tool.c:63
+#: ../tool/seahorse-tool.c:60
msgid "Encrypt file"
msgstr "Užšifruoti failą"
-#: ../tool/seahorse-tool.c:65
+#: ../tool/seahorse-tool.c:62
msgid "Sign file with default key"
msgstr "Pasirašyti failą su numatytuoju raktu"
-#: ../tool/seahorse-tool.c:67
+#: ../tool/seahorse-tool.c:64
msgid "Encrypt and sign file with default key"
msgstr "Užšifruoti ir pasirašyti failą su numatytuoju raktu"
-#: ../tool/seahorse-tool.c:69
+#: ../tool/seahorse-tool.c:66
msgid "Decrypt encrypted file"
msgstr "Iššifruoti užšifruotą failą"
-#: ../tool/seahorse-tool.c:71
+#: ../tool/seahorse-tool.c:68
msgid "Verify signature file"
msgstr "Patikrinti pagal parašo failą"
-#: ../tool/seahorse-tool.c:73
+#: ../tool/seahorse-tool.c:70
msgid "Read list of URIs on standard in"
msgstr "Skaityti failų (URI) sąrašą iš standartinės įvesties"
-#: ../tool/seahorse-tool.c:75
+#: ../tool/seahorse-tool.c:72
msgid "file..."
msgstr "failas..."
-#: ../tool/seahorse-tool.c:169
-msgid "Choose Recipients"
-msgstr "Pasirinkite gavėjus, kuriems skirta ši informacija"
+#: ../tool/seahorse-tool.c:168
+msgid "Encryption settings"
+msgstr "Šifravimo nustatymai"
-#: ../tool/seahorse-tool.c:234
-#: ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:233 ../tool/seahorse-tool.c:347
msgid "Couldn't load keys"
msgstr "Nepavyko įkelti raktų"
-#: ../tool/seahorse-tool.c:252
+#: ../tool/seahorse-tool.c:250
#, c-format
msgid "Choose Encrypted File Name for '%s'"
msgstr "Nurodykite vardą užšifruojam failui '%s'"
@@ -409,81 +432,81 @@ msgstr "Tikrinama"
msgid "Couldn't verify file: %s"
msgstr "Nepavyko patikrinti failo: %s"
-#: ../tool/seahorse-tool-files.c:119
+#: ../tool/seahorse-tool-files.c:116
msgid "Ace (.ace)"
msgstr "Ace (.ace)"
-#: ../tool/seahorse-tool-files.c:120
+#: ../tool/seahorse-tool-files.c:117
msgid "Ar (.ar)"
msgstr "Ar (.ar)"
-#: ../tool/seahorse-tool-files.c:121
+#: ../tool/seahorse-tool-files.c:118
msgid "Arj (.arj)"
msgstr "Arj (.arj)"
-#: ../tool/seahorse-tool-files.c:128
+#: ../tool/seahorse-tool-files.c:125
msgid "Ear (.ear)"
msgstr "Ear (.ear)"
-#: ../tool/seahorse-tool-files.c:129
+#: ../tool/seahorse-tool-files.c:126
msgid "Self-extracting zip (.exe)"
msgstr "Išsispaudžiantis zip (.exe)"
-#: ../tool/seahorse-tool-files.c:131
+#: ../tool/seahorse-tool-files.c:128
msgid "Jar (.jar)"
msgstr "Jar (.jar)"
-#: ../tool/seahorse-tool-files.c:132
+#: ../tool/seahorse-tool-files.c:129
msgid "Lha (.lzh)"
msgstr "Lha (.lzh)"
-#: ../tool/seahorse-tool-files.c:134
+#: ../tool/seahorse-tool-files.c:131
msgid "Rar (.rar)"
msgstr "Rar (.rar)"
-#: ../tool/seahorse-tool-files.c:136
+#: ../tool/seahorse-tool-files.c:133
msgid "Tar uncompressed (.tar)"
msgstr "Tar (nearchyvuotas) (.tar)"
-#: ../tool/seahorse-tool-files.c:137
+#: ../tool/seahorse-tool-files.c:134
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Tar (archyvuotas su bzip) (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:135
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Tar (archyvuotas su bzip2) (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:136
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Tar (archyvuotas su gzip) (.tar.gz)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Tar (archyvuotas su lzop) (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Tar (archyvuotas su compress) (.tar.Z)"
-#: ../tool/seahorse-tool-files.c:143
+#: ../tool/seahorse-tool-files.c:140
msgid "War (.war)"
msgstr "War (.war)"
-#: ../tool/seahorse-tool-files.c:144
+#: ../tool/seahorse-tool-files.c:141
msgid "Zip (.zip)"
msgstr "Zip (.zip)"
-#: ../tool/seahorse-tool-files.c:145
+#: ../tool/seahorse-tool-files.c:142
msgid "Zoo (.zoo)"
msgstr "Zoo (.zoo)"
-#: ../tool/seahorse-tool-files.c:146
+#: ../tool/seahorse-tool-files.c:143
msgid "7-Zip (.7z)"
msgstr "7-Zip (.7z)"
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:328
+#: ../tool/seahorse-tool-files.c:325
#, c-format
msgid "You have selected %d file "
msgid_plural "You have selected %d files "
@@ -493,7 +516,7 @@ msgstr[2] "Jūs pasirinkote %d failų "
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:333
+#: ../tool/seahorse-tool-files.c:330
#, c-format
msgid "and %d folder"
msgid_plural "and %d folders"
@@ -503,12 +526,12 @@ msgstr[2] "ir %d aplankų"
#. TRANSLATOR: "%s%s" are "You have selected %d files and %d folders"
#. * Swap order with "%2$s%1$s" if needed
-#: ../tool/seahorse-tool-files.c:338
+#: ../tool/seahorse-tool-files.c:335
#, c-format
msgid "<b>%s%s</b>"
msgstr "<b>%s%s</b>"
-#: ../tool/seahorse-tool-files.c:346
+#: ../tool/seahorse-tool-files.c:343
#, c-format
msgid "You have selected %d file"
msgid_plural "You have selected %d files"
@@ -516,7 +539,7 @@ msgstr[0] "Jūs pasirinkote %d failą"
msgstr[1] "Jūs pasirinkote %d failus"
msgstr[2] "Jūs pasirinkote %d failų"
-#: ../tool/seahorse-tool-files.c:351
+#: ../tool/seahorse-tool-files.c:348
#, c-format
msgid "You have selected %d folder"
msgid_plural "You have selected %d folders"
@@ -524,52 +547,49 @@ msgstr[0] "Jūs pasirinkote %d aplanką"
msgstr[1] "Jūs pasirinkote %d aplankus"
msgstr[2] "Jūs pasirinkote %d aplankų"
-#: ../tool/seahorse-tool-files.c:866
+#: ../tool/seahorse-tool-files.c:863
msgid "Preparing..."
msgstr "Ruošiama..."
-#: ../tool/seahorse-tool-files.c:875
-#: ../tool/seahorse-tool-files.c:898
+#: ../tool/seahorse-tool-files.c:872 ../tool/seahorse-tool-files.c:895
msgid "Couldn't list files"
msgstr "Nepavyko sudaryti failų sąrašo"
-#: ../tool/seahorse-tool-files.c:885
-#: ../tool/seahorse-util.c:399
+#: ../tool/seahorse-tool-files.c:882 ../tool/seahorse-util.c:396
msgid "Couldn't package files"
msgstr "Nepavyko supakuoti failų"
-#: ../tool/seahorse-util.c:173
+#: ../tool/seahorse-util.c:170
msgid "Decryption failed. You probably do not have the decryption key."
msgstr "Iššifravimas nepavyko. Greičiausiai neturite iššifravimo rakto."
-#: ../tool/seahorse-util.c:200
+#: ../tool/seahorse-util.c:197
msgid "%Y-%m-%d"
msgstr "%Y-%m-%d"
-#: ../tool/seahorse-util.c:394
+#: ../tool/seahorse-util.c:391
msgid "Couldn't run file-roller"
msgstr "Nepavyko paleisti file-roller"
-#: ../tool/seahorse-util.c:400
+#: ../tool/seahorse-util.c:397
msgid "The file-roller process did not complete successfully"
msgstr "Programa file-roller nesėkmingai baigė darbą"
#. Filter for PGP keys. We also include *.asc, as in many
#. cases that extension is associated with text/plain
-#: ../tool/seahorse-util.c:436
+#: ../tool/seahorse-util.c:433
msgid "All key files"
msgstr "Visi raktų failai"
-#: ../tool/seahorse-util.c:443
-#: ../tool/seahorse-util.c:483
+#: ../tool/seahorse-util.c:440 ../tool/seahorse-util.c:480
msgid "All files"
msgstr "Visi failai"
-#: ../tool/seahorse-util.c:476
+#: ../tool/seahorse-util.c:473
msgid "Archive files"
msgstr "Archyvo failai"
-#: ../tool/seahorse-util.c:505
+#: ../tool/seahorse-util.c:502
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -579,7 +599,6 @@ msgstr ""
"\n"
"Ar norite jį pakeisti nauju failu?"
-#: ../tool/seahorse-util.c:508
+#: ../tool/seahorse-util.c:505
msgid "_Replace"
msgstr "_Pakeisti"
-
diff --git a/po/lv.po b/po/lv.po
index 469d1d7..5cdd049 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -10,14 +10,15 @@
# seahorse <normunds.jakubanecs at gmail.com>, 2007.
# Peteris Krisjanis <pecisk at gmail.com>, 2010.
# Rudolfs <rudolfs.mazurs at gmail.com>, 2011.
-# Rūdofls Mazurs <rudolfs.mazurs at gmail.com>, 2011.
+# Rūdofls Mazurs <rudolfs.mazurs at gmail.com>, 2011, 2013.
msgid ""
msgstr ""
"Project-Id-Version: lv\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 11:29+0200\n"
-"PO-Revision-Date: 2011-09-07 11:36+0300\n"
-"Last-Translator: Rūdofls Mazurs <rudolfs.mazurs at gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=seahorse-nautilus&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-08-16 17:26+0000\n"
+"PO-Revision-Date: 2013-09-21 23:43+0300\n"
+"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs at gmail.com>\n"
"Language-Team: Latvian <lata-l10n at googlegroups.com>\n"
"Language: lv\n"
"MIME-Version: 1.0\n"
@@ -25,7 +26,50 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
"2);\n"
-"X-Generator: Lokalize 1.1\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:1
+msgid "File extension for packages"
+msgstr "Datņu paplašinājums pakotnēm"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
+msgid "File extension for packages when handling mulitple files."
+msgstr "Datņu paplašinājums pakotnēm, kad apstrādā vairākas datnes."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
+#| msgid "Encrypt each file separately"
+msgid "Handle multiple files separately"
+msgstr "Apstrādāt vairākas datnes atsevišķi"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:4
+msgid ""
+"When handling multiple files, don't package them but process separately."
+msgstr ""
+"Kad apstrādā vairākas datnes, nevis tās pakot, bet apstrādāt atsevišķi."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
+msgid "Use armor mode when encrypting"
+msgstr "Šifrējot lietot bruņu režīmu"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:6
+msgid "Use PGP ASCII armor mode when encrypting or signing files."
+msgstr "Šifrējot vai parakstot datnes, lietot PGP ASCII bruņu režīmu."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:1
+msgid "Width of the window"
+msgstr "Loga platums"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:2
+msgid "Width (in pixels) of the window."
+msgstr "Loga platums pikseļos."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:3
+msgid "Height of the window"
+msgstr "Loga augstums"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:4
+msgid "Height (in pixels) of the window."
+msgstr "Loga augstums pikseļos."
#: ../nautilus-ext/seahorse-nautilus.c:158
msgid "Encrypt..."
@@ -50,18 +94,16 @@ msgstr[1] "Parakstīt izvēlētos failus"
msgstr[2] "Parakstīt izvēlētos failus"
#: ../tool/seahorse-multi-encrypt.xml.h:1
-msgid "<b>You have selected multiple files or folders</b>"
-msgstr "<b>Jūs esat izvēlējušies vairākus failus vai mapes</b>"
+msgid "Encrypt Multiple Files"
+msgstr "Vairāku failu šifrēšana"
#: ../tool/seahorse-multi-encrypt.xml.h:2
-msgid ""
-"Because the files are located remotely, each file will be encrypted "
-"separately."
-msgstr "Faili tiks šifrēti atsevišķi, jo tie atrodas attālināti."
+msgid "<b>You have selected multiple files or folders</b>"
+msgstr "<b>Jūs esat izvēlējušies vairākus failus vai mapes</b>"
#: ../tool/seahorse-multi-encrypt.xml.h:3
-msgid "Encrypt Multiple Files"
-msgstr "Vairāku failu šifrēšana"
+msgid "encrypted-package"
+msgstr "encrypted-package"
#: ../tool/seahorse-multi-encrypt.xml.h:4
msgid "Encrypt each file separately"
@@ -72,25 +114,27 @@ msgid "Encrypt packed together in a package"
msgstr "Šifrēt saarhivēt kopā vienā pakotnē"
#: ../tool/seahorse-multi-encrypt.xml.h:6
-msgid "Package Name:"
-msgstr "Pakotnes nosaukums:"
-
-#: ../tool/seahorse-multi-encrypt.xml.h:7
msgid "Packaging:"
msgstr "Pakošana:"
+#: ../tool/seahorse-multi-encrypt.xml.h:7
+msgid "Package Name:"
+msgstr "Pakotnes nosaukums:"
+
#: ../tool/seahorse-multi-encrypt.xml.h:8
-msgid "encrypted-package"
-msgstr "encrypted-package"
+msgid ""
+"Because the files are located remotely, each file will be encrypted "
+"separately."
+msgstr "Faili tiks šifrēti atsevišķi, jo tie atrodas attālināti."
-#: ../tool/seahorse-notification.c:580 ../tool/seahorse-notification.c:605
+#: ../tool/seahorse-notification.c:572
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] "Atslēga importēta"
msgstr[1] "Atslēgas importētas"
msgstr[2] "Atslēgas importētas"
-#: ../tool/seahorse-notification.c:584 ../tool/seahorse-notification.c:604
+#: ../tool/seahorse-notification.c:576
#, c-format
msgid "Imported %i key"
msgid_plural "Imported %i keys"
@@ -98,7 +142,7 @@ msgstr[0] "Importēta %i atslēga"
msgstr[1] "Importētas %i atslēgas"
msgstr[2] "Importēts %i atslēgu"
-#: ../tool/seahorse-notification.c:586
+#: ../tool/seahorse-notification.c:578
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -107,60 +151,60 @@ msgstr[1] "Importētas atslēgas"
msgstr[2] "Importētas atslēgas"
#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:623
+#: ../tool/seahorse-notification.c:606
#, c-format
msgid "Signed by <i><key id='%s'/> <b>expired</b></i> on %s."
msgstr "Parakstījis <i><key id='%s'/> <b>izbeidzies</b></i> %s."
-#: ../tool/seahorse-notification.c:624
+#: ../tool/seahorse-notification.c:607
msgid "Invalid Signature"
msgstr "Nederīgs paraksts"
-#: ../tool/seahorse-notification.c:630
+#: ../tool/seahorse-notification.c:613
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s <b>Expired</b>."
msgstr "Parakstījis <i><key id='%s'/></i> %s <b> izbeidzies</b>."
-#: ../tool/seahorse-notification.c:631
+#: ../tool/seahorse-notification.c:614
msgid "Expired Signature"
msgstr "Paraksts ar iztecējušu derīguma termiņu"
-#: ../tool/seahorse-notification.c:637
+#: ../tool/seahorse-notification.c:620
#, c-format
msgid "Signed by <i><key id='%s'/> <b>Revoked</b></i> on %s."
msgstr "Parakstījis <i><key id='%s'/> <b>atsaukts</b></i> %s."
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:621
msgid "Revoked Signature"
msgstr "Atsaukts paraksts"
#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:644
+#: ../tool/seahorse-notification.c:627
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s."
msgstr "Parakstījis <i><key id='%s'/></i> %s."
-#: ../tool/seahorse-notification.c:645
+#: ../tool/seahorse-notification.c:628
msgid "Good Signature"
msgstr "Labs paraksts"
-#: ../tool/seahorse-notification.c:650
+#: ../tool/seahorse-notification.c:633
msgid "Signing key not in keyring."
msgstr "Parakstīšanas atslēga neatrodas saišķī."
-#: ../tool/seahorse-notification.c:651
+#: ../tool/seahorse-notification.c:634
msgid "Unknown Signature"
msgstr "Nezināms paraksts"
-#: ../tool/seahorse-notification.c:655
+#: ../tool/seahorse-notification.c:638
msgid "Bad or forged signature. The signed data was modified."
msgstr "Slikts vai viltots paraksts. Parakstītie dati tika modificēti."
-#: ../tool/seahorse-notification.c:656
+#: ../tool/seahorse-notification.c:639
msgid "Bad Signature"
msgstr "Slikts paraksts"
-#: ../tool/seahorse-notification.c:664
+#: ../tool/seahorse-notification.c:647
msgid "Couldn't verify signature."
msgstr "Neizdevās pārbaudīt parakstu."
@@ -168,42 +212,41 @@ msgstr "Neizdevās pārbaudīt parakstu."
msgid "Notification Messages"
msgstr "Paziņojumi"
-#: ../tool/seahorse-passphrase.c:200
-msgid "Passphrase"
-msgstr "Parole"
-
-#: ../tool/seahorse-passphrase.c:203
-msgid "Password:"
-msgstr "Parole:"
-
-#. The second and main entry
-#: ../tool/seahorse-passphrase.c:267
-msgid "Confirm:"
-msgstr "Apstiprināt:"
-
-#: ../tool/seahorse-passphrase.c:355
+#: ../tool/seahorse-passphrase.c:114
#, c-format
msgid "Wrong passphrase."
msgstr "Nepareiza parole."
-#: ../tool/seahorse-passphrase.c:359
+#: ../tool/seahorse-passphrase.c:118
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Ievadiet '%s' jaunu paroli"
-#: ../tool/seahorse-passphrase.c:361
+#: ../tool/seahorse-passphrase.c:120
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Ievadiet '%s paroli'"
-#: ../tool/seahorse-passphrase.c:364
+#: ../tool/seahorse-passphrase.c:123
msgid "Enter new passphrase"
msgstr "Ievadiet jauno paroli"
-#: ../tool/seahorse-passphrase.c:366
+#: ../tool/seahorse-passphrase.c:125
msgid "Enter passphrase"
msgstr "Ievadiet paroli"
+#: ../tool/seahorse-passphrase.c:130
+msgid "Passphrase"
+msgstr "Parole"
+
+#: ../tool/seahorse-passphrase.c:138
+msgid "Ok"
+msgstr "Labi"
+
+#: ../tool/seahorse-passphrase.c:139
+msgid "Cancel"
+msgstr "Atcelt"
+
#: ../tool/seahorse-pgp-encrypted.desktop.in.in.h:1
msgid "Decrypt File"
msgstr "Atšifrēt failu"
@@ -252,50 +295,51 @@ msgstr "Lasīt URI sarakstu no standarta uz"
msgid "file..."
msgstr "fails..."
-#: ../tool/seahorse-tool.c:169
-msgid "Choose Recipients"
-msgstr "Izvēlieties adresātus"
+#: ../tool/seahorse-tool.c:171
+#| msgid "Encrypting"
+msgid "Encryption settings"
+msgstr "Šifrēšanas iestatījumi"
-#: ../tool/seahorse-tool.c:234 ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:236 ../tool/seahorse-tool.c:350
msgid "Couldn't load keys"
msgstr "Neizdevās ielādēt atslēgas"
-#: ../tool/seahorse-tool.c:252
+#: ../tool/seahorse-tool.c:253
#, c-format
msgid "Choose Encrypted File Name for '%s'"
msgstr "Izvēlēties šifrētā faila nosaukumu '%s'"
-#: ../tool/seahorse-tool.c:325
+#: ../tool/seahorse-tool.c:328
msgid "Choose Signer"
msgstr "Izvēlieties parakstītāju"
-#: ../tool/seahorse-tool.c:367
+#: ../tool/seahorse-tool.c:370
#, c-format
msgid "Choose Signature File Name for '%s'"
msgstr "Izvēlēties paraksta faila nosaukumu '%s'"
-#: ../tool/seahorse-tool.c:407
+#: ../tool/seahorse-tool.c:410
msgid "Import is complete"
msgstr "Importēšana ir pabeigta"
-#: ../tool/seahorse-tool.c:440
+#: ../tool/seahorse-tool.c:443
msgid "Importing keys ..."
msgstr "Importē atslēgas ..."
-#: ../tool/seahorse-tool.c:470
+#: ../tool/seahorse-tool.c:473
msgid "Import Failed"
msgstr "Importēšana neizdevās"
-#: ../tool/seahorse-tool.c:471
+#: ../tool/seahorse-tool.c:474
msgid "Keys were found but not imported."
msgstr "Atslēgas tika atrastas, bet netika importētas."
-#: ../tool/seahorse-tool.c:494
+#: ../tool/seahorse-tool.c:497
#, c-format
msgid "Imported key"
msgstr "Importētā atslēga"
-#: ../tool/seahorse-tool.c:496
+#: ../tool/seahorse-tool.c:499
#, c-format
msgid "Imported %d key"
msgid_plural "Imported %d keys"
@@ -304,12 +348,12 @@ msgstr[1] "Importētas %d atslēgas"
msgstr[2] "Importētas %d atslēgas"
#. File to decrypt to
-#: ../tool/seahorse-tool.c:518
+#: ../tool/seahorse-tool.c:521
#, c-format
msgid "Choose Decrypted File Name for '%s'"
msgstr "Izvēlēties atšifrēta faila nosaukumu '%s'"
-#: ../tool/seahorse-tool.c:575
+#: ../tool/seahorse-tool.c:578
#, c-format
msgid "Choose Original File for '%s'"
msgstr "Izvēlēties oriģinālo failu '%s'"
@@ -319,135 +363,135 @@ msgstr "Izvēlēties oriģinālo failu '%s'"
#. * The last thing we want to do is cascade a big pile of error
#. * dialogs at the user.
#.
-#: ../tool/seahorse-tool.c:648
+#: ../tool/seahorse-tool.c:651
#, c-format
msgid "No valid signatures found"
msgstr "Nav atrasti derīgi paraksti"
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:698
msgid "File Encryption Tool"
msgstr "Failu šifrēšanas rīks"
-#: ../tool/seahorse-tool.c:713
+#: ../tool/seahorse-tool.c:716
msgid "Encrypting"
msgstr "Šifrē"
-#: ../tool/seahorse-tool.c:714
+#: ../tool/seahorse-tool.c:717
#, c-format
msgid "Couldn't encrypt file: %s"
msgstr "Neizdevās šifrēt failu: '%s'"
-#: ../tool/seahorse-tool.c:722
+#: ../tool/seahorse-tool.c:725
msgid "Signing"
msgstr "Paraksta"
-#: ../tool/seahorse-tool.c:723
+#: ../tool/seahorse-tool.c:726
#, c-format
msgid "Couldn't sign file: %s"
msgstr "Neizdevās parakstīt failu: '%s'"
-#: ../tool/seahorse-tool.c:728
+#: ../tool/seahorse-tool.c:731
msgid "Importing"
msgstr "Importē"
-#: ../tool/seahorse-tool.c:729
+#: ../tool/seahorse-tool.c:732
#, c-format
msgid "Couldn't import keys from file: %s"
msgstr "Neizdevās importēt atslēgas no faila: %s"
-#: ../tool/seahorse-tool.c:735
+#: ../tool/seahorse-tool.c:738
msgid "Decrypting"
msgstr "Atšifrē"
-#: ../tool/seahorse-tool.c:736
+#: ../tool/seahorse-tool.c:739
#, c-format
msgid "Couldn't decrypt file: %s"
msgstr "Neizdevās atšifrēt failu: %s"
-#: ../tool/seahorse-tool.c:741
+#: ../tool/seahorse-tool.c:744
msgid "Verifying"
msgstr "Pārbauda"
-#: ../tool/seahorse-tool.c:742
+#: ../tool/seahorse-tool.c:745
#, c-format
msgid "Couldn't verify file: %s"
msgstr "Neizdevās pārbaudīt failu: '%s'"
-#: ../tool/seahorse-tool-files.c:120
+#: ../tool/seahorse-tool-files.c:119
msgid "Ace (.ace)"
msgstr "Ace (.ace)"
-#: ../tool/seahorse-tool-files.c:121
+#: ../tool/seahorse-tool-files.c:120
msgid "Ar (.ar)"
msgstr "Ar (.arj)"
-#: ../tool/seahorse-tool-files.c:122
+#: ../tool/seahorse-tool-files.c:121
msgid "Arj (.arj)"
msgstr "Arj (.arj)"
-#: ../tool/seahorse-tool-files.c:129
+#: ../tool/seahorse-tool-files.c:128
msgid "Ear (.ear)"
msgstr "Ear (.ear)"
-#: ../tool/seahorse-tool-files.c:130
+#: ../tool/seahorse-tool-files.c:129
msgid "Self-extracting zip (.exe)"
msgstr "Pašatspiedošs zip (.exe)"
-#: ../tool/seahorse-tool-files.c:132
+#: ../tool/seahorse-tool-files.c:131
msgid "Jar (.jar)"
msgstr "Jar (.jar)"
-#: ../tool/seahorse-tool-files.c:133
+#: ../tool/seahorse-tool-files.c:132
msgid "Lha (.lzh)"
msgstr "Lha (.lzh)"
-#: ../tool/seahorse-tool-files.c:135
+#: ../tool/seahorse-tool-files.c:134
msgid "Rar (.rar)"
msgstr "Rar (.rar)"
-#: ../tool/seahorse-tool-files.c:137
+#: ../tool/seahorse-tool-files.c:136
msgid "Tar uncompressed (.tar)"
msgstr "Tar nesaspiests (.tar)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Tar saspiests ar bzip (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Tar saspiests ar bzip2 (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:139
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Tar saspiests ar gzip (.tar.gz)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:140
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Tar saspiests ar lzop (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:142
+#: ../tool/seahorse-tool-files.c:141
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Tar saspiests ar compress (.tar.Z)"
-#: ../tool/seahorse-tool-files.c:144
+#: ../tool/seahorse-tool-files.c:143
msgid "War (.war)"
msgstr "War (.war)"
-#: ../tool/seahorse-tool-files.c:145
+#: ../tool/seahorse-tool-files.c:144
msgid "Zip (.zip)"
msgstr "Zip (.zip)"
-#: ../tool/seahorse-tool-files.c:146
+#: ../tool/seahorse-tool-files.c:145
msgid "Zoo (.zoo)"
msgstr "Zoo (.zoo)"
-#: ../tool/seahorse-tool-files.c:147
+#: ../tool/seahorse-tool-files.c:146
msgid "7-Zip (.7z)"
msgstr "7-Zip (.7z)"
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:327
+#: ../tool/seahorse-tool-files.c:328
#, c-format
msgid "You have selected %d file "
msgid_plural "You have selected %d files "
@@ -457,7 +501,7 @@ msgstr[2] "Jūs esat izvēlējies %d failus"
#. TRANSLATOR: This string will become
#. * "You have selected %d files and %d folders"
-#: ../tool/seahorse-tool-files.c:332
+#: ../tool/seahorse-tool-files.c:333
#, c-format
msgid "and %d folder"
msgid_plural "and %d folders"
@@ -467,12 +511,12 @@ msgstr[2] "un %d mapes"
#. TRANSLATOR: "%s%s" are "You have selected %d files and %d folders"
#. * Swap order with "%2$s%1$s" if needed
-#: ../tool/seahorse-tool-files.c:337
+#: ../tool/seahorse-tool-files.c:338
#, c-format
msgid "<b>%s%s</b>"
msgstr "<b>%s%s</b>"
-#: ../tool/seahorse-tool-files.c:345
+#: ../tool/seahorse-tool-files.c:346
#, c-format
msgid "You have selected %d file"
msgid_plural "You have selected %d files"
@@ -480,7 +524,7 @@ msgstr[0] "Jūs esat izvēlējies %d failu"
msgstr[1] "Jūs esat izvēlējies %d failus"
msgstr[2] "Jūs esat izvēlējies %d failu"
-#: ../tool/seahorse-tool-files.c:350
+#: ../tool/seahorse-tool-files.c:351
#, c-format
msgid "You have selected %d folder"
msgid_plural "You have selected %d folders"
@@ -488,15 +532,15 @@ msgstr[0] "Jūs esat izvēlējies %d failu"
msgstr[1] "Jūs esat izvēlējies %d failus"
msgstr[2] "Jūs esat izvēlējies %d failus"
-#: ../tool/seahorse-tool-files.c:868
+#: ../tool/seahorse-tool-files.c:866
msgid "Preparing..."
msgstr "Sagatavo..."
-#: ../tool/seahorse-tool-files.c:877 ../tool/seahorse-tool-files.c:900
+#: ../tool/seahorse-tool-files.c:875 ../tool/seahorse-tool-files.c:898
msgid "Couldn't list files"
msgstr "Neizdevās parādīt failus sarakstā"
-#: ../tool/seahorse-tool-files.c:887 ../tool/seahorse-util.c:647
+#: ../tool/seahorse-tool-files.c:885 ../tool/seahorse-util.c:399
msgid "Couldn't package files"
msgstr "Neizdevās sapakot failus"
@@ -504,33 +548,33 @@ msgstr "Neizdevās sapakot failus"
msgid "Decryption failed. You probably do not have the decryption key."
msgstr "Atšifrēšana nesekmīga. Jums, visticamāk, nav atšifrēšanas atslēgas."
-#: ../tool/seahorse-util.c:223
+#: ../tool/seahorse-util.c:200
msgid "%Y-%m-%d"
msgstr "%d.%m.%Y"
-#: ../tool/seahorse-util.c:642
+#: ../tool/seahorse-util.c:394
msgid "Couldn't run file-roller"
msgstr "Neizdevās palaist 'file-roller'"
-#: ../tool/seahorse-util.c:648
+#: ../tool/seahorse-util.c:400
msgid "The file-roller process did not complete successfully"
msgstr "'file-roller' process nebeidzās veiksmīgi"
#. Filter for PGP keys. We also include *.asc, as in many
#. cases that extension is associated with text/plain
-#: ../tool/seahorse-util.c:708
+#: ../tool/seahorse-util.c:436
msgid "All key files"
msgstr "Visi atslēgu faili"
-#: ../tool/seahorse-util.c:715 ../tool/seahorse-util.c:755
+#: ../tool/seahorse-util.c:443 ../tool/seahorse-util.c:483
msgid "All files"
msgstr "Visi faili"
-#: ../tool/seahorse-util.c:748
+#: ../tool/seahorse-util.c:476
msgid "Archive files"
msgstr "Arhīva faili"
-#: ../tool/seahorse-util.c:777
+#: ../tool/seahorse-util.c:505
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -540,11 +584,18 @@ msgstr ""
"\n"
"Vai vēlaties aizstāt to ar jaunu failu?"
-#: ../tool/seahorse-util.c:780
+#: ../tool/seahorse-util.c:508
msgid "_Replace"
msgstr "_Aizvietot"
-#: ../tool/seahorse-widget.c:365
-#, c-format
-msgid "Could not display help: %s"
-msgstr "Neizdevās parādīt palīdzību: %s"
+#~ msgid "Password:"
+#~ msgstr "Parole:"
+
+#~ msgid "Confirm:"
+#~ msgstr "Apstiprināt:"
+
+#~ msgid "Choose Recipients"
+#~ msgstr "Izvēlieties adresātus"
+
+#~ msgid "Could not display help: %s"
+#~ msgstr "Neizdevās parādīt palīdzību: %s"
diff --git a/po/pl.po b/po/pl.po
index 2f17620..de78e83 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,14 +7,14 @@
# Artur Flinta <aflinta at at.kernel.pl>, 2003-2006.
# Andrzej Polatyński <andrzej at datatel.net.pl>, 2007.
# Tomasz Dominikowski <dominikowski at gmail.com>, 2007-2009.
-# Piotr Drąg <piotrdrag at gmail.com>, 2010-2012.
-# Aviary.pl <gnomepl at aviary.pl>, 2007-2012.
+# Piotr Drąg <piotrdrag at gmail.com>, 2010-2014.
+# Aviary.pl <gnomepl at aviary.pl>, 2007-2014.
msgid ""
msgstr ""
"Project-Id-Version: seahorse-nautilus\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 20:45+0200\n"
-"PO-Revision-Date: 2012-09-04 20:47+0200\n"
+"POT-Creation-Date: 2014-01-03 16:47+0100\n"
+"PO-Revision-Date: 2014-01-03 16:48+0100\n"
"Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
"Language-Team: Polish <gnomepl at aviary.pl>\n"
"Language: pl\n"
@@ -31,7 +31,7 @@ msgid "File extension for packages"
msgstr "Rozszerzenie pliku dla pakietów"
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
-msgid "File extension for packages when handling mulitple files."
+msgid "File extension for packages when handling multiple files."
msgstr "Rozszerzenie pliku dla pakietów podczas obsługiwania wielu plików."
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
@@ -180,33 +180,43 @@ msgstr "Podpisany przez <i><key id='%s'/> <b>Unieważniony</b></i> dnia %s."
msgid "Revoked Signature"
msgstr "Podpis unieważniony"
-#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:627
+#: ../tool/seahorse-notification.c:628
+msgid "Good Signature"
+msgstr "Podpis prawidłowy"
+
+#: ../tool/seahorse-notification.c:629
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s."
msgstr "Podpisany przez <i><key id='%s'/></i> dnia %s."
-#: ../tool/seahorse-notification.c:628
-msgid "Good Signature"
-msgstr "Podpis prawidłowy"
+#: ../tool/seahorse-notification.c:631
+msgid "Untrusted Valid Signature"
+msgstr "Niezaufany prawidłowy podpis"
-#: ../tool/seahorse-notification.c:633
+#: ../tool/seahorse-notification.c:632
+#, c-format
+msgid "Valid but <b>untrusted</b> signature by <i><key id='%s'/></i> on %s."
+msgstr ""
+"Prawidłowy, ale <b>niezaufany</b> podpis użytkownika <i><key id='%s'/></i> "
+"dnia %s."
+
+#: ../tool/seahorse-notification.c:638
msgid "Signing key not in keyring."
msgstr "Klucz podpisujący nie jest w bazie kluczy."
-#: ../tool/seahorse-notification.c:634
+#: ../tool/seahorse-notification.c:639
msgid "Unknown Signature"
msgstr "Nieznany podpis"
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:643
msgid "Bad or forged signature. The signed data was modified."
msgstr "Błędny lub podrobiony podpis. Podpisane dane zostały zmodyfikowane."
-#: ../tool/seahorse-notification.c:639
+#: ../tool/seahorse-notification.c:644
msgid "Bad Signature"
msgstr "Błędny podpis"
-#: ../tool/seahorse-notification.c:647
+#: ../tool/seahorse-notification.c:652
msgid "Couldn't verify signature."
msgstr "Nie można zweryfikować podpisu."
@@ -297,50 +307,50 @@ msgstr "Odczytuje listę adresów URI ze standardowego wejścia"
msgid "file..."
msgstr "plik..."
-#: ../tool/seahorse-tool.c:169
-msgid "Choose Recipients"
-msgstr "Wybór odbiorców"
+#: ../tool/seahorse-tool.c:171
+msgid "Encryption settings"
+msgstr "Ustawienia szyfrowania"
-#: ../tool/seahorse-tool.c:234 ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:236 ../tool/seahorse-tool.c:350
msgid "Couldn't load keys"
msgstr "Nie można wczytać kluczy"
-#: ../tool/seahorse-tool.c:252
+#: ../tool/seahorse-tool.c:253
#, c-format
msgid "Choose Encrypted File Name for '%s'"
msgstr "Wybór nazwy zaszyfrowanego pliku dla \"%s\""
-#: ../tool/seahorse-tool.c:325
+#: ../tool/seahorse-tool.c:328
msgid "Choose Signer"
msgstr "Wybór osoby podpisującej"
-#: ../tool/seahorse-tool.c:367
+#: ../tool/seahorse-tool.c:370
#, c-format
msgid "Choose Signature File Name for '%s'"
msgstr "Wybór nazwy pliku podpisu dla \"%s\""
-#: ../tool/seahorse-tool.c:407
+#: ../tool/seahorse-tool.c:410
msgid "Import is complete"
msgstr "Importowanie ukończone"
-#: ../tool/seahorse-tool.c:440
+#: ../tool/seahorse-tool.c:443
msgid "Importing keys ..."
msgstr "Importowanie kluczy ..."
-#: ../tool/seahorse-tool.c:470
+#: ../tool/seahorse-tool.c:473
msgid "Import Failed"
msgstr "Importowanie się nie powiodło"
-#: ../tool/seahorse-tool.c:471
+#: ../tool/seahorse-tool.c:474
msgid "Keys were found but not imported."
msgstr "Odnaleziono klucze, ale nie zostały one zaimportowane."
-#: ../tool/seahorse-tool.c:494
+#: ../tool/seahorse-tool.c:497
#, c-format
msgid "Imported key"
msgstr "Zaimportowany klucz"
-#: ../tool/seahorse-tool.c:496
+#: ../tool/seahorse-tool.c:499
#, c-format
msgid "Imported %d key"
msgid_plural "Imported %d keys"
@@ -349,12 +359,12 @@ msgstr[1] "Zaimportowano %d klucze"
msgstr[2] "Zaimportowano %d kluczy"
#. File to decrypt to
-#: ../tool/seahorse-tool.c:518
+#: ../tool/seahorse-tool.c:521
#, c-format
msgid "Choose Decrypted File Name for '%s'"
msgstr "Wybór nazwy odszyfrowanego pliku dla \"%s\""
-#: ../tool/seahorse-tool.c:575
+#: ../tool/seahorse-tool.c:578
#, c-format
msgid "Choose Original File for '%s'"
msgstr "Wybór pliku oryginału dla \"%s\""
@@ -364,56 +374,56 @@ msgstr "Wybór pliku oryginału dla \"%s\""
#. * The last thing we want to do is cascade a big pile of error
#. * dialogs at the user.
#.
-#: ../tool/seahorse-tool.c:648
+#: ../tool/seahorse-tool.c:651
#, c-format
msgid "No valid signatures found"
msgstr "Nie odnaleziono prawidłowych podpisów"
-#: ../tool/seahorse-tool.c:695
+#: ../tool/seahorse-tool.c:698
msgid "File Encryption Tool"
msgstr "Narzędzie do szyfrowania plików"
-#: ../tool/seahorse-tool.c:713
+#: ../tool/seahorse-tool.c:716
msgid "Encrypting"
msgstr "Szyfrowanie"
-#: ../tool/seahorse-tool.c:714
+#: ../tool/seahorse-tool.c:717
#, c-format
msgid "Couldn't encrypt file: %s"
msgstr "Nie można zaszyfrować pliku: %s"
-#: ../tool/seahorse-tool.c:722
+#: ../tool/seahorse-tool.c:725
msgid "Signing"
msgstr "Podpisywanie"
-#: ../tool/seahorse-tool.c:723
+#: ../tool/seahorse-tool.c:726
#, c-format
msgid "Couldn't sign file: %s"
msgstr "Nie można podpisać pliku: %s"
-#: ../tool/seahorse-tool.c:728
+#: ../tool/seahorse-tool.c:731
msgid "Importing"
msgstr "Importowanie"
-#: ../tool/seahorse-tool.c:729
+#: ../tool/seahorse-tool.c:732
#, c-format
msgid "Couldn't import keys from file: %s"
msgstr "Nie można zaimportować kluczy z pliku: %s"
-#: ../tool/seahorse-tool.c:735
+#: ../tool/seahorse-tool.c:738
msgid "Decrypting"
msgstr "Odszyfrowywanie"
-#: ../tool/seahorse-tool.c:736
+#: ../tool/seahorse-tool.c:739
#, c-format
msgid "Couldn't decrypt file: %s"
msgstr "Nie można odszyfrować pliku: %s"
-#: ../tool/seahorse-tool.c:741
+#: ../tool/seahorse-tool.c:744
msgid "Verifying"
msgstr "Weryfikowanie"
-#: ../tool/seahorse-tool.c:742
+#: ../tool/seahorse-tool.c:745
#, c-format
msgid "Couldn't verify file: %s"
msgstr "Nie można zweryfikować pliku: %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 37b091d..d43e953 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
"Project-Id-Version: seahorse-nautilus\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=seahorse-nautilus&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-02-18 15:09+0000\n"
-"PO-Revision-Date: 2013-03-12 08:29-0300\n"
+"POT-Creation-Date: 2013-11-23 05:06+0000\n"
+"PO-Revision-Date: 2013-11-25 08:45-0300\n"
"Last-Translator: Rafael Ferreira <rafael.f.f1 at gmail.com>\n"
"Language-Team: Brazilian Portuguese <gnome-pt_br-list at gnome.org>\n"
"Language: pt_BR\n"
@@ -22,14 +22,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.5.7\n"
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:1
msgid "File extension for packages"
msgstr "Extensão de arquivos de pacotes"
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
-msgid "File extension for packages when handling mulitple files."
+msgid "File extension for packages when handling multiple files."
msgstr "A extensão de arquivos de pacotes ao lidar com múltiplos arquivos."
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
@@ -170,35 +170,45 @@ msgstr "Assinado por <i><key id=\"%s\"/> <b>Revogado</b></i> em %s."
msgid "Revoked Signature"
msgstr "Assinatura revogada"
-#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:627
-#, c-format
-msgid "Signed by <i><key id='%s'/></i> on %s."
-msgstr "Assinado por <i><key id=\"%s\"/></i> em %s."
-
# "Bad Signature" é "Assinatura Inválida".
# Traduzir como "Assinatura Válida"?
#: ../tool/seahorse-notification.c:628
msgid "Good Signature"
msgstr "Assinatura válida"
-#: ../tool/seahorse-notification.c:633
+#: ../tool/seahorse-notification.c:629
+#, c-format
+msgid "Signed by <i><key id='%s'/></i> on %s."
+msgstr "Assinado por <i><key id=\"%s\"/></i> em %s."
+
+#: ../tool/seahorse-notification.c:631
+msgid "Untrusted Valid Signature"
+msgstr "Assinatura válida não confiável"
+
+#: ../tool/seahorse-notification.c:632
+#, c-format
+msgid "Valid but <b>untrusted</b> signature by <i><key id='%s'/></i> on %s."
+msgstr ""
+"Assinatura válida, porém <b>não confiável</b> por <i><key id='%s'/></i> em "
+"%s."
+
+#: ../tool/seahorse-notification.c:638
msgid "Signing key not in keyring."
msgstr "Chave de assinatura fora do chaveiro."
-#: ../tool/seahorse-notification.c:634
+#: ../tool/seahorse-notification.c:639
msgid "Unknown Signature"
msgstr "Assinatura desconhecida"
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:643
msgid "Bad or forged signature. The signed data was modified."
msgstr "Assinatura inválida ou forjada. A data da assinatura foi modificada."
-#: ../tool/seahorse-notification.c:639
+#: ../tool/seahorse-notification.c:644
msgid "Bad Signature"
msgstr "Assinatura inválida"
-#: ../tool/seahorse-notification.c:647
+#: ../tool/seahorse-notification.c:652
msgid "Couldn't verify signature."
msgstr "Não foi possível verificar a assinatura."
@@ -289,50 +299,50 @@ msgstr "Ler a lista de URIs na entrada padrão"
msgid "file..."
msgstr "arquivo..."
-#: ../tool/seahorse-tool.c:169
-msgid "Choose Recipients"
-msgstr "Escolher destinatários"
+#: ../tool/seahorse-tool.c:171
+msgid "Encryption settings"
+msgstr "Configurações de criptografia"
-#: ../tool/seahorse-tool.c:234 ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:236 ../tool/seahorse-tool.c:350
msgid "Couldn't load keys"
msgstr "Não foi possível ler as chaves"
-#: ../tool/seahorse-tool.c:252
+#: ../tool/seahorse-tool.c:253
#, c-format
msgid "Choose Encrypted File Name for '%s'"
msgstr "Escolha o nome de arquivo criptografado para \"%s\""
-#: ../tool/seahorse-tool.c:325
+#: ../tool/seahorse-tool.c:328
msgid "Choose Signer"
msgstr "Escolher signatário"
-#: ../tool/seahorse-tool.c:367
+#: ../tool/seahorse-tool.c:370
#, c-format
msgid "Choose Signature File Name for '%s'"
msgstr "Escolha o nome de arquivo assinado para \"%s\""
-#: ../tool/seahorse-tool.c:407
+#: ../tool/seahorse-tool.c:410
msgid "Import is complete"
msgstr "Importação está completa"
-#: ../tool/seahorse-tool.c:440
+#: ../tool/seahorse-tool.c:443
msgid "Importing keys ..."
msgstr "Importando chaves ..."
-#: ../tool/seahorse-tool.c:470
+#: ../tool/seahorse-tool.c:473
msgid "Import Failed"
msgstr "Importação falhou"
-#: ../tool/seahorse-tool.c:471
+#: ../tool/seahorse-tool.c:474
msgid "Keys were found but not imported."
msgstr "Chaves localizadas, mas não importadas."
-#: ../tool/seahorse-tool.c:494
+#: ../tool/seahorse-tool.c:497
#, c-format
msgid "Imported key"
msgstr "Chaves importadas"
-#: ../tool/seahorse-tool.c:496
+#: ../tool/seahorse-tool.c:499
#, c-format
msgid "Imported %d key"
msgid_plural "Imported %d keys"
@@ -340,12 +350,12 @@ msgstr[0] "%d chave importada"
msgstr[1] "%d chaves importadas"
#. File to decrypt to
-#: ../tool/seahorse-tool.c:518
+#: ../tool/seahorse-tool.c:521
#, c-format
msgid "Choose Decrypted File Name for '%s'"
msgstr "Escolha o nome de arquivo descriptografado para \"%s\""
-#: ../tool/seahorse-tool.c:575
+#: ../tool/seahorse-tool.c:578
#, c-format
msgid "Choose Original File for '%s'"
msgstr "Escolha o arquivo original para \"%s\""
@@ -355,56 +365,56 @@ msgstr "Escolha o arquivo original para \"%s\""
#. * The last thing we want to do is cascade a big pile of error
#. * dialogs at the user.
#.
-#: ../tool/seahorse-tool.c:648
+#: ../tool/seahorse-tool.c:651
#, c-format
msgid "No valid signatures found"
msgstr "Nenhuma assinatura válida localizada"
-#: ../tool/seahorse-tool.c:695
+#: ../tool/seahorse-tool.c:698
msgid "File Encryption Tool"
msgstr "Ferramenta de criptografia de arquivos"
-#: ../tool/seahorse-tool.c:713
+#: ../tool/seahorse-tool.c:716
msgid "Encrypting"
msgstr "Criptografando"
-#: ../tool/seahorse-tool.c:714
+#: ../tool/seahorse-tool.c:717
#, c-format
msgid "Couldn't encrypt file: %s"
msgstr "Não foi possível criptografar o arquivo: %s"
-#: ../tool/seahorse-tool.c:722
+#: ../tool/seahorse-tool.c:725
msgid "Signing"
msgstr "Assinando"
-#: ../tool/seahorse-tool.c:723
+#: ../tool/seahorse-tool.c:726
#, c-format
msgid "Couldn't sign file: %s"
msgstr "Não foi possível assinar o arquivo: %s"
-#: ../tool/seahorse-tool.c:728
+#: ../tool/seahorse-tool.c:731
msgid "Importing"
msgstr "Importando"
-#: ../tool/seahorse-tool.c:729
+#: ../tool/seahorse-tool.c:732
#, c-format
msgid "Couldn't import keys from file: %s"
msgstr "Não foi possível importar chaves do arquivo: %s"
-#: ../tool/seahorse-tool.c:735
+#: ../tool/seahorse-tool.c:738
msgid "Decrypting"
msgstr "Descriptografando"
-#: ../tool/seahorse-tool.c:736
+#: ../tool/seahorse-tool.c:739
#, c-format
msgid "Couldn't decrypt file: %s"
msgstr "Não foi possível descriptografar o arquivo: %s"
-#: ../tool/seahorse-tool.c:741
+#: ../tool/seahorse-tool.c:744
msgid "Verifying"
msgstr "Verificando"
-#: ../tool/seahorse-tool.c:742
+#: ../tool/seahorse-tool.c:745
#, c-format
msgid "Couldn't verify file: %s"
msgstr "Não foi possível verificar arquivo: %s"
@@ -538,7 +548,7 @@ msgstr ""
"Falha na descriptografia. Você provavelmente não tem a chave de "
"descriptografia."
-# Mudar para %d/%m/%Y?
+# dia/mês/ano ( man date(1) )
#: ../tool/seahorse-util.c:200
msgid "%Y-%m-%d"
msgstr "%d-%m-%Y"
@@ -579,6 +589,9 @@ msgstr ""
msgid "_Replace"
msgstr "_Substituir"
+#~ msgid "Choose Recipients"
+#~ msgstr "Escolher destinatários"
+
#~ msgid "Password:"
#~ msgstr "Senha:"
diff --git a/po/sl.po b/po/sl.po
index 2e0a3f7..f3aea58 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,23 +3,22 @@
# This file is distributed under the same license as the seahorse-plugins package.
#
# Andraž Tori <andraz.tori1 at guest.arnes.si>, 2000.
-# Matej Urbančič <mateju at svn.gnome.org>, 2007 - 2012.
+# Matej Urbančič <mateju at svn.gnome.org>, 2007 - 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: seahorse-nautilus master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=seahorse-nautilus&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-01-08 20:34+0000\n"
-"PO-Revision-Date: 2013-01-10 20:53+0100\n"
+"POT-Creation-Date: 2013-12-19 16:22+0000\n"
+"PO-Revision-Date: 2013-12-22 19:17+0100\n"
"Last-Translator: Matej Urbančič <mateju at svn.gnome.org>\n"
"Language-Team: Slovenian GNOME Translation Team <gnome-si at googlegroups.com>\n"
"Language: sl_SI\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Generator: Poedit 1.5.4\n"
@@ -28,7 +27,7 @@ msgid "File extension for packages"
msgstr "Pripona datotek paketov"
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
-msgid "File extension for packages when handling mulitple files."
+msgid "File extension for packages when handling multiple files."
msgstr "Pripona datotek paketov med upravljanjem več datotek."
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
@@ -179,33 +178,43 @@ msgstr "Podpis: <i><key id='%s'/> <b>je preklican</b></i> %s."
msgid "Revoked Signature"
msgstr "Preklican podpis"
-#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:627
+#: ../tool/seahorse-notification.c:628
+msgid "Good Signature"
+msgstr "Dober podpis"
+
+#: ../tool/seahorse-notification.c:629
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s."
msgstr "Podpis: <i><key id='%s'/></i> %s."
-#: ../tool/seahorse-notification.c:628
-msgid "Good Signature"
-msgstr "Dober podpis"
+#: ../tool/seahorse-notification.c:631
+msgid "Untrusted Valid Signature"
+msgstr "Nezaupljiv veljaven podpis"
-#: ../tool/seahorse-notification.c:633
+#: ../tool/seahorse-notification.c:632
+#, c-format
+msgid "Valid but <b>untrusted</b> signature by <i><key id='%s'/></i> on %s."
+msgstr ""
+"Veljaven podpis, vendar označen kot <b>nezaupljiv</b> <i><key id='%s'/></i> "
+"na %s."
+
+#: ../tool/seahorse-notification.c:638
msgid "Signing key not in keyring."
msgstr "Podpisovanje ključa, ki ni v zbirki."
-#: ../tool/seahorse-notification.c:634
+#: ../tool/seahorse-notification.c:639
msgid "Unknown Signature"
msgstr "Neznan podpis"
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:643
msgid "Bad or forged signature. The signed data was modified."
msgstr "Neveljaven ali ponarejen podpis. Podatki podpisa so bili spremenjeni."
-#: ../tool/seahorse-notification.c:639
+#: ../tool/seahorse-notification.c:644
msgid "Bad Signature"
msgstr "Slab podpis"
-#: ../tool/seahorse-notification.c:647
+#: ../tool/seahorse-notification.c:652
msgid "Couldn't verify signature."
msgstr "Ni mogoče overiti podpisa."
@@ -296,50 +305,50 @@ msgstr "Preberi seznam naslovov URI preko standardnega vhoda"
msgid "file..."
msgstr "datoteka ..."
-#: ../tool/seahorse-tool.c:169
-msgid "Choose Recipients"
-msgstr "Izbor prejemnikov"
+#: ../tool/seahorse-tool.c:171
+msgid "Encryption settings"
+msgstr "Nastavitve šifriranja"
-#: ../tool/seahorse-tool.c:234 ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:236 ../tool/seahorse-tool.c:350
msgid "Couldn't load keys"
msgstr "Ni mogoče naložiti ključev"
-#: ../tool/seahorse-tool.c:252
+#: ../tool/seahorse-tool.c:253
#, c-format
msgid "Choose Encrypted File Name for '%s'"
msgstr "Izberi ime šifrirane datoteke za '%s'"
-#: ../tool/seahorse-tool.c:325
+#: ../tool/seahorse-tool.c:328
msgid "Choose Signer"
msgstr "Izbor podpisnika"
-#: ../tool/seahorse-tool.c:367
+#: ../tool/seahorse-tool.c:370
#, c-format
msgid "Choose Signature File Name for '%s'"
msgstr "Izberi ime datoteke s podpisom za '%s'"
-#: ../tool/seahorse-tool.c:407
+#: ../tool/seahorse-tool.c:410
msgid "Import is complete"
msgstr "Uvoz je končan"
-#: ../tool/seahorse-tool.c:440
+#: ../tool/seahorse-tool.c:443
msgid "Importing keys ..."
msgstr "Uvažanje ključev ..."
-#: ../tool/seahorse-tool.c:470
+#: ../tool/seahorse-tool.c:473
msgid "Import Failed"
msgstr "Uvoz ni uspel"
-#: ../tool/seahorse-tool.c:471
+#: ../tool/seahorse-tool.c:474
msgid "Keys were found but not imported."
msgstr "Ključi so najdeni, vendar niso uvoženi."
-#: ../tool/seahorse-tool.c:494
+#: ../tool/seahorse-tool.c:497
#, c-format
msgid "Imported key"
msgstr "Uvoženi ključ"
-#: ../tool/seahorse-tool.c:496
+#: ../tool/seahorse-tool.c:499
#, c-format
msgid "Imported %d key"
msgid_plural "Imported %d keys"
@@ -349,12 +358,12 @@ msgstr[2] "Uvožena %d ključa"
msgstr[3] "Uvoženi %d ključi"
#. File to decrypt to
-#: ../tool/seahorse-tool.c:518
+#: ../tool/seahorse-tool.c:521
#, c-format
msgid "Choose Decrypted File Name for '%s'"
msgstr "Izberi ime odšifrirane datoteke za '%s'"
-#: ../tool/seahorse-tool.c:575
+#: ../tool/seahorse-tool.c:578
#, c-format
msgid "Choose Original File for '%s'"
msgstr "Izberi ime obstoječe datoteke za '%s'"
@@ -364,56 +373,56 @@ msgstr "Izberi ime obstoječe datoteke za '%s'"
#. * The last thing we want to do is cascade a big pile of error
#. * dialogs at the user.
#.
-#: ../tool/seahorse-tool.c:648
+#: ../tool/seahorse-tool.c:651
#, c-format
msgid "No valid signatures found"
msgstr "Ni veljavnih podpisov"
-#: ../tool/seahorse-tool.c:695
+#: ../tool/seahorse-tool.c:698
msgid "File Encryption Tool"
msgstr "Orodje za šifriranje datotek"
-#: ../tool/seahorse-tool.c:713
+#: ../tool/seahorse-tool.c:716
msgid "Encrypting"
msgstr "Šifriranje"
-#: ../tool/seahorse-tool.c:714
+#: ../tool/seahorse-tool.c:717
#, c-format
msgid "Couldn't encrypt file: %s"
msgstr "Ni mogoče šifrirati datoteke: %s"
-#: ../tool/seahorse-tool.c:722
+#: ../tool/seahorse-tool.c:725
msgid "Signing"
msgstr "Podpisovanje"
-#: ../tool/seahorse-tool.c:723
+#: ../tool/seahorse-tool.c:726
#, c-format
msgid "Couldn't sign file: %s"
msgstr "Ni mogoče podpisati datoteke: %s"
-#: ../tool/seahorse-tool.c:728
+#: ../tool/seahorse-tool.c:731
msgid "Importing"
msgstr "Uvažanje"
-#: ../tool/seahorse-tool.c:729
+#: ../tool/seahorse-tool.c:732
#, c-format
msgid "Couldn't import keys from file: %s"
msgstr "Ni mogoče uvoziti ključev iz datoteke: %s"
-#: ../tool/seahorse-tool.c:735
+#: ../tool/seahorse-tool.c:738
msgid "Decrypting"
msgstr "Odšifriranje"
-#: ../tool/seahorse-tool.c:736
+#: ../tool/seahorse-tool.c:739
#, c-format
msgid "Couldn't decrypt file: %s"
msgstr "Ni mogoče odšifrirati datoteke: %s"
-#: ../tool/seahorse-tool.c:741
+#: ../tool/seahorse-tool.c:744
msgid "Verifying"
msgstr "Overjanje"
-#: ../tool/seahorse-tool.c:742
+#: ../tool/seahorse-tool.c:745
#, c-format
msgid "Couldn't verify file: %s"
msgstr "Ni mogoče overiti datoteke: %s"
@@ -593,6 +602,9 @@ msgstr ""
msgid "_Replace"
msgstr "_Zamenjaj"
+#~ msgid "Choose Recipients"
+#~ msgstr "Izbor prejemnikov"
+
#~ msgid "Password:"
#~ msgstr "Geslo:"
diff --git a/po/sr.po b/po/sr.po
index a2f40c5..6e64792 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,14 +5,14 @@
# Translated on 2009-05-09 by: Бранко Кокановић <branko.kokanovic at gmail.com>
# Бранко Кокановић <branko.kokanovic at gmail.com>, 2009.
# Милош Поповић <gpopac at gmail.com>, 2010.
-# Мирослав Николић <miroslavnikolic at rocketmail.com>, 2011, 2013.
+# Мирослав Николић <miroslavnikolic at rocketmail.com>, 2011, 2013, 2014.
msgid ""
msgstr ""
"Project-Id-Version: Seahorse\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product"
"=seahorse-nautilus&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-12-03 23:46+0000\n"
-"PO-Revision-Date: 2013-01-08 21:29+0200\n"
+"POT-Creation-Date: 2014-01-02 04:00+0000\n"
+"PO-Revision-Date: 2014-01-27 22:39+0200\n"
"Last-Translator: Мирослав Николић <miroslavnikolic at rocketmail.com>\n"
"Language-Team: Serbian <gnom at prevod.org>\n"
"Language: sr\n"
@@ -28,12 +28,12 @@ msgid "File extension for packages"
msgstr "Проширење датотеке за пакете"
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
-msgid "File extension for packages when handling mulitple files."
+#| msgid "File extension for packages when handling mulitple files."
+msgid "File extension for packages when handling multiple files."
msgstr "Проширење датотеке за пакете приликом обраде бројних датотека."
# bug: s/seperately/separately/
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
-#| msgid "Encrypt each file separately"
msgid "Handle multiple files separately"
msgstr "Обрађује сваку датотеку засебно"
@@ -184,33 +184,43 @@ msgstr "Потписан од <i><key id='%s'/> <b>Опозван</b></i> %s."
msgid "Revoked Signature"
msgstr "Опозван потпис"
-#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:627
+#: ../tool/seahorse-notification.c:628
+msgid "Good Signature"
+msgstr "Добар потпис"
+
+#: ../tool/seahorse-notification.c:629
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s."
msgstr "Потписан од <i><key id='%s'/></i> %s."
-#: ../tool/seahorse-notification.c:628
-msgid "Good Signature"
-msgstr "Добар потпис"
+#: ../tool/seahorse-notification.c:631
+#| msgid "Invalid Signature"
+msgid "Untrusted Valid Signature"
+msgstr "Неповерљив исправан потпис"
+
+#: ../tool/seahorse-notification.c:632
+#, c-format
+#| msgid "Signed by <i><key id='%s'/></i> on %s."
+msgid "Valid but <b>untrusted</b> signature by <i><key id='%s'/></i> on %s."
+msgstr "Исправан али <b>неповерљив</b> потпис од <i><key id='%s'/></i> на „%s“."
-#: ../tool/seahorse-notification.c:633
+#: ../tool/seahorse-notification.c:638
msgid "Signing key not in keyring."
msgstr "Кључ за потпис није у привеску кључева."
-#: ../tool/seahorse-notification.c:634
+#: ../tool/seahorse-notification.c:639
msgid "Unknown Signature"
msgstr "Непознат потпис"
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:643
msgid "Bad or forged signature. The signed data was modified."
msgstr "Лош или фалсификован потпис. Потписани подаци су мењани."
-#: ../tool/seahorse-notification.c:639
+#: ../tool/seahorse-notification.c:644
msgid "Bad Signature"
msgstr "Лош потпис"
-#: ../tool/seahorse-notification.c:647
+#: ../tool/seahorse-notification.c:652
msgid "Couldn't verify signature."
msgstr "Не могу да проверим потпис."
@@ -301,51 +311,51 @@ msgstr "Прочитај списак адреса на стандардном
msgid "file..."
msgstr "датотека..."
-#: ../tool/seahorse-tool.c:169
-msgid "Choose Recipients"
-msgstr "Одаберите примаоца"
+#: ../tool/seahorse-tool.c:171
+msgid "Encryption settings"
+msgstr "Подешавања шифровања"
-#: ../tool/seahorse-tool.c:234 ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:236 ../tool/seahorse-tool.c:350
msgid "Couldn't load keys"
msgstr "Не могу да учитам кључеве"
-#: ../tool/seahorse-tool.c:252
+#: ../tool/seahorse-tool.c:253
#, c-format
msgid "Choose Encrypted File Name for '%s'"
msgstr "Изаберите име шифроване датотеке за „%s“"
-#: ../tool/seahorse-tool.c:325
+#: ../tool/seahorse-tool.c:328
msgid "Choose Signer"
msgstr "Изаберите потписника"
-#: ../tool/seahorse-tool.c:367
+#: ../tool/seahorse-tool.c:370
#, c-format
msgid "Choose Signature File Name for '%s'"
msgstr "Изаберите име потписане датотеке за „%s“"
-#: ../tool/seahorse-tool.c:407
+#: ../tool/seahorse-tool.c:410
msgid "Import is complete"
msgstr "Увоз је завршен"
-#: ../tool/seahorse-tool.c:440
+#: ../tool/seahorse-tool.c:443
msgid "Importing keys ..."
msgstr "Увозим кључеве ..."
-#: ../tool/seahorse-tool.c:470
+#: ../tool/seahorse-tool.c:473
msgid "Import Failed"
msgstr "Увоз није успео"
-#: ../tool/seahorse-tool.c:471
+#: ../tool/seahorse-tool.c:474
msgid "Keys were found but not imported."
msgstr "Кључеви су нађени али нису увежени."
# bug: plural-forms
-#: ../tool/seahorse-tool.c:494
+#: ../tool/seahorse-tool.c:497
#, c-format
msgid "Imported key"
msgstr "Увезох кључ"
-#: ../tool/seahorse-tool.c:496
+#: ../tool/seahorse-tool.c:499
#, c-format
msgid "Imported %d key"
msgid_plural "Imported %d keys"
@@ -355,12 +365,12 @@ msgstr[2] "Увезено је %d кључева"
msgstr[3] "Увезен је један кључ"
#. File to decrypt to
-#: ../tool/seahorse-tool.c:518
+#: ../tool/seahorse-tool.c:521
#, c-format
msgid "Choose Decrypted File Name for '%s'"
msgstr "Изаберите име дешифроване датотеке за „%s“"
-#: ../tool/seahorse-tool.c:575
+#: ../tool/seahorse-tool.c:578
#, c-format
msgid "Choose Original File for '%s'"
msgstr "Изаберите изворну датотеку за „%s“"
@@ -370,56 +380,56 @@ msgstr "Изаберите изворну датотеку за „%s“"
#. * The last thing we want to do is cascade a big pile of error
#. * dialogs at the user.
#.
-#: ../tool/seahorse-tool.c:648
+#: ../tool/seahorse-tool.c:651
#, c-format
msgid "No valid signatures found"
msgstr "Не могу да нађем ниједан исправан потпис"
-#: ../tool/seahorse-tool.c:695
+#: ../tool/seahorse-tool.c:698
msgid "File Encryption Tool"
msgstr "Алат за шифровање датотека"
-#: ../tool/seahorse-tool.c:713
+#: ../tool/seahorse-tool.c:716
msgid "Encrypting"
msgstr "Дешифрујем"
-#: ../tool/seahorse-tool.c:714
+#: ../tool/seahorse-tool.c:717
#, c-format
msgid "Couldn't encrypt file: %s"
msgstr "Не могу да шифрујем датотеку: %s"
-#: ../tool/seahorse-tool.c:722
+#: ../tool/seahorse-tool.c:725
msgid "Signing"
msgstr "Потписујем"
-#: ../tool/seahorse-tool.c:723
+#: ../tool/seahorse-tool.c:726
#, c-format
msgid "Couldn't sign file: %s"
msgstr "Не могу да потпишем датотеку: %s"
-#: ../tool/seahorse-tool.c:728
+#: ../tool/seahorse-tool.c:731
msgid "Importing"
msgstr "Увозим"
-#: ../tool/seahorse-tool.c:729
+#: ../tool/seahorse-tool.c:732
#, c-format
msgid "Couldn't import keys from file: %s"
msgstr "Не могу да увезем кључеве из датотеке: %s"
-#: ../tool/seahorse-tool.c:735
+#: ../tool/seahorse-tool.c:738
msgid "Decrypting"
msgstr "Дешифрујем"
-#: ../tool/seahorse-tool.c:736
+#: ../tool/seahorse-tool.c:739
#, c-format
msgid "Couldn't decrypt file: %s"
msgstr "Не могу да дешифрујем датотеку: %s"
-#: ../tool/seahorse-tool.c:741
+#: ../tool/seahorse-tool.c:744
msgid "Verifying"
msgstr "Проверавам"
-#: ../tool/seahorse-tool.c:742
+#: ../tool/seahorse-tool.c:745
#, c-format
msgid "Couldn't verify file: %s"
msgstr "Не могу да проверим датотеку: %s"
diff --git a/po/sr at latin.po b/po/sr at latin.po
index c6c2c56..26caf52 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -5,14 +5,14 @@
# Translated on 2009-05-09 by: Branko Kokanović <branko.kokanovic at gmail.com>
# Branko Kokanović <branko.kokanovic at gmail.com>, 2009.
# Miloš Popović <gpopac at gmail.com>, 2010.
-# Miroslav Nikolić <miroslavnikolic at rocketmail.com>, 2011, 2013.
+# Miroslav Nikolić <miroslavnikolic at rocketmail.com>, 2011, 2013, 2014.
msgid ""
msgstr ""
"Project-Id-Version: Seahorse\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product"
"=seahorse-nautilus&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-12-03 23:46+0000\n"
-"PO-Revision-Date: 2013-01-08 21:29+0200\n"
+"POT-Creation-Date: 2014-01-02 04:00+0000\n"
+"PO-Revision-Date: 2014-01-27 22:39+0200\n"
"Last-Translator: Miroslav Nikolić <miroslavnikolic at rocketmail.com>\n"
"Language-Team: Serbian <gnom at prevod.org>\n"
"Language: sr\n"
@@ -28,12 +28,12 @@ msgid "File extension for packages"
msgstr "Proširenje datoteke za pakete"
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
-msgid "File extension for packages when handling mulitple files."
+#| msgid "File extension for packages when handling mulitple files."
+msgid "File extension for packages when handling multiple files."
msgstr "Proširenje datoteke za pakete prilikom obrade brojnih datoteka."
# bug: s/seperately/separately/
#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
-#| msgid "Encrypt each file separately"
msgid "Handle multiple files separately"
msgstr "Obrađuje svaku datoteku zasebno"
@@ -184,33 +184,43 @@ msgstr "Potpisan od <i><key id='%s'/> <b>Opozvan</b></i> %s."
msgid "Revoked Signature"
msgstr "Opozvan potpis"
-#. TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate.
-#: ../tool/seahorse-notification.c:627
+#: ../tool/seahorse-notification.c:628
+msgid "Good Signature"
+msgstr "Dobar potpis"
+
+#: ../tool/seahorse-notification.c:629
#, c-format
msgid "Signed by <i><key id='%s'/></i> on %s."
msgstr "Potpisan od <i><key id='%s'/></i> %s."
-#: ../tool/seahorse-notification.c:628
-msgid "Good Signature"
-msgstr "Dobar potpis"
+#: ../tool/seahorse-notification.c:631
+#| msgid "Invalid Signature"
+msgid "Untrusted Valid Signature"
+msgstr "Nepoverljiv ispravan potpis"
+
+#: ../tool/seahorse-notification.c:632
+#, c-format
+#| msgid "Signed by <i><key id='%s'/></i> on %s."
+msgid "Valid but <b>untrusted</b> signature by <i><key id='%s'/></i> on %s."
+msgstr "Ispravan ali <b>nepoverljiv</b> potpis od <i><key id='%s'/></i> na „%s“."
-#: ../tool/seahorse-notification.c:633
+#: ../tool/seahorse-notification.c:638
msgid "Signing key not in keyring."
msgstr "Ključ za potpis nije u privesku ključeva."
-#: ../tool/seahorse-notification.c:634
+#: ../tool/seahorse-notification.c:639
msgid "Unknown Signature"
msgstr "Nepoznat potpis"
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:643
msgid "Bad or forged signature. The signed data was modified."
msgstr "Loš ili falsifikovan potpis. Potpisani podaci su menjani."
-#: ../tool/seahorse-notification.c:639
+#: ../tool/seahorse-notification.c:644
msgid "Bad Signature"
msgstr "Loš potpis"
-#: ../tool/seahorse-notification.c:647
+#: ../tool/seahorse-notification.c:652
msgid "Couldn't verify signature."
msgstr "Ne mogu da proverim potpis."
@@ -301,51 +311,51 @@ msgstr "Pročitaj spisak adresa na standardnom ulazu"
msgid "file..."
msgstr "datoteka..."
-#: ../tool/seahorse-tool.c:169
-msgid "Choose Recipients"
-msgstr "Odaberite primaoca"
+#: ../tool/seahorse-tool.c:171
+msgid "Encryption settings"
+msgstr "Podešavanja šifrovanja"
-#: ../tool/seahorse-tool.c:234 ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:236 ../tool/seahorse-tool.c:350
msgid "Couldn't load keys"
msgstr "Ne mogu da učitam ključeve"
-#: ../tool/seahorse-tool.c:252
+#: ../tool/seahorse-tool.c:253
#, c-format
msgid "Choose Encrypted File Name for '%s'"
msgstr "Izaberite ime šifrovane datoteke za „%s“"
-#: ../tool/seahorse-tool.c:325
+#: ../tool/seahorse-tool.c:328
msgid "Choose Signer"
msgstr "Izaberite potpisnika"
-#: ../tool/seahorse-tool.c:367
+#: ../tool/seahorse-tool.c:370
#, c-format
msgid "Choose Signature File Name for '%s'"
msgstr "Izaberite ime potpisane datoteke za „%s“"
-#: ../tool/seahorse-tool.c:407
+#: ../tool/seahorse-tool.c:410
msgid "Import is complete"
msgstr "Uvoz je završen"
-#: ../tool/seahorse-tool.c:440
+#: ../tool/seahorse-tool.c:443
msgid "Importing keys ..."
msgstr "Uvozim ključeve ..."
-#: ../tool/seahorse-tool.c:470
+#: ../tool/seahorse-tool.c:473
msgid "Import Failed"
msgstr "Uvoz nije uspeo"
-#: ../tool/seahorse-tool.c:471
+#: ../tool/seahorse-tool.c:474
msgid "Keys were found but not imported."
msgstr "Ključevi su nađeni ali nisu uveženi."
# bug: plural-forms
-#: ../tool/seahorse-tool.c:494
+#: ../tool/seahorse-tool.c:497
#, c-format
msgid "Imported key"
msgstr "Uvezoh ključ"
-#: ../tool/seahorse-tool.c:496
+#: ../tool/seahorse-tool.c:499
#, c-format
msgid "Imported %d key"
msgid_plural "Imported %d keys"
@@ -355,12 +365,12 @@ msgstr[2] "Uvezeno je %d ključeva"
msgstr[3] "Uvezen je jedan ključ"
#. File to decrypt to
-#: ../tool/seahorse-tool.c:518
+#: ../tool/seahorse-tool.c:521
#, c-format
msgid "Choose Decrypted File Name for '%s'"
msgstr "Izaberite ime dešifrovane datoteke za „%s“"
-#: ../tool/seahorse-tool.c:575
+#: ../tool/seahorse-tool.c:578
#, c-format
msgid "Choose Original File for '%s'"
msgstr "Izaberite izvornu datoteku za „%s“"
@@ -370,56 +380,56 @@ msgstr "Izaberite izvornu datoteku za „%s“"
#. * The last thing we want to do is cascade a big pile of error
#. * dialogs at the user.
#.
-#: ../tool/seahorse-tool.c:648
+#: ../tool/seahorse-tool.c:651
#, c-format
msgid "No valid signatures found"
msgstr "Ne mogu da nađem nijedan ispravan potpis"
-#: ../tool/seahorse-tool.c:695
+#: ../tool/seahorse-tool.c:698
msgid "File Encryption Tool"
msgstr "Alat za šifrovanje datoteka"
-#: ../tool/seahorse-tool.c:713
+#: ../tool/seahorse-tool.c:716
msgid "Encrypting"
msgstr "Dešifrujem"
-#: ../tool/seahorse-tool.c:714
+#: ../tool/seahorse-tool.c:717
#, c-format
msgid "Couldn't encrypt file: %s"
msgstr "Ne mogu da šifrujem datoteku: %s"
-#: ../tool/seahorse-tool.c:722
+#: ../tool/seahorse-tool.c:725
msgid "Signing"
msgstr "Potpisujem"
-#: ../tool/seahorse-tool.c:723
+#: ../tool/seahorse-tool.c:726
#, c-format
msgid "Couldn't sign file: %s"
msgstr "Ne mogu da potpišem datoteku: %s"
-#: ../tool/seahorse-tool.c:728
+#: ../tool/seahorse-tool.c:731
msgid "Importing"
msgstr "Uvozim"
-#: ../tool/seahorse-tool.c:729
+#: ../tool/seahorse-tool.c:732
#, c-format
msgid "Couldn't import keys from file: %s"
msgstr "Ne mogu da uvezem ključeve iz datoteke: %s"
-#: ../tool/seahorse-tool.c:735
+#: ../tool/seahorse-tool.c:738
msgid "Decrypting"
msgstr "Dešifrujem"
-#: ../tool/seahorse-tool.c:736
+#: ../tool/seahorse-tool.c:739
#, c-format
msgid "Couldn't decrypt file: %s"
msgstr "Ne mogu da dešifrujem datoteku: %s"
-#: ../tool/seahorse-tool.c:741
+#: ../tool/seahorse-tool.c:744
msgid "Verifying"
msgstr "Proveravam"
-#: ../tool/seahorse-tool.c:742
+#: ../tool/seahorse-tool.c:745
#, c-format
msgid "Couldn't verify file: %s"
msgstr "Ne mogu da proverim datoteku: %s"
diff --git a/tool/Makefile.in b/tool/Makefile.in
index 6b410eb..2a4e065 100644
--- a/tool/Makefile.in
+++ b/tool/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.2 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2012 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,
@@ -16,23 +16,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@
@@ -53,11 +81,12 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = seahorse-tool$(EXEEXT)
subdir = tool
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/mkinstalldirs \
$(srcdir)/seahorse-pgp-encrypted.desktop.in.in \
$(srcdir)/seahorse-pgp-keys.desktop.in.in \
$(srcdir)/seahorse-pgp-signature.desktop.in.in \
- $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs
+ $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -161,6 +190,23 @@ man1dir = $(mandir)/man1
NROFF = nroff
MANS = $(man_MANS)
DATA = $(desktop_DATA) $(ui_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)
@@ -447,10 +493,12 @@ install-binPROGRAMS: $(bin_PROGRAMS)
fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p || test -f $$p1; \
- then echo "$$p"; echo "$$p"; else :; fi; \
+ while read p p1; do if test -f $$p \
+ || test -f $$p1 \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
done | \
- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
-e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
sed 'N;N;N;s,\n, ,g' | \
$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -471,7 +519,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
@@ -484,6 +533,7 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
+
seahorse-tool$(EXEEXT): $(seahorse_tool_OBJECTS) $(seahorse_tool_DEPENDENCIES) $(EXTRA_seahorse_tool_DEPENDENCIES)
@rm -f seahorse-tool$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(seahorse_tool_OBJECTS) $(seahorse_tool_LDADD) $(LIBS)
@@ -619,26 +669,15 @@ uninstall-uiDATA:
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(uidir)'; $(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; \
@@ -650,15 +689,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
@@ -667,9 +702,10 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
-cscopelist: $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
case "$(srcdir)" in \
[\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
*) sdir=$(subdir)/$(srcdir) ;; \
@@ -686,19 +722,6 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
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)'; \
@@ -844,21 +867,22 @@ uninstall-man: uninstall-man1
.MAKE: all check install install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic clean-libtool cscopelist ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-binPROGRAMS install-data \
- install-data-am install-desktopDATA 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 install-uiDATA installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-binPROGRAMS uninstall-desktopDATA \
- uninstall-man uninstall-man1 uninstall-uiDATA
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+ ctags ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-desktopDATA 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 install-uiDATA installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+ uninstall-desktopDATA uninstall-man uninstall-man1 \
+ uninstall-uiDATA
seahorse-marshal.h: seahorse-marshal.list $(GLIB_GENMARSHAL)
diff --git a/tool/seahorse-libdialogs.h b/tool/seahorse-libdialogs.h
index a46f015..cde3312 100644
--- a/tool/seahorse-libdialogs.h
+++ b/tool/seahorse-libdialogs.h
@@ -14,10 +14,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/tool/seahorse-notification.c b/tool/seahorse-notification.c
index 6fcc1b6..52f46d5 100644
--- a/tool/seahorse-notification.c
+++ b/tool/seahorse-notification.c
@@ -13,10 +13,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
@@ -624,8 +621,13 @@ seahorse_notify_signatures (const gchar* data, gpgme_verify_result_t status)
break;
case GPG_ERR_NO_ERROR:
/* TRANSLATORS: <key id='xxx'> is a custom markup tag, do not translate. */
- body = _("Signed by <i><key id='%s'/></i> on %s.");
- title = _("Good Signature");
+ if (status->signatures->validity >= GPGME_VALIDITY_FULL) {
+ title = _("Good Signature");
+ body = _("Signed by <i><key id='%s'/></i> on %s.");
+ } else {
+ title = _("Untrusted Valid Signature");
+ body = _("Valid but <b>untrusted</b> signature by <i><key id='%s'/></i> on %s.");
+ }
icon = ICON_PREFIX "seahorse-sign-ok.png";
sig = TRUE;
break;
diff --git a/tool/seahorse-operation.c b/tool/seahorse-operation.c
index 800aac0..c2bb2cc 100644
--- a/tool/seahorse-operation.c
+++ b/tool/seahorse-operation.c
@@ -13,10 +13,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tool/seahorse-operation.h b/tool/seahorse-operation.h
index a75aec6..ca70b8f 100644
--- a/tool/seahorse-operation.h
+++ b/tool/seahorse-operation.h
@@ -13,10 +13,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/tool/seahorse-passphrase.c b/tool/seahorse-passphrase.c
index ffb44ec..9c3000a 100644
--- a/tool/seahorse-passphrase.c
+++ b/tool/seahorse-passphrase.c
@@ -15,10 +15,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tool/seahorse-passphrase.h b/tool/seahorse-passphrase.h
index 1035f8c..15a63a6 100644
--- a/tool/seahorse-passphrase.h
+++ b/tool/seahorse-passphrase.h
@@ -13,10 +13,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __SEAHORSE_PASSPHRASE__
diff --git a/tool/seahorse-pgp-encrypted.desktop.in b/tool/seahorse-pgp-encrypted.desktop.in
index c2a154a..45b1075 100644
--- a/tool/seahorse-pgp-encrypted.desktop.in
+++ b/tool/seahorse-pgp-encrypted.desktop.in
@@ -8,5 +8,5 @@ NoDisplay=true
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=seahorse
X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.8.0
+X-GNOME-Bugzilla-Version=3.11.92
X-GNOME-DocPath=seahorse/seahorse.xml
diff --git a/tool/seahorse-pgp-keys.desktop.in b/tool/seahorse-pgp-keys.desktop.in
index 965eac4..ad6b46d 100644
--- a/tool/seahorse-pgp-keys.desktop.in
+++ b/tool/seahorse-pgp-keys.desktop.in
@@ -8,5 +8,5 @@ NoDisplay=true
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=seahorse
X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.8.0
+X-GNOME-Bugzilla-Version=3.11.92
X-GNOME-DocPath=seahorse/seahorse.xml
diff --git a/tool/seahorse-pgp-operation.c b/tool/seahorse-pgp-operation.c
index 0788d2d..1c01c13 100644
--- a/tool/seahorse-pgp-operation.c
+++ b/tool/seahorse-pgp-operation.c
@@ -13,10 +13,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tool/seahorse-pgp-operation.h b/tool/seahorse-pgp-operation.h
index 8a602c5..8d1c1a6 100644
--- a/tool/seahorse-pgp-operation.h
+++ b/tool/seahorse-pgp-operation.h
@@ -13,10 +13,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/tool/seahorse-pgp-signature.desktop.in b/tool/seahorse-pgp-signature.desktop.in
index 8ac3a54..861b7ae 100644
--- a/tool/seahorse-pgp-signature.desktop.in
+++ b/tool/seahorse-pgp-signature.desktop.in
@@ -8,5 +8,5 @@ NoDisplay=true
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=seahorse
X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.8.0
+X-GNOME-Bugzilla-Version=3.11.92
X-GNOME-DocPath=seahorse/seahorse.xml
diff --git a/tool/seahorse-progress.c b/tool/seahorse-progress.c
index 38de780..6327a0d 100644
--- a/tool/seahorse-progress.c
+++ b/tool/seahorse-progress.c
@@ -13,10 +13,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tool/seahorse-progress.h b/tool/seahorse-progress.h
index fac9f6f..678cd9d 100644
--- a/tool/seahorse-progress.h
+++ b/tool/seahorse-progress.h
@@ -13,10 +13,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/tool/seahorse-tool-files.c b/tool/seahorse-tool-files.c
index 37148c8..e6abc88 100644
--- a/tool/seahorse-tool-files.c
+++ b/tool/seahorse-tool-files.c
@@ -13,10 +13,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tool/seahorse-tool-progress.c b/tool/seahorse-tool-progress.c
index 613e82f..7a946cd 100644
--- a/tool/seahorse-tool-progress.c
+++ b/tool/seahorse-tool-progress.c
@@ -13,10 +13,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
@@ -217,7 +214,7 @@ seahorse_tool_progress_start (const gchar *title)
argv[2] = (gchar *)title;
argv[3] = NULL;
- ret = g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_SEARCH_PATH,
+ ret = g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
NULL, NULL, &progress_pid, &progress_fd, NULL, NULL, &err);
if (!ret) {
diff --git a/tool/seahorse-tool.1 b/tool/seahorse-tool.1
index b02168f..d71f2c1 100644
--- a/tool/seahorse-tool.1
+++ b/tool/seahorse-tool.1
@@ -41,6 +41,9 @@ Encrypt FILE.
\fB\-s \fR\fIFILE\fR, \fB\-\-sign \fR\fIFILE\fR
Sign FILE with default key.
.TP
+\fB\-n \fR\fIFILE\fR, \fB\-\-encrypt-sign \fR\fIFILE\fR
+Encrypt and sign FILE with default key.
+.TP
\fB\-d \fR\fIFILE\fR, \fB\-\-decrypt \fR\fIFILE\fR
Decrypt encrypted FILE.
.TP
@@ -52,6 +55,9 @@ Read list of URIs on standard in.
.TP
\fB\-\-version\fR
Show version information and exit.
+.TP
+\fB\-h, \-\-help\fR
+Show help options.
.\" End List
.SS "Additional options"
diff --git a/tool/seahorse-tool.c b/tool/seahorse-tool.c
index 46d7901..cf98532 100644
--- a/tool/seahorse-tool.c
+++ b/tool/seahorse-tool.c
@@ -13,10 +13,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
@@ -149,26 +146,28 @@ init_crypt ()
*/
static gpgme_key_t*
-prompt_recipients (gpgme_key_t *signkey)
+prompt_recipients (gpgme_key_t *signkey, gboolean *symmetric)
{
gpgme_error_t gerr = 0;
CryptUIKeyset *keyset;
gpgme_ctx_t ctx;
gpgme_key_t key;
GArray *keys = NULL;
- gchar **recips;
+ gpgme_key_t *ret = NULL;
+ gchar **recips = NULL;
gchar *signer;
+ g_assert (symmetric != NULL);
*signkey = NULL;
keyset = cryptui_keyset_new ("openpgp", TRUE);
if (cryptui_keyset_get_count (keyset) == 0) {
- cryptui_need_to_get_keys ();
+ *symmetric = cryptui_need_to_get_keys_or_symmetric ();
} else {
- recips = cryptui_prompt_recipients (keyset, _("Choose Recipients"), &signer);
+ recips = cryptui_prompt_recipients_with_symmetric (keyset, _("Encryption settings"), &signer, symmetric);
- if (recips) {
+ if (recips || *symmetric) {
gpgme_check_version (NULL);
gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
g_return_val_if_fail (gerr == 0, NULL);
@@ -181,13 +180,14 @@ prompt_recipients (gpgme_key_t *signkey)
gchar *id = cryptui_keyset_key_raw_keyid (keyset, signer);
gerr = gpgme_get_key (ctx, id, signkey, 1);
g_free (id);
+ g_free (signer);
/* A more descriptive error message */
if (GPG_ERR_EOF == gpgme_err_code (gerr))
gerr = gpgme_error (GPG_ERR_NOT_FOUND);
}
- if (gerr == 0) {
+ if (gerr == 0 && !*symmetric) {
gchar **ids;
guint num;
@@ -210,29 +210,27 @@ prompt_recipients (gpgme_key_t *signkey)
if (gerr == 0 && num != keys->len)
g_warning ("couldn't load all the keys (%d/%d) from GPGME", keys->len, num);
- }
+ ret = (gpgme_key_t*) g_array_free (keys, FALSE);
+ }
+ g_strfreev (recips);
gpgme_release (ctx);
}
g_object_unref (keyset);
+ }
- if (!recips)
- return NULL;
-
- g_strfreev (recips);
- g_free (signer);
-
- if (gerr == 0 && keys->len)
- return (gpgme_key_t*)g_array_free (keys, FALSE);
+ if (gerr == 0 && (*symmetric || recips))
+ return ret;
- /* When failure, free all our return values */
+ /* When failure, free all our return values */
+ if (keys)
seahorse_util_free_keys ((gpgme_key_t*)g_array_free (keys, FALSE));
- if (*signkey)
- gpgme_key_unref (*signkey);
+ if (*signkey)
+ gpgme_key_unref (*signkey);
+ if (gerr)
seahorse_util_handle_gpgme (gerr, _("Couldn't load keys"));
- }
return NULL;
}
@@ -245,7 +243,7 @@ encrypt_sign_start (SeahorseToolMode *mode, const gchar *uri, gpgme_data_t urida
gpgme_error_t gerr;
gchar *touri;
- g_assert (mode->recipients && mode->recipients[0]);
+ g_assert (mode->symmetric || (mode->recipients && mode->recipients[0]));
/* File to encrypt to */
touri = seahorse_util_add_suffix (uri, SEAHORSE_CRYPT_SUFFIX,
@@ -268,10 +266,12 @@ encrypt_sign_start (SeahorseToolMode *mode, const gchar *uri, gpgme_data_t urida
gpgme_signers_clear (pop->gctx);
if (mode->signer) {
gpgme_signers_add (pop->gctx, mode->signer);
+ /* mode->recipients might be NULL if symmetric encryption has been selected */
gerr = gpgme_op_encrypt_sign_start (pop->gctx, mode->recipients,
GPGME_ENCRYPT_ALWAYS_TRUST, uridata, cipher);
} else {
+ /* mode->recipients might be NULL if symmetric encryption has been selected */
gerr = gpgme_op_encrypt_start (pop->gctx, mode->recipients,
GPGME_ENCRYPT_ALWAYS_TRUST, uridata, cipher);
}
@@ -708,8 +708,8 @@ main (int argc, char **argv)
memset (&mode, 0, sizeof (mode));
if (mode_encrypt_sign || mode_encrypt) {
- mode.recipients = prompt_recipients (&mode.signer);
- if (mode.recipients) {
+ mode.recipients = prompt_recipients (&mode.signer, &mode.symmetric);
+ if (mode.recipients || mode.symmetric) {
mode.title = _("Encrypting");
mode.errmsg = _("Couldn't encrypt file: %s");
mode.startcb = encrypt_sign_start;
diff --git a/tool/seahorse-tool.h b/tool/seahorse-tool.h
index 04b1842..972d7af 100644
--- a/tool/seahorse-tool.h
+++ b/tool/seahorse-tool.h
@@ -13,10 +13,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __SEAHORSE_TOOL_H__
@@ -45,6 +42,7 @@ typedef struct _SeahorseToolMode {
gboolean package;
/* Used for encryption /signing */
+ gboolean symmetric;
gpgme_key_t *recipients;
gpgme_key_t signer;
diff --git a/tool/seahorse-util.c b/tool/seahorse-util.c
index 3ad2c77..eee092c 100644
--- a/tool/seahorse-util.c
+++ b/tool/seahorse-util.c
@@ -14,10 +14,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tool/seahorse-util.h b/tool/seahorse-util.h
index c92761c..9052856 100644
--- a/tool/seahorse-util.h
+++ b/tool/seahorse-util.h
@@ -14,10 +14,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/**
diff --git a/tool/seahorse-vfs-data.c b/tool/seahorse-vfs-data.c
index 7bda99c..7250b08 100644
--- a/tool/seahorse-vfs-data.c
+++ b/tool/seahorse-vfs-data.c
@@ -13,10 +13,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
diff --git a/tool/seahorse-vfs-data.h b/tool/seahorse-vfs-data.h
index c836064..419b60a 100644
--- a/tool/seahorse-vfs-data.h
+++ b/tool/seahorse-vfs-data.h
@@ -13,10 +13,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <gio/gio.h>
diff --git a/tool/seahorse-widget.c b/tool/seahorse-widget.c
index 5defcf9..bb75c0e 100644
--- a/tool/seahorse-widget.c
+++ b/tool/seahorse-widget.c
@@ -14,10 +14,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
diff --git a/tool/seahorse-widget.h b/tool/seahorse-widget.h
index 26fe5a6..f2207c1 100644
--- a/tool/seahorse-widget.h
+++ b/tool/seahorse-widget.h
@@ -14,10 +14,7 @@
* 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __SEAHORSE_WIDGET_H__
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/seahorse-nautilus.git
More information about the Pkg-privacy-commits
mailing list