[Pkg-privacy-commits] [seahorse-nautilus] 03/26: Import Upstream version 3.8.0
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 8102354724911934a9a03cf47cb5f10996db3e48
Author: Carlos Maddela <e7appew at gmail.com>
Date: Sun Jan 8 06:52:18 2017 +1100
Import Upstream version 3.8.0
---
ChangeLog | 773 +++--
Makefile.am | 1 +
Makefile.in | 186 +-
NEWS | 28 +
aclocal.m4 | 3284 ++++++++++----------
config.h.in | 5 +
configure | 1265 ++++----
configure.ac | 13 +-
data/Makefile.am | 15 +
{nautilus-ext => data}/Makefile.in | 324 +-
data/org.gnome.seahorse.nautilus.convert | 4 +
data/org.gnome.seahorse.nautilus.gschema.xml | 19 +
.../org.gnome.seahorse.nautilus.window.gschema.xml | 14 +
m4/intltool.m4 | 71 +-
mkinstalldirs | 4 +-
nautilus-ext/Makefile.in | 107 +-
po/Makefile.in.in | 13 +-
po/POTFILES.in | 2 +
po/cs.po | 231 +-
po/es.po | 241 +-
po/he.po | 225 +-
po/hu.po | 231 +-
po/lt.po | 229 +-
po/pl.po | 230 +-
po/pt_BR.po | 248 +-
po/sl.po | 243 +-
po/sr.po | 240 +-
po/sr at latin.po | 240 +-
tool/Makefile.am | 8 +-
tool/Makefile.in | 176 +-
tool/seahorse-gconf.c | 183 --
tool/seahorse-gconf.h | 55 -
tool/seahorse-libdialogs.h | 2 +
tool/seahorse-multi-encrypt.xml | 3 +-
tool/seahorse-notification.c | 17 +-
tool/seahorse-notify.xml | 1 -
tool/seahorse-passphrase.c | 387 +--
tool/seahorse-passphrase.h | 4 -
tool/seahorse-pgp-encrypted.desktop.in | 2 +-
tool/seahorse-pgp-keys.desktop.in | 2 +-
tool/seahorse-pgp-signature.desktop.in | 2 +-
tool/seahorse-progress.xml | 1 -
tool/seahorse-secure-buffer.c | 196 --
tool/seahorse-secure-buffer.h | 57 -
tool/seahorse-secure-memory.c | 128 -
tool/seahorse-secure-memory.h | 39 -
tool/seahorse-tool-files.c | 17 +-
tool/seahorse-tool.c | 19 +-
tool/seahorse-tool.h | 2 +
tool/seahorse-util.c | 1 -
tool/seahorse-widget.c | 114 +-
tool/seahorse-widget.h | 1 +
52 files changed, 5075 insertions(+), 4828 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1f6fe5e..eb6b6bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,338 @@
# Generated automatically. Do not edit.
+commit 6819a7dcbe6d81a549a98209f4c8cdc545c252ab
+Author: Stef Walter <stefw at gnome.org>
+Date: 2013-03-25
+
+ Release version 3.8.0
+
+ NEWS | 3 +++
+ configure.ac | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+commit b6a754fa0a3a73b9fbf1c2f8123bf23756d2aadf
+Author: Stef Walter <stefw at gnome.org>
+Date: 2013-03-18
+
+ Release version 3.7.92
+
+ NEWS | 3 +++
+ configure.ac | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+commit 112050ef5064fc035489ca5490a6cbf6aa7f2d64
+Author: Rafael Ferreira <rafael.f.f1 at gmail.com>
+Date: 2013-03-12
+
+ Updated Brazilian Portuguese translation
+
+ po/pt_BR.po | 248 ++++++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 148 insertions(+), 100 deletions(-)
+
+commit 8f87359bf4cdae6bf4f289262f7b15157f3d877c
+Author: Gabor Kelemen <kelemeng at gnome.hu>
+Date: 2013-02-18
+
+ Updated Hungarian translation
+
+ po/hu.po | 231 ++++++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 138 insertions(+), 93 deletions(-)
+
+commit 3db8c693b87ffa7f1d4314c197fb1a607d2649db
+Author: Stef Walter <stefw at gnome.org>
+Date: 2013-02-04
+
+ Release version 3.7.5
+
+ NEWS | 3 +++
+ configure.ac | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+commit 618fdbdd75a3699eac3f1b4ce674bcd67ebec932
+Author: Marek Černocký <marek at manet.cz>
+Date: 2013-01-24
+
+ Updated Czech translation
+
+ po/cs.po | 231 +++++++++++++++++++++++++++++++++++++--------------------------
+ 1 file changed, 135 insertions(+), 96 deletions(-)
+
+commit 71d0225cad632d656e1fd1dc180ee042fe33dcba
+Author: Matej Urbančič <mateju at svn.gnome.org>
+Date: 2013-01-10
+
+ Updated Slovenian translation
+
+ po/sl.po | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+commit 49eee94d8cd7561d68c8511c81d523454efc3887
+Author: Мирослав Николић <miroslavnikolic at rocketmail.com>
+Date: 2013-01-08
+
+ Updated Serbian translation
+
+ po/sr.po | 240 +++++++++++++++++++++++++++++++++------------------------
+ po/sr at latin.po | 240 +++++++++++++++++++++++++++++++++------------------------
+ 2 files changed, 280 insertions(+), 200 deletions(-)
+
+commit 925ebc698dcc0b646f391b3d35d0e9ef9612b65d
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date: 2012-12-31
+
+ Updated Spanish translation
+
+ po/es.po | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+commit 4b963f9f253866304a4d2d53f4fd98afc7965c7d
+Author: Yaron Shahrabani <sh.yaron at gmail.com>
+Date: 2012-12-28
+
+ Updated Hebrew translation.
+
+ po/he.po | 225 ++++++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 135 insertions(+), 90 deletions(-)
+
+commit 2beb4f3e3c4abcc7055aa58255a86cdce8813e10
+Author: Aurimas Černius <aurisc4 at gmail.com>
+Date: 2012-12-20
+
+ Updated Lithuanian translation
+
+ po/lt.po | 229 ++++++++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 131 insertions(+), 98 deletions(-)
+
+commit 29d1bdec06145b55bc26e6144c9ac7973759d4a2
+Author: Matej Urbančič <mateju at svn.gnome.org>
+Date: 2012-12-19
+
+ Added Slovenian translation
+
+ po/sl.po | 244 +++++++++++++++++++++++++++++++++++++--------------------------
+ 1 file changed, 145 insertions(+), 99 deletions(-)
+
+commit 2f5da6af42b6aa46470a1b2470cc87ccf029b122
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date: 2012-12-04
+
+ Updated Spanish translation
+
+ po/es.po | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+commit 6378fe596897c79db52765bbe5521fe19256b56c
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date: 2012-12-04
+
+ Updated Spanish translation
+
+ po/es.po | 238 ++++++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 144 insertions(+), 94 deletions(-)
+
+commit ca686e81e20ab537d2f87f8b1554e227d182f2bd
+Author: Stef Walter <stefw at gnome.org>
+Date: 2012-10-15
+
+ Release version 3.6.1
+
+ NEWS | 3 +++
+ configure.ac | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+commit 8f48809c0fb6633bb45eac2144c1125f79933053
+Author: Stef Walter <stefw at gnome.org>
+Date: 2012-10-01
+
+ Fix the schema identifier for GSettings window settings
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=685124
+
+ data/org.gnome.seahorse.nautilus.window.gschema.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit c80bf826e927fb9d9e45426e0f1306cf22f8a1d3
+Author: Stef Walter <stefw at gnome.org>
+Date: 2012-09-25
+
+ Release version 3.6.0
+
+ NEWS | 3 +++
+ configure.ac | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+commit 07a93be3a5e2f4d7cdd1d0d2c209af7f20563957
+Author: Stef Walter <stefw at gnome.org>
+Date: 2012-09-18
+
+ Release version 3.5.92
+
+ NEWS | 3 +++
+ configure.ac | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+commit 4cdb4d37ecbd4a0c71414a046372dc79a7de987c
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date: 2012-09-04
+
+ Updated Polish translation
+
+ po/pl.po | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+commit bdc117a11f93ee152dd73e3b9509283bbf2cb1dd
+Author: Stef Walter <stefw at gnome.org>
+Date: 2012-09-03
+
+ Release version 3.5.91
+
+ NEWS | 3 +++
+ configure.ac | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+commit 4a7e7b0ec5b2899d1eaa53661be59d436fb7bb4e
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date: 2012-08-22
+
+ Updated Polish translation
+
+ po/pl.po | 223 +++++++++++++++++++++++++++++++++++++--------------------------
+ 1 file changed, 131 insertions(+), 92 deletions(-)
+
+commit 65062a63d0a1c220835de2ecf54b24044276ecb4
+Author: Stef Walter <stefw at gnome.org>
+Date: 2012-07-16
+
+ Release version 3.5.4
+
+ NEWS | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+commit a76eb15551dff7148d91053f018fa39623d0dc0d
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date: 2012-06-29
+
+ Updated POTFILES.in
+
+ po/POTFILES.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit fc461e7ebefdffc88ff92730f9919cbddd760253
+Author: Stef Walter <stefw at gnome.org>
+Date: 2012-06-29
+
+ Bump version number
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit f2044481fa173feba45eb15a55708bd73f58a77e
+Author: Stef Walter <stefw at gnome.org>
+Date: 2012-06-29
+
+ Fix use of uninitialized variable
+
+ tool/seahorse-tool.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 8abff8e3e7592bb85a6e1466afb5e68ca0ca9de4
+Author: Stef Walter <stefw at gnome.org>
+Date: 2012-06-29
+
+ Use GtkComboBoxText correctly
+
+ * And remove check for old versions of GTK+
+
+ tool/seahorse-multi-encrypt.xml | 2 +-
+ tool/seahorse-tool-files.c | 8 --------
+ 2 files changed, 1 insertion(+), 9 deletions(-)
+
+commit f923946e3c0b0e70f2bad845d37484e2bcc5f345
+Author: Stef Walter <stefw at gnome.org>
+Date: 2012-06-29
+
+ Don't use has_separator property in dialogs, deprecated
+
+ tool/seahorse-multi-encrypt.xml | 1 -
+ tool/seahorse-notify.xml | 1 -
+ tool/seahorse-progress.xml | 1 -
+ 3 files changed, 3 deletions(-)
+
+commit d673c20a6d376300accbec3f0da91b0d581fc465
+Author: Stef Walter <stefw at gnome.org>
+Date: 2012-06-29
+
+ Don't use g_atexit now that its deprecated
+
+ tool/seahorse-libdialogs.h | 2 ++
+ tool/seahorse-notification.c | 17 ++++++++---------
+ tool/seahorse-tool.c | 2 ++
+ 3 files changed, 12 insertions(+), 9 deletions(-)
+
+commit e83548cf4f26ddac22940b0cff16f8d38b55f1a3
+Author: Stef Walter <stefw at gnome.org>
+Date: 2012-06-29
+
+ Fix loading of UI files
+
+ * Path was built incorrectly
+ * Report errors during loading of UI files
+
+ tool/Makefile.am | 2 +-
+ tool/seahorse-widget.c | 7 ++++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit ff0c38ae75d14ae1df4c00e0c604cb2bd0a24f93
+Author: Stef Walter <stefw at gnome.org>
+Date: 2012-06-29
+
+ Use GcrPrompt for prompting
+
+ * Now depends on gcr 3.4.0 or later
+
+ configure.ac | 7 +
+ tool/Makefile.am | 5 +-
+ tool/seahorse-passphrase.c | 387 +++++++++---------------------------------
+ tool/seahorse-passphrase.h | 4 -
+ tool/seahorse-secure-buffer.c | 196 ---------------------
+ tool/seahorse-secure-buffer.h | 57 -------
+ tool/seahorse-secure-memory.c | 128 --------------
+ tool/seahorse-secure-memory.h | 39 -----
+ tool/seahorse-tool.c | 3 -
+ 9 files changed, 87 insertions(+), 739 deletions(-)
+
+commit ecc8717bc14ec239e83f2ac58de96c437f1f31e3
+Author: Stef Walter <stefw at gnome.org>
+Date: 2012-06-29
+
+ Migrate from GConf to GSettings
+
+ .gitignore | 1 +
+ Makefile.am | 1 +
+ configure.ac | 4 +-
+ data/Makefile.am | 15 ++
+ data/org.gnome.seahorse.nautilus.convert | 4 +
+ data/org.gnome.seahorse.nautilus.gschema.xml | 19 +++
+ .../org.gnome.seahorse.nautilus.window.gschema.xml | 14 ++
+ tool/Makefile.am | 1 -
+ tool/seahorse-gconf.c | 183 ---------------------
+ tool/seahorse-gconf.h | 55 -------
+ tool/seahorse-tool-files.c | 9 +-
+ tool/seahorse-tool.c | 12 +-
+ tool/seahorse-tool.h | 2 +
+ tool/seahorse-util.c | 1 -
+ tool/seahorse-widget.c | 107 +++++-------
+ tool/seahorse-widget.h | 1 +
+ 16 files changed, 116 insertions(+), 313 deletions(-)
+
commit cf90865d3c72a14911812b999d86084d45b90ca8
Author: Stef Walter <stefw at gnome.org>
Date: 2012-03-26
Release 3.4.0
- NEWS | 3 +++
- configure.ac | 2 +-
+ NEWS | 3 +++
+ configure.ac | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
commit 081e708351504e3fc9b466988163ec522a4e963c
@@ -16,7 +341,7 @@ Date: 2011-10-24
Bump version number
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c85b7ac8e47e0788524090e4bb201927c764b75c
@@ -25,9 +350,9 @@ Date: 2011-10-24
Release version 3.3.1
- NEWS | 7 ++++++-
- configure.ac | 2 +-
- seahorse-nautilus.doap | 24 ++++++++++++++++++++++++
+ NEWS | 7 ++++++-
+ configure.ac | 2 +-
+ seahorse-nautilus.doap | 24 ++++++++++++++++++++++++
3 files changed, 31 insertions(+), 2 deletions(-)
commit 68d503557dfdb01c336dc43d99b38993dcbecaec
@@ -36,32 +361,32 @@ Date: 2011-10-07
Remove unused functions, and fix up warnings
- configure.ac | 3 +-
- tool/Makefile.am | 1 -
- tool/seahorse-gconf.c | 117 ----------
- tool/seahorse-gconf.h | 33 ---
- tool/seahorse-gpgmex-op.c | 123 -----------
- tool/seahorse-gpgmex-util.c | 416 -----------------------------------
- tool/seahorse-gpgmex.h | 130 -----------
- tool/seahorse-libdialogs.h | 7 -
- tool/seahorse-notification.c | 20 +-
- tool/seahorse-operation.c | 359 ------------------------------
- tool/seahorse-operation.h | 60 -----
- tool/seahorse-passphrase.c | 12 +-
- tool/seahorse-pgp-operation.c | 9 +-
- tool/seahorse-pgp-operation.h | 2 +-
- tool/seahorse-progress.c | 58 +----
- tool/seahorse-progress.h | 7 -
- tool/seahorse-tool-files.c | 29 ++-
- tool/seahorse-tool-progress.c | 9 +-
- tool/seahorse-tool.c | 42 ++--
- tool/seahorse-tool.h | 8 +-
- tool/seahorse-util.c | 488 +----------------------------------------
- tool/seahorse-util.h | 65 +-----
- tool/seahorse-vfs-data.c | 168 +-------------
- tool/seahorse-vfs-data.h | 10 +-
- tool/seahorse-widget.c | 85 -------
- tool/seahorse-widget.h | 16 +-
+ configure.ac | 3 +-
+ tool/Makefile.am | 1 -
+ tool/seahorse-gconf.c | 117 ----------
+ tool/seahorse-gconf.h | 33 ---
+ tool/seahorse-gpgmex-op.c | 123 -----------
+ tool/seahorse-gpgmex-util.c | 416 -----------------------------------
+ tool/seahorse-gpgmex.h | 130 -----------
+ tool/seahorse-libdialogs.h | 7 -
+ tool/seahorse-notification.c | 20 +-
+ tool/seahorse-operation.c | 359 -------------------------------
+ tool/seahorse-operation.h | 60 ------
+ tool/seahorse-passphrase.c | 12 +-
+ tool/seahorse-pgp-operation.c | 9 +-
+ tool/seahorse-pgp-operation.h | 2 +-
+ tool/seahorse-progress.c | 58 +----
+ tool/seahorse-progress.h | 7 -
+ tool/seahorse-tool-files.c | 29 ++-
+ tool/seahorse-tool-progress.c | 9 +-
+ tool/seahorse-tool.c | 42 ++--
+ tool/seahorse-tool.h | 8 +-
+ tool/seahorse-util.c | 488 +-----------------------------------------
+ tool/seahorse-util.h | 65 +-----
+ tool/seahorse-vfs-data.c | 168 +--------------
+ tool/seahorse-vfs-data.h | 10 +-
+ tool/seahorse-widget.c | 85 --------
+ tool/seahorse-widget.h | 16 +-
26 files changed, 82 insertions(+), 2195 deletions(-)
commit 2e1f11f6de02b829c6d25d39eb92ea65d5e11531
@@ -74,106 +399,106 @@ Date: 2011-10-07
old releases of the nautilus plugin use the seahorse-plugins
git module.
- .gitignore | 43 +++
- AUTHORS | 14 +
- COPYING | 340 ++++++++++++++++++++++++
- ChangeLog | 32 +++
- INSTALL | 365 +++++++++++++++++++++++++
- MAINTAINERS | 3 +
- Makefile.am | 41 +++
- NEWS | 1 +
- README | 4 +
- THANKS | 27 ++
- autogen.sh | 20 ++
- configure.ac | 304 +++++++++++++++++++++
- po/LINGUAS | 77 ++++++
- po/POTFILES.in | 15 ++
- po/POTFILES.skip | 3 +
- po/ar.po | 575 +++++++++++++++++++++++++++++++++++++++
- po/as.po | 551 ++++++++++++++++++++++++++++++++++++++
- po/ast.po | 536 +++++++++++++++++++++++++++++++++++++
- po/az.po | 534 +++++++++++++++++++++++++++++++++++++
- po/be at latin.po | 544 +++++++++++++++++++++++++++++++++++++
- po/bg.po | 532 +++++++++++++++++++++++++++++++++++++
- po/bn.po | 538 +++++++++++++++++++++++++++++++++++++
- po/bn_IN.po | 536 +++++++++++++++++++++++++++++++++++++
- po/br.po | 527 ++++++++++++++++++++++++++++++++++++
- po/ca.po | 538 +++++++++++++++++++++++++++++++++++++
- po/ca at valencia.po | 538 +++++++++++++++++++++++++++++++++++++
- po/cs.po | 551 ++++++++++++++++++++++++++++++++++++++
- po/da.po | 554 ++++++++++++++++++++++++++++++++++++++
- po/de.po | 537 +++++++++++++++++++++++++++++++++++++
- po/dz.po | 538 +++++++++++++++++++++++++++++++++++++
- po/el.po | 540 +++++++++++++++++++++++++++++++++++++
- po/en at shaw.po | 533 +++++++++++++++++++++++++++++++++++++
- po/en_CA.po | 558 ++++++++++++++++++++++++++++++++++++++
- po/en_GB.po | 534 +++++++++++++++++++++++++++++++++++++
- po/eo.po | 529 ++++++++++++++++++++++++++++++++++++
- po/es.po | 537 +++++++++++++++++++++++++++++++++++++
- po/et.po | 536 +++++++++++++++++++++++++++++++++++++
- po/eu.po | 534 +++++++++++++++++++++++++++++++++++++
- po/fi.po | 534 +++++++++++++++++++++++++++++++++++++
- po/fr.po | 545 +++++++++++++++++++++++++++++++++++++
- po/ga.po | 540 +++++++++++++++++++++++++++++++++++++
- po/gl.po | 535 +++++++++++++++++++++++++++++++++++++
- po/gu.po | 537 +++++++++++++++++++++++++++++++++++++
- po/he.po | 530 ++++++++++++++++++++++++++++++++++++
- po/hi.po | 550 ++++++++++++++++++++++++++++++++++++++
- po/hr.po | 557 ++++++++++++++++++++++++++++++++++++++
- po/hu.po | 537 +++++++++++++++++++++++++++++++++++++
- po/id.po | 525 ++++++++++++++++++++++++++++++++++++
- po/it.po | 539 +++++++++++++++++++++++++++++++++++++
- po/ja.po | 523 ++++++++++++++++++++++++++++++++++++
- po/kn.po | 534 +++++++++++++++++++++++++++++++++++++
- po/ko.po | 531 ++++++++++++++++++++++++++++++++++++
- po/ku.po | 527 ++++++++++++++++++++++++++++++++++++
- po/lt.po | 552 ++++++++++++++++++++++++++++++++++++++
- po/lv.po | 550 ++++++++++++++++++++++++++++++++++++++
- po/mai.po | 529 ++++++++++++++++++++++++++++++++++++
- po/mk.po | 549 ++++++++++++++++++++++++++++++++++++++
- po/ml.po | 535 +++++++++++++++++++++++++++++++++++++
- po/mr.po | 531 ++++++++++++++++++++++++++++++++++++
- po/ms.po | 560 ++++++++++++++++++++++++++++++++++++++
- po/nb.po | 531 ++++++++++++++++++++++++++++++++++++
- po/ne.po | 535 +++++++++++++++++++++++++++++++++++++
- po/nl.po | 556 ++++++++++++++++++++++++++++++++++++++
- po/nn.po | 532 +++++++++++++++++++++++++++++++++++++
- po/oc.po | 531 ++++++++++++++++++++++++++++++++++++
- po/or.po | 545 +++++++++++++++++++++++++++++++++++++
- po/pa.po | 535 +++++++++++++++++++++++++++++++++++++
- po/pl.po | 547 ++++++++++++++++++++++++++++++++++++++
- po/pt.po | 538 +++++++++++++++++++++++++++++++++++++
- po/pt_BR.po | 541 +++++++++++++++++++++++++++++++++++++
- po/ro.po | 544 +++++++++++++++++++++++++++++++++++++
- po/ru.po | 547 ++++++++++++++++++++++++++++++++++++++
- po/rw.po | 579 ++++++++++++++++++++++++++++++++++++++++
- po/si.po | 528 ++++++++++++++++++++++++++++++++++++
- po/sk.po | 547 ++++++++++++++++++++++++++++++++++++++
- po/sl.po | 558 ++++++++++++++++++++++++++++++++++++++
- po/sq.po | 566 +++++++++++++++++++++++++++++++++++++++
- po/sr.po | 562 +++++++++++++++++++++++++++++++++++++++
- po/sr at latin.po | 562 +++++++++++++++++++++++++++++++++++++++
- po/sv.po | 532 +++++++++++++++++++++++++++++++++++++
- po/ta.po | 536 +++++++++++++++++++++++++++++++++++++
- po/te.po | 535 +++++++++++++++++++++++++++++++++++++
- po/th.po | 521 ++++++++++++++++++++++++++++++++++++
- po/tr.po | 535 +++++++++++++++++++++++++++++++++++++
- po/ug.po | 527 ++++++++++++++++++++++++++++++++++++
- po/uk.po | 546 +++++++++++++++++++++++++++++++++++++
- po/vi.po | 541 +++++++++++++++++++++++++++++++++++++
- po/zh_CN.po | 522 ++++++++++++++++++++++++++++++++++++
- po/zh_HK.po | 531 ++++++++++++++++++++++++++++++++++++
- po/zh_TW.po | 531 ++++++++++++++++++++++++++++++++++++
- tool/Makefile.am | 80 +++---
- tool/seahorse-algo.c | 591 -----------------------------------------
- tool/seahorse-algo.h | 97 -------
- tool/seahorse-gpgmex-util.c | 47 ----
- tool/seahorse-marshal.list | 3 -
- tool/seahorse-notification.c | 3 -
- tool/seahorse-passphrase.c | 4 -
- tool/seahorse-tool-progress.c | 4 -
- tool/seahorse-tool.c | 4 -
- tool/seahorse-widget.c | 1 -
+ .gitignore | 43 +++
+ AUTHORS | 14 +
+ COPYING | 340 ++++++++++++++++++++++++
+ ChangeLog | 32 +++
+ INSTALL | 365 ++++++++++++++++++++++++++
+ MAINTAINERS | 3 +
+ Makefile.am | 41 +++
+ NEWS | 1 +
+ README | 4 +
+ THANKS | 27 ++
+ autogen.sh | 20 ++
+ configure.ac | 304 ++++++++++++++++++++++
+ po/LINGUAS | 77 ++++++
+ po/POTFILES.in | 15 ++
+ po/POTFILES.skip | 3 +
+ po/ar.po | 575 ++++++++++++++++++++++++++++++++++++++++
+ po/as.po | 551 +++++++++++++++++++++++++++++++++++++++
+ po/ast.po | 536 ++++++++++++++++++++++++++++++++++++++
+ po/az.po | 534 ++++++++++++++++++++++++++++++++++++++
+ po/be at latin.po | 544 ++++++++++++++++++++++++++++++++++++++
+ po/bg.po | 532 +++++++++++++++++++++++++++++++++++++
+ po/bn.po | 538 ++++++++++++++++++++++++++++++++++++++
+ po/bn_IN.po | 536 ++++++++++++++++++++++++++++++++++++++
+ po/br.po | 527 +++++++++++++++++++++++++++++++++++++
+ po/ca.po | 538 ++++++++++++++++++++++++++++++++++++++
+ po/ca at valencia.po | 538 ++++++++++++++++++++++++++++++++++++++
+ po/cs.po | 551 +++++++++++++++++++++++++++++++++++++++
+ po/da.po | 554 +++++++++++++++++++++++++++++++++++++++
+ po/de.po | 537 ++++++++++++++++++++++++++++++++++++++
+ po/dz.po | 538 ++++++++++++++++++++++++++++++++++++++
+ po/el.po | 540 ++++++++++++++++++++++++++++++++++++++
+ po/en at shaw.po | 533 +++++++++++++++++++++++++++++++++++++
+ po/en_CA.po | 558 +++++++++++++++++++++++++++++++++++++++
+ po/en_GB.po | 534 ++++++++++++++++++++++++++++++++++++++
+ po/eo.po | 529 +++++++++++++++++++++++++++++++++++++
+ po/es.po | 537 ++++++++++++++++++++++++++++++++++++++
+ po/et.po | 536 ++++++++++++++++++++++++++++++++++++++
+ po/eu.po | 534 ++++++++++++++++++++++++++++++++++++++
+ po/fi.po | 534 ++++++++++++++++++++++++++++++++++++++
+ po/fr.po | 545 ++++++++++++++++++++++++++++++++++++++
+ po/ga.po | 540 ++++++++++++++++++++++++++++++++++++++
+ po/gl.po | 535 ++++++++++++++++++++++++++++++++++++++
+ po/gu.po | 537 ++++++++++++++++++++++++++++++++++++++
+ po/he.po | 530 +++++++++++++++++++++++++++++++++++++
+ po/hi.po | 550 +++++++++++++++++++++++++++++++++++++++
+ po/hr.po | 557 +++++++++++++++++++++++++++++++++++++++
+ po/hu.po | 537 ++++++++++++++++++++++++++++++++++++++
+ po/id.po | 525 +++++++++++++++++++++++++++++++++++++
+ po/it.po | 539 ++++++++++++++++++++++++++++++++++++++
+ po/ja.po | 523 +++++++++++++++++++++++++++++++++++++
+ po/kn.po | 534 ++++++++++++++++++++++++++++++++++++++
+ po/ko.po | 531 +++++++++++++++++++++++++++++++++++++
+ po/ku.po | 527 +++++++++++++++++++++++++++++++++++++
+ po/lt.po | 552 +++++++++++++++++++++++++++++++++++++++
+ po/lv.po | 550 +++++++++++++++++++++++++++++++++++++++
+ po/mai.po | 529 +++++++++++++++++++++++++++++++++++++
+ po/mk.po | 549 +++++++++++++++++++++++++++++++++++++++
+ po/ml.po | 535 ++++++++++++++++++++++++++++++++++++++
+ po/mr.po | 531 +++++++++++++++++++++++++++++++++++++
+ po/ms.po | 560 +++++++++++++++++++++++++++++++++++++++
+ po/nb.po | 531 +++++++++++++++++++++++++++++++++++++
+ po/ne.po | 535 ++++++++++++++++++++++++++++++++++++++
+ po/nl.po | 556 +++++++++++++++++++++++++++++++++++++++
+ po/nn.po | 532 +++++++++++++++++++++++++++++++++++++
+ po/oc.po | 531 +++++++++++++++++++++++++++++++++++++
+ po/or.po | 545 ++++++++++++++++++++++++++++++++++++++
+ po/pa.po | 535 ++++++++++++++++++++++++++++++++++++++
+ po/pl.po | 547 ++++++++++++++++++++++++++++++++++++++
+ po/pt.po | 538 ++++++++++++++++++++++++++++++++++++++
+ po/pt_BR.po | 541 ++++++++++++++++++++++++++++++++++++++
+ po/ro.po | 544 ++++++++++++++++++++++++++++++++++++++
+ po/ru.po | 547 ++++++++++++++++++++++++++++++++++++++
+ po/rw.po | 579 +++++++++++++++++++++++++++++++++++++++++
+ po/si.po | 528 +++++++++++++++++++++++++++++++++++++
+ po/sk.po | 547 ++++++++++++++++++++++++++++++++++++++
+ po/sl.po | 558 +++++++++++++++++++++++++++++++++++++++
+ po/sq.po | 566 ++++++++++++++++++++++++++++++++++++++++
+ po/sr.po | 562 +++++++++++++++++++++++++++++++++++++++
+ po/sr at latin.po | 562 +++++++++++++++++++++++++++++++++++++++
+ po/sv.po | 532 +++++++++++++++++++++++++++++++++++++
+ po/ta.po | 536 ++++++++++++++++++++++++++++++++++++++
+ po/te.po | 535 ++++++++++++++++++++++++++++++++++++++
+ po/th.po | 521 +++++++++++++++++++++++++++++++++++++
+ po/tr.po | 535 ++++++++++++++++++++++++++++++++++++++
+ po/ug.po | 527 +++++++++++++++++++++++++++++++++++++
+ po/uk.po | 546 ++++++++++++++++++++++++++++++++++++++
+ po/vi.po | 541 ++++++++++++++++++++++++++++++++++++++
+ po/zh_CN.po | 522 +++++++++++++++++++++++++++++++++++++
+ po/zh_HK.po | 531 +++++++++++++++++++++++++++++++++++++
+ po/zh_TW.po | 531 +++++++++++++++++++++++++++++++++++++
+ tool/Makefile.am | 80 +++---
+ tool/seahorse-algo.c | 591 ------------------------------------------
+ tool/seahorse-algo.h | 97 -------
+ tool/seahorse-gpgmex-util.c | 47 ----
+ tool/seahorse-marshal.list | 3 -
+ tool/seahorse-notification.c | 3 -
+ tool/seahorse-passphrase.c | 4 -
+ tool/seahorse-tool-progress.c | 4 -
+ tool/seahorse-tool.c | 4 -
+ tool/seahorse-widget.c | 1 -
100 files changed, 41853 insertions(+), 791 deletions(-)
commit ecefeb4ca4a593e01d53c1cb9bc3b22d5ecb4bd9
@@ -184,7 +509,7 @@ Date: 2011-08-31
https://bugzilla.gnome.org/show_bug.cgi?id=648896
- tool/seahorse-tool-files.c | 3 +--
+ tool/seahorse-tool-files.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit 2e30bcd26b9928170c25988a982d3ac58b5d908e
@@ -195,9 +520,9 @@ Date: 2011-05-09
https://bugzilla.gnome.org/show_bug.cgi?id=588432
- tool/seahorse-tool-files.c | 9 +++++++++
- tool/seahorse-tool.c | 12 ++++++------
- tool/seahorse-tool.h | 7 +++++++
+ tool/seahorse-tool-files.c | 9 +++++++++
+ tool/seahorse-tool.c | 12 ++++++------
+ tool/seahorse-tool.h | 7 +++++++
3 files changed, 22 insertions(+), 6 deletions(-)
commit 9ed9907e0bc680b848a9c7b7e6202dca3d43ead5
@@ -206,7 +531,7 @@ Date: 2011-02-10
Compatibility with GTK+ 2.22
- tool/seahorse-tool-files.c | 10 +++++++++-
+ tool/seahorse-tool-files.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
commit 017f76b335e123e1446e3808a5d9f1a169d18de3
@@ -224,7 +549,7 @@ Date: 2011-01-14
* notify_notification_new cannot attach itself to widgets with 0.7
- tool/seahorse-notification.c | 10 ++++++++++
+ tool/seahorse-notification.c | 10 ++++++++++
1 file changed, 10 insertions(+)
commit 6c58d8aef3cb5121dda75c21996900ce5f8258f3
@@ -238,7 +563,7 @@ Date: 2011-01-14
- gtk_quit_add() shouldn't be needed since uninit is called atexit()
* Require gtk+-2.91.1 or gtk+-2.23.0 for this
- tool/seahorse-tool-files.c | 7 +++----
+ tool/seahorse-tool-files.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
commit 072f2498b5fef691167ea763c4c2b1eaca265b84
@@ -249,9 +574,9 @@ Date: 2010-10-06
To build with GTK3 use the --with-gtk=3.0 command line argument.
- tool/seahorse-passphrase.c | 5 ++++-
- tool/seahorse-widget.c | 51 +++++++++++++++++++++++++++++---------------
- tool/seahorse-widget.h | 18 ++++++++++------
+ tool/seahorse-passphrase.c | 5 ++++-
+ tool/seahorse-widget.c | 51 ++++++++++++++++++++++++++++++----------------
+ tool/seahorse-widget.h | 18 +++++++++-------
3 files changed, 49 insertions(+), 25 deletions(-)
commit b5586afc3cdfcc635e283273c7521691857186f3
@@ -262,7 +587,7 @@ Date: 2010-10-06
Fix compiler warnings in seahorse-operation.c
- tool/seahorse-operation.c | 14 +++++++-------
+ tool/seahorse-operation.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
commit 21787ab0975f8a7eb742c94e07905cd9f52232cc
@@ -274,13 +599,13 @@ Date: 2010-07-27
* Fix support for large files by including config.h everywhere properly.
* Add proper .gitignore
- tool/seahorse-algo.c | 2 ++
- tool/seahorse-gconf.c | 2 ++
- tool/seahorse-gpgmex-op.c | 2 ++
- tool/seahorse-gpgmex-util.c | 3 ++-
- tool/seahorse-operation.c | 4 ++--
- tool/seahorse-progress.c | 2 ++
- tool/seahorse-vfs-data.c | 2 ++
+ tool/seahorse-algo.c | 2 ++
+ tool/seahorse-gconf.c | 2 ++
+ tool/seahorse-gpgmex-op.c | 2 ++
+ tool/seahorse-gpgmex-util.c | 3 ++-
+ tool/seahorse-operation.c | 4 ++--
+ tool/seahorse-progress.c | 2 ++
+ tool/seahorse-vfs-data.c | 2 ++
7 files changed, 14 insertions(+), 3 deletions(-)
commit 46febb742c115a2ec163548c2a1325f279bb8446
@@ -289,9 +614,9 @@ Date: 2010-06-20
Fix build with -DGSEAL
- tool/seahorse-pgp-operation.c | 1 +
- tool/seahorse-tool.c | 7 +++++++
- tool/seahorse-widget.c | 1 -
+ tool/seahorse-pgp-operation.c | 1 +
+ tool/seahorse-tool.c | 7 +++++++
+ tool/seahorse-widget.c | 1 -
3 files changed, 8 insertions(+), 1 deletion(-)
commit 5e4103867fc639a33a865181c3c28e9a2b74f538
@@ -300,9 +625,9 @@ Date: 2010-06-13
[agent] Remove agent now that there's a gpg-agent in gnome-keyring.
- tool/seahorse-passphrase.c | 165 -----------------------------------------
- tool/seahorse-passphrase.h | 9 ---
- tool/seahorse-secure-memory.h | 2 +-
+ tool/seahorse-passphrase.c | 165 ------------------------------------------
+ tool/seahorse-passphrase.h | 9 ---
+ tool/seahorse-secure-memory.h | 2 +-
3 files changed, 1 insertion(+), 175 deletions(-)
commit 25c33100192968b3874b42701831f541c7baf7f5
@@ -311,8 +636,8 @@ Date: 2010-04-13
Fix nearly everything to compile with -DGSEAL_ENABLE. See bug 612495.
- tool/seahorse-passphrase.c | 12 ++++++------
- tool/seahorse-util.c | 10 ++++++----
+ tool/seahorse-passphrase.c | 12 ++++++------
+ tool/seahorse-util.c | 10 ++++++----
2 files changed, 12 insertions(+), 10 deletions(-)
commit 7b355b02724ef1f12c54de8bf50cbe4af81521a1
@@ -323,8 +648,8 @@ Date: 2010-02-13
URI's need to be unescaped before presenting them to the user.
- tool/seahorse-notification.c | 5 +++--
- tool/seahorse-tool.c | 6 ++++--
+ tool/seahorse-notification.c | 5 +++--
+ tool/seahorse-tool.c | 6 ++++--
2 files changed, 7 insertions(+), 4 deletions(-)
commit 84bbb56d55dbaff948774609f412af0a83af940c
@@ -335,7 +660,7 @@ Date: 2010-02-11
Set visibility to FALSE on GtkEntries used for passphrase fields.
- tool/seahorse-passphrase.c | 2 ++
+ tool/seahorse-passphrase.c | 2 ++
1 file changed, 2 insertions(+)
commit 9b86b72c12822b5c3561f7cac39282bdcfc48a22
@@ -344,8 +669,8 @@ Date: 2010-02-07
Connect cancel clicked signal
- tool/seahorse-progress.c | 2 ++
- tool/seahorse-progress.xml | 1 -
+ tool/seahorse-progress.c | 2 ++
+ tool/seahorse-progress.xml | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
commit a6c3294e4853513e2c24e4cb47a5979bd16386e1
@@ -375,7 +700,7 @@ Date: 2009-08-23
Added return carriage to the output when you
don't specify any argument.
- tool/seahorse-tool.c | 2 +-
+ tool/seahorse-tool.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 4bc591102a5186f9af6570086ee13ada4d7a2e36
@@ -386,8 +711,8 @@ Date: 2009-08-23
Finish migration from libglade to gtkbuilder.
- tool/Makefile.am | 4 ++--
- tool/seahorse-passphrase.c | 1 -
+ tool/Makefile.am | 4 ++--
+ tool/seahorse-passphrase.c | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
commit b87186744f5b27ae50446c09e36b8340b14d7646
@@ -396,17 +721,17 @@ Date: 2009-08-19
Bug 590247 - Migrate from libglade to GtkBuilder
- tool/seahorse-gconf.h | 2 +
- tool/seahorse-multi-encrypt.glade | 340 ------------------------------------
- tool/seahorse-multi-encrypt.xml | 236 +++++++++++++++++++++++++
- tool/seahorse-notify.glade | 99 -----------
- tool/seahorse-notify.xml | 79 +++++++++
- tool/seahorse-progress.c | 38 ++--
- tool/seahorse-progress.glade | 189 --------------------
- tool/seahorse-progress.xml | 128 ++++++++++++++
- tool/seahorse-tool-files.c | 20 +--
- tool/seahorse-widget.c | 345 +++++++++++++------------------------
- tool/seahorse-widget.h | 50 +++---
+ tool/seahorse-gconf.h | 2 +
+ tool/seahorse-multi-encrypt.glade | 340 -------------------------------------
+ tool/seahorse-multi-encrypt.xml | 236 ++++++++++++++++++++++++++
+ tool/seahorse-notify.glade | 99 -----------
+ tool/seahorse-notify.xml | 79 +++++++++
+ tool/seahorse-progress.c | 38 +++--
+ tool/seahorse-progress.glade | 189 ---------------------
+ tool/seahorse-progress.xml | 128 ++++++++++++++
+ tool/seahorse-tool-files.c | 20 +--
+ tool/seahorse-widget.c | 345 ++++++++++++++------------------------
+ tool/seahorse-widget.h | 50 +++---
11 files changed, 624 insertions(+), 902 deletions(-)
commit c6b30ba646d0cc6f0a0863e2638ba3f45883690e
@@ -418,7 +743,9 @@ Date: 2009-08-23
seahorse-tool-progress.c and seahorse-tool.c
do not need execute permissions.
- 0 files changed
+ tool/seahorse-tool-progress.c | 0
+ tool/seahorse-tool.c | 0
+ 2 files changed, 0 insertions(+), 0 deletions(-)
commit 501ce9135056a75b75d40db8c170ff3c33e32ba3
Author: Pablo Castellano <pablog.ubuntu at gmail.com>
@@ -426,7 +753,7 @@ Date: 2009-08-19
Added .gitignore files
- nautilus-ext/.gitignore | 4 ++++
+ nautilus-ext/.gitignore | 4 ++++
1 file changed, 4 insertions(+)
commit 75cae72481c2bf98ed6114dbc9a8368f60013422
@@ -435,7 +762,7 @@ Date: 2009-08-04
Bug 590723 – Build failure because of missing include
- tool/seahorse-gpgmex-op.c | 2 ++
+ tool/seahorse-gpgmex-op.c | 2 ++
1 file changed, 2 insertions(+)
commit 7ce323163db01e497163d8fba70174fe7e0554d4
@@ -444,7 +771,7 @@ Date: 2009-07-14
Fix single glib include
- tool/seahorse-algo.h | 2 +-
+ tool/seahorse-algo.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a8db5cd9f84633c2ab156a5dda81ef69fa9e9ea9
@@ -456,7 +783,7 @@ Date: 2009-03-03
svn path=/seahorse-plugins/trunk/; revision=2877
- tool/seahorse-notification.c | 10 +++++++++-
+ tool/seahorse-notification.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
commit 54b3aa4acc0cdaca127aa5354a6e267630dffc50
@@ -473,7 +800,7 @@ Date: 2009-02-27
svn path=/seahorse-plugins/trunk/; revision=2854
- tool/seahorse-widget.c | 2 ++
+ tool/seahorse-widget.c | 2 ++
1 file changed, 2 insertions(+)
commit c2199c5f65f66b50dd569ded71f210802dfec3c3
@@ -488,7 +815,7 @@ Date: 2009-02-17
svn path=/seahorse-plugins/trunk/; revision=2828
- tool/seahorse-widget.c | 4 ++--
+ tool/seahorse-widget.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 34399de1ae1fa27f26c106097c5139cc389090e3
@@ -505,7 +832,7 @@ Date: 2009-02-17
svn path=/seahorse-plugins/trunk/; revision=2827
- tool/seahorse-widget.h | 10 +++++-----
+ tool/seahorse-widget.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
commit b0ef5789d1dbe51c5ac82ea0d237116f4151fe21
@@ -522,7 +849,7 @@ Date: 2009-02-01
svn path=/seahorse-plugins/trunk/; revision=2724
- tool/seahorse-tool.c | 25 +++++++++++++++++++++++--
+ tool/seahorse-tool.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
commit 5b9bad721a8074c6bb8ad1f7090872bd0041f99e
@@ -538,7 +865,7 @@ Date: 2008-12-21
svn path=/seahorse-plugins/trunk/; revision=2690
- tool/seahorse-util.c | 14 ++++++--------
+ tool/seahorse-util.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
commit d6fd0d7015f9e6163f37ce8eb4f109b5f4815309
@@ -555,7 +882,7 @@ Date: 2008-12-09
svn path=/seahorse-plugins/trunk/; revision=2645
- nautilus-ext/seahorse-nautilus-module.c | 4 ++--
+ nautilus-ext/seahorse-nautilus-module.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit e5be4ffffbb57e54e865792786195da146c4b02b
@@ -571,8 +898,8 @@ Date: 2008-11-15
svn path=/seahorse-plugins/trunk/; revision=2617
- tool/seahorse-multi-encrypt.glade | 112 ++++++++++++++++++-------------------
- tool/seahorse-notify.glade | 7 ++-
+ tool/seahorse-multi-encrypt.glade | 112 +++++++++++++++++++-------------------
+ tool/seahorse-notify.glade | 7 ++-
2 files changed, 60 insertions(+), 59 deletions(-)
commit bacb8c73ada2261416fd158594c6ebe2791216e8
@@ -586,7 +913,7 @@ Date: 2008-09-15
svn path=/seahorse-plugins/trunk/; revision=2519
- tool/seahorse-passphrase.c | 14 +++++++++-----
+ tool/seahorse-passphrase.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
commit 3bb8da8ee715497548e0afdc6710c45d2056d315
@@ -601,7 +928,7 @@ Date: 2008-09-15
svn path=/seahorse-plugins/trunk/; revision=2517
- tool/seahorse-passphrase.c | 41 ++++++++++++++++++++++++++++++++---------
+ tool/seahorse-passphrase.c | 41 ++++++++++++++++++++++++++++++++---------
1 file changed, 32 insertions(+), 9 deletions(-)
commit e5f8ec3e381ef86a6b699187b4a5640c3ca41d87
@@ -618,7 +945,7 @@ Date: 2008-09-13
svn path=/seahorse-plugins/trunk/; revision=2498
- tool/seahorse-util.c | 7 +++++++
+ tool/seahorse-util.c | 7 +++++++
1 file changed, 7 insertions(+)
commit cfba76593dec63d7e3e79b94ccb8f74a20a10201
@@ -638,7 +965,7 @@ Date: 2008-09-08
svn path=/seahorse-plugins/trunk/; revision=2464
- tool/seahorse-notification.c | 2 +-
+ tool/seahorse-notification.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 326e26c0f98ceea70d366f75bbebdf3430e06d33
@@ -658,9 +985,9 @@ Date: 2008-09-01
svn path=/seahorse-plugins/trunk/; revision=2423
- tool/seahorse-pgp-encrypted.desktop.in.in | 1 -
- tool/seahorse-pgp-keys.desktop.in.in | 1 -
- tool/seahorse-pgp-signature.desktop.in.in | 1 -
+ tool/seahorse-pgp-encrypted.desktop.in.in | 1 -
+ tool/seahorse-pgp-keys.desktop.in.in | 1 -
+ tool/seahorse-pgp-signature.desktop.in.in | 1 -
3 files changed, 3 deletions(-)
commit eb44326b032cf3b9dab006c85eecbb526c74191b
@@ -678,8 +1005,8 @@ Date: 2008-08-27
svn path=/seahorse-plugins/trunk/; revision=2398
- tool/seahorse-tool.c | 2 +-
- tool/seahorse-util.c | 4 ++--
+ tool/seahorse-tool.c | 2 +-
+ tool/seahorse-util.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
commit 7db5277e133d474a86f359fde6d2d473b52f60c4
@@ -701,7 +1028,7 @@ Date: 2008-08-13
svn path=/seahorse-plugins/trunk/; revision=2353
- tool/seahorse-widget.c | 6 +-----
+ tool/seahorse-widget.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
commit 6d8d68bc8b91c4067aa9ed2b12bb47701ca014ce
@@ -721,7 +1048,7 @@ Date: 2008-07-06
svn path=/seahorse-plugins/trunk/; revision=2263
- tool/seahorse-tool.c | 8 +++++++-
+ tool/seahorse-tool.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
commit e513986208b8400355f37ccb52316e983fe9f9f5
@@ -738,7 +1065,7 @@ Date: 2008-07-06
svn path=/seahorse-plugins/trunk/; revision=2262
- tool/seahorse-tool.c | 98 ++++++++++++++++++++++++++------------------------
+ tool/seahorse-tool.c | 98 ++++++++++++++++++++++++++++------------------------
1 file changed, 52 insertions(+), 46 deletions(-)
commit 11707e48715c90e17d9a1f9ba485f9d05b8b9b15
@@ -765,15 +1092,15 @@ Date: 2008-06-30
svn path=/seahorse-plugins/trunk/; revision=2253
- nautilus-ext/seahorse-nautilus.c | 3 -
- tool/seahorse-multi-encrypt.glade | 340 +++++++++++++++++++++++++++++
- tool/seahorse-tool-files.c | 311 ++++++++++++++------------
- tool/seahorse-tool-progress.c | 15 +-
- tool/seahorse-tool.c | 5 -
- tool/seahorse-util.c | 122 +++--------
- tool/seahorse-util.h | 2 -
- tool/seahorse-vfs-data.c | 435 +++++++++++++++++++------------------
- tool/seahorse-vfs-data.h | 10 +-
+ nautilus-ext/seahorse-nautilus.c | 3 -
+ tool/seahorse-multi-encrypt.glade | 340 +++++++++++++++++++++++++++++
+ tool/seahorse-tool-files.c | 311 +++++++++++++++------------
+ tool/seahorse-tool-progress.c | 15 +-
+ tool/seahorse-tool.c | 5 -
+ tool/seahorse-util.c | 122 +++--------
+ tool/seahorse-util.h | 2 -
+ tool/seahorse-vfs-data.c | 435 +++++++++++++++++++-------------------
+ tool/seahorse-vfs-data.h | 10 +-
9 files changed, 765 insertions(+), 478 deletions(-)
commit eeb817e976814cf3d73eea84809ba02ab5b6dc95
@@ -788,7 +1115,7 @@ Date: 2008-06-25
svn path=/seahorse-plugins/trunk/; revision=2246
- tool/seahorse-secure-memory.c | 35 +++++++++++++++++++++++++++--------
+ tool/seahorse-secure-memory.c | 35 +++++++++++++++++++++++++++--------
1 file changed, 27 insertions(+), 8 deletions(-)
commit 55dcb817cda90a39faff8e3539f77cfc603ed253
@@ -799,8 +1126,8 @@ Date: 2008-05-30
svn path=/seahorse-plugins/trunk/; revision=2222
- tool/seahorse-tool-progress.c | 6 +++---
- tool/seahorse-util.c | 4 ++--
+ tool/seahorse-tool-progress.c | 6 +++---
+ tool/seahorse-util.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
commit 8ef0fdcedb11dfae691e202999130101d185d0ba
@@ -817,7 +1144,7 @@ Date: 2008-05-17
svn path=/seahorse-plugins/trunk/; revision=2213
- tool/seahorse-passphrase.c | 2 +-
+ tool/seahorse-passphrase.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 0909b673fc9ac4c646d678d1a288c1af28bc4133
@@ -856,14 +1183,14 @@ Date: 2008-05-05
svn path=/seahorse-plugins/trunk/; revision=2205
- nautilus-ext/Makefile.am | 1 -
- tool/seahorse-operation.c | 1 +
- tool/seahorse-tool-files.c | 6 +++++-
- tool/seahorse-tool-progress.c | 5 +++--
- tool/seahorse-tool.c | 13 +++++++------
- tool/seahorse-util.c | 2 --
- tool/seahorse-vfs-data.h | 2 ++
- tool/seahorse-widget.c | 27 +++++++++++++++++----------
+ nautilus-ext/Makefile.am | 1 -
+ tool/seahorse-operation.c | 1 +
+ tool/seahorse-tool-files.c | 6 +++++-
+ tool/seahorse-tool-progress.c | 5 +++--
+ tool/seahorse-tool.c | 13 +++++++------
+ tool/seahorse-util.c | 2 --
+ tool/seahorse-vfs-data.h | 2 ++
+ tool/seahorse-widget.c | 27 +++++++++++++++++----------
8 files changed, 35 insertions(+), 22 deletions(-)
commit 61939ab4ead41e6a6066441caaf9a94a9b0fb6ef
diff --git a/Makefile.am b/Makefile.am
index aa1b051..f06ea43 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
+ data \
tool \
nautilus-ext \
po
diff --git a/Makefile.in b/Makefile.in
index 8cf291f..91a3e8d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ 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;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -52,12 +68,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_ at AM_V@)
am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
AM_V_at = $(am__v_at_ at AM_V@)
am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -67,13 +89,19 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir dist dist-all distcheck
+ cscope distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
+CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
@@ -84,6 +112,7 @@ am__remove_distdir = \
&& rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -111,6 +140,7 @@ am__relativize = \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -146,11 +176,10 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCR_CFLAGS = @GCR_CFLAGS@
+GCR_LIBS = @GCR_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
@@ -159,6 +188,7 @@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@
GNUPG = @GNUPG@
GPGME_CONFIG = @GPGME_CONFIG@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
INSTALL = @INSTALL@
@@ -172,6 +202,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBCRYPTUI_CFLAGS = @LIBCRYPTUI_CFLAGS@
@@ -250,6 +284,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -259,6 +294,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -280,6 +317,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
+ data \
tool \
nautilus-ext \
po
@@ -369,12 +407,12 @@ distclean-libtool:
-rm -f libtool config.lt
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
@fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -384,7 +422,11 @@ $(RECURSIVE_TARGETS):
done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -398,37 +440,6 @@ $(RECURSIVE_TARGETS):
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
@@ -437,6 +448,10 @@ 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)'; \
@@ -500,8 +515,32 @@ GTAGS:
&& $(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-recursive cscopelist
+
+cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
$(am__remove_distdir)
@@ -537,13 +576,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -575,40 +611,36 @@ distdir: $(DISTFILES)
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
- $(am__remove_distdir)
-
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-shar: distdir
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+dist dist-all:
+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+ $(am__post_remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
@@ -619,8 +651,6 @@ distcheck: dist
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.lz*) \
lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
@@ -632,7 +662,7 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
+ chmod -R a-w $(distdir); chmod u+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
@@ -666,7 +696,7 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
&& cd "$$am__cwd" \
|| exit 1
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -803,12 +833,14 @@ ps-am:
uninstall-am:
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
- ctags-recursive install-am install-strip tags-recursive
+ 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-generic \
- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \
+ 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 \
diff --git a/NEWS b/NEWS
index f6cd076..e6c9c01 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,31 @@
+seahorse-nautilus 3.8.0
+ (no changes since previous release)
+
+seahorse-nautilus 3.7.92
+ * Updated translations
+
+seahorse-nautilus 3.7.5
+ * Updated translations
+
+seahorse-nautilus 3.6.1
+ * Fix the GSettings schema
+
+seahorse-nautilus 3.6.0
+ (no changes since previous release)
+
+seahorse-nautilus 3.5.92
+ * Updated translations
+
+seahorse-nautilus 3.5.91
+ * Updated translations
+
+seahorse-nautilus 3.5.4
+ * Update for newer Gtk and Glib
+ * Use Gcr library for prompting of passwords
+ * Migrate from GConf to GSettings
+ * Fix several crashers
+ * Translation fixes
+
seahorse-nautilus 3.4.0
(no changes since previous release)
diff --git a/aclocal.m4 b/aclocal.m4
index 8514c2d..077844d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.2 -*- Autoconf -*-
+
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,922 +13,807 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.3], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too. Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.3])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# This file is free software, distributed under the terms of the GNU
+# General Public License. As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# This file can be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory. The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run. This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
#
-# $ac_aux_dir/missing
-# fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-# fails if $ac_aux_dir is absolute,
-# fails when called from a subdirectory in a VPATH build with
-# a relative $ac_aux_dir
+# Modified to never use included libintl.
+# Owen Taylor <otaylor at redhat.com>, 12/15/1998
#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
+# Major rework to remove unused code
+# Owen Taylor <otaylor at redhat.com>, 12/11/2002
#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-# MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
+# Added better handling of ALL_LINGUAS from GNU gettext version
+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH. The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Modified to require ngettext
+# Matthias Clasen <mclasen at redhat.com> 08/06/2004
#
-# 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.
+# We need this here as well, since someone might use autoconf-2.5x
+# to configure GLib then an older version to configure a package
+# using AM_GLIB_GNU_GETTEXT
+AC_PREREQ(2.53)
-# serial 9
+dnl
+dnl We go to great lengths to make sure that aclocal won't
+dnl try to pull in the installed version of these macros
+dnl when running aclocal in the glib directory.
+dnl
+m4_copy([AC_DEFUN],[glib_DEFUN])
+m4_copy([AC_REQUIRE],[glib_REQUIRE])
+dnl
+dnl At the end, if we're not within glib, we'll define the public
+dnl definitions in terms of our private definitions.
+dnl
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
+# GLIB_LC_MESSAGES
+#--------------------
+glib_DEFUN([GLIB_LC_MESSAGES],
+ [AC_CHECK_HEADERS([locale.h])
+ if test $ac_cv_header_locale_h = yes; then
+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+ if test $am_cv_val_LC_MESSAGES = yes; then
+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
+ [Define if your <locale.h> file defines LC_MESSAGES.])
+ fi
+ fi])
+
+# GLIB_PATH_PROG_WITH_TEST
+#----------------------------
+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+ /*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if [$3]; then
+ ac_cv_path_$1="$ac_dir/$ac_word"
+ break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+ ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+ AC_MSG_RESULT([$]$1)
else
- $1_TRUE='#'
- $1_FALSE=
+ AC_MSG_RESULT(no)
fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
-#
-# 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_SUBST($1)dnl
+])
-# serial 12
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
+ dnl NLS is obligatory
+ [USE_NLS=yes
+ AC_SUBST(USE_NLS)
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+ gt_cv_have_gettext=no
+ CATOBJEXT=NONE
+ XGETTEXT=:
+ INTLLIBS=
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
+ AC_CHECK_HEADER(libintl.h,
+ [gt_cv_func_dgettext_libintl="no"
+ libintl_extra_libs=""
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+ #
+ # First check in libc
+ #
+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
+ [AC_TRY_LINK([
+#include <libintl.h>
+],
+ [return !ngettext ("","", 1)],
+ gt_cv_func_ngettext_libc=yes,
+ gt_cv_func_ngettext_libc=no)
+ ])
+
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+ [AC_TRY_LINK([
+#include <libintl.h>
+],
+ [return !dgettext ("","")],
+ gt_cv_func_dgettext_libc=yes,
+ gt_cv_func_dgettext_libc=no)
+ ])
+ fi
+
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+ AC_CHECK_FUNCS(bind_textdomain_codeset)
+ fi
-AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
+ #
+ # If we don't have everything we want, check in libintl
+ #
+ if test "$gt_cv_func_dgettext_libc" != "yes" \
+ || test "$gt_cv_func_ngettext_libc" != "yes" \
+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+
+ AC_CHECK_LIB(intl, bindtextdomain,
+ [AC_CHECK_LIB(intl, ngettext,
+ [AC_CHECK_LIB(intl, dgettext,
+ gt_cv_func_dgettext_libintl=yes)])])
- am_cv_$1_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
- fi
- am__universal=false
- m4_case([$1], [CC],
- [case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac],
- [CXX],
- [case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac])
+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
+ AC_MSG_RESULT([])
+ AC_CHECK_LIB(intl, ngettext,
+ [AC_CHECK_LIB(intl, dcgettext,
+ [gt_cv_func_dgettext_libintl=yes
+ libintl_extra_libs=-liconv],
+ :,-liconv)],
+ :,-liconv)
+ fi
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ #
+ # If we found libintl, then check in it for bind_textdomain_codeset();
+ # we'll prefer libc if neither have bind_textdomain_codeset(),
+ # and both have dgettext and ngettext
+ #
+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
+ glib_save_LIBS="$LIBS"
+ LIBS="$LIBS -lintl $libintl_extra_libs"
+ unset ac_cv_func_bind_textdomain_codeset
+ AC_CHECK_FUNCS(bind_textdomain_codeset)
+ LIBS="$glib_save_LIBS"
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
- none) break ;;
- esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+ gt_cv_func_dgettext_libc=no
+ else
+ if test "$gt_cv_func_dgettext_libc" = "yes" \
+ && test "$gt_cv_func_ngettext_libc" = "yes"; then
+ gt_cv_func_dgettext_libintl=no
+ fi
+ fi
+ fi
fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
+ if test "$gt_cv_func_dgettext_libc" = "yes" \
+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
+ gt_cv_have_gettext=yes
+ fi
+
+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+ INTLLIBS="-lintl $libintl_extra_libs"
+ fi
+
+ if test "$gt_cv_have_gettext" = "yes"; then
+ AC_DEFINE(HAVE_GETTEXT,1,
+ [Define if the GNU gettext() function is already present or preinstalled.])
+ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+ if test "$MSGFMT" != "no"; then
+ glib_save_LIBS="$LIBS"
+ LIBS="$LIBS $INTLLIBS"
+ AC_CHECK_FUNCS(dcgettext)
+ MSGFMT_OPTS=
+ AC_MSG_CHECKING([if msgfmt accepts -c])
+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo at bar.xx>\n"
+"Language-Team: C <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+ AC_SUBST(MSGFMT_OPTS)
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr],
+ [CATOBJEXT=.gmo
+ DATADIRNAME=share],
+ [case $host in
+ *-*-solaris*)
+ dnl On Solaris, if bind_textdomain_codeset is in libc,
+ dnl GNU format message catalog is always supported,
+ dnl since both are added to the libc all together.
+ dnl Hence, we'd like to go with DATADIRNAME=share and
+ dnl and CATOBJEXT=.gmo in this case.
+ AC_CHECK_FUNC(bind_textdomain_codeset,
+ [CATOBJEXT=.gmo
+ DATADIRNAME=share],
+ [CATOBJEXT=.mo
+ DATADIRNAME=lib])
+ ;;
+ *-*-openbsd*)
+ CATOBJEXT=.mo
+ DATADIRNAME=share
+ ;;
+ *)
+ CATOBJEXT=.mo
+ DATADIRNAME=lib
+ ;;
+ esac])
+ LIBS="$glib_save_LIBS"
+ INSTOBJEXT=.mo
+ else
+ gt_cv_have_gettext=no
+ fi
+ fi
+ ])
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
- am__nodep='_no'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
-])
-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 5
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
- # are listed without --file. Let's play safe and only enable the eval
- # if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
- shift
- for mf
- do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
+ if test "$gt_cv_have_gettext" = "yes" ; then
+ AC_DEFINE(ENABLE_NLS, 1,
+ [always defined to indicate that i18n is enabled])
fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
- done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+ dnl Test whether we really found GNU xgettext.
+ if test "$XGETTEXT" != ":"; then
+ dnl If it is not GNU xgettext we define it as : so that the
+ dnl Makefiles still can work.
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ : ;
+ else
+ AC_MSG_RESULT(
+ [found xgettext program is not GNU xgettext; ignore it])
+ XGETTEXT=":"
+ fi
+ fi
-# Do all the work for Automake. -*- Autoconf -*-
+ # We need to process the po/ directory.
+ POSUB=po
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 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_OUTPUT_COMMANDS(
+ [case "$CONFIG_FILES" in *po/Makefile.in*)
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ esac])
-# serial 16
+ dnl These rules are solely for the distribution goal. While doing this
+ dnl we only have to keep exactly one list of the available catalogs
+ dnl in configure.ac.
+ for lang in $ALL_LINGUAS; do
+ GMOFILES="$GMOFILES $lang.gmo"
+ POFILES="$POFILES $lang.po"
+ done
-# This macro actually does too much. Some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
+ dnl Make all variables we use known to autoconf.
+ AC_SUBST(CATALOGS)
+ AC_SUBST(CATOBJEXT)
+ AC_SUBST(DATADIRNAME)
+ AC_SUBST(GMOFILES)
+ AC_SUBST(INSTOBJEXT)
+ AC_SUBST(INTLLIBS)
+ AC_SUBST(PO_IN_DATADIR_TRUE)
+ AC_SUBST(PO_IN_DATADIR_FALSE)
+ AC_SUBST(POFILES)
+ AC_SUBST(POSUB)
+ ])
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# 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
-dnl Autoconf wants to disallow AM_ names. We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
- # is not polluted with repeated "-I."
- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
- fi
-fi
+# AM_GLIB_GNU_GETTEXT
+# -------------------
+# Do checks necessary for use of gettext. If a suitable implementation
+# of gettext is found in either in libintl or in the C library,
+# it will set INTLLIBS to the libraries needed for use of gettext
+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
+# on various variables needed by the Makefile.in.in installed by
+# glib-gettextize.
+dnl
+glib_DEFUN([GLIB_GNU_GETTEXT],
+ [AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_HEADER_STDC])dnl
+
+ GLIB_LC_MESSAGES
+ GLIB_WITH_NLS
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-AC_SUBST([CYGPATH_W])
+ if test "$gt_cv_have_gettext" = "yes"; then
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
+ else
+ AC_MSG_CHECKING(for catalogs to be installed)
+ NEW_LINGUAS=
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+ desiredlanguages="$LINGUAS"
+ else
+ desiredlanguages="$ALL_LINGUAS"
+ fi
+ for desiredlang in $desiredlanguages; do
+ # Use the presentlang catalog if desiredlang is
+ # a. equal to presentlang, or
+ # b. a variant of presentlang (because in this case,
+ # presentlang can be used as a fallback for messages
+ # which are not translated in the desiredlang catalog).
+ case "$desiredlang" in
+ "$presentlang"*) useit=yes;;
+ esac
+ done
+ if test $useit = yes; then
+ NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+ fi
+ done
+ LINGUAS=$NEW_LINGUAS
+ AC_MSG_RESULT($LINGUAS)
+ fi
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+ dnl Construct list of names of catalog files to be constructed.
+ if test -n "$LINGUAS"; then
+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+ fi
+ fi
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+ dnl Try to locate is.
+ MKINSTALLDIRS=
+ if test -n "$ac_aux_dir"; then
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+ fi
+ if test -z "$MKINSTALLDIRS"; then
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
+ AC_SUBST(MKINSTALLDIRS)
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-_AM_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_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+ dnl Generate list of files to be processed by xgettext which will
+ dnl be included in po/Makefile.
+ test -d po || mkdir po
+ if test "x$srcdir" != "x."; then
+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+ posrcprefix="$srcdir/"
+ else
+ posrcprefix="../$srcdir/"
+ fi
+ else
+ posrcprefix="../"
+ fi
+ rm -f po/POTFILES
+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ < $srcdir/po/POTFILES.in > po/POTFILES
+ ])
+
+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+# -------------------------------
+# Define VARIABLE to the location where catalog files will
+# be installed by po/Makefile.
+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+glib_save_prefix="$prefix"
+glib_save_exec_prefix="$exec_prefix"
+glib_save_datarootdir="$datarootdir"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+datarootdir=`eval echo "${datarootdir}"`
+if test "x$CATOBJEXT" = "x.mo" ; then
+ localedir=`eval echo "${libdir}/locale"`
+else
+ localedir=`eval echo "${datadir}/locale"`
+fi
+prefix="$glib_save_prefix"
+exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
+AC_DEFINE_UNQUOTED($1, "$localedir",
+ [Define the location where the catalogs will be installed])
])
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+dnl
+dnl Now the definitions that aclocal will find
+dnl
+ifdef(glib_configure_ac,[],[
+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+])dnl
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+#
+# Create a temporary file with TEST-FILE as its contents and pass the
+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
+# 0 and perform ACTION-IF-FAIL for any other exit status.
+AC_DEFUN([GLIB_RUN_PROG],
+[cat >conftest.foo <<_ACEOF
+$2
+_ACEOF
+if AC_RUN_LOG([$1 conftest.foo]); then
+ m4_ifval([$3], [$3], [:])
+m4_ifvaln([$4], [else $4])dnl
+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+fi])
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+dnl GLIB_GSETTINGS
+dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
+dnl the schema should be compiled
+dnl
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+AC_DEFUN([GLIB_GSETTINGS],
+[
+ m4_pattern_allow([AM_V_GEN])
+ AC_ARG_ENABLE(schemas-compile,
+ AS_HELP_STRING([--disable-schemas-compile],
+ [Disable regeneration of gschemas.compiled on install]),
+ [case ${enableval} in
+ yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
+ no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
+ esac])
+ AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
+ PKG_PROG_PKG_CONFIG([0.16])
+ AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
+ if test x$cross_compiling != xyes; then
+ GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
+ else
+ AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
+ fi
+ AC_SUBST(GLIB_COMPILE_SCHEMAS)
+ if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
+ ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
+ else
+ ifelse([$1],,[:],[$1])
+ fi
-# serial 1
+ GSETTINGS_RULES='
+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
- *)
- install_sh="\${SHELL} $am_aux_dir/install-sh"
- esac
-fi
-AC_SUBST(install_sh)])
+mostlyclean-am: clean-gsettings-schemas
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
-# serial 2
+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+ $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
+all-am: $(gsettings_SCHEMAS:.xml=.valid)
+uninstall-am: uninstall-gsettings-schemas
+install-data-am: install-gsettings-schemas
-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
-# From Jim Meyering
+.SECONDARY: $(gsettings_SCHEMAS)
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
-# 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
+ @$(NORMAL_INSTALL)
+ if test -n "$^"; then \
+ test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+ fi
-# serial 5
+uninstall-gsettings-schemas:
+ @$(NORMAL_UNINSTALL)
+ @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+
+clean-gsettings-schemas:
+ rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+ $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE). at EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
+endif
+'
+ _GSETTINGS_SUBST(GSETTINGS_RULES)
+])
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well. Anyway, the user
-# can override the default with the --enable/--disable switch.
-AC_DEFUN([AM_MAINTAINER_MODE],
-[m4_case(m4_default([$1], [disable]),
- [enable], [m4_define([am_maintainer_other], [disable])],
- [disable], [m4_define([am_maintainer_other], [enable])],
- [m4_define([am_maintainer_other], [enable])
- m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
- dnl maintainer-mode's default is 'disable' unless 'enable' is passed
- AC_ARG_ENABLE([maintainer-mode],
-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
- (and sometimes confusing) to the casual installer],
- [USE_MAINTAINER_MODE=$enableval],
- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
- MAINT=$MAINTAINER_MODE_TRUE
- AC_SUBST([MAINT])dnl
+dnl _GSETTINGS_SUBST(VARIABLE)
+dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+AC_DEFUN([_GSETTINGS_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
]
)
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
-# Check to see how 'make' treats includes. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 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,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# 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.
+dnl Authors:
+dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
+dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
-# serial 6
+AC_PREREQ([2.50])
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
- # Losing compiler, so override with the script.
- # FIXME: It is wrong to rewrite CC.
- # But if we don't then we get into trouble of one sort or another.
- # A longer-term fix would be to have automake use am__CC in this case,
- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
- CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+AC_DEFUN([AM_NLS],
+[
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+ AC_ARG_ENABLE([nls],
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+ AC_MSG_RESULT([$USE_NLS])
+ AC_SUBST([USE_NLS])
])
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+#
+# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 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.
+#
+# 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.
+#
+# 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.
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-# 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.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
- *)
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
- esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-else
- am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
-])
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
#
-# 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.
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_default([$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
-# serial 1
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
-# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
#
-# 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.
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-# serial 5
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-# _AM_SET_OPTION(NAME)
-# --------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
-# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+if test $pkg_failed = yes; then
+ AC_MSG_RESULT([no])
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+ m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+$$1_PKG_ERRORS
-# serial 1
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN([AM_RUN_LOG],
-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
- ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- (exit $ac_status); }])
+_PKG_TEXT])[]dnl
+ ])
+elif test $pkg_failed = untried; then
+ AC_MSG_RESULT([no])
+ m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+ ])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ $3
+fi[]dnl
+])# PKG_CHECK_MODULES
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+ [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+ [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+# Copyright (C) 2002-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 5
+# serial 8
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name. Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
- *[[\\\"\#\$\&\'\`$am_lf]]*)
- AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-esac
+# 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'
+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], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too. Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
+# AM_SET_CURRENT_AUTOMAKE_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
+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) 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -937,873 +821,1075 @@ AC_MSG_RESULT(yes)])
# serial 2
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[ --enable-silent-rules less verbose build output (undo: `make V=1')
- --disable-silent-rules verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no) AM_DEFAULT_VERBOSITY=1;;
-*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
-dnl
-dnl A few `make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
- [am_cv_make_support_nested_variables],
- [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])
-if test $am_cv_make_support_nested_variables = yes; then
- dnl Using `$V' instead of `$(V)' breaks IRIX make.
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+# 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/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run. This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+# fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+# fails if $ac_aux_dir is absolute,
+# fails when called from a subdirectory in a VPATH build with
+# a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
+# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+# MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
])
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# AM_CONDITIONAL -*- Autoconf -*-
+
+# Copyright (C) 1997-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 1
+# serial 10
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries. This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+else
+ $1_TRUE='#'
+ $1_FALSE=
fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+ AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1999-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 3
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball. -*- Autoconf -*-
+# serial 17
-# Copyright (C) 2004, 2005, 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.
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-# serial 2
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-# tardir=directory && $(am__tar) > result.tar
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# We try a few techniques and use that to set a single cache variable.
#
-# 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.
-_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
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
- # 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], [CC], [depcc="$CC" am_compiler_list=],
+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
- # tar/untar a dummy directory, and stop if the command works
+AC_CACHE_CHECK([dependency style of $depcc],
+ [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
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])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_$1_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
-done
-rm -rf conftest.dir
+ am__universal=false
+ m4_case([$1], [CC],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac],
+ [CXX],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac])
-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
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 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,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
+ nosideeffect)
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
+ none) break ;;
+ esac
+ if depmode=$depmode \
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_$1_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
-dnl Authors:
-dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
-AC_PREREQ([2.50])
-AC_DEFUN([AM_NLS],
-[
- AC_MSG_CHECKING([whether NLS is requested])
- dnl Default is enabled NLS
- AC_ARG_ENABLE([nls],
- [ --disable-nls do not use Native Language Support],
- USE_NLS=$enableval, USE_NLS=yes)
- AC_MSG_RESULT([$USE_NLS])
- AC_SUBST([USE_NLS])
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
])
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-#
-# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 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.
-#
-# 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.
-#
-# 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.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+ [--enable-dependency-tracking],
+ [do not reject slow dependency extractors])
+AS_HELP_STRING(
+ [--disable-dependency-tracking],
+ [speeds up one-time build])])
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_default([$1], [0.9.0])
- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- PKG_CONFIG=""
- fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
+])
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+# Generate code to set up dependency tracking. -*- Autoconf -*-
+
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_default([$2], [:])
-m4_ifvaln([$3], [else
- $3])dnl
-fi])
+# 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
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named 'Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running 'make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ 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
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
+ done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- else
- pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-# _PKG_SHORT_ERRORS_SUPPORTED
+# AM_OUTPUT_DEPENDENCY_COMMANDS
# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
+# This macro should only be invoked once -- use via AC_REQUIRE.
#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+# This code is only required when automatic dependency tracking
+# is enabled. FIXME. This creates each '.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+ [test x"$AMDEP_TRUE" != x"" || _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.
#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+# 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.
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
+# serial 19
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+# 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.
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out. PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition. After
+# the next Automake release, Autoconf can make the AC_INIT
+# 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
+dnl Autoconf wants to disallow AM_ names. We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
+fi
-if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
- else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
+ CYGPATH_W='cygpath -w'
+ else
+ CYGPATH_W=echo
+ fi
+fi
+AC_SUBST([CYGPATH_W])
- m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
+# Define the identity of the package.
+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])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(
+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+ [ok:ok],,
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-$$1_PKG_ERRORS
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+ [_AM_DEPENDENCIES([CC])],
+ [m4_define([AC_PROG_CC],
+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [_AM_DEPENDENCIES([CXX])],
+ [m4_define([AC_PROG_CXX],
+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+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],
+ [_AM_DEPENDENCIES([OBJCXX])],
+ [m4_define([AC_PROG_OBJCXX],
+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
-_PKG_TEXT])
- ])
-elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
- m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-_PKG_TEXT
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
- ])
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001-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_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
+AC_SUBST([install_sh])])
+
+# Copyright (C) 2003-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 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],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
- AC_MSG_RESULT([yes])
- $3
-fi[]dnl
-])# PKG_CHECK_MODULES
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-dnl (i.e. pass to gconftool-2
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-dnl you should install foo.schemas files
-dnl
+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+# From Jim Meyering
-AC_DEFUN([AM_GCONF_SOURCE_2],
-[
- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- else
- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
- fi
+# 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 7
- AC_ARG_WITH([gconf-source],
- AC_HELP_STRING([--with-gconf-source=sourceaddress],
- [Config database for installing schema files.]),
- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well. Anyway, the user
+# can override the default with the --enable/--disable switch.
+AC_DEFUN([AM_MAINTAINER_MODE],
+[m4_case(m4_default([$1], [disable]),
+ [enable], [m4_define([am_maintainer_other], [disable])],
+ [disable], [m4_define([am_maintainer_other], [enable])],
+ [m4_define([am_maintainer_other], [enable])
+ m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+ AC_ARG_ENABLE([maintainer-mode],
+ [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+ am_maintainer_other[ make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer])],
+ [USE_MAINTAINER_MODE=$enableval],
+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+ MAINT=$MAINTAINER_MODE_TRUE
+ AC_SUBST([MAINT])dnl
+]
+)
- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
- fi
+# Check to see how 'make' treats includes. -*- Autoconf -*-
- AC_ARG_WITH([gconf-schema-file-dir],
- AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
- [Directory for installing schema files.]),
- [GCONF_SCHEMA_FILE_DIR="$withval"],)
+# Copyright (C) 2001-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.
- AC_SUBST(GCONF_SCHEMA_FILE_DIR)
- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+# serial 5
- AC_ARG_ENABLE(schemas-install,
- AC_HELP_STRING([--disable-schemas-install],
- [Disable the schemas installation]),
- [case ${enableval} in
- yes|no) ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
- esac])
- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+ @echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
+ am__quote=
+ _am_result=GNU
+ ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ ;;
+ esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
])
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
-#
-# This file is free software, distributed under the terms of the GNU
-# General Public License. As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
-#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-#
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
-#
-# Modified to never use included libintl.
-# Owen Taylor <otaylor at redhat.com>, 12/15/1998
-#
-# Major rework to remove unused code
-# Owen Taylor <otaylor at redhat.com>, 12/11/2002
-#
-# Added better handling of ALL_LINGUAS from GNU gettext version
-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-#
-# Modified to require ngettext
-# Matthias Clasen <mclasen at redhat.com> 08/06/2004
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
#
-# We need this here as well, since someone might use autoconf-2.5x
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
-
-dnl
-dnl We go to great lengths to make sure that aclocal won't
-dnl try to pull in the installed version of these macros
-dnl when running aclocal in the glib directory.
-dnl
-m4_copy([AC_DEFUN],[glib_DEFUN])
-m4_copy([AC_REQUIRE],[glib_REQUIRE])
-dnl
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
+# 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.
-# GLIB_LC_MESSAGES
-#--------------------
-glib_DEFUN([GLIB_LC_MESSAGES],
- [AC_CHECK_HEADERS([locale.h])
- if test $ac_cv_header_locale_h = yes; then
- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
- if test $am_cv_val_LC_MESSAGES = yes; then
- AC_DEFINE(HAVE_LC_MESSAGES, 1,
- [Define if your <locale.h> file defines LC_MESSAGES.])
- fi
- fi])
+# serial 6
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
- /*)
- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if [$3]; then
- ac_cv_path_$1="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
- ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
- AC_MSG_RESULT([$]$1)
-else
- AC_MSG_RESULT(no)
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
fi
-AC_SUBST($1)dnl
+dnl Make sure AC_PROG_CC is never called again, or it will override our
+dnl setting of CC.
+m4_define([AC_PROG_CC],
+ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
])
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN([GLIB_WITH_NLS],
- dnl NLS is obligatory
- [USE_NLS=yes
- AC_SUBST(USE_NLS)
-
- gt_cv_have_gettext=no
+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
- CATOBJEXT=NONE
- XGETTEXT=:
- INTLLIBS=
+# Copyright (C) 1997-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.
- AC_CHECK_HEADER(libintl.h,
- [gt_cv_func_dgettext_libintl="no"
- libintl_extra_libs=""
+# serial 7
- #
- # First check in libc
- #
- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
- [AC_TRY_LINK([
-#include <libintl.h>
-],
- [return !ngettext ("","", 1)],
- gt_cv_func_ngettext_libc=yes,
- gt_cv_func_ngettext_libc=no)
- ])
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
- [AC_TRY_LINK([
-#include <libintl.h>
-],
- [return !dgettext ("","")],
- gt_cv_func_dgettext_libc=yes,
- gt_cv_func_dgettext_libc=no)
- ])
- fi
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- fi
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
- #
- # If we don't have everything we want, check in libintl
- #
- if test "$gt_cv_func_dgettext_libc" != "yes" \
- || test "$gt_cv_func_ngettext_libc" != "yes" \
- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-
- AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dgettext,
- gt_cv_func_dgettext_libintl=yes)])])
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
- AC_MSG_CHECKING([if -liconv is needed to use gettext])
- AC_MSG_RESULT([])
- AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dcgettext,
- [gt_cv_func_dgettext_libintl=yes
- libintl_extra_libs=-liconv],
- :,-liconv)],
- :,-liconv)
- fi
+# 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.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
+else
+ am_missing_run=
+ AC_MSG_WARN(['missing' script is too old or missing])
+fi
+])
- #
- # If we found libintl, then check in it for bind_textdomain_codeset();
- # we'll prefer libc if neither have bind_textdomain_codeset(),
- # and both have dgettext and ngettext
- #
- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $libintl_extra_libs"
- unset ac_cv_func_bind_textdomain_codeset
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- LIBS="$glib_save_LIBS"
+# Helper functions for option handling. -*- Autoconf -*-
- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
- gt_cv_func_dgettext_libc=no
- else
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- && test "$gt_cv_func_ngettext_libc" = "yes"; then
- gt_cv_func_dgettext_libintl=no
- fi
- fi
- fi
- fi
+# Copyright (C) 2001-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.
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
- gt_cv_have_gettext=yes
- fi
-
- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
- INTLLIBS="-lintl $libintl_extra_libs"
- fi
-
- if test "$gt_cv_have_gettext" = "yes"; then
- AC_DEFINE(HAVE_GETTEXT,1,
- [Define if the GNU gettext() function is already present or preinstalled.])
- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
- if test "$MSGFMT" != "no"; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS $INTLLIBS"
- AC_CHECK_FUNCS(dcgettext)
- MSGFMT_OPTS=
- AC_MSG_CHECKING([if msgfmt accepts -c])
- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: test 1.0\n"
-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-"Last-Translator: test <foo at bar.xx>\n"
-"Language-Team: C <LL at li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
- AC_SUBST(MSGFMT_OPTS)
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr],
- [CATOBJEXT=.gmo
- DATADIRNAME=share],
- [case $host in
- *-*-solaris*)
- dnl On Solaris, if bind_textdomain_codeset is in libc,
- dnl GNU format message catalog is always supported,
- dnl since both are added to the libc all together.
- dnl Hence, we'd like to go with DATADIRNAME=share and
- dnl and CATOBJEXT=.gmo in this case.
- AC_CHECK_FUNC(bind_textdomain_codeset,
- [CATOBJEXT=.gmo
- DATADIRNAME=share],
- [CATOBJEXT=.mo
- DATADIRNAME=lib])
- ;;
- *-*-openbsd*)
- CATOBJEXT=.mo
- DATADIRNAME=share
- ;;
- *)
- CATOBJEXT=.mo
- DATADIRNAME=lib
- ;;
- esac])
- LIBS="$glib_save_LIBS"
- INSTOBJEXT=.mo
- else
- gt_cv_have_gettext=no
- fi
- fi
- ])
+# serial 6
- if test "$gt_cv_have_gettext" = "yes" ; then
- AC_DEFINE(ENABLE_NLS, 1,
- [always defined to indicate that i18n is enabled])
- fi
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
- dnl Test whether we really found GNU xgettext.
- if test "$XGETTEXT" != ":"; then
- dnl If it is not GNU xgettext we define it as : so that the
- dnl Makefiles still can work.
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
- AC_MSG_RESULT(
- [found xgettext program is not GNU xgettext; ignore it])
- XGETTEXT=":"
- fi
- fi
+# _AM_SET_OPTION(NAME)
+# --------------------
+# Set option NAME. Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
- # We need to process the po/ directory.
- POSUB=po
+# _AM_SET_OPTIONS(OPTIONS)
+# ------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
- AC_OUTPUT_COMMANDS(
- [case "$CONFIG_FILES" in *po/Makefile.in*)
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
- esac])
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
- dnl These rules are solely for the distribution goal. While doing this
- dnl we only have to keep exactly one list of the available catalogs
- dnl in configure.ac.
- for lang in $ALL_LINGUAS; do
- GMOFILES="$GMOFILES $lang.gmo"
- POFILES="$POFILES $lang.po"
- done
+# Copyright (C) 2001-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.
- dnl Make all variables we use known to autoconf.
- AC_SUBST(CATALOGS)
- AC_SUBST(CATOBJEXT)
- AC_SUBST(DATADIRNAME)
- AC_SUBST(GMOFILES)
- AC_SUBST(INSTOBJEXT)
- AC_SUBST(INTLLIBS)
- AC_SUBST(PO_IN_DATADIR_TRUE)
- AC_SUBST(PO_IN_DATADIR_FALSE)
- AC_SUBST(POFILES)
- AC_SUBST(POSUB)
- ])
+# serial 1
-# AM_GLIB_GNU_GETTEXT
+# AM_RUN_LOG(COMMAND)
# -------------------
-# Do checks necessary for use of gettext. If a suitable implementation
-# of gettext is found in either in libintl or in the C library,
-# it will set INTLLIBS to the libraries needed for use of gettext
-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-# on various variables needed by the Makefile.in.in installed by
-# glib-gettextize.
-dnl
-glib_DEFUN([GLIB_GNU_GETTEXT],
- [AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
-
- GLIB_LC_MESSAGES
- GLIB_WITH_NLS
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ (exit $ac_status); }])
- if test "$gt_cv_have_gettext" = "yes"; then
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
- AC_MSG_CHECKING(for catalogs to be installed)
- NEW_LINGUAS=
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
- fi
- done
- LINGUAS=$NEW_LINGUAS
- AC_MSG_RESULT($LINGUAS)
- fi
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
- dnl Construct list of names of catalog files to be constructed.
- if test -n "$LINGUAS"; then
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+# 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 9
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[[\\\"\#\$\&\'\`$am_lf]]*)
+ AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
fi
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+ alias in your environment])
+ fi
+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
+ test "$[2]" = conftest.file
+ )
+then
+ # Ok.
+ :
+else
+ AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+ [AC_MSG_CHECKING([that generated files are newer than configure])
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
fi
+ AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
- dnl Try to locate is.
- MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
- fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- fi
- AC_SUBST(MKINSTALLDIRS)
+# Copyright (C) 2009-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.
- dnl Generate list of files to be processed by xgettext which will
- dnl be included in po/Makefile.
- test -d po || mkdir po
- if test "x$srcdir" != "x."; then
- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
- posrcprefix="$srcdir/"
- else
- posrcprefix="../$srcdir/"
- fi
- else
- posrcprefix="../"
- fi
- rm -f po/POTFILES
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- < $srcdir/po/POTFILES.in > po/POTFILES
- ])
+# serial 3
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
-# Define VARIABLE to the location where catalog files will
-# be installed by po/Makefile.
-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-glib_save_prefix="$prefix"
-glib_save_exec_prefix="$exec_prefix"
-glib_save_datarootdir="$datarootdir"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-datarootdir=`eval echo "${datarootdir}"`
-if test "x$CATOBJEXT" = "x.mo" ; then
- localedir=`eval echo "${libdir}/locale"`
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+ [--enable-silent-rules],
+ [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+ [--disable-silent-rules],
+ [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+ [am_cv_make_support_nested_variables],
+ [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
- localedir=`eval echo "${datadir}/locale"`
+ am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-datarootdir="$glib_save_datarootdir"
-AC_DEFINE_UNQUOTED($1, "$localedir",
- [Define the location where the catalogs will be installed])
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-dnl
-dnl Now the definitions that aclocal will find
-dnl
-ifdef(glib_configure_ac,[],[
-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-])dnl
+# Copyright (C) 2001-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.
-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
-#
-# Create a temporary file with TEST-FILE as its contents and pass the
-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
-# 0 and perform ACTION-IF-FAIL for any other exit status.
-AC_DEFUN([GLIB_RUN_PROG],
-[cat >conftest.foo <<_ACEOF
-$2
-_ACEOF
-if AC_RUN_LOG([$1 conftest.foo]); then
- m4_ifval([$3], [$3], [:])
-m4_ifvaln([$4], [else $4])dnl
-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
-fi])
+# serial 2
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor 'install' (even GNU) is that you can't
+# specify the program used to strip binaries. This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in "make install-strip", and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006-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 3
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball. -*- Autoconf -*-
+
+# Copyright (C) 2004-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 3
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+# tardir=directory && $(am__tar) > result.tar
+#
+# 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.
+_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
+
+ # 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])
+ 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_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
m4_include([m4/intltool.m4])
m4_include([m4/libtool.m4])
diff --git a/config.h.in b/config.h.in
index b58900d..3a33778 100644
--- a/config.h.in
+++ b/config.h.in
@@ -128,6 +128,11 @@
/* More strict checks */
#undef WITH_STRICT
+/* Enable large inode numbers on Mac OS X 10.5. */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
/* In debug mode */
#undef _DEBUG
diff --git a/configure b/configure
index 2631970..a4ce035 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for seahorse-nautilus 3.4.0.
+# Generated by GNU Autoconf 2.69 for seahorse-nautilus 3.8.0.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse-plugins&component=Nautilus>.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -222,21 +246,25 @@ IFS=$as_save_IFS
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -340,6 +368,14 @@ $as_echo X"$as_dir" |
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -461,6 +497,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -495,16 +535,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -516,28 +556,8 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -571,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='seahorse-nautilus'
PACKAGE_TARNAME='seahorse-nautilus'
-PACKAGE_VERSION='3.4.0'
-PACKAGE_STRING='seahorse-nautilus 3.4.0'
+PACKAGE_VERSION='3.8.0'
+PACKAGE_STRING='seahorse-nautilus 3.8.0'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse-plugins&component=Nautilus'
PACKAGE_URL=''
@@ -620,6 +640,8 @@ SEAHORSE_LIBS
SEAHORSE_CFLAGS
LIBNOTIFY_LIBS
LIBNOTIFY_CFLAGS
+GCR_LIBS
+GCR_CFLAGS
LIBCRYPTUI_LIBS
LIBCRYPTUI_CFLAGS
DBUS_LIBS
@@ -634,10 +656,6 @@ GNUPG
GLIB_GENMARSHAL
GTK_LIBS
GTK_CFLAGS
-GCONF_LIBS
-GCONF_CFLAGS
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
MKINSTALLDIRS
POSUB
POFILES
@@ -649,10 +667,12 @@ GMOFILES
CATOBJEXT
CATALOGS
MSGFMT_OPTS
-GCONF_SCHEMAS_INSTALL_FALSE
-GCONF_SCHEMAS_INSTALL_TRUE
-GCONF_SCHEMA_FILE_DIR
-GCONF_SCHEMA_CONFIG_SOURCE
+GSETTINGS_RULES
+GLIB_COMPILE_SCHEMAS
+gsettingsschemadir
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+GSETTINGS_DISABLE_SCHEMAS_COMPILE
GETTEXT_PACKAGE
PKG_CONFIG
DATADIRNAME
@@ -681,6 +701,12 @@ INTLTOOL_PROP_RULE
INTLTOOL_KEYS_RULE
INTLTOOL_DIRECTORY_RULE
INTLTOOL_DESKTOP_RULE
+intltool__v_merge_options_0
+intltool__v_merge_options_
+INTLTOOL_V_MERGE_OPTIONS
+INTLTOOL__v_MERGE_0
+INTLTOOL__v_MERGE_
+INTLTOOL_V_MERGE
INTLTOOL_EXTRACT
INTLTOOL_MERGE
INTLTOOL_UPDATE
@@ -815,9 +841,7 @@ with_sysroot
enable_libtool_lock
enable_nls
enable_largefile
-with_gconf_source
-with_gconf_schema_file_dir
-enable_schemas_install
+enable_schemas_compile
enable_gpg_check
with_nautilus_ext_dir
enable_libnotify
@@ -836,8 +860,6 @@ CPP
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
-GCONF_CFLAGS
-GCONF_LIBS
GTK_CFLAGS
GTK_LIBS
NAUTILUS_CFLAGS
@@ -848,6 +870,8 @@ DBUS_CFLAGS
DBUS_LIBS
LIBCRYPTUI_CFLAGS
LIBCRYPTUI_LIBS
+GCR_CFLAGS
+GCR_LIBS
LIBNOTIFY_CFLAGS
LIBNOTIFY_LIBS'
@@ -1305,8 +1329,6 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1392,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.4.0 to adapt to many kinds of systems.
+\`configure' configures seahorse-nautilus 3.8.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1463,7 +1485,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of seahorse-nautilus 3.4.0:";;
+ short | recursive ) echo "Configuration of seahorse-nautilus 3.8.0:";;
esac
cat <<\_ACEOF
@@ -1471,12 +1493,15 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-silent-rules less verbose build output (undo: `make V=1')
- --disable-silent-rules verbose build output (undo: `make V=0')
- --disable-maintainer-mode disable make rules and dependencies not useful
- (and sometimes confusing) to the casual installer
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-silent-rules less verbose build output (undo: "make V=1")
+ --disable-silent-rules verbose build output (undo: "make V=0")
+ --disable-maintainer-mode
+ disable make rules and dependencies not useful (and
+ sometimes confusing) to the casual installer
+ --enable-dependency-tracking
+ do not reject slow dependency extractors
+ --disable-dependency-tracking
+ speeds up one-time build
--enable-static[=PKGS] build static libraries [default=no]
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-fast-install[=PKGS]
@@ -1484,8 +1509,8 @@ Optional Features:
--disable-libtool-lock avoid locking (might break parallel builds)
--disable-nls do not use Native Language Support
--disable-largefile omit support for large files
- --disable-schemas-install
- Disable the schemas installation
+ --disable-schemas-compile
+ Disable regeneration of gschemas.compiled on install
--disable-gpg-check check GPG version (default is yes)
--disable-libnotify Don't compile in libnotify support
--enable-debug=no/default/yes
@@ -1502,10 +1527,6 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot=DIR Search for dependent libraries within DIR
(or the compiler's sysroot if not specified).
- --with-gconf-source=sourceaddress
- Config database for installing schema files.
- --with-gconf-schema-file-dir=dir
- Directory for installing schema files.
--with-nautilus-ext-dir=DIR
directory to nautilus extension config
@@ -1523,9 +1544,6 @@ Some influential environment variables:
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
- GCONF_CFLAGS
- C compiler flags for GCONF, overriding pkg-config
- GCONF_LIBS linker flags for GCONF, overriding pkg-config
GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
GTK_LIBS linker flags for GTK, overriding pkg-config
NAUTILUS_CFLAGS
@@ -1542,6 +1560,8 @@ Some influential environment variables:
C compiler flags for LIBCRYPTUI, overriding pkg-config
LIBCRYPTUI_LIBS
linker flags for LIBCRYPTUI, overriding pkg-config
+ GCR_CFLAGS C compiler flags for GCR, overriding pkg-config
+ GCR_LIBS linker flags for GCR, overriding pkg-config
LIBNOTIFY_CFLAGS
C compiler flags for LIBNOTIFY, overriding pkg-config
LIBNOTIFY_LIBS
@@ -1613,10 +1633,10 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-seahorse-nautilus configure 3.4.0
-generated by GNU Autoconf 2.68
+seahorse-nautilus configure 3.8.0
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1893,7 +1913,7 @@ $as_echo "$ac_try_echo"; } >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -2036,8 +2056,8 @@ 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.4.0, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+It was created by seahorse-nautilus $as_me 3.8.0, which was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2387,7 +2407,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# -----------------------------------------------------------------------------
-am__api_version='1.11'
+am__api_version='1.12'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2455,7 +2475,7 @@ case $as_dir/ in #((
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -2513,9 +2533,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -2526,32 +2543,40 @@ case `pwd` in
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
esac
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
-alias in your environment" "$LINENO" 5
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+ if test "$2" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$2" = conftest.file
)
then
@@ -2563,6 +2588,16 @@ Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
@@ -2589,8 +2624,8 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
if test x"${install_sh}" != xset; then
@@ -2602,10 +2637,10 @@ if test x"${install_sh}" != xset; then
esac
fi
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -2624,7 +2659,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2664,7 +2699,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2715,7 +2750,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
@@ -2744,12 +2779,6 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; }
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2768,7 +2797,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2854,7 +2883,7 @@ fi
# Define the identity of the package.
PACKAGE='seahorse-nautilus'
- VERSION='3.4.0'
+ VERSION='3.8.0'
cat >>confdefs.h <<_ACEOF
@@ -2882,6 +2911,12 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
@@ -2895,7 +2930,7 @@ $as_echo_n "checking how to create a ustar tar archive... " >&6; }
_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 `-'.
+# Solaris sh will not grok spaces in the rhs of '-'.
for _am_tool in $_am_tools
do
case $_am_tool in
@@ -2977,9 +3012,6 @@ $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; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -2990,32 +3022,40 @@ case `pwd` in
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
esac
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
-alias in your environment" "$LINENO" 5
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+ if test "$2" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$2" = conftest.file
)
then
@@ -3027,6 +3067,16 @@ Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
ac_config_headers="$ac_config_headers config.h"
# Check whether --enable-silent-rules was given.
@@ -3034,10 +3084,10 @@ if test "${enable_silent_rules+set}" = set; then :
enableval=$enable_silent_rules;
fi
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no) AM_DEFAULT_VERBOSITY=1;;
-*) AM_DEFAULT_VERBOSITY=0;;
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=0;;
esac
am_make=${MAKE-make}
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
@@ -3115,7 +3165,7 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@ -3181,7 +3231,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3221,7 +3271,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3274,7 +3324,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3315,7 +3365,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -3373,7 +3423,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3417,7 +3467,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3863,8 +3913,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3960,8 +4009,8 @@ else
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
@@ -3996,16 +4045,16 @@ else
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -4014,8 +4063,8 @@ else
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@ -4023,7 +4072,7 @@ else
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@ -4232,7 +4281,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -4298,7 +4347,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -4505,8 +4554,8 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-# define __EXTENSIONS__ 1
- $ac_includes_default
+# define __EXTENSIONS__ 1
+ $ac_includes_default
int
main ()
{
@@ -4615,7 +4664,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4655,7 +4704,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4708,7 +4757,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4749,7 +4798,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -4807,7 +4856,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4851,7 +4900,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5047,8 +5096,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -5144,8 +5192,8 @@ else
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
@@ -5180,16 +5228,16 @@ else
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -5198,8 +5246,8 @@ else
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
@@ -5207,7 +5255,7 @@ else
fi
;;
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@ -5785,7 +5833,7 @@ do
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
case `"$ac_path_SED" --version 2>&1` in
@@ -5864,7 +5912,7 @@ do
for ac_prog in fgrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+ as_fn_executable_p "$ac_path_FGREP" || continue
# Check for GNU ac_path_FGREP and select it if it is found.
# Check for GNU $ac_path_FGREP
case `"$ac_path_FGREP" --version 2>&1` in
@@ -6120,7 +6168,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6164,7 +6212,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6577,7 +6625,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6617,7 +6665,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6923,7 +6971,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6963,7 +7011,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7066,7 +7114,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7110,7 +7158,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AR="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7235,7 +7283,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7275,7 +7323,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7334,7 +7382,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7374,7 +7422,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8023,7 +8071,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8063,7 +8111,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8143,7 +8191,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8183,7 +8231,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8235,7 +8283,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8275,7 +8323,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8327,7 +8375,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8367,7 +8415,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_LIPO="lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8419,7 +8467,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8459,7 +8507,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL="otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8511,7 +8559,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8551,7 +8599,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL64="otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12769,14 +12817,12 @@ case "$am__api_version" in
;;
esac
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
if test -n "0.35.0"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
$as_echo_n "checking for intltool >= 0.35.0... " >&6; }
-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
- INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
@@ -12801,7 +12847,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12841,7 +12887,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12881,7 +12927,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -12907,25 +12953,48 @@ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT";
as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
fi
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< $@'
- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+ AM_DEFAULT_VERBOSITY=1
+fi
+
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;'
+
+
+
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+
+
+
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@'
+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
+else
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
+fi
+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -13042,7 +13111,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -13082,7 +13151,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -13122,7 +13191,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -13162,7 +13231,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -13213,7 +13282,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -13321,7 +13390,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -13541,6 +13610,8 @@ _ACEOF
esac
rm -rf conftest*
fi
+
+
fi
ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
@@ -13635,55 +13706,237 @@ _ACEOF
# GLib and GTK+ stuff
- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- else
- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
- fi
-
-# Check whether --with-gconf-source was given.
-if test "${with_gconf_source+set}" = set; then :
- withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
+ # Check whether --enable-schemas-compile was given.
+if test "${enable_schemas_compile+set}" = set; then :
+ enableval=$enable_schemas_compile; case ${enableval} in
+ yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
+ no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+ *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;;
+ esac
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
-$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
- fi
-# Check whether --with-gconf-schema-file-dir was given.
-if test "${with_gconf_schema_file_dir+set}" = set; then :
- withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
-$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
- # Check whether --enable-schemas-install was given.
-if test "${enable_schemas_install+set}" = set; then :
- enableval=$enable_schemas_install; case ${enableval} in
- yes|no) ;;
- *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
- esac
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.16
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; }
+ PKG_CONFIG=""
+ fi
fi
+ gsettingsschemadir=${datadir}/glib-2.0/schemas
+
+ if test x$cross_compiling != xyes; then
+ GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
+ else
+ # Extract the first word of "glib-compile-schemas", so it can be a program name with args.
+set dummy glib-compile-schemas; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GLIB_COMPILE_SCHEMAS+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GLIB_COMPILE_SCHEMAS in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
- if test "$enable_schemas_install" != no; then
- GCONF_SCHEMAS_INSTALL_TRUE=
- GCONF_SCHEMAS_INSTALL_FALSE='#'
+ ;;
+esac
+fi
+GLIB_COMPILE_SCHEMAS=$ac_cv_path_GLIB_COMPILE_SCHEMAS
+if test -n "$GLIB_COMPILE_SCHEMAS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_SCHEMAS" >&5
+$as_echo "$GLIB_COMPILE_SCHEMAS" >&6; }
else
- GCONF_SCHEMAS_INSTALL_TRUE='#'
- GCONF_SCHEMAS_INSTALL_FALSE=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+ fi
+
+ if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
+ as_fn_error $? "glib-compile-schemas not found." "$LINENO" 5
+ else
+ :
+ fi
+
+ GSETTINGS_RULES='
+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
+
+mostlyclean-am: clean-gsettings-schemas
+
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+
+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+ $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@
+
+all-am: $(gsettings_SCHEMAS:.xml=.valid)
+uninstall-am: uninstall-gsettings-schemas
+install-data-am: install-gsettings-schemas
+
+.SECONDARY: $(gsettings_SCHEMAS)
+
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
+ @$(NORMAL_INSTALL)
+ if test -n "$^"; then \
+ test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+ fi
+
+uninstall-gsettings-schemas:
+ @$(NORMAL_UNINSTALL)
+ @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+
+clean-gsettings-schemas:
+ rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+ $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE). at EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" $^ > $@.tmp && mv $@.tmp $@
+endif
+'
+
+
+
+
+
+
for ac_header in locale.h
do :
@@ -14182,7 +14435,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -14394,216 +14647,6 @@ $as_echo "$LINGUAS" >&6; }
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_pt_PKG_CONFIG" = x; then
- PKG_CONFIG=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
- fi
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; }
- PKG_CONFIG=""
- fi
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF" >&5
-$as_echo_n "checking for GCONF... " >&6; }
-
-if test -n "$GCONF_CFLAGS"; then
- pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$GCONF_LIBS"; then
- pkg_cv_GCONF_LIBS="$GCONF_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0" 2>&1`
- else
- GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GCONF_PKG_ERRORS" >&5
-
- as_fn_error $? "Package requirements (gconf-2.0) were not met:
-
-$GCONF_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GCONF_CFLAGS
-and GCONF_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GCONF_CFLAGS
-and GCONF_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-else
- GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
- GCONF_LIBS=$pkg_cv_GCONF_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
$as_echo_n "checking for GTK... " >&6; }
@@ -14618,6 +14661,7 @@ if test -n "$GTK_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0 gio-2.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14634,6 +14678,7 @@ if test -n "$GTK_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0 gio-2.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14653,9 +14698,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= 3.0 gio-2.0" 2>&1`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.0 gio-2.0" 2>&1`
else
- GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= 3.0 gio-2.0" 2>&1`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.0 gio-2.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
@@ -14670,7 +14715,6 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables GTK_CFLAGS
and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
-
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -14686,7 +14730,6 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
-
else
GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
GTK_LIBS=$pkg_cv_GTK_LIBS
@@ -14713,7 +14756,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -14772,7 +14815,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GNUPG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -14856,7 +14899,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GPGME_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -14935,6 +14978,7 @@ if test -n "$NAUTILUS_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-extension >= 2.12.0 glib-2.0 >= 2.10.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14951,6 +14995,7 @@ if test -n "$NAUTILUS_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs "libnautilus-extension >= 2.12.0 glib-2.0 >= 2.10.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -14970,9 +15015,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnautilus-extension >= 2.12.0 glib-2.0 >= 2.10.0" 2>&1`
+ NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnautilus-extension >= 2.12.0 glib-2.0 >= 2.10.0" 2>&1`
else
- NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnautilus-extension >= 2.12.0 glib-2.0 >= 2.10.0" 2>&1`
+ NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnautilus-extension >= 2.12.0 glib-2.0 >= 2.10.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NAUTILUS_PKG_ERRORS" >&5
@@ -14987,7 +15032,6 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables NAUTILUS_CFLAGS
and NAUTILUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
-
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -15003,7 +15047,6 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
-
else
NAUTILUS_CFLAGS=$pkg_cv_NAUTILUS_CFLAGS
NAUTILUS_LIBS=$pkg_cv_NAUTILUS_LIBS
@@ -15049,6 +15092,7 @@ if test -n "$GNOME_KEYRING_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GNOME_KEYRING_CFLAGS=`$PKG_CONFIG --cflags "gnome-keyring-1" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -15065,6 +15109,7 @@ if test -n "$GNOME_KEYRING_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GNOME_KEYRING_LIBS=`$PKG_CONFIG --libs "gnome-keyring-1" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -15084,9 +15129,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-keyring-1" 2>&1`
+ GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnome-keyring-1" 2>&1`
else
- GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-keyring-1" 2>&1`
+ GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnome-keyring-1" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GNOME_KEYRING_PKG_ERRORS" >&5
@@ -15101,7 +15146,6 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables GNOME_KEYRING_CFLAGS
and GNOME_KEYRING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
-
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -15117,7 +15161,6 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
-
else
GNOME_KEYRING_CFLAGS=$pkg_cv_GNOME_KEYRING_CFLAGS
GNOME_KEYRING_LIBS=$pkg_cv_GNOME_KEYRING_LIBS
@@ -15148,6 +15191,7 @@ if test -n "$DBUS_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -15164,6 +15208,7 @@ if test -n "$DBUS_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -15183,9 +15228,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
+ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
else
- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
+ DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
@@ -15230,6 +15275,7 @@ if test -n "$LIBCRYPTUI_CFLAGS"; then
$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`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -15246,6 +15292,7 @@ if test -n "$LIBCRYPTUI_LIBS"; then
$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`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -15265,9 +15312,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBCRYPTUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cryptui-0.0" 2>&1`
+ LIBCRYPTUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cryptui-0.0" 2>&1`
else
- LIBCRYPTUI_PKG_ERRORS=`$PKG_CONFIG --print-errors "cryptui-0.0" 2>&1`
+ LIBCRYPTUI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cryptui-0.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBCRYPTUI_PKG_ERRORS" >&5
@@ -15282,7 +15329,6 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables LIBCRYPTUI_CFLAGS
and LIBCRYPTUI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
-
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -15298,7 +15344,6 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
-
else
LIBCRYPTUI_CFLAGS=$pkg_cv_LIBCRYPTUI_CFLAGS
LIBCRYPTUI_LIBS=$pkg_cv_LIBCRYPTUI_LIBS
@@ -15311,6 +15356,103 @@ SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $LIBCRYPTUI_CFLAGS"
SEAHORSE_LIBS="$SEAHORSE_LIBS $LIBCRYPTUI_LIBS"
# -----------------------------------------------------------------------------
+# Gcr
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCR" >&5
+$as_echo_n "checking for GCR... " >&6; }
+
+if test -n "$GCR_CFLAGS"; then
+ pkg_cv_GCR_CFLAGS="$GCR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gcr-3 > 3.4.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gcr-3 > 3.4.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GCR_CFLAGS=`$PKG_CONFIG --cflags "gcr-3 > 3.4.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GCR_LIBS"; then
+ pkg_cv_GCR_LIBS="$GCR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gcr-3 > 3.4.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gcr-3 > 3.4.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GCR_LIBS=`$PKG_CONFIG --libs "gcr-3 > 3.4.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GCR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gcr-3 > 3.4.0" 2>&1`
+ else
+ GCR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gcr-3 > 3.4.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GCR_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (gcr-3 > 3.4.0) were not met:
+
+$GCR_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GCR_CFLAGS
+and GCR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GCR_CFLAGS
+and GCR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ GCR_CFLAGS=$pkg_cv_GCR_CFLAGS
+ GCR_LIBS=$pkg_cv_GCR_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GCR_CFLAGS"
+SEAHORSE_LIBS="$SEAHORSE_LIBS $GCR_LIBS"
+
+# -----------------------------------------------------------------------------
# Libnotify
LIBNOTIFY_REQUIRED=0.3
@@ -15341,6 +15483,7 @@ if test -n "$LIBNOTIFY_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -15357,6 +15500,7 @@ if test -n "$LIBNOTIFY_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -15376,9 +15520,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1`
+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1`
else
- LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1`
+ LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBNOTIFY_PKG_ERRORS" >&5
@@ -15532,7 +15676,7 @@ $as_echo "$strict_status" >&6; }
-ac_config_files="$ac_config_files Makefile po/Makefile.in tool/Makefile tool/seahorse-pgp-encrypted.desktop.in tool/seahorse-pgp-keys.desktop.in tool/seahorse-pgp-signature.desktop.in nautilus-ext/Makefile"
+ac_config_files="$ac_config_files Makefile data/Makefile po/Makefile.in tool/Makefile tool/seahorse-pgp-encrypted.desktop.in tool/seahorse-pgp-keys.desktop.in tool/seahorse-pgp-signature.desktop.in nautilus-ext/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -15643,6 +15787,14 @@ LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -15651,6 +15803,14 @@ else
am__EXEEXT_FALSE=
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -15671,10 +15831,6 @@ fi
ac_config_commands="$ac_config_commands po/stamp-it"
-if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
- as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -15973,16 +16129,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -16042,28 +16198,16 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -16084,8 +16228,8 @@ 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.4.0, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+This file was extended by seahorse-nautilus $as_me 3.8.0, which was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -16150,11 +16294,11 @@ _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.4.0
-configured by $0, generated by GNU Autoconf 2.68,
+seahorse-nautilus config.status 3.8.0
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -16245,7 +16389,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
@@ -16562,6 +16706,7 @@ do
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"tool/Makefile") CONFIG_FILES="$CONFIG_FILES tool/Makefile" ;;
"tool/seahorse-pgp-encrypted.desktop.in") CONFIG_FILES="$CONFIG_FILES tool/seahorse-pgp-encrypted.desktop.in" ;;
@@ -17178,7 +17323,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -17212,21 +17357,19 @@ $as_echo X"$mf" |
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
test -z "am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`$as_dirname -- "$file" ||
diff --git a/configure.ac b/configure.ac
index 1fb6a9a..46de4e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.63])
-AC_INIT([seahorse-nautilus], [3.4.0],
+AC_INIT([seahorse-nautilus], [3.8.0],
[http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse-plugins&component=Nautilus],
[seahorse-nautilus])
@@ -39,10 +39,9 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext dom
# -----------------------------------------------------------------------------
# GLib and GTK+ stuff
-AM_GCONF_SOURCE_2
+GLIB_GSETTINGS
AM_GLIB_GNU_GETTEXT
-PKG_CHECK_MODULES(GCONF, gconf-2.0)
PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 gio-2.0)
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
@@ -179,6 +178,13 @@ SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $LIBCRYPTUI_CFLAGS"
SEAHORSE_LIBS="$SEAHORSE_LIBS $LIBCRYPTUI_LIBS"
# -----------------------------------------------------------------------------
+# Gcr
+
+PKG_CHECK_MODULES(GCR, gcr-3 > 3.4.0)
+SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GCR_CFLAGS"
+SEAHORSE_LIBS="$SEAHORSE_LIBS $GCR_LIBS"
+
+# -----------------------------------------------------------------------------
# Libnotify
LIBNOTIFY_REQUIRED=0.3
@@ -288,6 +294,7 @@ AC_SUBST(SEAHORSE_LIBS)
AC_OUTPUT([
Makefile
+data/Makefile
po/Makefile.in
tool/Makefile
tool/seahorse-pgp-encrypted.desktop.in
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..c3efc91
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,15 @@
+gsettings_SCHEMAS = \
+ org.gnome.seahorse.nautilus.gschema.xml \
+ org.gnome.seahorse.nautilus.window.gschema.xml
+
+ at GSETTINGS_RULES@
+
+convert_DATA = \
+ org.gnome.seahorse.nautilus.convert
+
+convertdir = \
+ $(datarootdir)/GConf/gsettings
+
+EXTRA_DIST = \
+ $(convert_DATA) \
+ $(gsettings_SCHEMAS)
\ No newline at end of file
diff --git a/nautilus-ext/Makefile.in b/data/Makefile.in
similarity index 56%
copy from nautilus-ext/Makefile.in
copy to data/Makefile.in
index b5e07cc..a95c1a1 100644
--- a/nautilus-ext/Makefile.in
+++ b/data/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ 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;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -34,8 +50,9 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-subdir = nautilus-ext
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+subdir = data
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/mkinstalldirs
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 \
@@ -47,6 +64,25 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,51 +110,8 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(nautilus_extensiondir)"
-LTLIBRARIES = $(nautilus_extension_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libnautilus_seahorse_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libnautilus_seahorse_la_OBJECTS = seahorse-nautilus.lo \
- seahorse-nautilus-module.lo
-libnautilus_seahorse_la_OBJECTS = \
- $(am_libnautilus_seahorse_la_OBJECTS)
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-libnautilus_seahorse_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(AM_CFLAGS) $(CFLAGS) $(libnautilus_seahorse_la_LDFLAGS) \
- $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_ at AM_V@)
-am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_ at AM_V@)
-am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_ at AM_V@)
-am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-SOURCES = $(libnautilus_seahorse_la_SOURCES)
-DIST_SOURCES = $(libnautilus_seahorse_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
+am__installdirs = "$(DESTDIR)$(convertdir)"
+DATA = $(convert_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -151,11 +144,10 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCR_CFLAGS = @GCR_CFLAGS@
+GCR_LIBS = @GCR_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
@@ -164,6 +156,7 @@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@
GNUPG = @GNUPG@
GPGME_CONFIG = @GPGME_CONFIG@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
INSTALL = @INSTALL@
@@ -177,6 +170,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBCRYPTUI_CFLAGS = @LIBCRYPTUI_CFLAGS@
@@ -255,6 +252,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -264,6 +262,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -283,24 +283,23 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir) \
- $(NAUTILUS_CFLAGS) \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-
-nautilus_extensiondir = $(NAUTILUS_EXTENSION_DIR)
-nautilus_extension_LTLIBRARIES = libnautilus-seahorse.la
-libnautilus_seahorse_la_SOURCES = \
- seahorse-nautilus.c \
- seahorse-nautilus.h \
- seahorse-nautilus-module.c
-
-libnautilus_seahorse_la_LDFLAGS = -module -avoid-version -no-undefined
-libnautilus_seahorse_la_LIBADD = $(NAUTILUS_LIBS)
+gsettings_SCHEMAS = \
+ org.gnome.seahorse.nautilus.gschema.xml \
+ org.gnome.seahorse.nautilus.window.gschema.xml
+
+convert_DATA = \
+ org.gnome.seahorse.nautilus.convert
+
+convertdir = \
+ $(datarootdir)/GConf/gsettings
+
+EXTRA_DIST = \
+ $(convert_DATA) \
+ $(gsettings_SCHEMAS)
+
all: all-am
.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -310,9 +309,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nautilus-ext/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign nautilus-ext/Makefile
+ $(AUTOMAKE) --foreign data/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -331,127 +330,41 @@ $(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)
- test -z "$(nautilus_extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(nautilus_extensiondir)"
- @list='$(nautilus_extension_LTLIBRARIES)'; test -n "$(nautilus_extensiondir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nautilus_extensiondir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nautilus_extensiondir)"; \
- }
-
-uninstall-nautilus_extensionLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(nautilus_extension_LTLIBRARIES)'; test -n "$(nautilus_extensiondir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(nautilus_extensiondir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(nautilus_extensiondir)/$$f"; \
- done
-
-clean-nautilus_extensionLTLIBRARIES:
- -test -z "$(nautilus_extension_LTLIBRARIES)" || rm -f $(nautilus_extension_LTLIBRARIES)
- @list='$(nautilus_extension_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-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)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-nautilus-module.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-nautilus.Plo at am__quote@
-
-.c.o:
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c $<
-
-.c.obj:
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
+install-convertDATA: $(convert_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(convertdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(convertdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(convertdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(convertdir)" || exit $$?; \
+ 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
+uninstall-convertDATA:
+ @$(NORMAL_UNINSTALL)
+ @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: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- 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; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$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; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+CTAGS:
+
+cscope cscopelist:
+
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -485,9 +398,9 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(nautilus_extensiondir)"; do \
+ for dir in "$(DESTDIR)$(convertdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -522,14 +435,11 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool \
- clean-nautilus_extensionLTLIBRARIES mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
+distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -543,7 +453,7 @@ info: info-am
info-am:
-install-data-am: install-nautilus_extensionLTLIBRARIES
+install-data-am: install-convertDATA
install-dvi: install-dvi-am
@@ -572,14 +482,12 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
pdf: pdf-am
@@ -589,26 +497,24 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-nautilus_extensionLTLIBRARIES
+uninstall-am: uninstall-convertDATA
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-nautilus_extensionLTLIBRARIES 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 \
- 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 \
+.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 \
- tags uninstall uninstall-am \
- uninstall-nautilus_extensionLTLIBRARIES
+ uninstall uninstall-am uninstall-convertDATA
+
+ at GSETTINGS_RULES@
# 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.
diff --git a/data/org.gnome.seahorse.nautilus.convert b/data/org.gnome.seahorse.nautilus.convert
new file mode 100644
index 0000000..54618da
--- /dev/null
+++ b/data/org.gnome.seahorse.nautilus.convert
@@ -0,0 +1,4 @@
+[org.gnome.seahorse.nautilus]
+package-extension = /desktop/pgp/package_extension
+separate-files = /desktop/pgp/multi_seperate
+armor-mode = /desktop/pgp/ascii_armor
diff --git a/data/org.gnome.seahorse.nautilus.gschema.xml b/data/org.gnome.seahorse.nautilus.gschema.xml
new file mode 100644
index 0000000..634c458
--- /dev/null
+++ b/data/org.gnome.seahorse.nautilus.gschema.xml
@@ -0,0 +1,19 @@
+<schemalist>
+ <schema id="org.gnome.seahorse.nautilus" path="/org/gnome/seahorse/nautilus/">
+ <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>
+ </key>
+ <key name="separate-files" type="b">
+ <default>false</default>
+ <summary>Handle multiple files separately</summary>
+ <description>When handling multiple files, don't package them but process separately.</description>
+ </key>
+ <key name="armor-mode" type="b">
+ <default>false</default>
+ <summary>Use armor mode when encrypting</summary>
+ <description>Use PGP ASCII armor mode when encrypting or signing files.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/data/org.gnome.seahorse.nautilus.window.gschema.xml b/data/org.gnome.seahorse.nautilus.window.gschema.xml
new file mode 100644
index 0000000..89f49f1
--- /dev/null
+++ b/data/org.gnome.seahorse.nautilus.window.gschema.xml
@@ -0,0 +1,14 @@
+<schemalist>
+ <schema id="org.gnome.seahorse.nautilus.window">
+ <key name="width" type="i">
+ <default>-1</default>
+ <summary>Width of the window</summary>
+ <description>Width (in pixels) of the window.</description>
+ </key>
+ <key name="height" type="i">
+ <default>-1</default>
+ <summary>Height of the window</summary>
+ <description>Height (in pixels) of the window.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/m4/intltool.m4 b/m4/intltool.m4
index 07af68b..33353ed 100644
--- a/m4/intltool.m4
+++ b/m4/intltool.m4
@@ -23,7 +23,7 @@
## the same distribution terms that you use for the rest of that program.
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 40 IT_PROG_INTLTOOL
+# serial 42 IT_PROG_INTLTOOL
AC_DEFUN([IT_PROG_INTLTOOL], [
AC_PREREQ([2.50])dnl
AC_REQUIRE([AM_NLS])dnl
@@ -36,13 +36,11 @@ case "$am__api_version" in
;;
esac
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
if test -n "$1"; then
AC_MSG_CHECKING([for intltool >= $1])
-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
- [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- ]
AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
@@ -55,25 +53,48 @@ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT";
AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
fi
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< [$]@'
- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+ AM_DEFAULT_VERBOSITY=1
+fi
+AC_SUBST([AM_DEFAULT_VERBOSITY])
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;'
+AC_SUBST(INTLTOOL_V_MERGE)
+AC_SUBST(INTLTOOL__v_MERGE_)
+AC_SUBST(INTLTOOL__v_MERGE_0)
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
+AC_SUBST(intltool__v_merge_options_)
+AC_SUBST(intltool__v_merge_options_0)
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
+else
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
+fi
+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
_IT_SUBST(INTLTOOL_DESKTOP_RULE)
_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
diff --git a/mkinstalldirs b/mkinstalldirs
index 4191a45..55d537f 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -81,9 +81,9 @@ case $dirmode in
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
else
- # On NextStep and OpenStep, the `mkdir' command does not
+ # On NextStep and OpenStep, the 'mkdir' command does not
# recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
+ # directories to create, and then abort because '.' already
# exists.
test -d ./-p && rmdir ./-p
test -d ./--version && rmdir ./--version
diff --git a/nautilus-ext/Makefile.in b/nautilus-ext/Makefile.in
index b5e07cc..1ba67e1 100644
--- a/nautilus-ext/Makefile.in
+++ b/nautilus-ext/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ 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;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -35,7 +51,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = nautilus-ext
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs
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 \
@@ -85,10 +102,23 @@ libnautilus_seahorse_la_OBJECTS = \
AM_V_lt = $(am__v_lt_ at AM_V@)
am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
am__v_lt_0 = --silent
+am__v_lt_1 =
libnautilus_seahorse_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(libnautilus_seahorse_la_LDFLAGS) \
$(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -101,22 +131,23 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_ at AM_V@)
am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_ at AM_V@)
-am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_ at AM_V@)
-am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(libnautilus_seahorse_la_SOURCES)
DIST_SOURCES = $(libnautilus_seahorse_la_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -151,11 +182,10 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCR_CFLAGS = @GCR_CFLAGS@
+GCR_LIBS = @GCR_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
@@ -164,6 +194,7 @@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@
GNUPG = @GNUPG@
GPGME_CONFIG = @GPGME_CONFIG@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
INSTALL = @INSTALL@
@@ -177,6 +208,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBCRYPTUI_CFLAGS = @LIBCRYPTUI_CFLAGS@
@@ -255,6 +290,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -264,6 +300,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -333,7 +371,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-nautilus_extensionLTLIBRARIES: $(nautilus_extension_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(nautilus_extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(nautilus_extensiondir)"
@list='$(nautilus_extension_LTLIBRARIES)'; test -n "$(nautilus_extensiondir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
@@ -341,6 +378,8 @@ install-nautilus_extensionLTLIBRARIES: $(nautilus_extension_LTLIBRARIES)
else :; fi; \
done; \
test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(nautilus_extensiondir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(nautilus_extensiondir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nautilus_extensiondir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nautilus_extensiondir)"; \
}
@@ -356,12 +395,14 @@ uninstall-nautilus_extensionLTLIBRARIES:
clean-nautilus_extensionLTLIBRARIES:
-test -z "$(nautilus_extension_LTLIBRARIES)" || rm -f $(nautilus_extension_LTLIBRARIES)
- @list='$(nautilus_extension_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
+ @list='$(nautilus_extension_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
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)
@@ -450,6 +491,20 @@ GTAGS:
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -594,8 +649,8 @@ 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 ctags \
- distclean distclean-compile distclean-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 \
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 5eb4fe8..06a8cfe 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -49,8 +49,8 @@ MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
ALL_LINGUAS = @ALL_LINGUAS@
@@ -73,15 +73,20 @@ CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$l
.SUFFIXES:
.SUFFIXES: .po .pox .gmo .mo .msg .cat
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
+INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
+INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@;
+
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
.po.mo:
- $(MSGFMT) -o $@ $<
+ $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
.po.gmo:
- file=`echo $* | sed 's,.*/,,'`.gmo \
+ $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) -o $$file $<
.po.cat:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2b8d020..9a7946d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,7 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
+data/org.gnome.seahorse.nautilus.gschema.xml
+data/org.gnome.seahorse.nautilus.window.gschema.xml
nautilus-ext/seahorse-nautilus.c
[type: gettext/glade]tool/seahorse-multi-encrypt.xml
tool/seahorse-notification.c
diff --git a/po/cs.po b/po/cs.po
index 353bd55..94d0246 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,21 +9,66 @@
# Vitezslav Kotrla <vitko at post.cz>, 2008.
# Lucas Lommer <llommer at svn.gnome.org>, 2008, 2010, 2011.
# Petr Kovar <pknbe at volny.cz>, 2008, 2010.
-# Marek Černocký <marek at manet.cz>, 2010.
+# Marek Černocký <marek at manet.cz>, 2010, 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-23 12:12+0100\n"
-"Last-Translator: Lucas Lommer <llommer at svn.gnome.org>\n"
-"Language-Team: Czech <gnome-cs-list at gnome.org>\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"
+"Last-Translator: Marek Černocký <marek at manet.cz>\n"
+"Language-Team: čeština <gnome-cs-list at gnome.org>\n"
"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Gtranslator 2.91.6\n"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:1
+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."
+msgstr "Přípona souboru pro balíčky, když se pracuje s více soubory."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
+msgid "Handle multiple files separately"
+msgstr "Pracovat s každým souborem zvlášť"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:4
+msgid ""
+"When handling multiple files, don't package them but process separately."
+msgstr ""
+"Když se pracuje s více soubory, nebalit je, ale zpracovat každý zvlášť."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
+msgid "Use armor mode when encrypting"
+msgstr "Během šifrování používat ochranný režim"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:6
+msgid "Use PGP ASCII armor mode when encrypting or signing files."
+msgstr ""
+"Během šifrování nebo podepisování souborů používat ochranný režim PGP ASCII."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:1
+msgid "Width of the window"
+msgstr "Šířka okna"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:2
+msgid "Width (in pixels) of the window."
+msgstr "Šířka okna (v pixelech)."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:3
+msgid "Height of the window"
+msgstr "Výška okna"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:4
+msgid "Height (in pixels) of the window."
+msgstr "Výšky okna (v pixelech)."
#: ../nautilus-ext/seahorse-nautilus.c:158
msgid "Encrypt..."
@@ -48,20 +93,16 @@ msgstr[1] "Podepsat vybrané soubory"
msgstr[2] "Podepsat vybraných souborů"
#: ../tool/seahorse-multi-encrypt.xml.h:1
-msgid "<b>You have selected multiple files or folders</b>"
-msgstr "<b>Bylo vybráno více souborů nebo složek</b>"
+msgid "Encrypt Multiple Files"
+msgstr "Zašifrovat více souborů"
#: ../tool/seahorse-multi-encrypt.xml.h:2
-msgid ""
-"Because the files are located remotely, each file will be encrypted "
-"separately."
-msgstr ""
-"Protože jsou soubory umístěny vzdáleně, bude každý soubor zašifrován "
-"samostatně."
+msgid "<b>You have selected multiple files or folders</b>"
+msgstr "<b>Bylo vybráno více souborů nebo složek</b>"
#: ../tool/seahorse-multi-encrypt.xml.h:3
-msgid "Encrypt Multiple Files"
-msgstr "Zašifrovat více souborů"
+msgid "encrypted-package"
+msgstr "šifrovaný balíček"
#: ../tool/seahorse-multi-encrypt.xml.h:4
msgid "Encrypt each file separately"
@@ -72,25 +113,29 @@ msgid "Encrypt packed together in a package"
msgstr "Zašifrovat sbalené do balíčku"
#: ../tool/seahorse-multi-encrypt.xml.h:6
-msgid "Package Name:"
-msgstr "Název balíčku:"
-
-#: ../tool/seahorse-multi-encrypt.xml.h:7
msgid "Packaging:"
msgstr "Balení:"
+#: ../tool/seahorse-multi-encrypt.xml.h:7
+msgid "Package Name:"
+msgstr "Název balíčku:"
+
#: ../tool/seahorse-multi-encrypt.xml.h:8
-msgid "encrypted-package"
-msgstr "šifrovaný balíček"
+msgid ""
+"Because the files are located remotely, each file will be encrypted "
+"separately."
+msgstr ""
+"Protože jsou soubory umístěny vzdáleně, bude každý soubor zašifrován "
+"samostatně."
-#: ../tool/seahorse-notification.c:580 ../tool/seahorse-notification.c:605
+#: ../tool/seahorse-notification.c:572
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] "Importovaný klíč"
msgstr[1] "Importované klíče"
msgstr[2] "Importovat"
-#: ../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 +143,7 @@ msgstr[0] "Importován %i klíč"
msgstr[1] "Importováno %i klíčů"
msgstr[2] "Importováno %i klíčů"
-#: ../tool/seahorse-notification.c:586
+#: ../tool/seahorse-notification.c:578
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -107,61 +152,61 @@ msgstr[1] "Importovány klíče pro"
msgstr[2] "Importován klíč"
#. 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 "Podepsáno: <i><key id='%s'/> <b>vypršel</b></i> dne %s."
-#: ../tool/seahorse-notification.c:624
+#: ../tool/seahorse-notification.c:607
msgid "Invalid Signature"
msgstr "Neplatný podpis"
-#: ../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 ""
"Podepsáno klíčem <i><key id='%s'/></i> dne %s <b>Platnost klíče vypršela</b>."
-#: ../tool/seahorse-notification.c:631
+#: ../tool/seahorse-notification.c:614
msgid "Expired Signature"
msgstr "Podpis s vypršenou platností"
-#: ../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 "Podepsáno klíčem <i><key id='%s'/> <b>Klíč odvolán</b></i> dne %s."
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:621
msgid "Revoked Signature"
msgstr "Odvolaný podpis"
#. 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 "Podepsáno klíčem <i><key id='%s'/></i> dne %s."
-#: ../tool/seahorse-notification.c:645
+#: ../tool/seahorse-notification.c:628
msgid "Good Signature"
msgstr "Správný podpis"
-#: ../tool/seahorse-notification.c:650
+#: ../tool/seahorse-notification.c:633
msgid "Signing key not in keyring."
msgstr "Podpisový klíč v klíčence chybí."
-#: ../tool/seahorse-notification.c:651
+#: ../tool/seahorse-notification.c:634
msgid "Unknown Signature"
msgstr "Neznámý podpis"
-#: ../tool/seahorse-notification.c:655
+#: ../tool/seahorse-notification.c:638
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:656
+#: ../tool/seahorse-notification.c:639
msgid "Bad Signature"
msgstr "Špatný podpis"
-#: ../tool/seahorse-notification.c:664
+#: ../tool/seahorse-notification.c:647
msgid "Couldn't verify signature."
msgstr "Nebylo možno ověřit podpis."
@@ -169,42 +214,41 @@ msgstr "Nebylo možno ověřit podpis."
msgid "Notification Messages"
msgstr "Upozornění"
-#: ../tool/seahorse-passphrase.c:200
-msgid "Passphrase"
-msgstr "Heslo"
-
-#: ../tool/seahorse-passphrase.c:203
-msgid "Password:"
-msgstr "Heslo:"
-
-#. The second and main entry
-#: ../tool/seahorse-passphrase.c:267
-msgid "Confirm:"
-msgstr "Potvrďte:"
-
-#: ../tool/seahorse-passphrase.c:355
+#: ../tool/seahorse-passphrase.c:114
#, c-format
msgid "Wrong passphrase."
msgstr "Špatné heslo."
-#: ../tool/seahorse-passphrase.c:359
+#: ../tool/seahorse-passphrase.c:118
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Zadejte nové heslo pro „%s“"
-#: ../tool/seahorse-passphrase.c:361
+#: ../tool/seahorse-passphrase.c:120
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Zadejte heslo pro „%s“"
-#: ../tool/seahorse-passphrase.c:364
+#: ../tool/seahorse-passphrase.c:123
msgid "Enter new passphrase"
msgstr "Zadejte nové heslo"
-#: ../tool/seahorse-passphrase.c:366
+#: ../tool/seahorse-passphrase.c:125
msgid "Enter passphrase"
msgstr "Zadejte heslo"
+#: ../tool/seahorse-passphrase.c:130
+msgid "Passphrase"
+msgstr "Heslo"
+
+#: ../tool/seahorse-passphrase.c:138
+msgid "Ok"
+msgstr "Budiž"
+
+#: ../tool/seahorse-passphrase.c:139
+msgid "Cancel"
+msgstr "Zrušit"
+
#: ../tool/seahorse-pgp-encrypted.desktop.in.in.h:1
msgid "Decrypt File"
msgstr "Dešifrovat soubor"
@@ -325,7 +369,7 @@ msgstr "Zvolte původní soubor pro „%s“"
msgid "No valid signatures found"
msgstr "Nebyl nalezen žádný platný podpis"
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:695
msgid "File Encryption Tool"
msgstr "Nástroj pro šifrování souborů"
@@ -374,81 +418,81 @@ msgstr "Ověření"
msgid "Couldn't verify file: %s"
msgstr "Nebylo možno ověřit soubor: %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 "Samorozbalovací 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 "Nekomprimovaný Tar (.tar)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Tar s kompresí bzip (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Tar s kompresí bzip2 (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:139
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Tar s kompresí gzip (.tar.gz)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:140
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Tar s kompresí lzop (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:142
+#: ../tool/seahorse-tool-files.c:141
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Tar s kompresí 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 "
@@ -458,7 +502,7 @@ msgstr[2] "Vybrali jste %d souborů "
#. 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"
@@ -468,12 +512,12 @@ msgstr[2] "a %d složek"
#. 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"
@@ -481,7 +525,7 @@ msgstr[0] "Vybrali jste %d soubor "
msgstr[1] "Vybrali jste %d soubory"
msgstr[2] "Vybrali jste %d souborů "
-#: ../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"
@@ -489,15 +533,15 @@ msgstr[0] "Vybrali jste %d složku"
msgstr[1] "Vybrali jste %d složky"
msgstr[2] "Vybrali jste %d složek"
-#: ../tool/seahorse-tool-files.c:868
+#: ../tool/seahorse-tool-files.c:866
msgid "Preparing..."
msgstr "Příprava…"
-#: ../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 "Nebylo možno vypsat soubory"
-#: ../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 "Nebylo možno zabalit soubory"
@@ -505,33 +549,33 @@ msgstr "Nebylo možno zabalit soubory"
msgid "Decryption failed. You probably do not have the decryption key."
msgstr "Dešifrování selhalo. Pravděpodobně nemáte dešifrovací klíč."
-#: ../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 "Nebylo možno spustit file-roller"
-#: ../tool/seahorse-util.c:648
+#: ../tool/seahorse-util.c:400
msgid "The file-roller process did not complete successfully"
msgstr "Proces file-roller neskončil úspěšně"
#. 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 "Všechny soubory klíčů"
-#: ../tool/seahorse-util.c:715 ../tool/seahorse-util.c:755
+#: ../tool/seahorse-util.c:443 ../tool/seahorse-util.c:483
msgid "All files"
msgstr "Všechny soubory"
-#: ../tool/seahorse-util.c:748
+#: ../tool/seahorse-util.c:476
msgid "Archive files"
msgstr "Soubory archivů"
-#: ../tool/seahorse-util.c:777
+#: ../tool/seahorse-util.c:505
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -541,11 +585,6 @@ msgstr ""
"\n"
"Chcete jej nahradit novým souborem?"
-#: ../tool/seahorse-util.c:780
+#: ../tool/seahorse-util.c:508
msgid "_Replace"
msgstr "Na_hradit"
-
-#: ../tool/seahorse-widget.c:365
-#, c-format
-msgid "Could not display help: %s"
-msgstr "Nebylo možno zobrazit nápovědu: %s"
diff --git a/po/es.po b/po/es.po
index af098bf..07e9090 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,21 +7,67 @@
# 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.
+#
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-08-31 17:14Centra\n"
-"Last-Translator: Jorge González <jorgegonz at svn.gnome.org>\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"
+"Last-Translator: Daniel Mustieles <daniel.mustieles at gmail.com>\n"
"Language-Team: Español; Castellano <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: KBabel 1.11.4\n"
+"X-Generator: Gtranslator 2.91.5\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."
+msgstr "Extensión de los archivos para paquetes al manejar varios archivos."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
+msgid "Handle multiple files separately"
+msgstr "Manejar varios archivos por separado"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:4
+msgid ""
+"When handling multiple files, don't package them but process separately."
+msgstr ""
+"Al manejar varios archivos, no empaquetarlos, pero sí procesarlos por "
+"separado."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
+msgid "Use armor mode when encrypting"
+msgstr "Usar modo de armadura al cifrar"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:6
+msgid "Use PGP ASCII armor mode when encrypting or signing files."
+msgstr "Usar modo de armadura PGP ASCII al cifrar o firmar archivos."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:1
+msgid "Width of the window"
+msgstr "Anchura de la ventana"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:2
+msgid "Width (in pixels) of the window."
+msgstr "Anchura de la ventana principal (en píxeles)."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:3
+msgid "Height of the window"
+msgstr "Altura de la ventana"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:4
+msgid "Height (in pixels) of the window."
+msgstr "Altura de la ventana principal (en píxeles)."
+
#: ../nautilus-ext/seahorse-nautilus.c:158
msgid "Encrypt..."
msgstr "Cifrar…"
@@ -43,20 +89,16 @@ msgstr[0] "Firmar el archivo seleccionado"
msgstr[1] "Firmar los archivos seleccionados"
#: ../tool/seahorse-multi-encrypt.xml.h:1
-msgid "<b>You have selected multiple files or folders</b>"
-msgstr "<b>Ha seleccionado múltiples archivos o carpetas</b>"
+msgid "Encrypt Multiple Files"
+msgstr "Cifrar varios archivos"
#: ../tool/seahorse-multi-encrypt.xml.h:2
-msgid ""
-"Because the files are located remotely, each file will be encrypted "
-"separately."
-msgstr ""
-"Debido a que los archivos están situados remotamente, cada archivo será "
-"cifrado por separado."
+msgid "<b>You have selected multiple files or folders</b>"
+msgstr "<b>Ha seleccionado múltiples archivos o carpetas</b>"
#: ../tool/seahorse-multi-encrypt.xml.h:3
-msgid "Encrypt Multiple Files"
-msgstr "Cifrar varios archivos"
+msgid "encrypted-package"
+msgstr "paquete-cifrado"
#: ../tool/seahorse-multi-encrypt.xml.h:4
msgid "Encrypt each file separately"
@@ -67,31 +109,35 @@ msgid "Encrypt packed together in a package"
msgstr "Cifrar todo empaquetándolo en un paquete"
#: ../tool/seahorse-multi-encrypt.xml.h:6
-msgid "Package Name:"
-msgstr "Nombre del paquete:"
-
-#: ../tool/seahorse-multi-encrypt.xml.h:7
msgid "Packaging:"
msgstr "Empaquetado:"
+#: ../tool/seahorse-multi-encrypt.xml.h:7
+msgid "Package Name:"
+msgstr "Nombre del 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 ""
+"Debido a que los archivos están situados remotamente, cada archivo será "
+"cifrado por separado."
-#: ../tool/seahorse-notification.c:580 ../tool/seahorse-notification.c:605
+#: ../tool/seahorse-notification.c:572
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] "Clave importada"
msgstr[1] "Claves 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] "Se importó %i clave"
msgstr[1] "Se importaron %i claves"
-#: ../tool/seahorse-notification.c:586
+#: ../tool/seahorse-notification.c:578
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -99,60 +145,60 @@ msgstr[0] "Clave importada para"
msgstr[1] "Claves 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 "Firmada por <i><key id='%s'/> <b>caducó</b></i> en %s."
-#: ../tool/seahorse-notification.c:624
+#: ../tool/seahorse-notification.c:607
msgid "Invalid Signature"
-msgstr "Firma inválida"
+msgstr "Firma no 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 "Firmado por <i><key id='%s'/></i> en %s <b>Caducado</b>."
-#: ../tool/seahorse-notification.c:631
+#: ../tool/seahorse-notification.c:614
msgid "Expired Signature"
msgstr "Firma 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 "Firmado por <i><key id='%s'/> <b>Revocado</b></i> el %s."
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:621
msgid "Revoked Signature"
msgstr "Firma revocada"
#. 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 "Firmado por <i><key id='%s'/></i> el %s."
-#: ../tool/seahorse-notification.c:645
+#: ../tool/seahorse-notification.c:628
msgid "Good Signature"
msgstr "Firma buena"
-#: ../tool/seahorse-notification.c:650
+#: ../tool/seahorse-notification.c:633
msgid "Signing key not in keyring."
msgstr "La clave de la firma no está en el depósito."
-#: ../tool/seahorse-notification.c:651
+#: ../tool/seahorse-notification.c:634
msgid "Unknown Signature"
msgstr "Firma desconocida"
-#: ../tool/seahorse-notification.c:655
+#: ../tool/seahorse-notification.c:638
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:656
+#: ../tool/seahorse-notification.c:639
msgid "Bad Signature"
msgstr "Firma mala"
-#: ../tool/seahorse-notification.c:664
+#: ../tool/seahorse-notification.c:647
msgid "Couldn't verify signature."
msgstr "No se pudo verificar la firma."
@@ -160,42 +206,41 @@ msgstr "No se pudo verificar la firma."
msgid "Notification Messages"
msgstr "Mensajes de notificación"
-#: ../tool/seahorse-passphrase.c:200
-msgid "Passphrase"
-msgstr "Frase de paso"
-
-#: ../tool/seahorse-passphrase.c:203
-msgid "Password:"
-msgstr "Contraseña:"
-
-#. 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 errónea."
-#: ../tool/seahorse-passphrase.c:359
+#: ../tool/seahorse-passphrase.c:118
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Introduzca la frase de paso para «%s»"
-#: ../tool/seahorse-passphrase.c:361
+#: ../tool/seahorse-passphrase.c:120
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Introduzca la frase de paso para «%s»"
-#: ../tool/seahorse-passphrase.c:364
+#: ../tool/seahorse-passphrase.c:123
msgid "Enter new passphrase"
msgstr "Introduzca la frase de paso nueva"
-#: ../tool/seahorse-passphrase.c:366
+#: ../tool/seahorse-passphrase.c:125
msgid "Enter passphrase"
msgstr "Introduzca la 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 fichero"
@@ -313,9 +358,9 @@ msgstr "Elija el archivo original para «%s»"
#: ../tool/seahorse-tool.c:648
#, c-format
msgid "No valid signatures found"
-msgstr "No se encontraron firmas inválidas"
+msgstr "No se encontraron firmas no válidas"
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:695
msgid "File Encryption Tool"
msgstr "Herramienta de cifrado de archivos"
@@ -364,81 +409,81 @@ msgstr "Verificación"
msgid "Couldn't verify file: %s"
msgstr "No se pudo verificar el archivo: «%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íble (.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 sin compresión (.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 "
@@ -447,7 +492,7 @@ msgstr[1] "Ha seleccionado %d archivos"
#. 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 +501,34 @@ msgstr[1] "y %d carpetas"
#. 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] "Ha seleccionado %d archivo"
msgstr[1] "Ha seleccionado %d archivos"
-#: ../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] "Ha seleccionado %d carpeta"
msgstr[1] "Ha seleccionado %d carpetas"
-#: ../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 "No se pudieron listar los archivos"
-#: ../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 "No se pudieron empaquetar los archivos"
@@ -491,33 +536,33 @@ msgstr "No se pudieron empaquetar los archivos"
msgid "Decryption failed. You probably do not have the decryption key."
msgstr "Falló el descifrado. Probablemente no tiene la clave 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 "No se pudo ejecutar file-roller"
-#: ../tool/seahorse-util.c:648
+#: ../tool/seahorse-util.c:400
msgid "The file-roller process did not complete successfully"
msgstr "El proceso de file-roller no terminó completamente"
#. 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 los archivos de claves"
-#: ../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 los archivos"
-#: ../tool/seahorse-util.c:748
+#: ../tool/seahorse-util.c:476
msgid "Archive files"
msgstr "Archivar ficheros"
-#: ../tool/seahorse-util.c:777
+#: ../tool/seahorse-util.c:505
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -527,11 +572,15 @@ msgstr ""
"\n"
"¿Quiere reemplazarlo por uno nuevo?"
-#: ../tool/seahorse-util.c:780
+#: ../tool/seahorse-util.c:508
msgid "_Replace"
msgstr "_Reemplazar"
-#: ../tool/seahorse-widget.c:365
-#, c-format
-msgid "Could not display help: %s"
-msgstr "No se pudo mostrar la ayuda: %s"
+#~ msgid "Password:"
+#~ msgstr "Contraseña:"
+
+#~ msgid "Confirm:"
+#~ msgstr "Confirmar:"
+
+#~ msgid "Could not display help: %s"
+#~ msgstr "No se pudo mostrar la ayuda: %s"
diff --git a/po/he.po b/po/he.po
index f45b0a8..a068f45 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: 1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 11:29+0200\n"
-"PO-Revision-Date: 2011-09-09 12:42+0200\n"
+"POT-Creation-Date: 2012-12-28 14:37+0200\n"
+"PO-Revision-Date: 2012-12-28 14:37+0200\n"
"Last-Translator: Yaron Shahrabani <sh.yaron at gmail.com>\n"
"Language-Team: Hebrew <he at li.org>\n"
"Language: he\n"
@@ -17,6 +17,46 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:1
+msgid "File extension for packages"
+msgstr "File extension for packages"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
+msgid "File extension for packages when handling mulitple files."
+msgstr "File extension for packages when handling mulitple files."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
+msgid "Handle multiple files separately"
+msgstr "Handle multiple files separately"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:4
+msgid "When handling multiple files, don't package them but process separately."
+msgstr "When handling multiple files, don't package them but process separately."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
+msgid "Use armor mode when encrypting"
+msgstr "Use armor mode when encrypting"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:6
+msgid "Use PGP ASCII armor mode when encrypting or signing files."
+msgstr "Use PGP ASCII armor mode when encrypting or signing files."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:1
+msgid "Width of the window"
+msgstr "Width of the window"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:2
+msgid "Width (in pixels) of the window."
+msgstr "Width (in pixels) of the window."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:3
+msgid "Height of the window"
+msgstr "Height of the window"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:4
+msgid "Height (in pixels) of the window."
+msgstr "Height (in pixels) of the window."
+
#: ../nautilus-ext/seahorse-nautilus.c:158
msgid "Encrypt..."
msgstr "הצפנה..."
@@ -38,18 +78,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"
@@ -60,31 +98,31 @@ 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] "ייובא מפתח אחד"
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"
@@ -92,60 +130,60 @@ 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 "לא ניתן לאמת את החתימה."
@@ -153,42 +191,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 "אישור"
+
+#: ../tool/seahorse-passphrase.c:139
+msgid "Cancel"
+msgstr "ביטול"
+
#: ../tool/seahorse-pgp-encrypted.desktop.in.in.h:1
msgid "Decrypt File"
msgstr "פענוח קובץ"
@@ -241,7 +278,8 @@ msgstr "קובץ..."
msgid "Choose Recipients"
msgstr "בחירת נמענים"
-#: ../tool/seahorse-tool.c:234 ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:234
+#: ../tool/seahorse-tool.c:347
msgid "Couldn't load keys"
msgstr "לא ניתן לטעון מפתחות"
@@ -308,7 +346,7 @@ msgstr "יש לבחור קובץ מקורי עבור '%s'"
msgid "No valid signatures found"
msgstr "לא נמצאו חתימות תקפות"
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:695
msgid "File Encryption Tool"
msgstr "כלי להצפנת קבצים"
@@ -357,81 +395,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 מכווץ עם lzo (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:142
+#: ../tool/seahorse-tool-files.c:141
msgid "Tar compressed with compress (.tar.Z)"
msgstr "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 "
@@ -440,7 +478,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"
@@ -449,34 +487,36 @@ 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
+#: ../tool/seahorse-tool-files.c:346
#, c-format
msgid "You have selected %d file"
msgid_plural "You have selected %d files"
msgstr[0] "בחרת בקובץ אחד"
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] "בחרת בתיקייה אחת"
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 "לא ניתן לארוז קבצים"
@@ -484,33 +524,34 @@ msgstr "לא ניתן לארוז קבצים"
msgid "Decryption failed. You probably do not have the decryption key."
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"
@@ -520,11 +561,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/hu.po b/po/hu.po
index d45885c..9e6900a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4,22 +4,64 @@
#
# 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.
+# Gabor Kelemen <kelemeng at gnome dot hu>, 2005, 2007, 2008, 2010, 2011, 2013.
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-21 03:41+0200\n"
+"POT-Creation-Date: 2013-02-18 15:31+0100\n"
+"PO-Revision-Date: 2013-02-18 16:09+0100\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
-"Language: \n"
+"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:1
+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."
+msgstr "Csomagok fájlkiterjesztése több fájl kezelésekor."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
+msgid "Handle multiple files separately"
+msgstr "Több fájl kezelése külön-külön"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:4
+msgid ""
+"When handling multiple files, don't package them but process separately."
+msgstr ""
+"Több fájl kezelésekor ne csomagolja azokat, hanem külön-külön dolgozza fel."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
+msgid "Use armor mode when encrypting"
+msgstr "Armor mód használata titkosításkor"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:6
+msgid "Use PGP ASCII armor mode when encrypting or signing files."
+msgstr "PGP ASCII armor mód használata fájlok titkosításakor vagy aláírásakor."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:1
+msgid "Width of the window"
+msgstr "Az ablak szélessége"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:2
+msgid "Width (in pixels) of the window."
+msgstr "Az ablak szélessége (képpontban)."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:3
+msgid "Height of the window"
+msgstr "Az ablak magassága"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:4
+msgid "Height (in pixels) of the window."
+msgstr "Az ablak magassága (képpontban)."
+
#: ../nautilus-ext/seahorse-nautilus.c:158
msgid "Encrypt..."
msgstr "Titkosítás…"
@@ -41,19 +83,16 @@ msgstr[0] "A kijelölt fájl aláírása"
msgstr[1] "A kijelölt fájlok aláírása"
#: ../tool/seahorse-multi-encrypt.xml.h:1
-msgid "<b>You have selected multiple files or folders</b>"
-msgstr "<b>Több fájlt vagy mappát jelölt ki</b>"
+msgid "Encrypt Multiple Files"
+msgstr "Több fájl titkosítása"
#: ../tool/seahorse-multi-encrypt.xml.h:2
-msgid ""
-"Because the files are located remotely, each file will be encrypted "
-"separately."
-msgstr ""
-"Mivel a fájlok távoli helyen vannak, minden fájl külön-külön lesz titkosítva."
+msgid "<b>You have selected multiple files or folders</b>"
+msgstr "<b>Több fájlt vagy mappát jelölt ki</b>"
#: ../tool/seahorse-multi-encrypt.xml.h:3
-msgid "Encrypt Multiple Files"
-msgstr "Több fájl titkosítása"
+msgid "encrypted-package"
+msgstr "titkosított-csomag"
#: ../tool/seahorse-multi-encrypt.xml.h:4
msgid "Encrypt each file separately"
@@ -64,31 +103,34 @@ msgid "Encrypt packed together in a package"
msgstr "Csomagoltak titkosítása egy csomagba"
#: ../tool/seahorse-multi-encrypt.xml.h:6
-msgid "Package Name:"
-msgstr "Csomag neve:"
-
-#: ../tool/seahorse-multi-encrypt.xml.h:7
msgid "Packaging:"
msgstr "Csomagolás:"
+#: ../tool/seahorse-multi-encrypt.xml.h:7
+msgid "Package Name:"
+msgstr "Csomag neve:"
+
#: ../tool/seahorse-multi-encrypt.xml.h:8
-msgid "encrypted-package"
-msgstr "titkosított-csomag"
+msgid ""
+"Because the files are located remotely, each file will be encrypted "
+"separately."
+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:580 ../tool/seahorse-notification.c:605
+#: ../tool/seahorse-notification.c:572
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] "Kulcs importálva"
msgstr[1] "Kulcs importálva"
-#: ../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 kulcs importálva"
msgstr[1] "%i kulcs importálva"
-#: ../tool/seahorse-notification.c:586
+#: ../tool/seahorse-notification.c:578
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -96,61 +138,61 @@ 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:623
+#: ../tool/seahorse-notification.c:606
#, 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:624
+#: ../tool/seahorse-notification.c:607
msgid "Invalid Signature"
msgstr "Érvénytelen aláírás"
-#: ../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 "Aláírva <i><kulcsazonosító='%s'/> által</i> ekkor: %s, <b>lejárt</b>."
-#: ../tool/seahorse-notification.c:631
+#: ../tool/seahorse-notification.c:614
msgid "Expired Signature"
msgstr "Lejárt aláírás"
-#: ../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 ""
"Aláírva <i><kulcsazonosító='%s'/> által, <b>visszavonva</b></i> ekkor: %s."
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:621
msgid "Revoked Signature"
msgstr "Visszavont aláírás"
#. 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 "Aláírva <i><kulcsazonosító='%s'/> által</i> ekkor: %s."
-#: ../tool/seahorse-notification.c:645
+#: ../tool/seahorse-notification.c:628
msgid "Good Signature"
msgstr "Jó aláírás"
-#: ../tool/seahorse-notification.c:650
+#: ../tool/seahorse-notification.c:633
msgid "Signing key not in keyring."
msgstr "Az aláíró kulcs nincs a kulcstartón."
-#: ../tool/seahorse-notification.c:651
+#: ../tool/seahorse-notification.c:634
msgid "Unknown Signature"
msgstr "Ismeretlen aláírás"
-#: ../tool/seahorse-notification.c:655
+#: ../tool/seahorse-notification.c:638
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:656
+#: ../tool/seahorse-notification.c:639
msgid "Bad Signature"
msgstr "Rossz aláírás"
-#: ../tool/seahorse-notification.c:664
+#: ../tool/seahorse-notification.c:647
msgid "Couldn't verify signature."
msgstr "Nem ellenőrizhető az aláírás."
@@ -158,42 +200,41 @@ msgstr "Nem ellenőrizhető az aláírás."
msgid "Notification Messages"
msgstr "Értesítési üzenetek"
-#: ../tool/seahorse-passphrase.c:200
-msgid "Passphrase"
-msgstr "Jelmondat"
-
-#: ../tool/seahorse-passphrase.c:203
-msgid "Password:"
-msgstr "Jelszó:"
-
-#. The second and main entry
-#: ../tool/seahorse-passphrase.c:267
-msgid "Confirm:"
-msgstr "Megerősítés:"
-
-#: ../tool/seahorse-passphrase.c:355
+#: ../tool/seahorse-passphrase.c:114
#, c-format
msgid "Wrong passphrase."
msgstr "Rossz jelmondat."
-#: ../tool/seahorse-passphrase.c:359
+#: ../tool/seahorse-passphrase.c:118
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Írja be az új jelmondatot %s számára"
-#: ../tool/seahorse-passphrase.c:361
+#: ../tool/seahorse-passphrase.c:120
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Írja be a jelmondatot %s számára"
-#: ../tool/seahorse-passphrase.c:364
+#: ../tool/seahorse-passphrase.c:123
msgid "Enter new passphrase"
msgstr "Írja be az új jelmondatot"
-#: ../tool/seahorse-passphrase.c:366
+#: ../tool/seahorse-passphrase.c:125
msgid "Enter passphrase"
msgstr "Írja be a jelmondatot"
+#: ../tool/seahorse-passphrase.c:130
+msgid "Passphrase"
+msgstr "Jelmondat"
+
+#: ../tool/seahorse-passphrase.c:138
+msgid "Ok"
+msgstr "OK"
+
+#: ../tool/seahorse-passphrase.c:139
+msgid "Cancel"
+msgstr "Mégse"
+
#: ../tool/seahorse-pgp-encrypted.desktop.in.in.h:1
msgid "Decrypt File"
msgstr "Fájl visszafejtése"
@@ -313,7 +354,7 @@ msgstr "Válassza ki az eredeti fájlt ehhez: „%s”"
msgid "No valid signatures found"
msgstr "Nem találhatók érvényes aláírások"
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:695
msgid "File Encryption Tool"
msgstr "Fájltitkosító eszköz"
@@ -362,81 +403,81 @@ msgstr "Ellenőrzés"
msgid "Couldn't verify file: %s"
msgstr "Nem ellenőrizhető a fájl: %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 "Önkibontó 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 "Nem tömörített tar (.tar)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Bzip-pel tömörített tar (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Bzip2-vel tömörített tar (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:139
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Gzip-pel tömörített tar (.tar.gz)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:140
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Lzop-pal tömörített tar (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:142
+#: ../tool/seahorse-tool-files.c:141
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Compress-szel tömörített 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 "
@@ -445,7 +486,7 @@ msgstr[1] "%d fájlt "
#. 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 +495,34 @@ 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: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] "%d fájlt választott ki"
msgstr[1] "%d fájlt választott ki"
-#: ../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 mappát választott ki"
msgstr[1] "%d mappát választott ki"
-#: ../tool/seahorse-tool-files.c:868
+#: ../tool/seahorse-tool-files.c:866
msgid "Preparing..."
msgstr "Előkészítés…"
-#: ../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 "A fájlok felsorolása meghiúsult"
-#: ../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 "Nem sikerült csomagolni a fájlokat"
@@ -491,33 +532,33 @@ msgstr ""
"A visszafejtés meghiúsult. Valószínűleg nem rendelkezik a visszafejtési "
"kulcssal."
-#: ../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 "Nem sikerült futtatni a file-rollert"
-#: ../tool/seahorse-util.c:648
+#: ../tool/seahorse-util.c:400
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:708
+#: ../tool/seahorse-util.c:436
msgid "All key files"
msgstr "Minden kulcsfájl"
-#: ../tool/seahorse-util.c:715 ../tool/seahorse-util.c:755
+#: ../tool/seahorse-util.c:443 ../tool/seahorse-util.c:483
msgid "All files"
msgstr "Minden fájl"
-#: ../tool/seahorse-util.c:748
+#: ../tool/seahorse-util.c:476
msgid "Archive files"
msgstr "Archív fájlok"
-#: ../tool/seahorse-util.c:777
+#: ../tool/seahorse-util.c:505
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -527,11 +568,15 @@ msgstr ""
"\n"
"Le akarja cserélni az új fájllal?"
-#: ../tool/seahorse-util.c:780
+#: ../tool/seahorse-util.c:508
msgid "_Replace"
msgstr "_Csere"
-#: ../tool/seahorse-widget.c:365
-#, c-format
-msgid "Could not display help: %s"
-msgstr "Nem lehet megjeleníteni a súgót: %s"
+#~ msgid "Password:"
+#~ msgstr "Jelszó:"
+
+#~ msgid "Confirm:"
+#~ msgstr "Megerősítés:"
+
+#~ msgid "Could not display help: %s"
+#~ msgstr "Nem lehet megjeleníteni a súgót: %s"
diff --git a/po/lt.po b/po/lt.po
index 22a362c..3559ca0 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9,22 +9,62 @@
msgid ""
msgstr ""
"Project-Id-Version: seahorse HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 11:29+0200\n"
-"PO-Revision-Date: 2011-09-02 23:29+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: 2012-12-03 23:46+0000\n"
+"PO-Revision-Date: 2012-12-20 22:58+0300\n"
"Last-Translator: Aurimas Černius <aurisc4 at gmail.com>\n"
"Language-Team: Lithuanian <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"
+"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"
"X-Poedit-Language: Lithuanian\n"
"X-Poedit-Country: LITHUANIA\n"
"X-Poedit-SourceCharset: utf-8\n"
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:1
+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."
+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."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
+msgid "Use armor mode when encrypting"
+msgstr "Naudoti šarvų veikseną šifruojant"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:6
+msgid "Use PGP ASCII armor mode when encrypting or signing files."
+msgstr "Naudoti PGP ASCII šarvų veikseną šifruojant ar pasirašant failus."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:1
+msgid "Width of the window"
+msgstr "Lango plotis"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:2
+msgid "Width (in pixels) of the window."
+msgstr "Lango plotis (pikseliais)"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:3
+msgid "Height of the window"
+msgstr "Lango aukštis"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:4
+msgid "Height (in pixels) of the window."
+msgstr "Lango aukštis (pikseliais)"
+
#: ../nautilus-ext/seahorse-nautilus.c:158
msgid "Encrypt..."
msgstr "Užšifruoti..."
@@ -48,20 +88,16 @@ msgstr[1] "Užšifruoti pasirinktus failus"
msgstr[2] "Užšifruoti pasirinktus failus"
#: ../tool/seahorse-multi-encrypt.xml.h:1
-msgid "<b>You have selected multiple files or folders</b>"
-msgstr "<b>Jūs pasirinkote keletą failų ar aplankų</b>"
+msgid "Encrypt Multiple Files"
+msgstr "Užšifruoti keletą failų"
#: ../tool/seahorse-multi-encrypt.xml.h:2
-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 "<b>You have selected multiple files or folders</b>"
+msgstr "<b>Jūs pasirinkote keletą failų ar aplankų</b>"
#: ../tool/seahorse-multi-encrypt.xml.h:3
-msgid "Encrypt Multiple Files"
-msgstr "Užšifruoti keletą failų"
+msgid "encrypted-package"
+msgstr "užšifruotas-paketas"
#: ../tool/seahorse-multi-encrypt.xml.h:4
msgid "Encrypt each file separately"
@@ -72,25 +108,25 @@ msgid "Encrypt packed together in a package"
msgstr "Užšifruoti supakuotus į vieną paketą"
#: ../tool/seahorse-multi-encrypt.xml.h:6
-msgid "Package Name:"
-msgstr "Paketo failo vardas:"
-
-#: ../tool/seahorse-multi-encrypt.xml.h:7
msgid "Packaging:"
msgstr "Pakavimas:"
+#: ../tool/seahorse-multi-encrypt.xml.h:7
+msgid "Package Name:"
+msgstr "Paketo failo vardas:"
+
#: ../tool/seahorse-multi-encrypt.xml.h:8
-msgid "encrypted-package"
-msgstr "užšifruotas-paketas"
+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:580 ../tool/seahorse-notification.c:605
+#: ../tool/seahorse-notification.c:572
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] "Raktas importuotas"
msgstr[1] "Raktai importuoti"
msgstr[2] "Raktų importuota"
-#: ../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 +134,7 @@ msgstr[0] "Importuotas %i raktas"
msgstr[1] "Importuoti %i raktai"
msgstr[2] "Importuota %i raktų"
-#: ../tool/seahorse-notification.c:586
+#: ../tool/seahorse-notification.c:578
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -107,62 +143,60 @@ msgstr[1] "Importuoti raktai"
msgstr[2] "Importuota raktų"
#. 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 "Pasirašė <i><key id='%s'/>, <b>galiojimas baigėsi:</b></i> %s."
-#: ../tool/seahorse-notification.c:624
+#: ../tool/seahorse-notification.c:607
msgid "Invalid Signature"
msgstr "Netinkamas parašas"
-#: ../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 ""
-"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:631
+#: ../tool/seahorse-notification.c:614
msgid "Expired Signature"
msgstr "Nebegaliojantis parašas"
-#: ../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 "Pasirašė <i><key id='%s'/>, <b>paskelbta negaliojančiu:</b></i> %s."
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:621
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:644
+#: ../tool/seahorse-notification.c:627
#, 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:645
+#: ../tool/seahorse-notification.c:628
msgid "Good Signature"
msgstr "Parašas geras"
-#: ../tool/seahorse-notification.c:650
+#: ../tool/seahorse-notification.c:633
msgid "Signing key not in keyring."
msgstr "Pasirašymo rakto nėra raktinėje."
-#: ../tool/seahorse-notification.c:651
+#: ../tool/seahorse-notification.c:634
msgid "Unknown Signature"
msgstr "Nežinomas parašas"
-#: ../tool/seahorse-notification.c:655
+#: ../tool/seahorse-notification.c:638
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:656
+#: ../tool/seahorse-notification.c:639
msgid "Bad Signature"
msgstr "Blogas parašas"
-#: ../tool/seahorse-notification.c:664
+#: ../tool/seahorse-notification.c:647
msgid "Couldn't verify signature."
msgstr "Parašo nepavyko patikrinti."
@@ -170,42 +204,41 @@ msgstr "Parašo nepavyko patikrinti."
msgid "Notification Messages"
msgstr "Informaciniai pranešimai"
-#: ../tool/seahorse-passphrase.c:200
-msgid "Passphrase"
-msgstr "Slaptafrazė"
-
-#: ../tool/seahorse-passphrase.c:203
-msgid "Password:"
-msgstr "Slaptažodis:"
-
-#. The second and main entry
-#: ../tool/seahorse-passphrase.c:267
-msgid "Confirm:"
-msgstr "Patvirtink:"
-
-#: ../tool/seahorse-passphrase.c:355
+#: ../tool/seahorse-passphrase.c:114
#, c-format
msgid "Wrong passphrase."
msgstr "Neteisinga slaptafrazė."
-#: ../tool/seahorse-passphrase.c:359
+#: ../tool/seahorse-passphrase.c:118
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Įveskite naują slaptafrazę raktui „%s“"
-#: ../tool/seahorse-passphrase.c:361
+#: ../tool/seahorse-passphrase.c:120
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Įveskite slaptafrazę raktui „%s“"
-#: ../tool/seahorse-passphrase.c:364
+#: ../tool/seahorse-passphrase.c:123
msgid "Enter new passphrase"
msgstr "Įveskite naują slaptafrazę"
-#: ../tool/seahorse-passphrase.c:366
+#: ../tool/seahorse-passphrase.c:125
msgid "Enter passphrase"
msgstr "Įveskite slaptafrazę"
+#: ../tool/seahorse-passphrase.c:130
+msgid "Passphrase"
+msgstr "Slaptafrazė"
+
+#: ../tool/seahorse-passphrase.c:138
+msgid "Ok"
+msgstr "Gerai"
+
+#: ../tool/seahorse-passphrase.c:139
+msgid "Cancel"
+msgstr "Atsisakyti"
+
#: ../tool/seahorse-pgp-encrypted.desktop.in.in.h:1
msgid "Decrypt File"
msgstr "Iššifruoti failą"
@@ -258,7 +291,8 @@ msgstr "failas..."
msgid "Choose Recipients"
msgstr "Pasirinkite gavėjus, kuriems skirta ši informacija"
-#: ../tool/seahorse-tool.c:234 ../tool/seahorse-tool.c:347
+#: ../tool/seahorse-tool.c:234
+#: ../tool/seahorse-tool.c:347
msgid "Couldn't load keys"
msgstr "Nepavyko įkelti raktų"
@@ -326,7 +360,7 @@ msgstr "Pasirinkite failą, kurį tikrinsite su el. parašu iš failo '%s'"
msgid "No valid signatures found"
msgstr "Nerasta galiojančių parašų"
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:695
msgid "File Encryption Tool"
msgstr "Failų šifravimo įrankis"
@@ -375,81 +409,81 @@ msgstr "Tikrinama"
msgid "Couldn't verify file: %s"
msgstr "Nepavyko patikrinti failo: %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 "Išsispaudžiantis 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 (nearchyvuotas) (.tar)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Tar (archyvuotas su bzip) (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Tar (archyvuotas su bzip2) (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:139
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Tar (archyvuotas su gzip) (.tar.gz)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:140
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Tar (archyvuotas su lzop) (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:142
+#: ../tool/seahorse-tool-files.c:141
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Tar (archyvuotas su 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 "
@@ -459,7 +493,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:332
+#: ../tool/seahorse-tool-files.c:333
#, c-format
msgid "and %d folder"
msgid_plural "and %d folders"
@@ -469,12 +503,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: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"
@@ -482,7 +516,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:350
+#: ../tool/seahorse-tool-files.c:351
#, c-format
msgid "You have selected %d folder"
msgid_plural "You have selected %d folders"
@@ -490,15 +524,17 @@ 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:868
+#: ../tool/seahorse-tool-files.c:866
msgid "Preparing..."
msgstr "Ruošiama..."
-#: ../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 "Nepavyko sudaryti failų sąrašo"
-#: ../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 "Nepavyko supakuoti failų"
@@ -506,33 +542,34 @@ msgstr "Nepavyko supakuoti failų"
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: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 "Nepavyko paleisti file-roller"
-#: ../tool/seahorse-util.c:648
+#: ../tool/seahorse-util.c:400
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:708
+#: ../tool/seahorse-util.c:436
msgid "All key files"
msgstr "Visi raktų failai"
-#: ../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 failai"
-#: ../tool/seahorse-util.c:748
+#: ../tool/seahorse-util.c:476
msgid "Archive files"
msgstr "Archyvo failai"
-#: ../tool/seahorse-util.c:777
+#: ../tool/seahorse-util.c:505
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -542,11 +579,7 @@ msgstr ""
"\n"
"Ar norite jį pakeisti nauju failu?"
-#: ../tool/seahorse-util.c:780
+#: ../tool/seahorse-util.c:508
msgid "_Replace"
msgstr "_Pakeisti"
-#: ../tool/seahorse-widget.c:365
-#, c-format
-msgid "Could not display help: %s"
-msgstr "Nepavyko įkelti žinyno: %s"
diff --git a/po/pl.po b/po/pl.po
index 8194398..2f17620 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,12 +4,17 @@
# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
# gnomepl at aviary.pl
# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# 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.
msgid ""
msgstr ""
-"Project-Id-Version: seahorse-plugins\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 17:29+0200\n"
+"POT-Creation-Date: 2012-09-04 20:45+0200\n"
+"PO-Revision-Date: 2012-09-04 20:47+0200\n"
"Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
"Language-Team: Polish <gnomepl at aviary.pl>\n"
"Language: pl\n"
@@ -21,6 +26,51 @@ msgstr ""
"X-Poedit-Language: Polish\n"
"X-Poedit-Country: Poland\n"
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:1
+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."
+msgstr "Rozszerzenie pliku dla pakietów podczas obsługiwania wielu plików."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
+msgid "Handle multiple files separately"
+msgstr "Obsługiwanie każdego pliku oddzielnie"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:4
+msgid ""
+"When handling multiple files, don't package them but process separately."
+msgstr ""
+"Bez tworzenia pakietów podczas obsługiwania wielu plików, ale przetwarzanie "
+"ich osobno."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
+msgid "Use armor mode when encrypting"
+msgstr "Użycie trybu opakowanego podczas szyfrowania"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:6
+msgid "Use PGP ASCII armor mode when encrypting or signing files."
+msgstr ""
+"Użycie trybu opakowanego ASCII PGP podczas szyfrowania lub podpisywania "
+"plików."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:1
+msgid "Width of the window"
+msgstr "Szerokość okna"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:2
+msgid "Width (in pixels) of the window."
+msgstr "Szerokość okna (w pikselach)."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:3
+msgid "Height of the window"
+msgstr "Wysokość okna"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:4
+msgid "Height (in pixels) of the window."
+msgstr "Wysokość okna (w pikselach)."
+
#: ../nautilus-ext/seahorse-nautilus.c:158
msgid "Encrypt..."
msgstr "Zaszyfruj..."
@@ -44,20 +94,16 @@ msgstr[1] "Podpisz zaznaczone pliki"
msgstr[2] "Podpisz zaznaczone pliki"
#: ../tool/seahorse-multi-encrypt.xml.h:1
-msgid "<b>You have selected multiple files or folders</b>"
-msgstr "<b>Zaznaczono wiele plików lub katalogów</b>"
+msgid "Encrypt Multiple Files"
+msgstr "Szyfrowanie wielu plików"
#: ../tool/seahorse-multi-encrypt.xml.h:2
-msgid ""
-"Because the files are located remotely, each file will be encrypted "
-"separately."
-msgstr ""
-"Ponieważ pliki są przechowywane zdalnie, każdy z nich będzie szyfrowany "
-"oddzielnie."
+msgid "<b>You have selected multiple files or folders</b>"
+msgstr "<b>Zaznaczono wiele plików lub katalogów</b>"
#: ../tool/seahorse-multi-encrypt.xml.h:3
-msgid "Encrypt Multiple Files"
-msgstr "Szyfrowanie wielu plików"
+msgid "encrypted-package"
+msgstr "zaszyfrowany-pakiet"
#: ../tool/seahorse-multi-encrypt.xml.h:4
msgid "Encrypt each file separately"
@@ -68,25 +114,29 @@ msgid "Encrypt packed together in a package"
msgstr "Szyfrowanie całego archiwum"
#: ../tool/seahorse-multi-encrypt.xml.h:6
-msgid "Package Name:"
-msgstr "Nazwa archiwum:"
-
-#: ../tool/seahorse-multi-encrypt.xml.h:7
msgid "Packaging:"
msgstr "Archiwizowanie:"
+#: ../tool/seahorse-multi-encrypt.xml.h:7
+msgid "Package Name:"
+msgstr "Nazwa archiwum:"
+
#: ../tool/seahorse-multi-encrypt.xml.h:8
-msgid "encrypted-package"
-msgstr "zaszyfrowany-pakiet"
+msgid ""
+"Because the files are located remotely, each file will be encrypted "
+"separately."
+msgstr ""
+"Ponieważ pliki są przechowywane zdalnie, każdy z nich będzie szyfrowany "
+"oddzielnie."
-#: ../tool/seahorse-notification.c:580 ../tool/seahorse-notification.c:605
+#: ../tool/seahorse-notification.c:572
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] "Zaimportowano klucz"
msgstr[1] "Zaimportowano klucze"
msgstr[2] "Zaimportowano klucze"
-#: ../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"
@@ -94,7 +144,7 @@ msgstr[0] "Zaimportowano %i klucz"
msgstr[1] "Zaimportowano %i klucze"
msgstr[2] "Zaimportowano %i kluczy"
-#: ../tool/seahorse-notification.c:586
+#: ../tool/seahorse-notification.c:578
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -103,60 +153,60 @@ msgstr[1] "Zaimportowano klucze dla"
msgstr[2] "Zaimportowano klucze dla"
#. 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 "Podpisany przez <i><key id='%s'/> <b>wygasły</b></i> dnia %s."
-#: ../tool/seahorse-notification.c:624
+#: ../tool/seahorse-notification.c:607
msgid "Invalid Signature"
msgstr "Nieprawidłowy podpis"
-#: ../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 "Podpisany przez <i><key id='%s'/></i> dnia %s <b>Wygasły</b>."
-#: ../tool/seahorse-notification.c:631
+#: ../tool/seahorse-notification.c:614
msgid "Expired Signature"
msgstr "Wygasły podpis"
-#: ../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 "Podpisany przez <i><key id='%s'/> <b>Unieważniony</b></i> dnia %s."
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:621
msgid "Revoked Signature"
msgstr "Podpis unieważniony"
#. 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 "Podpisany przez <i><key id='%s'/></i> dnia %s."
-#: ../tool/seahorse-notification.c:645
+#: ../tool/seahorse-notification.c:628
msgid "Good Signature"
msgstr "Podpis prawidłowy"
-#: ../tool/seahorse-notification.c:650
+#: ../tool/seahorse-notification.c:633
msgid "Signing key not in keyring."
msgstr "Klucz podpisujący nie jest w bazie kluczy."
-#: ../tool/seahorse-notification.c:651
+#: ../tool/seahorse-notification.c:634
msgid "Unknown Signature"
msgstr "Nieznany podpis"
-#: ../tool/seahorse-notification.c:655
+#: ../tool/seahorse-notification.c:638
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:656
+#: ../tool/seahorse-notification.c:639
msgid "Bad Signature"
msgstr "Błędny podpis"
-#: ../tool/seahorse-notification.c:664
+#: ../tool/seahorse-notification.c:647
msgid "Couldn't verify signature."
msgstr "Nie można zweryfikować podpisu."
@@ -164,42 +214,41 @@ msgstr "Nie można zweryfikować podpisu."
msgid "Notification Messages"
msgstr "Wiadomości powiadomień"
-#: ../tool/seahorse-passphrase.c:200
-msgid "Passphrase"
-msgstr "Hasło"
-
-#: ../tool/seahorse-passphrase.c:203
-msgid "Password:"
-msgstr "Hasło:"
-
-#. The second and main entry
-#: ../tool/seahorse-passphrase.c:267
-msgid "Confirm:"
-msgstr "Potwierdzenie:"
-
-#: ../tool/seahorse-passphrase.c:355
+#: ../tool/seahorse-passphrase.c:114
#, c-format
msgid "Wrong passphrase."
msgstr "Błędne hasło."
-#: ../tool/seahorse-passphrase.c:359
+#: ../tool/seahorse-passphrase.c:118
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Proszę wprowadzić nowe hasło dla \"%s\""
-#: ../tool/seahorse-passphrase.c:361
+#: ../tool/seahorse-passphrase.c:120
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Proszę wprowadzić hasło dla \"%s\""
-#: ../tool/seahorse-passphrase.c:364
+#: ../tool/seahorse-passphrase.c:123
msgid "Enter new passphrase"
msgstr "Proszę wprowadzić nowe hasło"
-#: ../tool/seahorse-passphrase.c:366
+#: ../tool/seahorse-passphrase.c:125
msgid "Enter passphrase"
msgstr "Proszę wprowadzić hasło"
+#: ../tool/seahorse-passphrase.c:130
+msgid "Passphrase"
+msgstr "Hasło"
+
+#: ../tool/seahorse-passphrase.c:138
+msgid "Ok"
+msgstr "OK"
+
+#: ../tool/seahorse-passphrase.c:139
+msgid "Cancel"
+msgstr "Anuluj"
+
#: ../tool/seahorse-pgp-encrypted.desktop.in.in.h:1
msgid "Decrypt File"
msgstr "Odszyfrowanie pliku"
@@ -320,7 +369,7 @@ msgstr "Wybór pliku oryginału dla \"%s\""
msgid "No valid signatures found"
msgstr "Nie odnaleziono prawidłowych podpisów"
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:695
msgid "File Encryption Tool"
msgstr "Narzędzie do szyfrowania plików"
@@ -369,81 +418,81 @@ msgstr "Weryfikowanie"
msgid "Couldn't verify file: %s"
msgstr "Nie można zweryfikować pliku: %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 "Samorozpakowujące się archiwum 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 bez kompresji (.tar)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Tar skompresowane za pomocą bzip (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Tar skompresowane za pomocą bzip2 (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:139
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Tar skompresowane za pomocą gzip (.tar.gz)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:140
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Tar skompresowane za pomocą lzop (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:142
+#: ../tool/seahorse-tool-files.c:141
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Tar skompresowane za pomocą 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 "
@@ -453,7 +502,7 @@ msgstr[2] "Zaznaczono %d plików "
#. 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"
@@ -463,12 +512,12 @@ msgstr[2] "i %d katalogów"
#. 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"
@@ -476,7 +525,7 @@ msgstr[0] "Zaznaczono %d plik"
msgstr[1] "Zaznaczono %d pliki"
msgstr[2] "Zaznaczono %d plików"
-#: ../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"
@@ -484,15 +533,15 @@ msgstr[0] "Zaznaczono %d katalog"
msgstr[1] "Zaznaczono %d katalogi"
msgstr[2] "Zaznaczono %d katalogów"
-#: ../tool/seahorse-tool-files.c:868
+#: ../tool/seahorse-tool-files.c:866
msgid "Preparing..."
msgstr "Przygotowywanie..."
-#: ../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 "Nie można odczytać listy plików"
-#: ../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 "Nie można zarchiwizować plików"
@@ -501,33 +550,33 @@ msgid "Decryption failed. You probably do not have the decryption key."
msgstr ""
"Odszyfrowywanie się nie powiodło. Prawdopodobnie brak klucza deszyfrującego."
-#: ../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 "Nie można uruchomić programu file-roller"
-#: ../tool/seahorse-util.c:648
+#: ../tool/seahorse-util.c:400
msgid "The file-roller process did not complete successfully"
msgstr "Proces file-roller nie zakończył się powodzeniem"
#. 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 "Wszystkie pliki kluczy"
-#: ../tool/seahorse-util.c:715 ../tool/seahorse-util.c:755
+#: ../tool/seahorse-util.c:443 ../tool/seahorse-util.c:483
msgid "All files"
msgstr "Wszystkie pliki"
-#: ../tool/seahorse-util.c:748
+#: ../tool/seahorse-util.c:476
msgid "Archive files"
msgstr "Pliki archiwów"
-#: ../tool/seahorse-util.c:777
+#: ../tool/seahorse-util.c:505
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -537,11 +586,6 @@ msgstr ""
"\n"
"Zastąpić go nowym plikiem?"
-#: ../tool/seahorse-util.c:780
+#: ../tool/seahorse-util.c:508
msgid "_Replace"
msgstr "_Zastąp"
-
-#: ../tool/seahorse-widget.c:365
-#, c-format
-msgid "Could not display help: %s"
-msgstr "Nie można wyświetlić pomocy: %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7c33ef7..37b091d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,25 +1,70 @@
-# Brazilian Portuguese translation of seahorse.
-# Copyright (C) 2000-2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the seahorse package
+# Brazilian Portuguese translation of seahorse-nautilus.
+# Copyright (C) 2000-2013 Free Software Foundation, Inc.
+# This file is distributed under the same license as the seahorse-nautilus package
# Fábio Rafael da Rosa <f2r at users.sourceforge.net>, 2003.
# Max Reinhold Jahnke <jahnke at brfree.com.br>, 2004.
# Luiz Armesto <luiz.armesto at gmail.com>, 2007.
# Raphael Higino <In memoriam>, 2004, 2007.
# Djavan Fagundes <dnoway at gmail.com>, 2008.
+# Rafael Ferreira <rafael.f.f1 at gmail.com>, 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-18 09:03-0300\n"
-"Last-Translator: Antonio Fernandes C. Neto <fernandesn at gnome.org>\n"
+"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"
+"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"
"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 "Extensão de arquivos de pacotes"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:2
+msgid "File extension for packages when handling mulitple files."
+msgstr "A extensão de arquivos de pacotes ao lidar com múltiplos arquivos."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
+msgid "Handle multiple files separately"
+msgstr "Lidar com múltiplos arquivos separadamente"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:4
+msgid ""
+"When handling multiple files, don't package them but process separately."
+msgstr ""
+"Ao lidar com múltiplos arquivos, não empacota-os mas processa separadamente."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
+msgid "Use armor mode when encrypting"
+msgstr "Usar modo de armadura ao criptografar"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:6
+msgid "Use PGP ASCII armor mode when encrypting or signing files."
+msgstr "Usa o modo armadura ASCII de PGP ao criptografar ou assinar arquivos."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:1
+msgid "Width of the window"
+msgstr "Largura da janela"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:2
+msgid "Width (in pixels) of the window."
+msgstr "A largura (em pixels) da janela."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:3
+msgid "Height of the window"
+msgstr "Altura da janela"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:4
+msgid "Height (in pixels) of the window."
+msgstr "A altura (em pixels) da janela."
#: ../nautilus-ext/seahorse-nautilus.c:158
msgid "Encrypt..."
@@ -42,20 +87,16 @@ msgstr[0] "Assinar o arquivo selecionado"
msgstr[1] "Assinar os arquivos selecionados"
#: ../tool/seahorse-multi-encrypt.xml.h:1
-msgid "<b>You have selected multiple files or folders</b>"
-msgstr "<b>Você selecionou múltiplos arquivos ou pastas</b>"
+msgid "Encrypt Multiple Files"
+msgstr "Criptografar múltiplos arquivos"
#: ../tool/seahorse-multi-encrypt.xml.h:2
-msgid ""
-"Because the files are located remotely, each file will be encrypted "
-"separately."
-msgstr ""
-"Já que os arquivos estão localizados remotamente, cada arquivo será "
-"criptografado separadamente."
+msgid "<b>You have selected multiple files or folders</b>"
+msgstr "<b>Você selecionou múltiplos arquivos ou pastas</b>"
#: ../tool/seahorse-multi-encrypt.xml.h:3
-msgid "Encrypt Multiple Files"
-msgstr "Criptografar múltiplos arquivos"
+msgid "encrypted-package"
+msgstr "pacote-criptografado"
#: ../tool/seahorse-multi-encrypt.xml.h:4
msgid "Encrypt each file separately"
@@ -66,31 +107,35 @@ msgid "Encrypt packed together in a package"
msgstr "Criptografar tudo junto em um pacote"
#: ../tool/seahorse-multi-encrypt.xml.h:6
-msgid "Package Name:"
-msgstr "Nome do pacote:"
-
-#: ../tool/seahorse-multi-encrypt.xml.h:7
msgid "Packaging:"
msgstr "Pacote:"
+#: ../tool/seahorse-multi-encrypt.xml.h:7
+msgid "Package Name:"
+msgstr "Nome do pacote:"
+
#: ../tool/seahorse-multi-encrypt.xml.h:8
-msgid "encrypted-package"
-msgstr "pacote-criptografado"
+msgid ""
+"Because the files are located remotely, each file will be encrypted "
+"separately."
+msgstr ""
+"Já que os arquivos estão localizados remotamente, cada arquivo será "
+"criptografado separadamente."
-#: ../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] "%i chave importada"
msgstr[1] "%i chaves importadas"
-#: ../tool/seahorse-notification.c:586
+#: ../tool/seahorse-notification.c:578
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -98,62 +143,62 @@ 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 "Assinado por <i><key id=\"%s\"/> <b>expirada</b></i> em %s."
-#: ../tool/seahorse-notification.c:624
+#: ../tool/seahorse-notification.c:607
msgid "Invalid Signature"
msgstr "Assinatura invá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 "Assinado por <i><key id=\"%s\"/></i> em %s <b>Expirado</b>."
-#: ../tool/seahorse-notification.c:631
+#: ../tool/seahorse-notification.c:614
msgid "Expired Signature"
msgstr "Assinatura expirada"
-#: ../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 "Assinado por <i><key id=\"%s\"/> <b>Revogado</b></i> em %s."
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:621
msgid "Revoked Signature"
msgstr "Assinatura 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 "Assinado por <i><key id=\"%s\"/></i> em %s."
# "Bad Signature" é "Assinatura Inválida".
# Traduzir como "Assinatura Válida"?
-#: ../tool/seahorse-notification.c:645
+#: ../tool/seahorse-notification.c:628
msgid "Good Signature"
msgstr "Assinatura válida"
-#: ../tool/seahorse-notification.c:650
+#: ../tool/seahorse-notification.c:633
msgid "Signing key not in keyring."
msgstr "Chave de assinatura fora do chaveiro."
-#: ../tool/seahorse-notification.c:651
+#: ../tool/seahorse-notification.c:634
msgid "Unknown Signature"
msgstr "Assinatura desconhecida"
-#: ../tool/seahorse-notification.c:655
+#: ../tool/seahorse-notification.c:638
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:656
+#: ../tool/seahorse-notification.c:639
msgid "Bad Signature"
msgstr "Assinatura inválida"
-#: ../tool/seahorse-notification.c:664
+#: ../tool/seahorse-notification.c:647
msgid "Couldn't verify signature."
msgstr "Não foi possível verificar a assinatura."
@@ -161,42 +206,41 @@ msgstr "Não foi possível verificar a assinatura."
msgid "Notification Messages"
msgstr "Mensagens de notificação"
-#: ../tool/seahorse-passphrase.c:200
-msgid "Passphrase"
-msgstr "Frase secreta"
-
-#: ../tool/seahorse-passphrase.c:203
-msgid "Password:"
-msgstr "Senha:"
-
-#. 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 secreta incorreta."
-#: ../tool/seahorse-passphrase.c:359
+#: ../tool/seahorse-passphrase.c:118
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Digite a nova frase secreta para \"%s\""
-#: ../tool/seahorse-passphrase.c:361
+#: ../tool/seahorse-passphrase.c:120
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Digite a frase secreta para \"%s\""
-#: ../tool/seahorse-passphrase.c:364
+#: ../tool/seahorse-passphrase.c:123
msgid "Enter new passphrase"
msgstr "Digite a nova frase secreta"
-#: ../tool/seahorse-passphrase.c:366
+#: ../tool/seahorse-passphrase.c:125
msgid "Enter passphrase"
msgstr "Digite a frase secreta"
+#: ../tool/seahorse-passphrase.c:130
+msgid "Passphrase"
+msgstr "Frase secreta"
+
+#: ../tool/seahorse-passphrase.c:138
+msgid "Ok"
+msgstr "Ok"
+
+#: ../tool/seahorse-passphrase.c:139
+msgid "Cancel"
+msgstr "Cancelar"
+
#: ../tool/seahorse-pgp-encrypted.desktop.in.in.h:1
msgid "Decrypt File"
msgstr "Descriptografar arquivo"
@@ -273,7 +317,7 @@ msgstr "Importação está completa"
#: ../tool/seahorse-tool.c:440
msgid "Importing keys ..."
-msgstr "Importando chaves..."
+msgstr "Importando chaves ..."
#: ../tool/seahorse-tool.c:470
msgid "Import Failed"
@@ -316,7 +360,7 @@ msgstr "Escolha o arquivo original para \"%s\""
msgid "No valid signatures found"
msgstr "Nenhuma assinatura válida localizada"
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:695
msgid "File Encryption Tool"
msgstr "Ferramenta de criptografia de arquivos"
@@ -365,81 +409,81 @@ msgstr "Verificando"
msgid "Couldn't verify file: %s"
msgstr "Não foi possível verificar arquivo: %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-extrator (.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 não compactado (.tar)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Tar compactado com bzip (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Tar compactado com bzip2 (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:139
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Tar compactado com gzip (.tar.gz)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:140
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Tar compactado com lzop (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:142
+#: ../tool/seahorse-tool-files.c:141
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Tar compactado com 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 +492,7 @@ msgstr[1] "Você selecionou %d arquivos "
#. 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 +501,34 @@ msgstr[1] "e %d pastas"
#. 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] "Você selecionou %d arquivo "
-msgstr[1] "Você selecionou %d arquivos "
+msgstr[0] "Você selecionou %d arquivo"
+msgstr[1] "Você selecionou %d arquivos"
-#: ../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] "Você selecionou %d pasta"
msgstr[1] "Você selecionou %d pastas"
-#: ../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 "Não foi possível listar arquivos"
-#: ../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 "Não foi possível empacotar arquivos"
@@ -495,33 +539,33 @@ msgstr ""
"descriptografia."
# Mudar para %d/%m/%Y?
-#: ../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 "Não foi possível 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 processo do file-roller não terminou com sucesso"
#. 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 arquivos 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 arquivos"
-#: ../tool/seahorse-util.c:748
+#: ../tool/seahorse-util.c:476
msgid "Archive files"
msgstr "Arquivos de dados"
-#: ../tool/seahorse-util.c:777
+#: ../tool/seahorse-util.c:505
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -531,11 +575,15 @@ msgstr ""
"\n"
"Deseja substituí-lo por um novo arquivo?"
-#: ../tool/seahorse-util.c:780
+#: ../tool/seahorse-util.c:508
msgid "_Replace"
msgstr "_Substituir"
-#: ../tool/seahorse-widget.c:365
-#, c-format
-msgid "Could not display help: %s"
-msgstr "Não foi possível exibir ajuda: %s"
+#~ msgid "Password:"
+#~ msgstr "Senha:"
+
+#~ msgid "Confirm:"
+#~ msgstr "Confirmar:"
+
+#~ msgid "Could not display help: %s"
+#~ msgstr "Não foi possível exibir ajuda: %s"
diff --git a/po/sl.po b/po/sl.po
index 0a5b309..2e0a3f7 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,27 +1,69 @@
-# Slovenian translations for seahorse-plugins.
+# Slovenian translations for seahorse-nautilus.
# Copyright (C) 2005 Free Software Foundation, Inc.
# This file is distributed under the same license as the seahorse-plugins package.
#
-# Andraz Tori <andraz.tori1 at guest.arnes.si>, 2000.
-# Matej Urbančič <mateju at svn.gnome.org>, 2007 - 2009.
+# Andraž Tori <andraz.tori1 at guest.arnes.si>, 2000.
+# Matej Urbančič <mateju at svn.gnome.org>, 2007 - 2012.
#
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-07 19:24+0100\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-01-08 20:34+0000\n"
+"PO-Revision-Date: 2013-01-10 20:53+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: \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"
-"X-Poedit-Language: Slovenian\n"
-"X-Poedit-Country: SLOVENIA\n"
"X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:1
+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."
+msgstr "Pripona datotek paketov med upravljanjem več datotek."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:3
+msgid "Handle multiple files separately"
+msgstr "Upravljaj več datotek ločeno"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:4
+msgid ""
+"When handling multiple files, don't package them but process separately."
+msgstr "Ne pakiraj datotek med upravljanjem, ampak opravila izvajaj ločeno."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
+msgid "Use armor mode when encrypting"
+msgstr "Uporabi zaščiteni način med šifriranjem"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:6
+msgid "Use PGP ASCII armor mode when encrypting or signing files."
+msgstr ""
+"Uporabi zaščiteni način PGP ASCII med šifriranjem ali podpisovanjem datotek."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:1
+msgid "Width of the window"
+msgstr "Širina okna"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:2
+msgid "Width (in pixels) of the window."
+msgstr "Širina okna v točkah."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:3
+msgid "Height of the window"
+msgstr "Višina okna"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:4
+msgid "Height (in pixels) of the window."
+msgstr "Višina okna v točkah."
#: ../nautilus-ext/seahorse-nautilus.c:158
msgid "Encrypt..."
@@ -48,20 +90,16 @@ msgstr[2] "Podpis izbranih datotek"
msgstr[3] "Podpis izbranih datotek"
#: ../tool/seahorse-multi-encrypt.xml.h:1
-msgid "<b>You have selected multiple files or folders</b>"
-msgstr "<b>Izbrali ste več datotek ali map</b>"
+msgid "Encrypt Multiple Files"
+msgstr "Šifriraj več datotek"
#: ../tool/seahorse-multi-encrypt.xml.h:2
-msgid ""
-"Because the files are located remotely, each file will be encrypted "
-"separately."
-msgstr ""
-"Ker so datoteke shranjene na oddaljenih mestih bo vsaka izmed njih šifrirana "
-"posebej."
+msgid "<b>You have selected multiple files or folders</b>"
+msgstr "<b>Izbrali ste več datotek ali map</b>"
#: ../tool/seahorse-multi-encrypt.xml.h:3
-msgid "Encrypt Multiple Files"
-msgstr "Šifriraj več datotek"
+msgid "encrypted-package"
+msgstr "šifriran-paket"
#: ../tool/seahorse-multi-encrypt.xml.h:4
msgid "Encrypt each file separately"
@@ -72,18 +110,22 @@ msgid "Encrypt packed together in a package"
msgstr "Šifriraj datoteke skupaj v paket"
#: ../tool/seahorse-multi-encrypt.xml.h:6
-msgid "Package Name:"
-msgstr "Ime paketa:"
-
-#: ../tool/seahorse-multi-encrypt.xml.h:7
msgid "Packaging:"
msgstr "Pakiranje:"
+#: ../tool/seahorse-multi-encrypt.xml.h:7
+msgid "Package Name:"
+msgstr "Ime paketa:"
+
#: ../tool/seahorse-multi-encrypt.xml.h:8
-msgid "encrypted-package"
-msgstr "šifriran-paket"
+msgid ""
+"Because the files are located remotely, each file will be encrypted "
+"separately."
+msgstr ""
+"Ker so datoteke shranjene na oddaljenih mestih bo vsaka izmed njih šifrirana "
+"posebej."
-#: ../tool/seahorse-notification.c:580 ../tool/seahorse-notification.c:605
+#: ../tool/seahorse-notification.c:572
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] "uvoženih ključev"
@@ -91,7 +133,7 @@ msgstr[1] "uvožen ključ"
msgstr[2] "uvožena ključa"
msgstr[3] "uvoženi ključi"
-#: ../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"
@@ -100,7 +142,7 @@ msgstr[1] "Uvožen %i ključ"
msgstr[2] "Uvožena %i ključa"
msgstr[3] "Uvoženi %i ključi"
-#: ../tool/seahorse-notification.c:586
+#: ../tool/seahorse-notification.c:578
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -110,60 +152,60 @@ msgstr[2] "Uvožena ključa za"
msgstr[3] "Uvoženi ključi za"
#. 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 "Podpis: <i><key id='%s'/> <b>preteče</b></i> %s."
-#: ../tool/seahorse-notification.c:624
+#: ../tool/seahorse-notification.c:607
msgid "Invalid Signature"
msgstr "Neveljaven podpis"
-#: ../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 "Podpis: <i><key id='%s'/></i> %s <b>je pretečen</b>."
-#: ../tool/seahorse-notification.c:631
+#: ../tool/seahorse-notification.c:614
msgid "Expired Signature"
msgstr "Pretečen podpis"
-#: ../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 "Podpis: <i><key id='%s'/> <b>je preklican</b></i> %s."
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:621
msgid "Revoked Signature"
msgstr "Preklican podpis"
#. 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 "Podpis: <i><key id='%s'/></i> %s."
-#: ../tool/seahorse-notification.c:645
+#: ../tool/seahorse-notification.c:628
msgid "Good Signature"
msgstr "Dober podpis"
-#: ../tool/seahorse-notification.c:650
+#: ../tool/seahorse-notification.c:633
msgid "Signing key not in keyring."
msgstr "Podpisovanje ključa, ki ni v zbirki."
-#: ../tool/seahorse-notification.c:651
+#: ../tool/seahorse-notification.c:634
msgid "Unknown Signature"
msgstr "Neznan podpis"
-#: ../tool/seahorse-notification.c:655
+#: ../tool/seahorse-notification.c:638
msgid "Bad or forged signature. The signed data was modified."
msgstr "Neveljaven ali ponarejen podpis. Podatki podpisa so bili spremenjeni."
-#: ../tool/seahorse-notification.c:656
+#: ../tool/seahorse-notification.c:639
msgid "Bad Signature"
msgstr "Slab podpis"
-#: ../tool/seahorse-notification.c:664
+#: ../tool/seahorse-notification.c:647
msgid "Couldn't verify signature."
msgstr "Ni mogoče overiti podpisa."
@@ -171,42 +213,41 @@ msgstr "Ni mogoče overiti podpisa."
msgid "Notification Messages"
msgstr "Opozorilna sporočila"
-#: ../tool/seahorse-passphrase.c:200
-msgid "Passphrase"
-msgstr "Šifrirno geslo"
-
-#: ../tool/seahorse-passphrase.c:203
-msgid "Password:"
-msgstr "Geslo:"
-
-#. The second and main entry
-#: ../tool/seahorse-passphrase.c:267
-msgid "Confirm:"
-msgstr "Potrditev:"
-
-#: ../tool/seahorse-passphrase.c:355
+#: ../tool/seahorse-passphrase.c:114
#, c-format
msgid "Wrong passphrase."
msgstr "Napačno šifrirno geslo."
-#: ../tool/seahorse-passphrase.c:359
+#: ../tool/seahorse-passphrase.c:118
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Vnesite novo šifrirno geslo za '%s'"
-#: ../tool/seahorse-passphrase.c:361
+#: ../tool/seahorse-passphrase.c:120
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Vnesite šifrirno geslo za '%s'"
-#: ../tool/seahorse-passphrase.c:364
+#: ../tool/seahorse-passphrase.c:123
msgid "Enter new passphrase"
msgstr "Vnesite novo šifrirno geslo"
-#: ../tool/seahorse-passphrase.c:366
+#: ../tool/seahorse-passphrase.c:125
msgid "Enter passphrase"
msgstr "Vnesite šifrirno geslo"
+#: ../tool/seahorse-passphrase.c:130
+msgid "Passphrase"
+msgstr "Šifrirno geslo"
+
+#: ../tool/seahorse-passphrase.c:138
+msgid "Ok"
+msgstr "V redu"
+
+#: ../tool/seahorse-passphrase.c:139
+msgid "Cancel"
+msgstr "Prekliči"
+
#: ../tool/seahorse-pgp-encrypted.desktop.in.in.h:1
msgid "Decrypt File"
msgstr "Odšifriranje datoteke"
@@ -328,7 +369,7 @@ msgstr "Izberi ime obstoječe datoteke za '%s'"
msgid "No valid signatures found"
msgstr "Ni veljavnih podpisov"
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:695
msgid "File Encryption Tool"
msgstr "Orodje za šifriranje datotek"
@@ -377,81 +418,81 @@ msgstr "Overjanje"
msgid "Couldn't verify file: %s"
msgstr "Ni mogoče overiti datoteke: %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 "Samodejno razširljivi arhiv 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 "Nestisnjeni Tar (.tar)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Tar, stisnjen z bzip (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Tar, stisnjen z bzip2 (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:139
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Tar, stisnjen z gzip (.tar.gz)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:140
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Tar, stisnjen z lzop (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:142
+#: ../tool/seahorse-tool-files.c:141
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Tar, stisnjen s 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 "
@@ -462,7 +503,7 @@ msgstr[3] "Izbrali ste %d datoteke "
#. 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"
@@ -473,12 +514,12 @@ msgstr[3] "in %d mape"
#. 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"
@@ -487,7 +528,7 @@ msgstr[1] "Izbrana je %d datoteka"
msgstr[2] "Izbrani sta %d datoteki"
msgstr[3] "Izbrane so %d datoteke "
-#: ../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"
@@ -496,15 +537,15 @@ msgstr[1] "Izbrana je %d mapa"
msgstr[2] "Izbrani sta %d mapi"
msgstr[3] "Izbrane so %d mape"
-#: ../tool/seahorse-tool-files.c:868
+#: ../tool/seahorse-tool-files.c:866
msgid "Preparing..."
msgstr "Pripravljanje ..."
-#: ../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 "Ni mogoče izpisati datotek"
-#: ../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 "Ni mogoče pakirati datotek"
@@ -512,33 +553,33 @@ msgstr "Ni mogoče pakirati datotek"
msgid "Decryption failed. You probably do not have the decryption key."
msgstr "Odšifriranje ni uspelo. Najverjetneje manjka odšifrirni ključ."
-#: ../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 "Ni mogoče zagnati programa file-roller"
-#: ../tool/seahorse-util.c:648
+#: ../tool/seahorse-util.c:400
msgid "The file-roller process did not complete successfully"
msgstr "Naloge programa file-roller niso bile uspešno končane"
#. 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 "Vse datoteke ključev"
-#: ../tool/seahorse-util.c:715 ../tool/seahorse-util.c:755
+#: ../tool/seahorse-util.c:443 ../tool/seahorse-util.c:483
msgid "All files"
msgstr "Vse datoteke"
-#: ../tool/seahorse-util.c:748
+#: ../tool/seahorse-util.c:476
msgid "Archive files"
msgstr "Arhivske datoteke"
-#: ../tool/seahorse-util.c:777
+#: ../tool/seahorse-util.c:505
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -548,11 +589,15 @@ msgstr ""
"\n"
"Ali želite obstoječo datoteko prepisati?"
-#: ../tool/seahorse-util.c:780
+#: ../tool/seahorse-util.c:508
msgid "_Replace"
msgstr "_Zamenjaj"
-#: ../tool/seahorse-widget.c:365
-#, c-format
-msgid "Could not display help: %s"
-msgstr "Pomoči ni mogoče prikazati: %s"
+#~ msgid "Password:"
+#~ msgstr "Geslo:"
+
+#~ msgid "Confirm:"
+#~ msgstr "Potrditev:"
+
+#~ msgid "Could not display help: %s"
+#~ msgstr "Pomoči ni mogoče prikazati: %s"
diff --git a/po/sr.po b/po/sr.po
index aba6678..a2f40c5 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,24 +5,70 @@
# 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.
+# Мирослав Николић <miroslavnikolic at rocketmail.com>, 2011, 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-23 10:20+0200\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"
"Last-Translator: Мирослав Николић <miroslavnikolic at rocketmail.com>\n"
"Language-Team: Serbian <gnom at prevod.org>\n"
"Language: sr\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==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Virtaal 0.7.0-beta5\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Project-Style: gnome\n"
+#: ../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 "Проширење датотеке за пакете приликом обраде бројних датотека."
+
+# bug: s/seperately/separately/
+#: ../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 ""
+"Користиће ПГП АСКРИ одбрамбени режим приликом шифровања или потписивања "
+"датотека."
+
+#: ../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..."
msgstr "Шифруј..."
@@ -48,19 +94,16 @@ msgstr[2] "Потпиши изабране датотеке"
msgstr[3] "Потпиши изабрану датотеку"
#: ../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 "шифровани-пакет"
# bug: s/seperately/separately/
#: ../tool/seahorse-multi-encrypt.xml.h:4
@@ -72,18 +115,21 @@ 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] "Увезен кључ"
@@ -91,7 +137,7 @@ msgstr[1] "Увезени кључеви"
msgstr[2] "Увезени кључеви"
msgstr[3] "Увезен кључ"
-#: ../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"
@@ -101,7 +147,7 @@ msgstr[2] "Увезено је %i кључева"
msgstr[3] "Увезен је један кључ"
# bug: plural-forms
-#: ../tool/seahorse-notification.c:586
+#: ../tool/seahorse-notification.c:578
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -111,60 +157,60 @@ msgstr[2] "Увезени су кључеви за"
msgstr[3] "Увезен je кључ за"
#. 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 "Не могу да проверим потпис."
@@ -172,42 +218,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 "У реду"
+
+#: ../tool/seahorse-passphrase.c:139
+msgid "Cancel"
+msgstr "Откажи"
+
#: ../tool/seahorse-pgp-encrypted.desktop.in.in.h:1
msgid "Decrypt File"
msgstr "Дешифруј датотеку"
@@ -330,7 +375,7 @@ msgstr "Изаберите изворну датотеку за „%s“"
msgid "No valid signatures found"
msgstr "Не могу да нађем ниједан исправан потпис"
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:695
msgid "File Encryption Tool"
msgstr "Алат за шифровање датотека"
@@ -379,93 +424,93 @@ 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)"
-#: ../tool/seahorse-tool-files.c:121
+#: ../tool/seahorse-tool-files.c:120
msgid "Ar (.ar)"
msgstr "Ар (.ar)"
-#: ../tool/seahorse-tool-files.c:122
+#: ../tool/seahorse-tool-files.c:121
msgid "Arj (.arj)"
msgstr "Арј (.arj)"
-#: ../tool/seahorse-tool-files.c:129
+#: ../tool/seahorse-tool-files.c:128
msgid "Ear (.ear)"
msgstr "Еар (.ear)"
-#: ../tool/seahorse-tool-files.c:130
+#: ../tool/seahorse-tool-files.c:129
msgid "Self-extracting zip (.exe)"
msgstr "Самоотпакујући зип (.exe)"
-#: ../tool/seahorse-tool-files.c:132
+#: ../tool/seahorse-tool-files.c:131
msgid "Jar (.jar)"
msgstr "Јар (.jar)"
-#: ../tool/seahorse-tool-files.c:133
+#: ../tool/seahorse-tool-files.c:132
msgid "Lha (.lzh)"
msgstr "Лха (.lzh)"
-#: ../tool/seahorse-tool-files.c:135
+#: ../tool/seahorse-tool-files.c:134
msgid "Rar (.rar)"
msgstr "Рар (.rar)"
-#: ../tool/seahorse-tool-files.c:137
+#: ../tool/seahorse-tool-files.c:136
msgid "Tar uncompressed (.tar)"
msgstr "Незапакован Тар (.tar)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Тар запакован бзипом (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Тар запакован бзипом 2 (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:139
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Тар запакован гзипом (.tar.gz)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:140
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Тар запакован лзопом (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:142
+#: ../tool/seahorse-tool-files.c:141
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Тар запакован компресом (.tar.Z)"
-#: ../tool/seahorse-tool-files.c:144
+#: ../tool/seahorse-tool-files.c:143
msgid "War (.war)"
msgstr "Вар (.war)"
-#: ../tool/seahorse-tool-files.c:145
+#: ../tool/seahorse-tool-files.c:144
msgid "Zip (.zip)"
msgstr "Зип (.zip)"
-#: ../tool/seahorse-tool-files.c:146
+#: ../tool/seahorse-tool-files.c:145
msgid "Zoo (.zoo)"
msgstr "Зоо (.zoo)"
-#: ../tool/seahorse-tool-files.c:147
+#: ../tool/seahorse-tool-files.c:146
msgid "7-Zip (.7z)"
msgstr "7-Зип (.7z)"
# bug: plural-forms
#. 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 "
-msgstr[0] "Изабрали сте %d датотеку"
-msgstr[1] "Изабрали сте %d датотеке"
-msgstr[2] "Изабрали сте %d датотека"
-msgstr[3] "Изабрали сте једну датотеку"
+msgstr[0] "Изабрали сте %d датотеку "
+msgstr[1] "Изабрали сте %d датотеке "
+msgstr[2] "Изабрали сте %d датотека "
+msgstr[3] "Изабрали сте једну датотеку "
#. 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"
@@ -476,13 +521,13 @@ msgstr[3] "и једну фасциклу"
#. 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>"
# bug: plural-forms
-#: ../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"
@@ -491,7 +536,7 @@ msgstr[1] "Изабрали сте %d датотеке"
msgstr[2] "Изабрали сте %d датотека"
msgstr[3] "Изабрали сте једну датотеку"
-#: ../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"
@@ -500,15 +545,15 @@ msgstr[1] "Изабрали сте %d директоријума"
msgstr[2] "Изабрали сте %d директоријума"
msgstr[3] "Изабрали сте један директоријум"
-#: ../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 "Не могу да упакујем датотеке"
@@ -516,33 +561,33 @@ msgstr "Не могу да упакујем датотеке"
msgid "Decryption failed. You probably do not have the decryption key."
msgstr "Дешифровање није успело. Вероватно немате кључ за дешифровање."
-#: ../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 "Не могу да покренем Управљача архивама"
-#: ../tool/seahorse-util.c:648
+#: ../tool/seahorse-util.c:400
msgid "The file-roller process did not complete successfully"
msgstr "Процес управљача архивама није успешно завршен"
#. 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"
@@ -552,11 +597,6 @@ 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"
diff --git a/po/sr at latin.po b/po/sr at latin.po
index d43c96d..c6c2c56 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -5,24 +5,70 @@
# 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.
+# Miroslav Nikolić <miroslavnikolic at rocketmail.com>, 2011, 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-23 10:20+0200\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"
"Last-Translator: Miroslav Nikolić <miroslavnikolic at rocketmail.com>\n"
"Language-Team: Serbian <gnom at prevod.org>\n"
"Language: sr\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==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Virtaal 0.7.0-beta5\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Project-Style: gnome\n"
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:1
+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."
+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"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:4
+msgid ""
+"When handling multiple files, don't package them but process separately."
+msgstr ""
+"Kada obrađuje brojne datoteke, neće ih pakovati već će ih obraditi zasebno."
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:5
+msgid "Use armor mode when encrypting"
+msgstr "Koristi odbrambeni režim prilikom šifrovanja"
+
+#: ../data/org.gnome.seahorse.nautilus.gschema.xml.h:6
+msgid "Use PGP ASCII armor mode when encrypting or signing files."
+msgstr ""
+"Koristiće PGP ASKRI odbrambeni režim prilikom šifrovanja ili potpisivanja "
+"datoteka."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:1
+msgid "Width of the window"
+msgstr "Širina prozora"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:2
+msgid "Width (in pixels) of the window."
+msgstr "Širina prozora (u tačkicama)."
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:3
+msgid "Height of the window"
+msgstr "Visina prozora"
+
+#: ../data/org.gnome.seahorse.nautilus.window.gschema.xml.h:4
+msgid "Height (in pixels) of the window."
+msgstr "Visina prozora (u tačkicama)."
+
#: ../nautilus-ext/seahorse-nautilus.c:158
msgid "Encrypt..."
msgstr "Šifruj..."
@@ -48,19 +94,16 @@ msgstr[2] "Potpiši izabrane datoteke"
msgstr[3] "Potpiši izabranu datoteku"
#: ../tool/seahorse-multi-encrypt.xml.h:1
-msgid "<b>You have selected multiple files or folders</b>"
-msgstr "<b>Izabrali ste više datoteka ili direktorijuma</b>"
+msgid "Encrypt Multiple Files"
+msgstr "Šifruj više datoteka"
#: ../tool/seahorse-multi-encrypt.xml.h:2
-msgid ""
-"Because the files are located remotely, each file will be encrypted "
-"separately."
-msgstr ""
-"Pošto su datoteke na udaljenim računarima, svaka će biti zasebno šifrovana."
+msgid "<b>You have selected multiple files or folders</b>"
+msgstr "<b>Izabrali ste više datoteka ili direktorijuma</b>"
#: ../tool/seahorse-multi-encrypt.xml.h:3
-msgid "Encrypt Multiple Files"
-msgstr "Šifruj više datoteka"
+msgid "encrypted-package"
+msgstr "šifrovani-paket"
# bug: s/seperately/separately/
#: ../tool/seahorse-multi-encrypt.xml.h:4
@@ -72,18 +115,21 @@ msgid "Encrypt packed together in a package"
msgstr "Šifruj zajedno spakovano u paket"
#: ../tool/seahorse-multi-encrypt.xml.h:6
-msgid "Package Name:"
-msgstr "Naziv paketa:"
-
-#: ../tool/seahorse-multi-encrypt.xml.h:7
msgid "Packaging:"
msgstr "Vrsta pakovanja:"
+#: ../tool/seahorse-multi-encrypt.xml.h:7
+msgid "Package Name:"
+msgstr "Naziv paketa:"
+
#: ../tool/seahorse-multi-encrypt.xml.h:8
-msgid "encrypted-package"
-msgstr "šifrovani-paket"
+msgid ""
+"Because the files are located remotely, each file will be encrypted "
+"separately."
+msgstr ""
+"Pošto su datoteke na udaljenim računarima, svaka će biti zasebno šifrovana."
-#: ../tool/seahorse-notification.c:580 ../tool/seahorse-notification.c:605
+#: ../tool/seahorse-notification.c:572
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] "Uvezen ključ"
@@ -91,7 +137,7 @@ msgstr[1] "Uvezeni ključevi"
msgstr[2] "Uvezeni ključevi"
msgstr[3] "Uvezen ključ"
-#: ../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"
@@ -101,7 +147,7 @@ msgstr[2] "Uvezeno je %i ključeva"
msgstr[3] "Uvezen je jedan ključ"
# bug: plural-forms
-#: ../tool/seahorse-notification.c:586
+#: ../tool/seahorse-notification.c:578
#, c-format
msgid "Imported a key for"
msgid_plural "Imported keys for"
@@ -111,60 +157,60 @@ msgstr[2] "Uvezeni su ključevi za"
msgstr[3] "Uvezen je ključ za"
#. 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 "Potpisao je <i><key id='%s'/> <b>ističe</b></i> %s."
-#: ../tool/seahorse-notification.c:624
+#: ../tool/seahorse-notification.c:607
msgid "Invalid Signature"
msgstr "Neispravan potpis"
-#: ../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 "Potpisano od <i><key id='%s'/></i> %s <b>Istekao</b>."
-#: ../tool/seahorse-notification.c:631
+#: ../tool/seahorse-notification.c:614
msgid "Expired Signature"
msgstr "Istekao potpis"
-#: ../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 "Potpisan od <i><key id='%s'/> <b>Opozvan</b></i> %s."
-#: ../tool/seahorse-notification.c:638
+#: ../tool/seahorse-notification.c:621
msgid "Revoked Signature"
msgstr "Opozvan potpis"
#. 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 "Potpisan od <i><key id='%s'/></i> %s."
-#: ../tool/seahorse-notification.c:645
+#: ../tool/seahorse-notification.c:628
msgid "Good Signature"
msgstr "Dobar potpis"
-#: ../tool/seahorse-notification.c:650
+#: ../tool/seahorse-notification.c:633
msgid "Signing key not in keyring."
msgstr "Ključ za potpis nije u privesku ključeva."
-#: ../tool/seahorse-notification.c:651
+#: ../tool/seahorse-notification.c:634
msgid "Unknown Signature"
msgstr "Nepoznat potpis"
-#: ../tool/seahorse-notification.c:655
+#: ../tool/seahorse-notification.c:638
msgid "Bad or forged signature. The signed data was modified."
msgstr "Loš ili falsifikovan potpis. Potpisani podaci su menjani."
-#: ../tool/seahorse-notification.c:656
+#: ../tool/seahorse-notification.c:639
msgid "Bad Signature"
msgstr "Loš potpis"
-#: ../tool/seahorse-notification.c:664
+#: ../tool/seahorse-notification.c:647
msgid "Couldn't verify signature."
msgstr "Ne mogu da proverim potpis."
@@ -172,42 +218,41 @@ msgstr "Ne mogu da proverim potpis."
msgid "Notification Messages"
msgstr "Obaveštajne poruke"
-#: ../tool/seahorse-passphrase.c:200
-msgid "Passphrase"
-msgstr "Lozinka"
-
-#: ../tool/seahorse-passphrase.c:203
-msgid "Password:"
-msgstr "Lozinka:"
-
-#. The second and main entry
-#: ../tool/seahorse-passphrase.c:267
-msgid "Confirm:"
-msgstr "Potvrdite:"
-
-#: ../tool/seahorse-passphrase.c:355
+#: ../tool/seahorse-passphrase.c:114
#, c-format
msgid "Wrong passphrase."
msgstr "Pogrešna lozinka."
-#: ../tool/seahorse-passphrase.c:359
+#: ../tool/seahorse-passphrase.c:118
#, c-format
msgid "Enter new passphrase for '%s'"
msgstr "Unesite novu lozinku za „%s“"
-#: ../tool/seahorse-passphrase.c:361
+#: ../tool/seahorse-passphrase.c:120
#, c-format
msgid "Enter passphrase for '%s'"
msgstr "Unesite lozinku za „%s“"
-#: ../tool/seahorse-passphrase.c:364
+#: ../tool/seahorse-passphrase.c:123
msgid "Enter new passphrase"
msgstr "Unesite novu lozinku"
-#: ../tool/seahorse-passphrase.c:366
+#: ../tool/seahorse-passphrase.c:125
msgid "Enter passphrase"
msgstr "Unesite lozinku"
+#: ../tool/seahorse-passphrase.c:130
+msgid "Passphrase"
+msgstr "Lozinka"
+
+#: ../tool/seahorse-passphrase.c:138
+msgid "Ok"
+msgstr "U redu"
+
+#: ../tool/seahorse-passphrase.c:139
+msgid "Cancel"
+msgstr "Otkaži"
+
#: ../tool/seahorse-pgp-encrypted.desktop.in.in.h:1
msgid "Decrypt File"
msgstr "Dešifruj datoteku"
@@ -330,7 +375,7 @@ msgstr "Izaberite izvornu datoteku za „%s“"
msgid "No valid signatures found"
msgstr "Ne mogu da nađem nijedan ispravan potpis"
-#: ../tool/seahorse-tool.c:697
+#: ../tool/seahorse-tool.c:695
msgid "File Encryption Tool"
msgstr "Alat za šifrovanje datoteka"
@@ -379,93 +424,93 @@ msgstr "Proveravam"
msgid "Couldn't verify file: %s"
msgstr "Ne mogu da proverim datoteku: %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 "Samootpakujući 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 "Nezapakovan Tar (.tar)"
-#: ../tool/seahorse-tool-files.c:138
+#: ../tool/seahorse-tool-files.c:137
msgid "Tar compressed with bzip (.tar.bz)"
msgstr "Tar zapakovan bzipom (.tar.bz)"
-#: ../tool/seahorse-tool-files.c:139
+#: ../tool/seahorse-tool-files.c:138
msgid "Tar compressed with bzip2 (.tar.bz2)"
msgstr "Tar zapakovan bzipom 2 (.tar.bz2)"
-#: ../tool/seahorse-tool-files.c:140
+#: ../tool/seahorse-tool-files.c:139
msgid "Tar compressed with gzip (.tar.gz)"
msgstr "Tar zapakovan gzipom (.tar.gz)"
-#: ../tool/seahorse-tool-files.c:141
+#: ../tool/seahorse-tool-files.c:140
msgid "Tar compressed with lzop (.tar.lzo)"
msgstr "Tar zapakovan lzopom (.tar.lzo)"
-#: ../tool/seahorse-tool-files.c:142
+#: ../tool/seahorse-tool-files.c:141
msgid "Tar compressed with compress (.tar.Z)"
msgstr "Tar zapakovan kompresom (.tar.Z)"
-#: ../tool/seahorse-tool-files.c:144
+#: ../tool/seahorse-tool-files.c:143
msgid "War (.war)"
msgstr "Var (.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)"
# bug: plural-forms
#. 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 "
-msgstr[0] "Izabrali ste %d datoteku"
-msgstr[1] "Izabrali ste %d datoteke"
-msgstr[2] "Izabrali ste %d datoteka"
-msgstr[3] "Izabrali ste jednu datoteku"
+msgstr[0] "Izabrali ste %d datoteku "
+msgstr[1] "Izabrali ste %d datoteke "
+msgstr[2] "Izabrali ste %d datoteka "
+msgstr[3] "Izabrali ste jednu datoteku "
#. 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"
@@ -476,13 +521,13 @@ msgstr[3] "i jednu fasciklu"
#. 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>"
# bug: plural-forms
-#: ../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"
@@ -491,7 +536,7 @@ msgstr[1] "Izabrali ste %d datoteke"
msgstr[2] "Izabrali ste %d datoteka"
msgstr[3] "Izabrali ste jednu datoteku"
-#: ../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"
@@ -500,15 +545,15 @@ msgstr[1] "Izabrali ste %d direktorijuma"
msgstr[2] "Izabrali ste %d direktorijuma"
msgstr[3] "Izabrali ste jedan direktorijum"
-#: ../tool/seahorse-tool-files.c:868
+#: ../tool/seahorse-tool-files.c:866
msgid "Preparing..."
msgstr "Pripremam..."
-#: ../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 "Ne mogu da izlistam datoteke"
-#: ../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 "Ne mogu da upakujem datoteke"
@@ -516,33 +561,33 @@ msgstr "Ne mogu da upakujem datoteke"
msgid "Decryption failed. You probably do not have the decryption key."
msgstr "Dešifrovanje nije uspelo. Verovatno nemate ključ za dešifrovanje."
-#: ../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 "Ne mogu da pokrenem Upravljača arhivama"
-#: ../tool/seahorse-util.c:648
+#: ../tool/seahorse-util.c:400
msgid "The file-roller process did not complete successfully"
msgstr "Proces upravljača arhivama nije uspešno završen"
#. 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 "Sve datoteke ključeva"
-#: ../tool/seahorse-util.c:715 ../tool/seahorse-util.c:755
+#: ../tool/seahorse-util.c:443 ../tool/seahorse-util.c:483
msgid "All files"
msgstr "Sve datoteke"
-#: ../tool/seahorse-util.c:748
+#: ../tool/seahorse-util.c:476
msgid "Archive files"
msgstr "Datoteke arhive"
-#: ../tool/seahorse-util.c:777
+#: ../tool/seahorse-util.c:505
msgid ""
"<b>A file already exists with this name.</b>\n"
"\n"
@@ -552,11 +597,6 @@ msgstr ""
"\n"
"Da li želite da je zamenite novom?"
-#: ../tool/seahorse-util.c:780
+#: ../tool/seahorse-util.c:508
msgid "_Replace"
msgstr "_Zameni"
-
-#: ../tool/seahorse-widget.c:365
-#, c-format
-msgid "Could not display help: %s"
-msgstr "Ne mogu da prikažem pomoć: %s"
diff --git a/tool/Makefile.am b/tool/Makefile.am
index f2cc9d5..77348a0 100644
--- a/tool/Makefile.am
+++ b/tool/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(datadir)/seahorse-nautilus/ui
+uidir = $(datadir)/seahorse-nautilus/ui/
localedir = $(datadir)/locale
INCLUDES = -I$(top_builddir) \
@@ -8,7 +8,8 @@ INCLUDES = -I$(top_builddir) \
-DLOCALEDIR=\"$(localedir)\" \
-DDATA_DIR=\""$(datadir)"\" \
-DSEAHORSE_UIDIR=\""$(uidir)"\" \
- -DLIBCRYPTUI_API_SUBJECT_TO_CHANGE
+ -DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
+ -DGCR_API_SUBJECT_TO_CHANGE
bin_PROGRAMS = seahorse-tool
@@ -16,15 +17,12 @@ BUILT_SOURCES = \
seahorse-marshal.c seahorse-marshal.h
seahorse_tool_SOURCES = \
- seahorse-gconf.c seahorse-gconf.h \
seahorse-libdialogs.h \
seahorse-notification.c \
seahorse-operation.c seahorse-operation.h \
seahorse-passphrase.c seahorse-passphrase.h \
seahorse-pgp-operation.c seahorse-pgp-operation.h \
seahorse-progress.c seahorse-progress.h \
- seahorse-secure-buffer.c seahorse-secure-buffer.h \
- seahorse-secure-memory.c seahorse-secure-memory.h \
seahorse-tool.c seahorse-tool.h \
seahorse-tool-files.c \
seahorse-tool-progress.c \
diff --git a/tool/Makefile.in b/tool/Makefile.in
index b63f212..6b410eb 100644
--- a/tool/Makefile.in
+++ b/tool/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ 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;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -40,7 +56,8 @@ subdir = tool
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/seahorse-pgp-encrypted.desktop.in.in \
$(srcdir)/seahorse-pgp-keys.desktop.in.in \
- $(srcdir)/seahorse-pgp-signature.desktop.in.in
+ $(srcdir)/seahorse-pgp-signature.desktop.in.in \
+ $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs
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 \
@@ -57,14 +74,13 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
"$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(uidir)"
PROGRAMS = $(bin_PROGRAMS)
am__objects_1 = seahorse-marshal.$(OBJEXT)
-am_seahorse_tool_OBJECTS = seahorse-gconf.$(OBJEXT) \
- seahorse-notification.$(OBJEXT) seahorse-operation.$(OBJEXT) \
- seahorse-passphrase.$(OBJEXT) seahorse-pgp-operation.$(OBJEXT) \
- seahorse-progress.$(OBJEXT) seahorse-secure-buffer.$(OBJEXT) \
- seahorse-secure-memory.$(OBJEXT) seahorse-tool.$(OBJEXT) \
- seahorse-tool-files.$(OBJEXT) seahorse-tool-progress.$(OBJEXT) \
- seahorse-util.$(OBJEXT) seahorse-vfs-data.$(OBJEXT) \
- seahorse-widget.$(OBJEXT) $(am__objects_1)
+am_seahorse_tool_OBJECTS = seahorse-notification.$(OBJEXT) \
+ seahorse-operation.$(OBJEXT) seahorse-passphrase.$(OBJEXT) \
+ seahorse-pgp-operation.$(OBJEXT) seahorse-progress.$(OBJEXT) \
+ seahorse-tool.$(OBJEXT) seahorse-tool-files.$(OBJEXT) \
+ seahorse-tool-progress.$(OBJEXT) seahorse-util.$(OBJEXT) \
+ seahorse-vfs-data.$(OBJEXT) seahorse-widget.$(OBJEXT) \
+ $(am__objects_1)
seahorse_tool_OBJECTS = $(am_seahorse_tool_OBJECTS)
am__DEPENDENCIES_1 =
seahorse_tool_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -72,6 +88,19 @@ seahorse_tool_DEPENDENCIES = $(am__DEPENDENCIES_1) \
AM_V_lt = $(am__v_lt_ at AM_V@)
am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
am__v_lt_0 = --silent
+am__v_lt_1 =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -84,22 +113,23 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_ at AM_V@)
am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_ at AM_V@)
-am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_ at AM_V@)
-am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(seahorse_tool_SOURCES)
DIST_SOURCES = $(seahorse_tool_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -165,11 +195,10 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GCR_CFLAGS = @GCR_CFLAGS@
+GCR_LIBS = @GCR_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
@@ -178,6 +207,7 @@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@
GNUPG = @GNUPG@
GPGME_CONFIG = @GPGME_CONFIG@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
INSTALL = @INSTALL@
@@ -191,6 +221,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBCRYPTUI_CFLAGS = @LIBCRYPTUI_CFLAGS@
@@ -269,6 +303,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -278,6 +313,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = $(datadir)/locale
@@ -297,7 +334,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-uidir = $(datadir)/seahorse-nautilus/ui
+uidir = $(datadir)/seahorse-nautilus/ui/
INCLUDES = -I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/libseahorse \
@@ -305,21 +342,19 @@ INCLUDES = -I$(top_builddir) \
-DLOCALEDIR=\"$(localedir)\" \
-DDATA_DIR=\""$(datadir)"\" \
-DSEAHORSE_UIDIR=\""$(uidir)"\" \
- -DLIBCRYPTUI_API_SUBJECT_TO_CHANGE
+ -DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
+ -DGCR_API_SUBJECT_TO_CHANGE
BUILT_SOURCES = \
seahorse-marshal.c seahorse-marshal.h
seahorse_tool_SOURCES = \
- seahorse-gconf.c seahorse-gconf.h \
seahorse-libdialogs.h \
seahorse-notification.c \
seahorse-operation.c seahorse-operation.h \
seahorse-passphrase.c seahorse-passphrase.h \
seahorse-pgp-operation.c seahorse-pgp-operation.h \
seahorse-progress.c seahorse-progress.h \
- seahorse-secure-buffer.c seahorse-secure-buffer.h \
- seahorse-secure-memory.c seahorse-secure-memory.h \
seahorse-tool.c seahorse-tool.h \
seahorse-tool-files.c \
seahorse-tool-progress.c \
@@ -405,8 +440,11 @@ seahorse-pgp-signature.desktop.in: $(top_builddir)/config.status $(srcdir)/seaho
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ 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; \
@@ -456,15 +494,12 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-gconf.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-marshal.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-notification.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-operation.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-passphrase.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-pgp-operation.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-progress.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-secure-buffer.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-secure-memory.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-tool-files.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-tool-progress.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-tool.Po at am__quote@
@@ -500,11 +535,18 @@ clean-libtool:
-rm -rf .libs _libs
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list=''; test -n "$(man1dir)" || exit 0; \
- { for i in $$list; do echo "$$i"; done; \
- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
- sed -n '/\.1[a-z]*$$/p'; \
+ @list1=''; \
+ list2='$(man_MANS)'; \
+ test -n "$(man1dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+ { for i in $$list1; do echo "$$i"; done; \
+ if test -n "$$list2"; then \
+ for i in $$list2; do echo "$$i"; done \
+ | sed -n '/\.1[a-z]*$$/p'; \
+ fi; \
} | while read p; do \
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
@@ -536,8 +578,11 @@ uninstall-man1:
dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
install-desktopDATA: $(desktop_DATA)
@$(NORMAL_INSTALL)
- test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -554,8 +599,11 @@ uninstall-desktopDATA:
dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
install-uiDATA: $(ui_DATA)
@$(NORMAL_INSTALL)
- test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -620,6 +668,20 @@ GTAGS:
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -630,10 +692,10 @@ distdir: $(DISTFILES)
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; \
+ 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; \
+ echo " typically 'make maintainer-clean' will remove them" >&2; \
exit 1; \
else :; fi; \
else :; fi
@@ -783,20 +845,20 @@ 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 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
+ 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
seahorse-marshal.h: seahorse-marshal.list $(GLIB_GENMARSHAL)
diff --git a/tool/seahorse-gconf.c b/tool/seahorse-gconf.c
deleted file mode 100644
index 56fec8d..0000000
--- a/tool/seahorse-gconf.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Seahorse
- *
- * Copyright (C) 2005 Stefan Walter
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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.
- * 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.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-
-#include "seahorse-gconf.h"
-
-static GConfClient *global_gconf_client = NULL;
-
-static void
-global_client_free (void)
-{
- if (global_gconf_client == NULL)
- return;
-
- gconf_client_remove_dir (global_gconf_client, SEAHORSE_DESKTOP_KEYS, NULL);
- gconf_client_remove_dir (global_gconf_client, SEAHORSE_SCHEMAS, NULL);
-
- g_object_unref (global_gconf_client);
- global_gconf_client = NULL;
-}
-
-static gboolean
-handle_error (GError **error)
-{
- g_return_val_if_fail (error != NULL, FALSE);
-
- if (*error != NULL) {
- g_warning ("GConf error:\n %s", (*error)->message);
- g_error_free (*error);
- *error = NULL;
-
- return TRUE;
- }
-
- return FALSE;
-}
-
-static GConfClient*
-get_global_client (void)
-{
- GError *error = NULL;
-
- /* Initialize gconf if needed */
- if (!gconf_is_initialized ()) {
- char *argv[] = { "seahorse", NULL };
-
- if (!gconf_init (1, argv, &error)) {
- if (handle_error (&error))
- return NULL;
- }
- }
-
- if (global_gconf_client == NULL) {
- global_gconf_client = gconf_client_get_default ();
-
- if (global_gconf_client) {
- gconf_client_add_dir (global_gconf_client, SEAHORSE_DESKTOP_KEYS,
- GCONF_CLIENT_PRELOAD_NONE, &error);
- handle_error (&error);
- gconf_client_add_dir (global_gconf_client, SEAHORSE_SCHEMAS,
- GCONF_CLIENT_PRELOAD_NONE, &error);
- handle_error (&error);
- }
-
- atexit (global_client_free);
- }
-
- return global_gconf_client;
-}
-
-void
-seahorse_gconf_set_boolean (const char *key, gboolean boolean_value)
-{
- GConfClient *client;
- GError *error = NULL;
-
- g_return_if_fail (key != NULL);
-
- client = get_global_client ();
- g_return_if_fail (client != NULL);
-
- gconf_client_set_bool (client, key, boolean_value, &error);
- handle_error (&error);
-}
-
-gboolean
-seahorse_gconf_get_boolean (const char *key)
-{
- gboolean result;
- GConfClient *client;
- GError *error = NULL;
-
- g_return_val_if_fail (key != NULL, FALSE);
-
- client = get_global_client ();
- g_return_val_if_fail (client != NULL, FALSE);
-
- result = gconf_client_get_bool (client, key, &error);
- return handle_error (&error) ? FALSE : result;
-}
-
-void
-seahorse_gconf_set_integer (const char *key, int int_value)
-{
- GConfClient *client;
- GError *error = NULL;
-
- g_return_if_fail (key != NULL);
-
- client = get_global_client ();
- g_return_if_fail (client != NULL);
-
- gconf_client_set_int (client, key, int_value, &error);
- handle_error (&error);
-}
-
-int
-seahorse_gconf_get_integer (const char *key)
-{
- int result;
- GConfClient *client;
- GError *error = NULL;
-
- g_return_val_if_fail (key != NULL, 0);
-
- client = get_global_client ();
- g_return_val_if_fail (client != NULL, 0);
-
- result = gconf_client_get_int (client, key, &error);
- return handle_error (&error) ? 0 : result;
-}
-
-void
-seahorse_gconf_set_string (const char *key, const char *string_value)
-{
- GConfClient *client;
- GError *error = NULL;
-
- g_return_if_fail (key != NULL);
-
- client = get_global_client ();
- g_return_if_fail (client != NULL);
-
- gconf_client_set_string (client, key, string_value, &error);
- handle_error (&error);
-}
-
-char *
-seahorse_gconf_get_string (const char *key)
-{
- char *result;
- GConfClient *client;
- GError *error = NULL;
-
- g_return_val_if_fail (key != NULL, NULL);
-
- client = get_global_client ();
- g_return_val_if_fail (client != NULL, NULL);
-
- result = gconf_client_get_string (client, key, &error);
- return handle_error (&error) ? g_strdup ("") : result;
-}
diff --git a/tool/seahorse-gconf.h b/tool/seahorse-gconf.h
deleted file mode 100644
index 04d50ad..0000000
--- a/tool/seahorse-gconf.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Seahorse
- *
- * Copyright (C) 2005 Stefan Walter
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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.
- * 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.
- */
-
-/**
- * A collection of functions for accessing gconf. Adapted from libeel.
- */
-
-#include <glib.h>
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-
-#include <gtk/gtk.h>
-
-#define SEAHORSE_DESKTOP_KEYS "/desktop/pgp"
-
-#define ARMOR_KEY SEAHORSE_DESKTOP_KEYS "/ascii_armor"
-#define MULTI_EXTENSION_KEY SEAHORSE_DESKTOP_KEYS "/package_extension"
-#define MULTI_SEPERATE_KEY SEAHORSE_DESKTOP_KEYS "/multi_seperate"
-
-#define SEAHORSE_SCHEMAS "/apps/seahorse"
-
-#define WINDOW_SIZE SEAHORSE_SCHEMAS "/windows/"
-
-void seahorse_gconf_set_boolean (const char *key,
- gboolean boolean_value);
-
-gboolean seahorse_gconf_get_boolean (const char *key);
-
-void seahorse_gconf_set_integer (const char *key,
- int int_value);
-
-int seahorse_gconf_get_integer (const char *key);
-
-void seahorse_gconf_set_string (const char *key,
- const char *string_value);
-
-char* seahorse_gconf_get_string (const char *key);
diff --git a/tool/seahorse-libdialogs.h b/tool/seahorse-libdialogs.h
index d1aaa94..a46f015 100644
--- a/tool/seahorse-libdialogs.h
+++ b/tool/seahorse-libdialogs.h
@@ -45,4 +45,6 @@ void seahorse_notification_display (const gchar *summary,
gboolean seahorse_notification_have (void);
+void seahorse_notification_cleanup (void);
+
#endif /* __SEAHORSE_LIBDIALOGS_H__ */
diff --git a/tool/seahorse-multi-encrypt.xml b/tool/seahorse-multi-encrypt.xml
index b3a8036..4390ca2 100644
--- a/tool/seahorse-multi-encrypt.xml
+++ b/tool/seahorse-multi-encrypt.xml
@@ -8,7 +8,6 @@
<property name="title" translatable="yes">Encrypt Multiple Files</property>
<property name="window_position">center</property>
<property name="type_hint">normal</property>
- <property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
@@ -56,7 +55,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="package-extension">
+ <object class="GtkComboBoxText" id="package-extension">
<property name="visible">True</property>
</object>
<packing>
diff --git a/tool/seahorse-notification.c b/tool/seahorse-notification.c
index 7d5caea..6fcc1b6 100644
--- a/tool/seahorse-notification.c
+++ b/tool/seahorse-notification.c
@@ -411,14 +411,6 @@ keys_start_element (GMarkupParseContext *ctx, const gchar *element_name,
}
-static void
-free_keyset (void)
-{
- if (keyset)
- g_object_unref (keyset);
- keyset = NULL;
-}
-
/* -----------------------------------------------------------------------------
* OBJECT
*/
@@ -429,7 +421,6 @@ seahorse_notification_init (SeahorseNotification *snotif)
if (!keyset) {
keyset = cryptui_keyset_new ("openpgp", TRUE);
g_return_if_fail (keyset);
- g_atexit (free_keyset);
}
g_signal_connect (keyset, "changed", G_CALLBACK (key_changed), snotif);
@@ -687,3 +678,11 @@ seahorse_notify_signatures (const gchar* data, gpgme_verify_result_t status)
g_free (title);
g_free (body);
}
+
+void
+seahorse_notification_cleanup (void)
+{
+ if (keyset)
+ g_object_unref (keyset);
+ keyset = NULL;
+}
diff --git a/tool/seahorse-notify.xml b/tool/seahorse-notify.xml
index c2e807b..b66af17 100644
--- a/tool/seahorse-notify.xml
+++ b/tool/seahorse-notify.xml
@@ -7,7 +7,6 @@
<property name="border_width">5</property>
<property name="title" translatable="yes">Notification Messages</property>
<property name="type_hint">dialog</property>
- <property name="has_separator">False</property>
<signal name="delete_event" handler="delete_event"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
diff --git a/tool/seahorse-passphrase.c b/tool/seahorse-passphrase.c
index e2decbf..ffb44ec 100644
--- a/tool/seahorse-passphrase.c
+++ b/tool/seahorse-passphrase.c
@@ -3,6 +3,7 @@
*
* Copyright (C) 2003 Jacob Perkins
* Copyright (C) 2004 - 2006 Stefan Walter
+ * Copyright (C) 2012 Red Hat
*
* 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
@@ -21,35 +22,14 @@
*/
#include "config.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/signal.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-
-#include <signal.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <err.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
+
+#include "seahorse-passphrase.h"
+#include "seahorse-util.h"
#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (2,90,0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
-#include <gpgme.h>
-#include "seahorse-libdialogs.h"
-#include "seahorse-widget.h"
-#include "seahorse-util.h"
-#include "seahorse-passphrase.h"
-#include "seahorse-secure-buffer.h"
+#include <gcr/gcr.h>
+#include <gpgme.h>
#define HIG_SMALL 6 /* gnome hig small space in pixels */
#define HIG_LARGE 12 /* gnome hig large space in pixels */
@@ -77,313 +57,102 @@ utf8_validate (const gchar *text)
return result;
}
-static gboolean
-key_press (GtkWidget *widget, GdkEventKey *event, gpointer data)
-{
- /* Close the dialog when hitting "Esc". */
- if (event->keyval == GDK_Escape)
- {
- gtk_dialog_response(GTK_DIALOG (widget), GTK_RESPONSE_REJECT);
- return TRUE;
- }
-
- return FALSE;
-}
+typedef struct {
+ GAsyncResult *result;
+ GMainLoop *loop;
+} SyncClosure;
-static gboolean
-grab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
-{
-#ifndef _DEBUG
- GdkGrabStatus status;
- if (!g_object_get_data (G_OBJECT (win), "keyboard-grabbed")) {
- status = gdk_keyboard_grab (gtk_widget_get_window (win), FALSE, gdk_event_get_time (event));
- if (status == GDK_GRAB_SUCCESS)
- g_object_set_data (G_OBJECT (win), "keyboard-grabbed", GINT_TO_POINTER (TRUE));
- else
- g_message ("could not grab keyboard: %d", (int)status);
- }
-#endif
- return FALSE;
-}
-
-/* ungrab_keyboard - remove grab */
-static gboolean
-ungrab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
-{
-#ifndef _DEBUG
- if (g_object_get_data (G_OBJECT (win), "keyboard-grabbed"))
- gdk_keyboard_ungrab (gdk_event_get_time (event));
- g_object_set_data (G_OBJECT (win), "keyboard-grabbed", NULL);
-#endif
- return FALSE;
-}
-
-/* When enter is pressed in the confirm entry, move */
static void
-confirm_callback (GtkWidget *widget, GtkDialog *dialog)
+on_sync_complete (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
{
- GtkWidget *entry = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), "secure-entry"));
- g_assert (GTK_IS_ENTRY (entry));
- gtk_widget_grab_focus (entry);
+ SyncClosure *sync = user_data;
+ sync->result = g_object_ref (result);
+ g_main_loop_quit (sync->loop);
}
-/* When enter is pressed in the entry, we simulate an ok */
-static void
-enter_callback (GtkWidget *widget, GtkDialog *dialog)
-{
- gtk_dialog_response (dialog, GTK_RESPONSE_ACCEPT);
-}
-
-static void
-entry_changed (GtkEditable *editable, GtkDialog *dialog)
+gpgme_error_t
+seahorse_passphrase_get (gconstpointer dummy, const gchar *passphrase_hint,
+ const char* passphrase_info, int flags, int fd)
{
- GtkEntry *entry, *confirm;
+ gchar **split_uid = NULL;
+ gchar *label = NULL;
+ gchar *errmsg = NULL;
+ const gchar *pass;
+ GcrPrompt *prompt;
+ SyncClosure sync;
+ GError *error = NULL;
+ gchar *msg;
- entry = GTK_ENTRY (g_object_get_data (G_OBJECT (dialog), "secure-entry"));
- confirm = GTK_ENTRY (g_object_get_data (G_OBJECT (dialog), "confirm-entry"));
+ sync.result = NULL;
+ sync.loop = g_main_loop_new (NULL, FALSE);
- gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_ACCEPT,
- strcmp (gtk_entry_get_text (entry),
- gtk_entry_get_text (confirm)) == 0);
-}
-
-static gboolean
-window_state_changed (GtkWidget *win, GdkEventWindowState *event, gpointer data)
-{
- GdkWindowState state = gdk_window_get_state (gtk_widget_get_window (win));
+ gcr_system_prompt_open_async (-1, NULL, on_sync_complete, &sync);
- if (state & GDK_WINDOW_STATE_WITHDRAWN ||
- state & GDK_WINDOW_STATE_ICONIFIED ||
- state & GDK_WINDOW_STATE_FULLSCREEN ||
- state & GDK_WINDOW_STATE_MAXIMIZED)
- ungrab_keyboard (win, (GdkEvent*)event, data);
- else
- grab_keyboard (win, (GdkEvent*)event, data);
+ g_main_loop_run (sync.loop);
+ g_assert (sync.result != NULL);
- return FALSE;
-}
-
-static void
-constrain_size (GtkWidget *win, GtkRequisition *req, gpointer data)
-{
- static gint width, height;
- GdkGeometry geo;
-
- if (req->width == width && req->height == height)
- return;
-
- width = req->width;
- height = req->height;
- geo.min_width = width;
- geo.max_width = 10000; /* limit is arbitrary, INT_MAX breaks other things */
- geo.min_height = geo.max_height = height;
- gtk_window_set_geometry_hints (GTK_WINDOW (win), NULL, &geo,
- GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
-}
+ prompt = gcr_system_prompt_open_finish (sync.result, &error);
-GtkDialog*
-seahorse_passphrase_prompt_show (const gchar *title, const gchar *description,
- const gchar *prompt, const gchar *check,
- gboolean confirm)
-{
- GtkEntryBuffer *buffer;
- GtkEntry *entry;
- GtkDialog *dialog;
- GtkWidget *w;
- GtkWidget *box;
- GtkTable *table;
- GtkWidget *wvbox;
- GtkWidget *chbox;
- gchar *msg;
-
- if (!title)
- title = _("Passphrase");
-
- if (!prompt)
- prompt = _("Password:");
-
- w = gtk_dialog_new_with_buttons (title, NULL, 0, NULL);
- gtk_window_set_icon_name (GTK_WINDOW (w), GTK_STOCK_DIALOG_AUTHENTICATION);
-
- dialog = GTK_DIALOG (w);
-
- g_signal_connect (G_OBJECT (dialog), "size-request", G_CALLBACK (constrain_size), NULL);
- g_signal_connect_after (G_OBJECT (dialog), "map-event", G_CALLBACK (grab_keyboard), NULL);
- g_signal_connect (G_OBJECT (dialog), "unmap-event", G_CALLBACK (ungrab_keyboard), NULL);
- g_signal_connect (G_OBJECT (dialog), "window-state-event", G_CALLBACK (window_state_changed), NULL);
-
- wvbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, HIG_LARGE * 2);
- gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (dialog)), wvbox);
- gtk_container_set_border_width (GTK_CONTAINER (wvbox), HIG_LARGE);
-
- chbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, HIG_LARGE);
- gtk_box_pack_start (GTK_BOX (wvbox), chbox, FALSE, FALSE, 0);
-
- /* The image */
- w = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG);
- gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0);
- gtk_box_pack_start (GTK_BOX (chbox), w, FALSE, FALSE, 0);
-
- box = gtk_box_new (GTK_ORIENTATION_VERTICAL, HIG_SMALL);
- gtk_box_pack_start (GTK_BOX (chbox), box, TRUE, TRUE, 0);
-
- /* The description text */
- if (description) {
- msg = utf8_validate (description);
- w = gtk_label_new (msg);
- g_free (msg);
-
- gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5);
- gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
- gtk_box_pack_start (GTK_BOX (box), w, TRUE, FALSE, 0);
- }
+ g_main_loop_unref (sync.loop);
+ g_object_unref (sync.result);
- /* Two entries (usually on is hidden) in a vbox */
- table = GTK_TABLE (gtk_table_new (3, 2, FALSE));
- gtk_table_set_row_spacings (table, HIG_SMALL);
- gtk_table_set_col_spacings (table, HIG_LARGE);
- gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (table), FALSE, FALSE, 0);
-
- /* The first entry if we have one */
- if (confirm) {
- msg = utf8_validate (prompt);
- w = gtk_label_new (msg);
- g_free (msg);
- gtk_table_attach (table, w, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
-
- buffer = seahorse_secure_buffer_new ();
- entry = GTK_ENTRY (gtk_entry_new_with_buffer (buffer));
- gtk_entry_set_visibility (entry, FALSE);
- g_object_unref (buffer);
- gtk_widget_set_size_request (GTK_WIDGET (entry), 200, -1);
- g_object_set_data (G_OBJECT (dialog), "confirm-entry", entry);
- g_signal_connect (G_OBJECT (entry), "activate", G_CALLBACK (confirm_callback), dialog);
- g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (entry_changed), dialog);
- gtk_table_attach_defaults (table, GTK_WIDGET (entry), 1, 2, 0, 1);
- gtk_widget_grab_focus (GTK_WIDGET (entry));
- }
+ if (error != NULL) {
+ g_message ("Couldn't open system prompt: %s", error->message);
+ g_error_free (error);
+ return gpgme_error (GPG_ERR_CANCELED);
+ }
- /* The second and main entry */
- msg = utf8_validate (confirm ? _("Confirm:") : prompt);
- w = gtk_label_new (msg);
- g_free (msg);
- gtk_table_attach (table, w, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
-
- buffer = seahorse_secure_buffer_new ();
- entry = GTK_ENTRY (gtk_entry_new_with_buffer (buffer));
- gtk_entry_set_visibility (entry, FALSE);
- g_object_unref (buffer);
- gtk_widget_set_size_request (GTK_WIDGET (entry), 200, -1);
- g_object_set_data (G_OBJECT (dialog), "secure-entry", entry);
- g_signal_connect (G_OBJECT (entry), "activate", G_CALLBACK (enter_callback), dialog);
- gtk_table_attach_defaults (table, GTK_WIDGET (entry), 1, 2, 1, 2);
- if (!confirm)
- gtk_widget_grab_focus (GTK_WIDGET (entry));
- else
- g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (entry_changed), dialog);
-
- /* The checkbox */
- if (check) {
- w = gtk_check_button_new_with_mnemonic (check);
- gtk_table_attach_defaults (table, w, 1, 2, 2, 3);
- g_object_set_data (G_OBJECT (dialog), "check-option", w);
- }
+ if (passphrase_info && strlen(passphrase_info) < 16)
+ flags |= SEAHORSE_PASS_NEW;
- gtk_widget_show_all (GTK_WIDGET (table));
+ if (passphrase_hint)
+ split_uid = g_strsplit (passphrase_hint, " ", 2);
- w = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
- gtk_dialog_add_action_widget (dialog, w, GTK_RESPONSE_REJECT);
- gtk_widget_set_can_default (w, TRUE);
+ if (flags & SEAHORSE_PASS_BAD)
+ errmsg = g_strdup_printf (_("Wrong passphrase."));
- w = gtk_button_new_from_stock (GTK_STOCK_OK);
- gtk_dialog_add_action_widget (dialog, w, GTK_RESPONSE_ACCEPT);
- gtk_widget_set_can_default (w, TRUE);
- g_signal_connect_object (G_OBJECT (entry), "focus_in_event",
- G_CALLBACK (gtk_widget_grab_default), G_OBJECT (w), 0);
- gtk_widget_grab_default (w);
+ if (split_uid && split_uid[0] && split_uid[1]) {
+ if (flags & SEAHORSE_PASS_NEW)
+ label = g_strdup_printf (_("Enter new passphrase for '%s'"), split_uid[1]);
+ else
+ label = g_strdup_printf (_("Enter passphrase for '%s'"), split_uid[1]);
+ } else {
+ if (flags & SEAHORSE_PASS_NEW)
+ label = g_strdup (_("Enter new passphrase"));
+ else
+ label = g_strdup (_("Enter passphrase"));
+ }
- g_signal_connect (dialog, "key_press_event", G_CALLBACK (key_press), NULL);
+ g_strfreev (split_uid);
- gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
- gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_NORMAL);
- gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE);
- gtk_widget_show_all (GTK_WIDGET (dialog));
- gdk_window_focus (gtk_widget_get_window (GTK_WIDGET (dialog)), GDK_CURRENT_TIME);
+ gcr_prompt_set_message (prompt, _("Passphrase"));
- if (confirm)
- entry_changed (NULL, dialog);
+ msg = utf8_validate (errmsg ? errmsg : label);
+ gcr_prompt_set_description (prompt, msg);
+ g_free (msg);
- return dialog;
-}
+ gcr_prompt_set_password_new (prompt, flags & SEAHORSE_PASS_NEW);
-const gchar*
-seahorse_passphrase_prompt_get (GtkDialog *dialog)
-{
- GtkEntry *entry;
+ gcr_prompt_set_continue_label (prompt, _("Ok"));
+ gcr_prompt_set_cancel_label (prompt, _("Cancel"));
- entry = GTK_ENTRY (g_object_get_data (G_OBJECT (dialog), "secure-entry"));
- return gtk_entry_get_text (entry);
-}
+ g_free (label);
+ g_free (errmsg);
-gboolean
-seahorse_passphrase_prompt_checked (GtkDialog *dialog)
-{
- GtkToggleButton *button = GTK_TOGGLE_BUTTON (g_object_get_data (G_OBJECT (dialog), "check-option"));
- return GTK_IS_TOGGLE_BUTTON (button) ? gtk_toggle_button_get_active (button) : FALSE;
-}
+ pass = gcr_prompt_password_run (prompt, NULL, &error);
+ if (pass != NULL)
+ seahorse_util_printf_fd (fd, "%s\n", pass);
+ gcr_system_prompt_close_async (GCR_SYSTEM_PROMPT (prompt), NULL, NULL, NULL);
+ g_object_unref (prompt);
-gpgme_error_t
-seahorse_passphrase_get (gconstpointer dummy, const gchar *passphrase_hint,
- const char* passphrase_info, int flags, int fd)
-{
- GtkDialog *dialog;
- gpgme_error_t err;
- gchar **split_uid = NULL;
- gchar *label = NULL;
- gchar *errmsg = NULL;
- const gchar *pass;
-
- if (passphrase_info && strlen(passphrase_info) < 16)
- flags |= SEAHORSE_PASS_NEW;
-
- if (passphrase_hint)
- split_uid = g_strsplit (passphrase_hint, " ", 2);
-
- if (flags & SEAHORSE_PASS_BAD)
- errmsg = g_strdup_printf (_("Wrong passphrase."));
-
- if (split_uid && split_uid[0] && split_uid[1]) {
- if (flags & SEAHORSE_PASS_NEW)
- label = g_strdup_printf (_("Enter new passphrase for '%s'"), split_uid[1]);
- else
- label = g_strdup_printf (_("Enter passphrase for '%s'"), split_uid[1]);
- } else {
- if (flags & SEAHORSE_PASS_NEW)
- label = g_strdup (_("Enter new passphrase"));
- else
- label = g_strdup (_("Enter passphrase"));
- }
+ if (error != NULL) {
+ g_message ("Couldn't prompt for password: %s", error->message);
+ g_error_free (error);
+ return gpgme_error (GPG_ERR_CANCELED);
+ }
- g_strfreev (split_uid);
-
- dialog = seahorse_passphrase_prompt_show (NULL, errmsg ? errmsg : label,
- NULL, NULL, FALSE);
- g_free (label);
- g_free (errmsg);
-
- switch (gtk_dialog_run (dialog)) {
- case GTK_RESPONSE_ACCEPT:
- pass = seahorse_passphrase_prompt_get (dialog);
- seahorse_util_printf_fd (fd, "%s\n", pass);
- err = 0;
- break;
- default:
- err = gpgme_error (GPG_ERR_CANCELED);
- break;
- };
-
- gtk_widget_destroy (GTK_WIDGET (dialog));
- return err;
+ return 0;
}
diff --git a/tool/seahorse-passphrase.h b/tool/seahorse-passphrase.h
index 0407a8d..1035f8c 100644
--- a/tool/seahorse-passphrase.h
+++ b/tool/seahorse-passphrase.h
@@ -34,10 +34,6 @@ GtkDialog* seahorse_passphrase_prompt_show (const gchar *title,
const gchar *check,
gboolean confirm);
-const gchar* seahorse_passphrase_prompt_get (GtkDialog *dialog);
-
-gboolean seahorse_passphrase_prompt_checked (GtkDialog *dialog);
-
gpgme_error_t seahorse_passphrase_get (gconstpointer dummy,
const gchar *passphrase_hint,
const char* passphrase_info,
diff --git a/tool/seahorse-pgp-encrypted.desktop.in b/tool/seahorse-pgp-encrypted.desktop.in
index 817372a..c2a154a 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.4.0
+X-GNOME-Bugzilla-Version=3.8.0
X-GNOME-DocPath=seahorse/seahorse.xml
diff --git a/tool/seahorse-pgp-keys.desktop.in b/tool/seahorse-pgp-keys.desktop.in
index 84d6b44..965eac4 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.4.0
+X-GNOME-Bugzilla-Version=3.8.0
X-GNOME-DocPath=seahorse/seahorse.xml
diff --git a/tool/seahorse-pgp-signature.desktop.in b/tool/seahorse-pgp-signature.desktop.in
index d524d11..8ac3a54 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.4.0
+X-GNOME-Bugzilla-Version=3.8.0
X-GNOME-DocPath=seahorse/seahorse.xml
diff --git a/tool/seahorse-progress.xml b/tool/seahorse-progress.xml
index e741c08..32297b9 100644
--- a/tool/seahorse-progress.xml
+++ b/tool/seahorse-progress.xml
@@ -9,7 +9,6 @@
<property name="window_position">center-on-parent</property>
<property name="default_width">400</property>
<property name="type_hint">dialog</property>
- <property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
diff --git a/tool/seahorse-secure-buffer.c b/tool/seahorse-secure-buffer.c
deleted file mode 100644
index 8db74f0..0000000
--- a/tool/seahorse-secure-buffer.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Seahorse
- *
- * Copyright (C) 2010 Stefan Walter
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser 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.
- */
-
-#include "config.h"
-
-#include "seahorse-secure-buffer.h"
-#include <gnome-keyring-memory.h>
-
-#include <string.h>
-
-/* Initial size of buffer, in bytes */
-#define MIN_SIZE 16
-
-struct _SeahorseSecureBufferPrivate
-{
- gchar *text;
- gsize text_size;
- gsize text_bytes;
- guint text_chars;
-};
-
-G_DEFINE_TYPE (SeahorseSecureBuffer, seahorse_secure_buffer, GTK_TYPE_ENTRY_BUFFER);
-
-/* --------------------------------------------------------------------------------
- * SECURE IMPLEMENTATIONS OF TEXT BUFFER
- */
-
-static const gchar*
-seahorse_secure_buffer_real_get_text (GtkEntryBuffer *buffer, gsize *n_bytes)
-{
- SeahorseSecureBuffer *self = SEAHORSE_SECURE_BUFFER (buffer);
- if (n_bytes)
- *n_bytes = self->priv->text_bytes;
- if (!self->priv->text)
- return "";
- return self->priv->text;
-}
-
-static guint
-seahorse_secure_buffer_real_get_length (GtkEntryBuffer *buffer)
-{
- SeahorseSecureBuffer *self = SEAHORSE_SECURE_BUFFER (buffer);
- return self->priv->text_chars;
-}
-
-static guint
-seahorse_secure_buffer_real_insert_text (GtkEntryBuffer *buffer, guint position,
- const gchar *chars, guint n_chars)
-{
- SeahorseSecureBuffer *self = SEAHORSE_SECURE_BUFFER (buffer);
- SeahorseSecureBufferPrivate *pv = self->priv;
- gsize n_bytes;
- gsize at;
-
- n_bytes = g_utf8_offset_to_pointer (chars, n_chars) - chars;
-
- /* Need more memory */
- if (n_bytes + pv->text_bytes + 1 > pv->text_size) {
-
- /* Calculate our new buffer size */
- while (n_bytes + pv->text_bytes + 1 > pv->text_size) {
- if (pv->text_size == 0) {
- pv->text_size = MIN_SIZE;
- } else {
- if (2 * pv->text_size < GTK_ENTRY_BUFFER_MAX_SIZE) {
- pv->text_size *= 2;
- } else {
- pv->text_size = GTK_ENTRY_BUFFER_MAX_SIZE;
- if (n_bytes > pv->text_size - pv->text_bytes - 1) {
- n_bytes = pv->text_size - pv->text_bytes - 1;
- n_bytes = g_utf8_find_prev_char (chars, chars + n_bytes + 1) - chars;
- n_chars = g_utf8_strlen (chars, n_bytes);
- }
- break;
- }
- }
- }
-
- pv->text = gnome_keyring_memory_realloc (pv->text, pv->text_size);
- }
-
- /* Actual text insertion */
- at = g_utf8_offset_to_pointer (pv->text, position) - pv->text;
- g_memmove (pv->text + at + n_bytes, pv->text + at, pv->text_bytes - at);
- memcpy (pv->text + at, chars, n_bytes);
-
- /* Book keeping */
- pv->text_bytes += n_bytes;
- pv->text_chars += n_chars;
- pv->text[pv->text_bytes] = '\0';
-
- gtk_entry_buffer_emit_inserted_text (buffer, position, chars, n_chars);
- return n_chars;
-}
-
-static guint
-seahorse_secure_buffer_real_delete_text (GtkEntryBuffer *buffer, guint position, guint n_chars)
-{
- SeahorseSecureBuffer *self = SEAHORSE_SECURE_BUFFER (buffer);
- SeahorseSecureBufferPrivate *pv = self->priv;
- gsize start, end;
-
- if (position > pv->text_chars)
- position = pv->text_chars;
- if (position + n_chars > pv->text_chars)
- n_chars = pv->text_chars - position;
-
- if (n_chars > 0) {
- start = g_utf8_offset_to_pointer (pv->text, position) - pv->text;
- end = g_utf8_offset_to_pointer (pv->text, position + n_chars) - pv->text;
-
- g_memmove (pv->text + start, pv->text + end, pv->text_bytes + 1 - end);
- pv->text_chars -= n_chars;
- pv->text_bytes -= (end - start);
-
- gtk_entry_buffer_emit_deleted_text (buffer, position, n_chars);
- }
-
- return n_chars;
-}
-
-/* --------------------------------------------------------------------------------
- *
- */
-
-static void
-seahorse_secure_buffer_init (SeahorseSecureBuffer *self)
-{
- SeahorseSecureBufferPrivate *pv;
- pv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, SEAHORSE_TYPE_SECURE_BUFFER, SeahorseSecureBufferPrivate);
-
- pv->text = NULL;
- pv->text_chars = 0;
- pv->text_bytes = 0;
- pv->text_size = 0;
-}
-
-static void
-seahorse_secure_buffer_finalize (GObject *obj)
-{
- SeahorseSecureBuffer *self = SEAHORSE_SECURE_BUFFER (obj);
- SeahorseSecureBufferPrivate *pv = self->priv;
-
- if (pv->text) {
- gnome_keyring_memory_free (pv->text);
- pv->text = NULL;
- pv->text_bytes = pv->text_size = 0;
- pv->text_chars = 0;
- }
-
- G_OBJECT_CLASS (seahorse_secure_buffer_parent_class)->finalize (obj);
-}
-
-static void
-seahorse_secure_buffer_class_init (SeahorseSecureBufferClass *klass)
-{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GtkEntryBufferClass *buffer_class = GTK_ENTRY_BUFFER_CLASS (klass);
-
- gobject_class->finalize = seahorse_secure_buffer_finalize;
-
- buffer_class->get_text = seahorse_secure_buffer_real_get_text;
- buffer_class->get_length = seahorse_secure_buffer_real_get_length;
- buffer_class->insert_text = seahorse_secure_buffer_real_insert_text;
- buffer_class->delete_text = seahorse_secure_buffer_real_delete_text;
-
- g_type_class_add_private (gobject_class, sizeof (SeahorseSecureBufferPrivate));
-}
-
-/* --------------------------------------------------------------------------------
- *
- */
-
-GtkEntryBuffer*
-seahorse_secure_buffer_new (void)
-{
- return g_object_new (SEAHORSE_TYPE_SECURE_BUFFER, NULL);
-}
diff --git a/tool/seahorse-secure-buffer.h b/tool/seahorse-secure-buffer.h
deleted file mode 100644
index 7c94f8a..0000000
--- a/tool/seahorse-secure-buffer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Seahorse
- *
- * Copyright (C) 2010 Stefan Walter
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser 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.
- */
-
-#ifndef __SEAHORSE_SECURE_BUFFER_H__
-#define __SEAHORSE_SECURE_BUFFER_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define SEAHORSE_TYPE_SECURE_BUFFER (seahorse_secure_buffer_get_type ())
-#define SEAHORSE_SECURE_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_SECURE_BUFFER, SeahorseSecureBuffer))
-#define SEAHORSE_SECURE_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_SECURE_BUFFER, SeahorseSecureBufferClass))
-#define SEAHORSE_IS_SECURE_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_SECURE_BUFFER))
-#define SEAHORSE_IS_SECURE_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_SECURE_BUFFER))
-#define SEAHORSE_SECURE_BUFFER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_SECURE_BUFFER, SeahorseSecureBufferClass))
-
-typedef struct _SeahorseSecureBuffer SeahorseSecureBuffer;
-typedef struct _SeahorseSecureBufferClass SeahorseSecureBufferClass;
-typedef struct _SeahorseSecureBufferPrivate SeahorseSecureBufferPrivate;
-
-struct _SeahorseSecureBuffer
-{
- GtkEntryBuffer parent;
- SeahorseSecureBufferPrivate *priv;
-};
-
-struct _SeahorseSecureBufferClass
-{
- GtkEntryBufferClass parent_class;
-};
-
-GType seahorse_secure_buffer_get_type (void) G_GNUC_CONST;
-
-GtkEntryBuffer* seahorse_secure_buffer_new (void);
-
-G_END_DECLS
-
-#endif /* __SEAHORSE_SECURE_BUFFER_H__ */
diff --git a/tool/seahorse-secure-memory.c b/tool/seahorse-secure-memory.c
deleted file mode 100644
index 479126e..0000000
--- a/tool/seahorse-secure-memory.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Seahorse
- *
- * Copyright (C) 2007 Stef Walter
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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.
- * 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.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <glib.h>
-
-#include <gnome-keyring-memory.h>
-
-#include "seahorse-secure-memory.h"
-
- /* extern declared in seahorse-secure-memory.h */
- gboolean seahorse_use_secure_mem = FALSE;
-
-static gpointer
-switch_malloc (gsize size)
-{
- gpointer p;
-
- if (size == 0)
- return NULL;
- if (seahorse_use_secure_mem)
- p = gnome_keyring_memory_try_alloc (size);
- else
- p = malloc (size);
- return p;
-}
-
-static gpointer
-switch_calloc (gsize num, gsize size)
-{
- gpointer p;
-
- if (size == 0 || num == 0)
- return NULL;
- if (seahorse_use_secure_mem)
- p = gnome_keyring_memory_try_alloc (size * num);
- else
- p = calloc (num, size);
- return p;
-}
-
-static gpointer
-switch_realloc (gpointer mem, gsize size)
-{
- gpointer p;
-
- if (size == 0) {
- free (mem);
- return NULL;
- }
-
- if (!mem) {
- if (seahorse_use_secure_mem)
- p = gnome_keyring_memory_alloc (size);
- else
- p = malloc (size);
- } else if (gnome_keyring_memory_is_secure (mem))
- p = gnome_keyring_memory_try_realloc (mem, size);
- else
- p = realloc (mem, size);
- return p;
-}
-
-static void
-switch_free (gpointer mem)
-{
- if (mem) {
- if (gnome_keyring_memory_is_secure (mem))
- gnome_keyring_memory_free (mem);
- else
- free (mem);
- }
-}
-
-static gboolean
-seahorse_try_gk_secure_memory ()
-{
- gpointer p;
-
- p = gnome_keyring_memory_try_alloc (10);
- if (p != NULL) {
- gnome_keyring_memory_free (p);
- return TRUE;
- }
-
- return FALSE;
-}
-
-void
-seahorse_secure_memory_init ()
-{
- if (seahorse_try_gk_secure_memory() == TRUE) {
- GMemVTable vtable;
-
- memset (&vtable, 0, sizeof (vtable));
- vtable.malloc = switch_malloc;
- vtable.realloc = switch_realloc;
- vtable.free = switch_free;
- vtable.calloc = switch_calloc;
- g_mem_set_vtable (&vtable);
- } else {
- g_warning ("Unable to allocate secure memory from gnome-keyring.\n");
- g_warning ("Proceeding using insecure memory for password fields.\n");
- }
-}
-
diff --git a/tool/seahorse-secure-memory.h b/tool/seahorse-secure-memory.h
deleted file mode 100644
index e67da46..0000000
--- a/tool/seahorse-secure-memory.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Secure memory allocation
- * Copyright (C) 1998,1999 Free Software Foundation, Inc.
- * Copyright (C) 1999,2000 Robert Bihlmeyer <robbe at orcus.priv.at>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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.
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _SEAHORSE_SECURE_MEMORY_H_
-#define _SEAHORSE_SECURE_MEMORY_H_
-
-#include <sys/types.h>
-
-extern gboolean seahorse_use_secure_mem;
-
-#define WITH_SECURE_MEM(EXP) \
- do { \
- gboolean _tmp = seahorse_use_secure_mem; \
- seahorse_use_secure_mem = TRUE; \
- EXP; \
- seahorse_use_secure_mem = _tmp; \
- } while (0)
-
-/* This must be called before any glib/gtk/gnome functions */
-void seahorse_secure_memory_init (void);
-
-#endif /* _SEAHORSE_SECURE_MEMORY_H_ */
diff --git a/tool/seahorse-tool-files.c b/tool/seahorse-tool-files.c
index 4742f40..37148c8 100644
--- a/tool/seahorse-tool-files.c
+++ b/tool/seahorse-tool-files.c
@@ -34,7 +34,6 @@
#include "seahorse-tool.h"
#include "seahorse-util.h"
#include "seahorse-widget.h"
-#include "seahorse-gconf.h"
#include "seahorse-vfs-data.h"
#define ONE_GIGABYTE 1024 * 1024 * 1024
@@ -406,7 +405,7 @@ prepare_dialog (FilesCtx *ctx, guint nfolders, guint nfiles, GFileInfo *info, gc
/* The local stuff */
} else {
- sep = seahorse_gconf_get_boolean (MULTI_SEPERATE_KEY);
+ sep = g_settings_get_boolean (seahorse_tool_settings, "separate-files");
/* Setup the package */
w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "package-name"));
@@ -433,11 +432,7 @@ prepare_dialog (FilesCtx *ctx, guint nfolders, guint nfiles, GFileInfo *info, gc
save_type_list = save_type;
for (i = 0; save_type_list[i] != FR_FILE_TYPE_NULL; i++) {
-#if GTK_CHECK_VERSION(2,23,0)
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo),
-#else
- gtk_combo_box_append_text (GTK_COMBO_BOX (combo),
-#endif
file_type_desc[save_type_list[i]].ext);
if (strcmp(ext, file_type_desc[save_type_list[i]].ext) == 0)
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), i);
@@ -469,7 +464,7 @@ get_results (SeahorseWidget *swidget)
w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "do-separate"));
sep = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
- seahorse_gconf_set_boolean (MULTI_SEPERATE_KEY, sep);
+ g_settings_set_boolean (seahorse_tool_settings, "separate-files", sep);
/* no packaging */
if(!sep) {
@@ -478,11 +473,7 @@ get_results (SeahorseWidget *swidget)
name = gtk_entry_get_text (GTK_ENTRY (w));
w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "package-extension"));
-#if GTK_CHECK_VERSION(2,23,0)
ext = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (w));
-#else
- ext = gtk_combo_box_get_active_text (GTK_COMBO_BOX (w));
-#endif
/* No paths */
t = strrchr(name, '/');
@@ -496,7 +487,7 @@ get_results (SeahorseWidget *swidget)
full_name = g_strdup_printf("%s%s", name, ext);
/* Save the extension */
- seahorse_gconf_set_string (MULTI_EXTENSION_KEY, ext);
+ g_settings_set_string (seahorse_tool_settings, "package-extension", ext);
return full_name;
}
@@ -537,7 +528,7 @@ step_process_multiple (FilesCtx *ctx,
return TRUE;
/* The package extension */
- if ((ext = seahorse_gconf_get_string (MULTI_EXTENSION_KEY)) == NULL)
+ if ((ext = g_settings_get_string (seahorse_tool_settings, "package-extension")) == NULL)
ext = g_strdup (".zip"); /* Yes this happens when the schema isn't installed */
/* Figure out a good URI for our package */
diff --git a/tool/seahorse-tool.c b/tool/seahorse-tool.c
index 041b968..46d7901 100644
--- a/tool/seahorse-tool.c
+++ b/tool/seahorse-tool.c
@@ -33,14 +33,14 @@
#include "cryptui.h"
#include "cryptui-key-store.h"
-#include "seahorse-secure-memory.h"
#include "seahorse-tool.h"
#include "seahorse-util.h"
#include "seahorse-vfs-data.h"
#include "seahorse-libdialogs.h"
-#include "seahorse-gconf.h"
#include "seahorse-util.h"
+GSettings *seahorse_tool_settings = NULL;
+
#define IMPORT_BUFFER_SIZE 50*1<<10 /* 50 kB */
/* -----------------------------------------------------------------------------
@@ -155,7 +155,7 @@ prompt_recipients (gpgme_key_t *signkey)
CryptUIKeyset *keyset;
gpgme_ctx_t ctx;
gpgme_key_t key;
- GArray *keys;
+ GArray *keys = NULL;
gchar **recips;
gchar *signer;
@@ -261,7 +261,7 @@ encrypt_sign_start (SeahorseToolMode *mode, const gchar *uri, gpgme_data_t urida
g_object_set_data_full (G_OBJECT (pop), "cipher-data", cipher,
(GDestroyNotify)gpgme_data_release);
- gpgme_set_armor (pop->gctx, seahorse_gconf_get_boolean (ARMOR_KEY));
+ gpgme_set_armor (pop->gctx, g_settings_get_boolean (seahorse_tool_settings, "armor-mode"));
gpgme_set_textmode (pop->gctx, FALSE);
/* Start actual encryption */
@@ -376,7 +376,7 @@ sign_start (SeahorseToolMode *mode, const gchar *uri, gpgme_data_t uridata,
g_object_set_data_full (G_OBJECT (pop), "cipher-data", cipher,
(GDestroyNotify)gpgme_data_release);
- gpgme_set_armor (pop->gctx, seahorse_gconf_get_boolean (ARMOR_KEY));
+ gpgme_set_armor (pop->gctx, g_settings_get_boolean (seahorse_tool_settings, "armor-mode"));
gpgme_set_textmode (pop->gctx, FALSE);
/* Start actual signage */
@@ -676,8 +676,6 @@ main (int argc, char **argv)
gchar **uris = NULL;
int ret = 0;
- seahorse_secure_memory_init ();
-
#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -704,6 +702,8 @@ main (int argc, char **argv)
return 2;
}
+ seahorse_tool_settings = g_settings_new ("org.gnome.seahorse.nautilus");
+
/* The basic settings for the operation */
memset (&mode, 0, sizeof (mode));
@@ -770,6 +770,11 @@ main (int argc, char **argv)
if (mode.signer)
gpgme_key_unref (mode.signer);
+ g_object_unref (seahorse_tool_settings);
+ seahorse_tool_settings = NULL;
+
+ seahorse_notification_cleanup ();
+
g_strfreev (uris);
return ret;
diff --git a/tool/seahorse-tool.h b/tool/seahorse-tool.h
index 2322bae..04b1842 100644
--- a/tool/seahorse-tool.h
+++ b/tool/seahorse-tool.h
@@ -31,6 +31,8 @@ extern gboolean mode_encrypt_sign;
extern gboolean mode_decrypt;
extern gboolean mode_verify;
+extern GSettings *seahorse_tool_settings;
+
struct _SeahorseToolMode;
typedef gboolean (*SeahorseToolCallback) (struct _SeahorseToolMode *mode, const gchar *uri,
gpgme_data_t uridata, SeahorsePGPOperation *pop,
diff --git a/tool/seahorse-util.c b/tool/seahorse-util.c
index 7c8cfd7..3ad2c77 100644
--- a/tool/seahorse-util.c
+++ b/tool/seahorse-util.c
@@ -44,7 +44,6 @@
#include <dbus/dbus-glib-bindings.h>
#include "seahorse-util.h"
-#include "seahorse-gconf.h"
#include "seahorse-vfs-data.h"
#include <gpgme.h>
diff --git a/tool/seahorse-widget.c b/tool/seahorse-widget.c
index c88d04d..5defcf9 100644
--- a/tool/seahorse-widget.c
+++ b/tool/seahorse-widget.c
@@ -27,7 +27,6 @@
#include <glib/gi18n.h>
#include "seahorse-widget.h"
-#include "seahorse-gconf.h"
#define STATUS "status"
@@ -59,10 +58,6 @@ static void object_get_property (GObject *object,
GValue *value,
GParamSpec *pspec);
-static GObject* seahorse_widget_constructor (GType type,
- guint n_props,
- GObjectConstructParam* props);
-
/* signal functions */
G_MODULE_EXPORT void on_widget_closed (GtkWidget *widget,
SeahorseWidget *swidget);
@@ -99,6 +94,31 @@ seahorse_widget_get_type (void)
}
static void
+seahorse_widget_constructed (GObject *object)
+{
+ SeahorseWidget *self = SEAHORSE_WIDGET (object);
+ GtkWindow *window;
+ gint width, height;
+ gchar *path;
+
+ G_OBJECT_CLASS (parent_class)->constructed (object);
+
+ /* Load window size for windows that aren't dialogs */
+ window = GTK_WINDOW (seahorse_widget_get_toplevel (self));
+ if (!GTK_IS_DIALOG (window)) {
+ path = g_strdup_printf ("/org/gnome/seahorse/nautilus/windows/%s/", self->name);
+ self->settings = g_settings_new_with_path ("org.gnome.seahorse.nautilus.window", path);
+ g_free (path);
+
+ width = g_settings_get_int (self->settings, "width");
+ height = g_settings_get_int (self->settings, "height");
+
+ if (width > 0 && height > 0)
+ gtk_window_resize (window, width, height);
+ }
+}
+
+static void
class_init (SeahorseWidgetClass *klass)
{
GObjectClass *gobject_class;
@@ -106,7 +126,7 @@ class_init (SeahorseWidgetClass *klass)
parent_class = g_type_class_peek_parent (klass);
gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->constructor = seahorse_widget_constructor;
+ gobject_class->constructed = seahorse_widget_constructed;
gobject_class->dispose = object_dispose;
gobject_class->finalize = object_finalize;
gobject_class->set_property = object_set_property;
@@ -127,38 +147,6 @@ object_init (SeahorseWidget *swidget)
}
-static GObject*
-seahorse_widget_constructor (GType type, guint n_props, GObjectConstructParam* props)
-{
- SeahorseWidget *swidget;
- GObject *obj;
-
- GtkWindow *window;
- gint width, height;
- gchar *widthkey, *heightkey;
-
- obj = G_OBJECT_CLASS (parent_class)->constructor (type, n_props, props);
- swidget = SEAHORSE_WIDGET (obj);
-
- /* Load window size for windows that aren't dialogs */
- window = GTK_WINDOW (seahorse_widget_get_toplevel (swidget));
- if (!GTK_IS_DIALOG (window)) {
- widthkey = g_strdup_printf ("%s%s%s", WINDOW_SIZE, swidget->name, "_width");
- width = seahorse_gconf_get_integer (widthkey);
-
- heightkey = g_strdup_printf ("%s%s%s", WINDOW_SIZE, swidget->name, "_height");
- height = seahorse_gconf_get_integer (heightkey);
-
- if (width > 0 && height > 0)
- gtk_window_resize (window, width, height);
-
- g_free (widthkey);
- g_free (heightkey);
- }
-
- return obj;
-}
-
static void
object_dispose (GObject *object)
{
@@ -197,6 +185,7 @@ object_finalize (GObject *gobject)
g_object_unref (swidget->gtkbuilder);
swidget->gtkbuilder = NULL;
+ g_clear_object (&swidget->settings);
g_free (swidget->name);
G_OBJECT_CLASS (parent_class)->finalize (gobject);
@@ -206,6 +195,7 @@ static void
object_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
SeahorseWidget *swidget;
+ GError *error = NULL;
GtkWidget *w;
char *path;
@@ -219,7 +209,11 @@ object_set_property (GObject *object, guint prop_id, const GValue *value, GParam
path = g_strdup_printf ("%sseahorse-%s.xml",
SEAHORSE_UIDIR, swidget->name);
swidget->gtkbuilder = gtk_builder_new ();
- gtk_builder_add_from_file (swidget->gtkbuilder, path, NULL);
+ gtk_builder_add_from_file (swidget->gtkbuilder, path, &error);
+ if (error != NULL) {
+ g_warning ("couldn't load ui file: %s", error->message);
+ g_error_free (error);
+ }
g_free (path);
g_return_if_fail (swidget->gtkbuilder != NULL);
@@ -365,34 +359,26 @@ seahorse_widget_get_widget (SeahorseWidget *swidget, const char *identifier)
* Unrefs @swidget.
**/
void
-seahorse_widget_destroy (SeahorseWidget *swidget)
+seahorse_widget_destroy (SeahorseWidget *self)
{
- GtkWidget *widget;
- gchar *widthkey, *heightkey;
- gint width, height;
+ GtkWidget *widget;
+ gint width, height;
- g_return_if_fail (swidget != NULL && SEAHORSE_IS_WIDGET (swidget));
- widget = seahorse_widget_get_toplevel (swidget);
+ g_return_if_fail (self != NULL && SEAHORSE_IS_WIDGET (self));
+ widget = seahorse_widget_get_toplevel (self);
- /* Don't save window size for dialogs */
- if (!GTK_IS_DIALOG (widget)) {
-
- /* Save window size */
- gtk_window_get_size (GTK_WINDOW (widget), &width, &height);
-
- widthkey = g_strdup_printf ("%s%s%s", WINDOW_SIZE, swidget->name, "_width");
- seahorse_gconf_set_integer (widthkey, width);
-
- heightkey = g_strdup_printf ("%s%s%s", WINDOW_SIZE, swidget->name, "_height");
- seahorse_gconf_set_integer (heightkey, height);
+ /* Save window size */
+ if (self->settings) {
+ gtk_window_get_size (GTK_WINDOW (widget), &width, &height);
+ g_settings_set_int (self->settings, "width", width);
+ g_settings_set_int (self->settings, "height", height);
+ }
- g_free (widthkey);
- g_free (heightkey);
- }
+ /* Destroy Widget */
+ if (!self->destroying) {
+ self->destroying = TRUE;
+ gtk_widget_destroy (seahorse_widget_get_toplevel (self));
+ g_object_unref (self);
+ }
- /* Destroy Widget */
- if (!swidget->destroying) {
- swidget->destroying = TRUE;
- g_object_unref (swidget);
- }
}
diff --git a/tool/seahorse-widget.h b/tool/seahorse-widget.h
index bc19562..26fe5a6 100644
--- a/tool/seahorse-widget.h
+++ b/tool/seahorse-widget.h
@@ -65,6 +65,7 @@ struct _SeahorseWidget {
/*< private >*/
gboolean destroying;
gboolean in_destruction;
+ GSettings *settings;
};
struct _SeahorseWidgetClass {
--
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