aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--COPYING14
-rw-r--r--ChangeLog4
-rw-r--r--INSTALL6
-rw-r--r--TODO2
-rw-r--r--checks/ChangeLog5
-rw-r--r--checks/Makefile.am2
-rwxr-xr-xchecks/defs.inc4
-rw-r--r--cipher/ChangeLog4
-rw-r--r--cipher/Makefile.am8
-rw-r--r--configure.ac21
-rw-r--r--doc/gpg.texi18
-rw-r--r--g10/ChangeLog10
-rw-r--r--g10/Makefile.am3
-rw-r--r--g10/keyedit.c4
-rw-r--r--g10/keyring.c30
-rw-r--r--g10/pkclist.c2
-rw-r--r--po/da.po636
-rw-r--r--po/de.po633
-rw-r--r--po/eo.po633
-rw-r--r--po/es_ES.po636
-rw-r--r--po/et.po633
-rw-r--r--po/fr.po633
-rw-r--r--po/id.po633
-rw-r--r--po/it.po633
-rw-r--r--po/ja.po633
-rw-r--r--po/nl.po634
-rw-r--r--po/pl.po636
-rw-r--r--po/pt_BR.po636
-rw-r--r--po/pt_PT.po633
-rw-r--r--po/sv.po633
-rw-r--r--po/tr.po633
-rw-r--r--scripts/ChangeLog4
-rwxr-xr-xscripts/autogen.sh4
-rwxr-xr-xscripts/config.guess1568
-rwxr-xr-xscripts/config.sub2382
-rwxr-xr-xscripts/install-sh3
-rwxr-xr-xscripts/missing177
-rwxr-xr-xscripts/mkinstalldirs36
38 files changed, 7146 insertions, 6673 deletions
diff --git a/COPYING b/COPYING
index 2b7b643ff..60549be51 100644
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -11,7 +11,7 @@
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
+software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
@@ -19,7 +19,7 @@ the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
+price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
@@ -201,7 +201,7 @@ otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
+may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
@@ -239,7 +239,7 @@ of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
-Each version is given a distinguishing version number. If the Program
+Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
@@ -249,7 +249,7 @@ Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
+to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
+ Copyright (C) 19yy <name of author>
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
diff --git a/ChangeLog b/ChangeLog
index 3b89b6103..e7d0fba4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-22 Werner Koch <[email protected]>
+
+ * configure.ac: Fixed for automake 1.5
+
2001-10-17 Werner Koch <[email protected]>
* README: Removed note on local_ID.
diff --git a/INSTALL b/INSTALL
index 4e443b27a..69115a758 100644
--- a/INSTALL
+++ b/INSTALL
@@ -107,6 +107,12 @@ Specific problems on some machines
You may want to use the option "-msg-disable ptrmismatch1"
to get rid of the sign/unsigned char mismatch warnings.
+ * SVR4.2 (ESIX V4.2 cc)
+
+ Due to problems with the ESIX as, you probably want to do
+ CFLAGS="-O -K pentium" ./configure --disable-asm
+ Reported by Reinhard Wobst.
+
The Random Device
diff --git a/TODO b/TODO
index f66b6a7ab..4c25ef75f 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,6 @@
+ * pause scrolling help in --edit-key and elsewhere.
+
* getkey does not return revoked/expired keys - therefore it is not
possible to override it.
diff --git a/checks/ChangeLog b/checks/ChangeLog
index 89493ec4f..4fe3d9964 100644
--- a/checks/ChangeLog
+++ b/checks/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-23 Werner Koch <[email protected]>
+
+ * defs.inc, Makefile.am: Do not use $srcdir when invoking gpg.
+ Write the logfile to the current directory.
+
2001-09-28 Werner Koch <[email protected]>
* defs.inc: Write a log file for each test.
diff --git a/checks/Makefile.am b/checks/Makefile.am
index 6583def88..c2992a91c 100644
--- a/checks/Makefile.am
+++ b/checks/Makefile.am
@@ -64,7 +64,7 @@ prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \
./gpg_dearmor:
echo '#!/bin/sh' >./gpg_dearmor
- echo "$(srcdir)/../g10/gpg --no-options --no-greeting \
+ echo "../g10/gpg --no-options --no-greeting \
--no-secmem-warning --batch --dearmor" >>./gpg_dearmor
chmod 755 ./gpg_dearmor
diff --git a/checks/defs.inc b/checks/defs.inc
index 8060bd20a..2eb25c7f1 100755
--- a/checks/defs.inc
+++ b/checks/defs.inc
@@ -98,9 +98,9 @@ pgmname=`basename $0`
[ -z "$srcdir" ] && fatal "not called from make"
-GPG="${srcdir}/../g10/gpg --homedir . "
+GPG="../g10/gpg --homedir . "
-exec 2> ${0}.log
+exec 2> ${pgmname}.log
:
# end \ No newline at end of file
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index 9174d424b..664570c0c 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-22 Werner Koch <[email protected]>
+
+ * Makefile.am: Need to use $(EXEEXT) where approriate.
+
2001-09-09 Werner Koch <[email protected]>
* rsa.c (rsa_get_info): s/usage/r_usage/ to avoid shadow warnings.
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index 023b8dc5a..f89a0b735 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -85,7 +85,7 @@ libcipher_a_LIBADD = @STATIC_CIPHER_OBJS@
# If I remember it correct, automake 1.4 has a feature to set
# fooFLAGS depending on the program. So we should check it out.
-tiger: $(srcdir)/tiger.c
+tiger$(EXEEXT): $(srcdir)/tiger.c
`echo $(COMPILE) $(DYNLINK_MOD_CFLAGS) -o tiger $(srcdir)/tiger.c | \
sed -e 's/-O[2-9s]*/-O/g' `
@@ -103,12 +103,12 @@ twofish: $(srcdir)/twofish.c
# `echo $(COMPILE) -c $(srcdir)/twofish.c | sed -e 's/-O[0-9s]*/ /g' `
-rndunix: $(srcdir)/rndunix.c
+rndunix$(EXEEXT): $(srcdir)/rndunix.c
$(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndunix $(srcdir)/rndunix.c
-rndlinux: $(srcdir)/rndlinux.c
+rndlinux$(EXEEXT): $(srcdir)/rndlinux.c
$(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndlinux $(srcdir)/rndlinux.c
-rndegd: $(srcdir)/rndegd.c
+rndegd$(EXEEXT): $(srcdir)/rndegd.c
$(COMPILE) $(DYNLINK_MOD_CFLAGS) -o rndegd $(srcdir)/rndegd.c
diff --git a/configure.ac b/configure.ac
index 83580eba9..69b4d546f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,24 +18,26 @@ dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
dnl
dnl (Process this file with autoconf to produce a configure script.)
-AC_REVISION($Revision$)dnl
+dnlAC_REVISION($Revision$)dnl
AC_PREREQ(2.52)
dnl A snapshot release has a letter appended. CVS files before a release
dnl are suffixed with the string "-cvs", so "1.0.6a-cvs" is a cvs version
dnl between 1.0.6 and 1.0.6a.
-AC_INIT(gnupg,1.0.6b-cvs)
-AC_CONFIG_SRCDIR(g10/g10.c)
-AC_CONFIG_AUX_DIR(scripts)
-AC_CONFIG_HEADERS(config.h)
-AC_CANONICAL_TARGET()
-
+AC_INIT(gnupg, 1.0.6b, [email protected])
ALL_LINGUAS="da de eo es_ES et fr id it ja nl pl pt_BR pt_PT sv tr"
static_modules="sha1 md5 rmd160"
static_random_module=""
-PACKAGE="$PACKAGE_NAME"
-VERSION="$PACKAGE_VERSION"
+PACKAGE=$PACKAGE_NAME
+VERSION=$PACKAGE_VERSION
+
+AC_CONFIG_AUX_DIR(scripts)
+AC_CONFIG_SRCDIR(g10/g10.c)
+AC_CANONICAL_TARGET()
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AM_CONFIG_HEADER(config.h)
+
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
@@ -162,7 +164,6 @@ case "${target}" in
;;
esac
-AC_ARG_PROGRAM
AC_PROG_MAKE_SET
AM_SANITY_CHECK
missing_dir=`cd $ac_aux_dir && pwd`
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 9d4a8963e..1a83b0906 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -319,10 +319,7 @@ not be expected to successfully import such a key.
@item ---import @code{files}
@itemx ---fast-import @code{files}
Import/merge keys. This adds the given keys to the
-keyring.
-The fast version does not update
-the trustdb; this can be done at any time with the
-command ---update-trustdb.
+keyring. The fast version is currently just a synonym.
There are a few other options which control how this command works.
Most notable here is the ---merge-only option which does not insert new keys
@@ -355,6 +352,10 @@ when this is required and then does it implicitly; this command can be
used to force such a check. The processing is identically to that of
---update-trustdb but it skips keys with a not yet defined "ownertrust".
+For use with cron jobs, this command can be used together with ---batch
+in which case the check is only done when it is due. To force a run
+even in batch mode add the option ---yes.
+
@item ---import-ownertrust @code{files}
Update the trustdb with the ownertrust values stored
in @code{files} (or stdin if not given); existing
@@ -787,6 +788,9 @@ v4 signatures but PGP 5.x recognizes v4 signatures only
on key material. This option forces v3 signatures for
signatures on data.
+@item ---no-force-v3-sigs
+Reset the ---force-v3-sigs option.
+
@item ---force-mdc
Force the use of encryption with appended manipulation
code. This is always used with the newer ciphers (those
@@ -997,12 +1001,6 @@ All words must match exactly (not case sensitive) but can appear in
any order in the user ID. Words are any sequences of letters,
digits, the underscore and all characters with bit 7 set.
-@item #34
-Using the Local ID. This is a very low level method and should
-only be used by applications which really need it. The hash character
-indicates this method. An application should not assume that this is
-only a number.
-
@item Heine
@itemx *Heine
By case insensitive substring matching. This is the default mode but
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 6d5bbe318..06588eebc 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,15 @@
+2001-10-23 Werner Koch <[email protected]>
+
+ * keyedit.c (keyedit_menu): Changed helptext for showpref
+ command. Suggested by Reinhard Wobst.
+
+ * keyring.c (keyring_search): When marking the offtbl ready, take
+ into account that we may have more than one keyring.
+
2001-10-22 Werner Koch <[email protected]>
+ * Makefile.am: Do not use OMIT_DEPENDENCIES
+
* build-packet.c (build_sig_subpkt): Default is now to put all
types of subpackets into the hashed area and only list those which
should go into the unhashed area.
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 7ad0afdc6..9828da796 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -20,7 +20,8 @@
INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
EXTRA_DIST = OPTIONS pubring.asc options.skel
-OMIT_DEPENDENCIES = zlib.h zconf.h
+# it seems that we can't use this with automake 1.5
+#OMIT_DEPENDENCIES = zlib.h zconf.h
LDFLAGS = @LDFLAGS@ @DYNLINK_LDFLAGS@
needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
diff --git a/g10/keyedit.c b/g10/keyedit.c
index ed4c0c279..980ee0927 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -597,8 +597,8 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
{ N_("toggle") , cmdTOGGLE , 1,0,0, N_("toggle between secret "
"and public key listing") },
{ N_("t" ) , cmdTOGGLE , 1,0,0, NULL },
- { N_("pref") , cmdPREF , 0,1,0, N_("list preferences") },
- { N_("showpref"), cmdSHOWPREF , 0,1,0, N_("list preferences") },
+ { N_("pref") , cmdPREF , 0,1,0, N_("list preferences (expert)") },
+ { N_("showpref"), cmdSHOWPREF , 0,1,0, N_("list preferences (verbose)") },
{ N_("setpref") , cmdSETPREF , 1,1,0, N_("set preference list") },
{ N_("updpref") , cmdUPDPREF , 1,1,0, N_("updated preferences") },
{ N_("passwd") , cmdPASSWD , 1,1,0, N_("change the passphrase") },
diff --git a/g10/keyring.c b/g10/keyring.c
index 95f92b171..153647572 100644
--- a/g10/keyring.c
+++ b/g10/keyring.c
@@ -55,6 +55,7 @@ struct keyring_name {
int secret;
DOTLOCK lockhd;
int is_locked;
+ int did_full_scan;
char fname[1];
};
typedef struct keyring_name const * CONST_KR_NAME;
@@ -214,6 +215,7 @@ keyring_register_filename (const char *fname, int secret)
kr->secret = !!secret;
kr->lockhd = NULL;
kr->is_locked = 0;
+ kr->did_full_scan = 0;
/* keep a list of all issued pointers */
kr->next = kr_names;
kr_names = kr;
@@ -1074,10 +1076,32 @@ keyring_search (KEYRING_HANDLE hd, KEYDB_SEARCH_DESC *desc, size_t ndesc)
else if (rc == -1)
{
hd->current.eof = 1;
- /* if we scanned the entire keyring, we are sure that
+ /* if we scanned all keyrings, we are sure that
* all known key IDs are in our offtbl, mark that. */
- if (use_offtbl)
- kr_offtbl_ready = 1;
+ if (use_offtbl && !kr_offtbl_ready)
+ {
+ KR_NAME kr;
+
+ /* First set the did_full_scan flag for this keyring (ignore
+ secret keyrings) */
+ for (kr=kr_names; kr; kr = kr->next)
+ {
+ if (!kr->secret && hd->resource == kr)
+ {
+ kr->did_full_scan = 1;
+ break;
+ }
+ }
+ /* Then check whether all flags are set and if so, mark the
+ offtbl ready */
+ for (kr=kr_names; kr; kr = kr->next)
+ {
+ if (!kr->secret && !kr->did_full_scan)
+ break;
+ }
+ if (!kr)
+ kr_offtbl_ready = 1;
+ }
}
else
hd->current.error = rc;
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 52310282c..9a4e4dd0f 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -151,7 +151,7 @@ show_revocation_reason( PKT_public_key *pk )
static void
show_paths (const PKT_public_key *pk, int only_first )
{
-#warning must change enum_cert_paths to use pk
+ log_debug("not yet implemented\n");
#if 0
void *context = NULL;
unsigned otrust, validity;
diff --git a/po/da.po b/po/da.po
index f16d1fe43..fe7a8db7c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2001-09-28 16:20+0200\n"
+"POT-Creation-Date: 2001-10-23 09:41+0200\n"
"PO-Revision-Date: 2000-03-07 22:51+01:00\n"
"Last-Translator: Birger Langkjer <[email protected]>\n"
"Language-Team: Danish <[email protected]>\n"
@@ -43,7 +43,7 @@ msgstr "n"
msgid "nN"
msgstr "nN"
-#: g10/keyedit.c:568 util/miscutil.c:326
+#: g10/keyedit.c:574 util/miscutil.c:326
msgid "quit"
msgstr "afslut"
@@ -344,7 +344,7 @@ msgstr ""
"Ikke nok tilf�ldige byte tilg�ngelig. Please do some other work to give\n"
"the OS a chance to collect more entropy! (Kr�ver %d byte mere)\n"
-#: g10/g10.c:237
+#: g10/g10.c:238
msgid ""
"@Commands:\n"
" "
@@ -352,145 +352,145 @@ msgstr ""
"@Kommandoer:\n"
" "
-#: g10/g10.c:239
+#: g10/g10.c:240
msgid "|[file]|make a signature"
msgstr "|[filer]|opret en signatur"
-#: g10/g10.c:240
+#: g10/g10.c:241
msgid "|[file]|make a clear text signature"
msgstr "|[filer]|opret rentekst signatur"
-#: g10/g10.c:241
+#: g10/g10.c:242
msgid "make a detached signature"
msgstr "opret en separat signatur"
-#: g10/g10.c:242
+#: g10/g10.c:243
msgid "encrypt data"
msgstr "krypt�r data"
-#: g10/g10.c:243
+#: g10/g10.c:244
msgid "encryption only with symmetric cipher"
msgstr "krypt�r kun med symmetriske cifre"
-#: g10/g10.c:244
+#: g10/g10.c:245
msgid "store only"
msgstr "gem kun"
-#: g10/g10.c:245
+#: g10/g10.c:246
msgid "decrypt data (default)"
msgstr "afkrypt�r data (standard)"
-#: g10/g10.c:246
+#: g10/g10.c:247
msgid "verify a signature"
msgstr "godkend en signatur"
-#: g10/g10.c:248
+#: g10/g10.c:249
msgid "list keys"
msgstr "vis n�gler"
-#: g10/g10.c:250
+#: g10/g10.c:251
msgid "list keys and signatures"
msgstr "vis n�gler og signaturer"
-#: g10/g10.c:251
+#: g10/g10.c:252
msgid "check key signatures"
msgstr "tjek n�glesignaturer"
-#: g10/g10.c:252
+#: g10/g10.c:253
msgid "list keys and fingerprints"
msgstr "vis n�gle og fingeraftryk"
-#: g10/g10.c:253
+#: g10/g10.c:254
msgid "list secret keys"
msgstr "vis hemmelige n�gler"
-#: g10/g10.c:254
+#: g10/g10.c:255
msgid "generate a new key pair"
msgstr "gener�r et nyt n�glepar"
-#: g10/g10.c:255
+#: g10/g10.c:256
msgid "remove key from the public keyring"
msgstr "fjern n�gle fra den offentlige n�glering"
-#: g10/g10.c:257
+#: g10/g10.c:258
msgid "remove key from the secret keyring"
msgstr "fjern n�gle fra den hemmelige n�glering"
-#: g10/g10.c:258
+#: g10/g10.c:259
msgid "sign a key"
msgstr "sign�r en n�gle"
-#: g10/g10.c:259
+#: g10/g10.c:260
msgid "sign a key locally"
msgstr "sign�r en n�gle lokalt"
-#: g10/g10.c:260
+#: g10/g10.c:261
msgid "sign or edit a key"
msgstr "sign�r eller redig�r en n�gle"
-#: g10/g10.c:261
+#: g10/g10.c:262
msgid "generate a revocation certificate"
msgstr "Gener�r en annull�rbar certifikat"
-#: g10/g10.c:262
+#: g10/g10.c:263
msgid "export keys"
msgstr "eksport�r n�gler"
-#: g10/g10.c:263
+#: g10/g10.c:264
msgid "export keys to a key server"
msgstr "eksport�r n�gler til en n�gletjener"
-#: g10/g10.c:264
+#: g10/g10.c:265
msgid "import keys from a key server"
msgstr "import�r n�gler fra en n�gleserver"
-#: g10/g10.c:266
+#: g10/g10.c:267
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "import�r n�gler fra en n�gleserver"
-#: g10/g10.c:270
+#: g10/g10.c:271
msgid "import/merge keys"
msgstr "import�r/fusion�r n�gler"
-#: g10/g10.c:272
+#: g10/g10.c:273
msgid "list only the sequence of packets"
msgstr "vis kun pakkesekvensen"
-#: g10/g10.c:274
+#: g10/g10.c:275
msgid "export the ownertrust values"
msgstr "eksport�r ejertillidsv�rdierne"
-#: g10/g10.c:276
+#: g10/g10.c:277
msgid "import ownertrust values"
msgstr "import�r ejertillidsv�rdierne"
-#: g10/g10.c:278
+#: g10/g10.c:279
msgid "update the trust database"
msgstr "opdat�r tillidsdatabasen"
-#: g10/g10.c:280
+#: g10/g10.c:281
#, fuzzy
msgid "unattended trust database update"
msgstr "opdat�r tillidsdatabasen"
-#: g10/g10.c:281
+#: g10/g10.c:282
msgid "fix a corrupted trust database"
msgstr "repar�r en �delagt tillidsdatabase"
-#: g10/g10.c:282
+#: g10/g10.c:283
msgid "De-Armor a file or stdin"
msgstr "De-beskydt en fil el. stdin"
-#: g10/g10.c:284
+#: g10/g10.c:285
msgid "En-Armor a file or stdin"
msgstr "Beskydt en fil el. stdin"
-#: g10/g10.c:286
+#: g10/g10.c:287
msgid "|algo [files]|print message digests"
msgstr "|algo [filer]|print meddelelsesresum�"
-#: g10/g10.c:290
+#: g10/g10.c:291
msgid ""
"@\n"
"Options:\n"
@@ -500,167 +500,172 @@ msgstr ""
"Indstillinger:\n"
" "
-#: g10/g10.c:292
+#: g10/g10.c:293
msgid "create ascii armored output"
msgstr "opret ascii beskyttet uddata"
-#: g10/g10.c:294
+#: g10/g10.c:295
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|krypt�r for NAME"
-#: g10/g10.c:297
+#: g10/g10.c:298
msgid "|NAME|use NAME as default recipient"
msgstr "|NAME|brug NAME som standard modtager"
-#: g10/g10.c:299
+#: g10/g10.c:300
msgid "use the default key as default recipient"
msgstr "brug standard n�glen som standard modtager"
-#: g10/g10.c:303
+#: g10/g10.c:304
msgid "use this user-id to sign or decrypt"
msgstr "brug denne bruger-id til at signere eller dekryptere"
-#: g10/g10.c:304
+#: g10/g10.c:305
msgid "|N|set compress level N (0 disables)"
msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
-#: g10/g10.c:306
+#: g10/g10.c:307
msgid "use canonical text mode"
msgstr "brug kanonisk tekstmodus"
-#: g10/g10.c:307
+#: g10/g10.c:308
msgid "use as output file"
msgstr "brug som uddatafil"
-#: g10/g10.c:308
+#: g10/g10.c:309
msgid "verbose"
msgstr "meddelsom"
-#: g10/g10.c:309
+#: g10/g10.c:310
msgid "be somewhat more quiet"
msgstr "v�r mere stille"
-#: g10/g10.c:310
+#: g10/g10.c:311
msgid "don't use the terminal at all"
msgstr "brug overhovedet ikke terminalen"
-#: g10/g10.c:311
+#: g10/g10.c:312
msgid "force v3 signatures"
msgstr "tving v3 signaturer"
-#: g10/g10.c:312
+#: g10/g10.c:313
+#, fuzzy
+msgid "do not force v3 signatures"
+msgstr "tving v3 signaturer"
+
+#: g10/g10.c:314
msgid "always use a MDC for encryption"
msgstr "brug altid en MDC for kryptering"
-#: g10/g10.c:313
+#: g10/g10.c:315
msgid "do not make any changes"
msgstr "lav ingen �ndringer"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:315
+#: g10/g10.c:317
msgid "use the gpg-agent"
msgstr ""
-#: g10/g10.c:316
+#: g10/g10.c:318
msgid "batch mode: never ask"
msgstr "k�rselsmodus: sp�rg aldrig"
-#: g10/g10.c:317
+#: g10/g10.c:319
msgid "assume yes on most questions"
msgstr "forvent ja til de fleste spr�gsm�l"
-#: g10/g10.c:318
+#: g10/g10.c:320
msgid "assume no on most questions"
msgstr "forvent nej til de fleste spr�gsm�l"
-#: g10/g10.c:319
+#: g10/g10.c:321
msgid "add this keyring to the list of keyrings"
msgstr "tilf�j denne n�glering til n�gleringslisten"
-#: g10/g10.c:320
+#: g10/g10.c:322
msgid "add this secret keyring to the list"
msgstr "tilf�j denne hemmeligen�glering til listen"
-#: g10/g10.c:321
+#: g10/g10.c:323
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|brug NAME som standard hemmelign�gle"
-#: g10/g10.c:322
+#: g10/g10.c:324
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
-#: g10/g10.c:323
+#: g10/g10.c:325
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAME|s�t terminal karakters�t til NAME"
-#: g10/g10.c:324
+#: g10/g10.c:326
msgid "read options from file"
msgstr "l�s indstillinger fra fil"
-#: g10/g10.c:328
+#: g10/g10.c:330
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinfo til denne FD"
-#: g10/g10.c:330
+#: g10/g10.c:332
#, fuzzy
msgid "|[file]|write status info to file"
msgstr "|FD|skriv statusinfo til denne FD"
-#: g10/g10.c:336
+#: g10/g10.c:338
msgid "|KEYID|ultimately trust this key"
msgstr ""
-#: g10/g10.c:337
+#: g10/g10.c:339
msgid "|FILE|load extension module FILE"
msgstr "|FILE|indl�s udvidelsesmodul FILE"
-#: g10/g10.c:338
+#: g10/g10.c:340
msgid "emulate the mode described in RFC1991"
msgstr "emul�r modusen beskrevet i RFC1991"
-#: g10/g10.c:339
+#: g10/g10.c:341
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "s�t alle pakker, cifre og resum� flag til OpenPGP standard"
-#: g10/g10.c:340
+#: g10/g10.c:342
msgid "|N|use passphrase mode N"
msgstr "|N|brug pasfrasemodus N"
-#: g10/g10.c:342
+#: g10/g10.c:344
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NAME|brug meddelelses resum�algoritme NAME for pasfrase"
-#: g10/g10.c:344
+#: g10/g10.c:346
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
-#: g10/g10.c:345
+#: g10/g10.c:347
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|brug cifferalgoritme NAME"
-#: g10/g10.c:346
+#: g10/g10.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
-#: g10/g10.c:347
+#: g10/g10.c:349
msgid "|N|use compress algorithm N"
msgstr "|N|brug kompresalgoritme N"
-#: g10/g10.c:348
+#: g10/g10.c:350
msgid "throw keyid field of encrypted packets"
msgstr ""
-#: g10/g10.c:349
+#: g10/g10.c:351
msgid "|NAME=VALUE|use this notation data"
msgstr "|NAME=VALUE|brug denne notationsdata"
-#: g10/g10.c:352
+#: g10/g10.c:354
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/g10.c:355
+#: g10/g10.c:357
msgid ""
"@\n"
"Examples:\n"
@@ -680,16 +685,16 @@ msgstr ""
" --list-keys [navne] vis n�gler\n"
" --fingerprint [navne] vis fingeraftryk\n"
-#: g10/g10.c:478
+#: g10/g10.c:480
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
-#: g10/g10.c:482
+#: g10/g10.c:484
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
# Skal alt dette overs�ttes eller er det flagene?
-#: g10/g10.c:485
+#: g10/g10.c:487
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -699,7 +704,7 @@ msgstr ""
"sign, check, encrypt eller decrypt\n"
"standard operation afh�nger af inddata\n"
-#: g10/g10.c:496
+#: g10/g10.c:498
msgid ""
"\n"
"Supported algorithms:\n"
@@ -707,214 +712,214 @@ msgstr ""
"\n"
"Underst�ttede algoritmer:\n"
-#: g10/g10.c:570
+#: g10/g10.c:572
msgid "usage: gpg [options] "
msgstr "brug: gpg [flag] "
-#: g10/g10.c:627
+#: g10/g10.c:629
msgid "conflicting commands\n"
msgstr "konfliktende kommandoer\n"
-#: g10/g10.c:783
+#: g10/g10.c:785
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTITS: ingen standard alternativfil '%s'\n"
-#: g10/g10.c:787
+#: g10/g10.c:789
#, c-format
msgid "option file `%s': %s\n"
msgstr "alternativfil`%s': %s\n"
-#: g10/g10.c:794
+#: g10/g10.c:796
#, c-format
msgid "reading options from `%s'\n"
msgstr "l�ser indstillinger fra `%s'\n"
-#: g10/g10.c:1038
+#: g10/g10.c:1041
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s er ikke et gyldigt tegns�t\n"
-#: g10/g10.c:1122
+#: g10/g10.c:1125
msgid "WARNING: program may create a core file!\n"
msgstr ""
-#: g10/g10.c:1126 g10/g10.c:1135
+#: g10/g10.c:1129 g10/g10.c:1138
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTITS: %s er ikke til normal brug!\n"
-#: g10/g10.c:1128
+#: g10/g10.c:1131
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ikke tilladt med %s!\n"
-#: g10/g10.c:1131
+#: g10/g10.c:1134
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er meningsl�s sammen med %s!\n"
-#: g10/g10.c:1151 g10/g10.c:1163
+#: g10/g10.c:1154 g10/g10.c:1166
msgid "selected cipher algorithm is invalid\n"
msgstr "valgte cifferalgoritme er ugyldig\n"
-#: g10/g10.c:1157 g10/g10.c:1169
+#: g10/g10.c:1160 g10/g10.c:1172
msgid "selected digest algorithm is invalid\n"
msgstr "valgte resum�algoritme er ugyldig\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1176
msgid "the given policy URL is invalid\n"
msgstr "den givne politik-URL er ugyldig\n"
-#: g10/g10.c:1176
+#: g10/g10.c:1179
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr ""
-#: g10/g10.c:1178
+#: g10/g10.c:1181
msgid "completes-needed must be greater than 0\n"
msgstr ""
-#: g10/g10.c:1180
+#: g10/g10.c:1183
msgid "marginals-needed must be greater than 1\n"
msgstr ""
-#: g10/g10.c:1182
+#: g10/g10.c:1185
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr ""
-#: g10/g10.c:1185
+#: g10/g10.c:1188
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
-#: g10/g10.c:1189
+#: g10/g10.c:1192
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1196
#, fuzzy
msgid "invalid preferences\n"
msgstr "vis pr�ferencer"
# er det klogt at overs�tte TrustDB?
-#: g10/g10.c:1276
+#: g10/g10.c:1279
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "kunne ikke initialisere TillidsDB: %s\n"
-#: g10/g10.c:1282
+#: g10/g10.c:1285
msgid "--store [filename]"
msgstr "--store [filnavn (som gemmes)]"
-#: g10/g10.c:1289
+#: g10/g10.c:1292
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
-#: g10/g10.c:1297
+#: g10/g10.c:1300
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn (som krypteres)]"
-#: g10/g10.c:1310
+#: g10/g10.c:1313
msgid "--sign [filename]"
msgstr "--sign [filnavn (som signeres)]"
-#: g10/g10.c:1323
+#: g10/g10.c:1326
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
-#: g10/g10.c:1337
+#: g10/g10.c:1340
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [filnavn]"
-#: g10/g10.c:1346
+#: g10/g10.c:1349
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
-#: g10/g10.c:1364
+#: g10/g10.c:1367
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn (som dekrypteres)]"
-#: g10/g10.c:1372
+#: g10/g10.c:1375
msgid "--sign-key user-id"
msgstr "--sign-key bruger-id"
-#: g10/g10.c:1380
+#: g10/g10.c:1383
msgid "--lsign-key user-id"
msgstr "--lsign-key bruger-id"
-#: g10/g10.c:1388
+#: g10/g10.c:1391
msgid "--edit-key user-id [commands]"
msgstr "--edit-key bruger-id [kommandoer]"
-#: g10/g10.c:1404
+#: g10/g10.c:1407
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key bruger-id"
-#: g10/g10.c:1407
+#: g10/g10.c:1410
msgid "--delete-key user-id"
msgstr "--delete-key bruger-id"
-#: g10/g10.c:1415
+#: g10/g10.c:1418
#, fuzzy
msgid "--delete-secret-and-public-key user-id"
msgstr "--delete-secret-and-public-key bruger-id"
-#: g10/encode.c:268 g10/g10.c:1452 g10/sign.c:632
+#: g10/encode.c:268 g10/g10.c:1455 g10/sign.c:632
#, c-format
msgid "can't open %s: %s\n"
msgstr "kan ikke �bne %s: %s\n"
-#: g10/g10.c:1467
+#: g10/g10.c:1470
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
-#: g10/g10.c:1539
+#: g10/g10.c:1542
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: g10/g10.c:1547
+#: g10/g10.c:1550
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
-#: g10/g10.c:1618
+#: g10/g10.c:1621
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "ugyldig hash-algoritme `%s'\n"
-#: g10/g10.c:1704
+#: g10/g10.c:1707
msgid "[filename]"
msgstr "[filnavn]"
-#: g10/g10.c:1708
+#: g10/g10.c:1711
msgid "Go ahead and type your message ...\n"
msgstr "G� til sagen og skriv meddelelsen ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1711 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1714 g10/verify.c:94 g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "kan ikke �bne `%s'\n"
-#: g10/g10.c:1920
+#: g10/g10.c:1923
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"f�rste bogstav af en notationsnavn skal v�re et bogstave eller en "
"understregning\n"
-#: g10/g10.c:1926
+#: g10/g10.c:1929
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
msgstr ""
-#: g10/g10.c:1932
+#: g10/g10.c:1935
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
-#: g10/g10.c:1940
+#: g10/g10.c:1943
msgid "a notation value must not use any control characters\n"
msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
@@ -1526,7 +1531,7 @@ msgstr ""
"Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
"\n"
-#: g10/keyedit.c:456 g10/keygen.c:1171
+#: g10/keyedit.c:462 g10/keygen.c:1171
msgid "passphrase not correctly repeated; try again.\n"
msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
@@ -1649,27 +1654,27 @@ msgstr "l�ser fra '%s'\n"
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s krypteret for: %s\n"
-#: g10/delkey.c:69 g10/export.c:149
+#: g10/delkey.c:69 g10/export.c:148
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "%s: bruger ikke fundet: %s\n"
-#: g10/delkey.c:77 g10/export.c:159
+#: g10/delkey.c:77 g10/export.c:158
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
msgstr "fejl ved l�sning af '%s': %s\n"
-#: g10/export.c:167
+#: g10/export.c:166
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
-#: g10/export.c:178
+#: g10/export.c:177
#, fuzzy, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
-#: g10/export.c:234
+#: g10/export.c:233
msgid "WARNING: nothing exported\n"
msgstr "ADVARSEL: intet blev eksporteret\n"
@@ -1679,17 +1684,17 @@ msgstr ""
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:183 g10/getkey.c:2188
+#: g10/getkey.c:183 g10/getkey.c:2192
#, fuzzy
msgid "[User id not found]"
msgstr "[bruger ikke fundet]"
-#: g10/getkey.c:1911
+#: g10/getkey.c:1915
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
-#: g10/getkey.c:1952
+#: g10/getkey.c:1956
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr ""
@@ -2019,560 +2024,566 @@ msgstr ""
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:296
+#: g10/keyedit.c:302
#, c-format
msgid "Already signed by key %08lX\n"
msgstr ""
-#: g10/keyedit.c:307
+#: g10/keyedit.c:313
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr ""
-#: g10/keyedit.c:316
+#: g10/keyedit.c:322
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
msgstr ""
-#: g10/keyedit.c:325
+#: g10/keyedit.c:331
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
msgstr ""
-#: g10/keyedit.c:330
+#: g10/keyedit.c:336
msgid "Really sign? "
msgstr "Vil du gerne signere? "
-#: g10/keyedit.c:361 g10/keyedit.c:2104 g10/keyedit.c:2166 g10/sign.c:225
+#: g10/keyedit.c:367 g10/keyedit.c:2110 g10/keyedit.c:2172 g10/sign.c:225
#, c-format
msgid "signing failed: %s\n"
msgstr "signering fejlede: %s\n"
-#: g10/keyedit.c:415
+#: g10/keyedit.c:421
msgid "This key is not protected.\n"
msgstr "Denne n�gle er ikke beskyttet.\n"
-#: g10/keyedit.c:419
+#: g10/keyedit.c:425
#, fuzzy
msgid "Secret parts of primary key are not available.\n"
msgstr "hemmelig n�gle ikke tilg�ngelig"
-#: g10/keyedit.c:423
+#: g10/keyedit.c:429
msgid "Key is protected.\n"
msgstr "N�glen er beskyttet.\n"
-#: g10/keyedit.c:443
+#: g10/keyedit.c:449
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Kan ikke redigere denne n�gle: %s\n"
-#: g10/keyedit.c:448
+#: g10/keyedit.c:454
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
msgstr ""
-#: g10/keyedit.c:460
+#: g10/keyedit.c:466
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
msgstr ""
-#: g10/keyedit.c:463
+#: g10/keyedit.c:469
msgid "Do you really want to do this? "
msgstr "Vil du virkelig gerne g�re dette?"
-#: g10/keyedit.c:527
+#: g10/keyedit.c:533
msgid "moving a key signature to the correct place\n"
msgstr ""
-#: g10/keyedit.c:568
+#: g10/keyedit.c:574
msgid "quit this menu"
msgstr "afslut denne menu"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:575
msgid "q"
msgstr "a"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save"
msgstr "gem"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save and quit"
msgstr "gem og afslut"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "help"
msgstr "hj�lp"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "show this help"
msgstr "vis denne hj�lp"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "show fingerprint"
msgstr "vis fingeraftryk"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list"
msgstr "vis"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list key and user IDs"
msgstr "vis n�gler og bruger-id'er"
-#: g10/keyedit.c:575
+#: g10/keyedit.c:581
msgid "l"
msgstr "l"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "select user ID N"
msgstr ""
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "key"
msgstr "n�gle"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "select secondary key N"
msgstr "v�lg sekund�r n�gle N"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "check"
msgstr "tjek"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "list signatures"
msgstr "vis signaturer"
-#: g10/keyedit.c:579
+#: g10/keyedit.c:585
msgid "c"
msgstr "c"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign"
msgstr "sign�r"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign the key"
msgstr "sign�r n�glen"
-#: g10/keyedit.c:581
+#: g10/keyedit.c:587
msgid "s"
msgstr "s"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "lsign"
msgstr "lsign�r"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "sign the key locally"
msgstr "sign�r n�glen lokalt"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:589
msgid "debug"
msgstr "aflus"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "adduid"
msgstr "tilf�j-bid"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "add a user ID"
msgstr "tilf�j bruger-id"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "deluid"
msgstr "sletbid"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "delete user ID"
msgstr "slet bruger id"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "addkey"
msgstr "tilf�j n�gle"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "add a secondary key"
msgstr "tilf�j sekund�r n�gle"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delkey"
msgstr "sletn�gle"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delete a secondary key"
msgstr "slet sekund�r n�gle"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delsig"
msgstr "sletsig"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delete signatures"
msgstr "slet signaturer"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "expire"
msgstr "udl�b"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "change the expire date"
msgstr "�ndr udl�bsdatoen"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "primary"
msgstr ""
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle"
msgstr "skift"
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle between secret and public key listing"
msgstr "skift imellem hemmelig og offentlig n�gle visning"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:599
msgid "t"
msgstr "s"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:600
msgid "pref"
msgstr "pr�f"
-#: g10/keyedit.c:594 g10/keyedit.c:595
-msgid "list preferences"
+#: g10/keyedit.c:600
+#, fuzzy
+msgid "list preferences (expert)"
msgstr "vis pr�ferencer"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:601
#, fuzzy
msgid "showpref"
msgstr "vispr�f"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:601
+#, fuzzy
+msgid "list preferences (verbose)"
+msgstr "vis pr�ferencer"
+
+#: g10/keyedit.c:602
#, fuzzy
msgid "setpref"
msgstr "pr�f"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:602
#, fuzzy
msgid "set preference list"
msgstr "vis pr�ferencer"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updpref"
msgstr "pr�f"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updated preferences"
msgstr "vis pr�ferencer"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "passwd"
msgstr "kodeord"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "change the passphrase"
msgstr "�ndr kodes�tningen"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "trust"
msgstr "betro"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "change the ownertrust"
msgstr ""
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revsig"
msgstr ""
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revoke signatures"
msgstr ""
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revkey"
msgstr ""
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revoke a secondary key"
msgstr ""
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable"
msgstr "sl�fra"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable a key"
msgstr "sl� n�gle fra"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable"
msgstr "sl�til"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable a key"
msgstr "sl� n�gle til"
-#: g10/delkey.c:112 g10/keyedit.c:623
+#: g10/delkey.c:112 g10/keyedit.c:629
msgid "can't do that in batchmode\n"
msgstr ""
-#: g10/keyedit.c:658
+#: g10/keyedit.c:664
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "fejl ved l�sning af '%s': %s\n"
-#: g10/keyedit.c:676
+#: g10/keyedit.c:682
msgid "Secret key is available.\n"
msgstr ""
-#: g10/keyedit.c:706
+#: g10/keyedit.c:712
msgid "Command> "
msgstr ""
-#: g10/keyedit.c:737
+#: g10/keyedit.c:743
msgid "Need the secret key to do this.\n"
msgstr ""
-#: g10/keyedit.c:741
+#: g10/keyedit.c:747
msgid "Please use the command \"toggle\" first.\n"
msgstr ""
-#: g10/keyedit.c:788
+#: g10/keyedit.c:794
msgid "Really sign all user IDs? "
msgstr ""
-#: g10/keyedit.c:789
+#: g10/keyedit.c:795
msgid "Hint: Select the user IDs to sign\n"
msgstr ""
-#: g10/keyedit.c:821 g10/keyedit.c:842
+#: g10/keyedit.c:827 g10/keyedit.c:848
msgid "You must select at least one user ID.\n"
msgstr ""
-#: g10/keyedit.c:823
+#: g10/keyedit.c:829
msgid "You can't delete the last user ID!\n"
msgstr ""
-#: g10/keyedit.c:826
+#: g10/keyedit.c:832
msgid "Really remove all selected user IDs? "
msgstr ""
-#: g10/keyedit.c:827
+#: g10/keyedit.c:833
msgid "Really remove this user ID? "
msgstr ""
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:871 g10/keyedit.c:893
msgid "You must select at least one key.\n"
msgstr ""
-#: g10/keyedit.c:869
+#: g10/keyedit.c:875
msgid "Do you really want to delete the selected keys? "
msgstr ""
-#: g10/keyedit.c:870
+#: g10/keyedit.c:876
msgid "Do you really want to delete this key? "
msgstr ""
-#: g10/keyedit.c:891
+#: g10/keyedit.c:897
msgid "Do you really want to revoke the selected keys? "
msgstr ""
-#: g10/keyedit.c:892
+#: g10/keyedit.c:898
msgid "Do you really want to revoke this key? "
msgstr ""
-#: g10/keyedit.c:956
+#: g10/keyedit.c:962
msgid "Really update the preferences for the selected user IDs? "
msgstr ""
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
msgid "Really update the preferences? "
msgstr ""
-#: g10/keyedit.c:992
+#: g10/keyedit.c:998
msgid "Save changes? "
msgstr "Gem �ndringer? "
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1001
msgid "Quit without saving? "
msgstr "Afslut uden at gemme? "
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1012
#, c-format
msgid "update failed: %s\n"
msgstr ""
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1019
#, c-format
msgid "update secret failed: %s\n"
msgstr ""
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1026
msgid "Key not changed so no update needed.\n"
msgstr ""
-#: g10/keyedit.c:1031
+#: g10/keyedit.c:1037
msgid "Invalid command (try \"help\")\n"
msgstr ""
-#: g10/keyedit.c:1139 g10/keyedit.c:1165
+#: g10/keyedit.c:1145 g10/keyedit.c:1171
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr ""
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1154
#, c-format
msgid " trust: %c/%c"
msgstr ""
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1158
msgid "This key has been disabled"
msgstr ""
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1187
#, fuzzy, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! undern�gle er blevet annulleret! %s\n"
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1190
#, fuzzy
msgid "rev- faked revocation found\n"
msgstr "rev- forkert n�gletilbagekald\n"
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1192
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr ""
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1408
msgid "Delete this good signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1412
msgid "Delete this invalid signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1416
msgid "Delete this unknown signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1422
msgid "Really delete this self-signature? (y/N)"
msgstr ""
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Slettede %d signatur.\n"
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
#, c-format
msgid "Deleted %d signatures.\n"
msgstr ""
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
msgid "Nothing deleted.\n"
msgstr ""
-#: g10/keyedit.c:1503
+#: g10/keyedit.c:1509
msgid "Please remove selections from the secret keys.\n"
msgstr ""
-#: g10/keyedit.c:1509
+#: g10/keyedit.c:1515
msgid "Please select at most one secondary key.\n"
msgstr ""
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1519
msgid "Changing expiration time for a secondary key.\n"
msgstr ""
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1521
msgid "Changing expiration time for the primary key.\n"
msgstr ""
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1563
msgid "You can't change the expiration date of a v3 key\n"
msgstr ""
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1579
msgid "No corresponding signature in secret ring\n"
msgstr ""
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1662
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1837
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen bruger-id med indeks %d\n"
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Ingen sekund�r n�gle med indeks %d\n"
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:1981
msgid "user ID: \""
msgstr "bruger-id: \""
-#: g10/keyedit.c:1978
+#: g10/keyedit.c:1984
#, c-format
msgid ""
"\"\n"
"signed with your key %08lX at %s\n"
msgstr ""
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1988
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr ""
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2012
msgid "You have signed these user IDs:\n"
msgstr ""
-#: g10/keyedit.c:2020 g10/keyedit.c:2055
+#: g10/keyedit.c:2026 g10/keyedit.c:2061
#, c-format
msgid " signed by %08lX at %s\n"
msgstr ""
-#: g10/keyedit.c:2025
+#: g10/keyedit.c:2031
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr ""
-#: g10/keyedit.c:2045
+#: g10/keyedit.c:2051
msgid "You are about to revoke these signatures:\n"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:2069
msgid "Really create the revocation certificates? (y/N)"
msgstr ""
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2098
msgid "no secret key\n"
msgstr ""
@@ -2753,37 +2764,37 @@ msgstr ""
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
-#: g10/passphrase.c:277 g10/passphrase.c:319
+#: g10/passphrase.c:278 g10/passphrase.c:320
msgid "gpg-agent is not available in this session\n"
msgstr ""
-#: g10/passphrase.c:285
+#: g10/passphrase.c:286
msgid "can't set client pid for the agent\n"
msgstr ""
-#: g10/passphrase.c:293
+#: g10/passphrase.c:294
msgid "can't get server read FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:300
+#: g10/passphrase.c:301
msgid "can't get server write FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:325
+#: g10/passphrase.c:326
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:174 g10/passphrase.c:344
+#: g10/hkp.c:174 g10/passphrase.c:345
#, fuzzy, c-format
msgid "can't connect to `%s': %s\n"
msgstr "kan ikke �bne '%s': %s\n"
-#: g10/passphrase.c:415 g10/passphrase.c:677
+#: g10/passphrase.c:417 g10/passphrase.c:679
#, c-format
msgid " (main key ID %08lX)"
msgstr " (hovedn�gle-ID %08lX)"
-#: g10/passphrase.c:425
+#: g10/passphrase.c:427
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -2791,54 +2802,54 @@ msgid ""
"%u-bit %s key, ID %08lX, created %s%s\n"
msgstr ""
-#: g10/passphrase.c:446
+#: g10/passphrase.c:448
#, fuzzy
msgid "Enter passphrase\n"
msgstr "Indtast kodes�tning: "
-#: g10/passphrase.c:448
+#: g10/passphrase.c:450
#, fuzzy
msgid "Repeat passphrase\n"
msgstr "Gentag kodes�tning: "
-#: g10/passphrase.c:483
+#: g10/passphrase.c:485
msgid "passphrase too long\n"
msgstr ""
-#: g10/passphrase.c:495
+#: g10/passphrase.c:497
msgid "invalid response from agent\n"
msgstr ""
-#: g10/passphrase.c:504
+#: g10/passphrase.c:506
msgid "cancelled by user\n"
msgstr ""
-#: g10/passphrase.c:507 g10/passphrase.c:580
+#: g10/passphrase.c:509 g10/passphrase.c:582
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr ""
-#: g10/passphrase.c:663
+#: g10/passphrase.c:665
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
"user: \""
msgstr ""
-#: g10/passphrase.c:672
+#: g10/passphrase.c:674
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr ""
-#: g10/passphrase.c:710
+#: g10/passphrase.c:712
msgid "can't query password in batchmode\n"
msgstr ""
-#: g10/passphrase.c:714
+#: g10/passphrase.c:716
msgid "Enter passphrase: "
msgstr "Indtast kodes�tning: "
-#: g10/passphrase.c:718
+#: g10/passphrase.c:720
msgid "Repeat passphrase: "
msgstr "Gentag kodes�tning: "
@@ -3059,7 +3070,7 @@ msgstr ""
msgid "%s: can't make lock\n"
msgstr "%s: kan ikke �bne: %s\n"
-#: g10/keyring.c:1376 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
+#: g10/keyring.c:1420 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
#, c-format
msgid "%s: can't create: %s\n"
msgstr ""
@@ -3194,22 +3205,31 @@ msgstr ""
msgid "trustdb: sync failed: %s\n"
msgstr ""
-#: g10/trustdb.c:688
+#: g10/trustdb.c:470
+msgid "no need for a trustdb check\n"
+msgstr ""
+
+#: g10/trustdb.c:476 g10/trustdb.c:1458
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr ""
+
+#: g10/trustdb.c:709
#, fuzzy
msgid "checking the trustdb\n"
msgstr "|[NAMES]|tjek tillidsdatabasen"
-#: g10/trustdb.c:839
+#: g10/trustdb.c:860
#, fuzzy, c-format
msgid "public key %08lX not found: %s\n"
msgstr "offentlig n�gle ikke fundet"
-#: g10/trustdb.c:1304
+#: g10/trustdb.c:1338
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr ""
-#: g10/trustdb.c:1374
+#: g10/trustdb.c:1411
#, c-format
msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
msgstr ""
@@ -3547,60 +3567,60 @@ msgstr "Ingen hj�lp tilg�ngelig"
msgid "No help available for `%s'"
msgstr "Ingen hj�lp tilg�ngelig for `%s'"
-#: g10/keydb.c:170
+#: g10/keydb.c:175
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "fejl ved skrivning af n�glering `%s': %s\n"
-#: g10/keydb.c:179
+#: g10/keydb.c:184
#, c-format
msgid "changing permission of `%s' failed: %s\n"
msgstr ""
-#: g10/keydb.c:188
+#: g10/keydb.c:193
#, c-format
msgid "keyring `%s' created\n"
msgstr ""
-#: g10/keydb.c:530
-#, c-format
-msgid "failed to rebuild all keyring caches: %s\n"
-msgstr ""
+#: g10/keydb.c:586
+#, fuzzy, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "ingen standard offentlig n�glering\n"
-#: g10/keyring.c:1179
+#: g10/keyring.c:1220
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr ""
-#: g10/keyring.c:1181
+#: g10/keyring.c:1222
#, c-format
msgid "%s is the unchanged one\n"
msgstr ""
-#: g10/keyring.c:1182
+#: g10/keyring.c:1223
#, c-format
msgid "%s is the new one\n"
msgstr ""
-#: g10/keyring.c:1183
+#: g10/keyring.c:1224
msgid "Please fix this possible security flaw\n"
msgstr ""
-#: g10/keyring.c:1281
+#: g10/keyring.c:1322
#, fuzzy, c-format
msgid "checking keyring `%s'\n"
msgstr "fejl ved skrivning af n�glering `%s': %s\n"
-#: g10/keyring.c:1312
+#: g10/keyring.c:1353
#, fuzzy, c-format
msgid "%lu keys so far checked (%lu signatures)\n"
msgstr "%lu n�gler behandlet indtil nu\n"
-#: g10/keyring.c:1323
+#: g10/keyring.c:1364
#, fuzzy, c-format
msgid "%lu keys checked (%lu signatures)\n"
msgstr "vis n�gler og signaturer"
-#: g10/keyring.c:1381
+#: g10/keyring.c:1425
#, c-format
msgid "%s: keyring created\n"
msgstr ""
diff --git a/po/de.po b/po/de.po
index ed3c3b190..70a035f5e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.0.4\n"
-"POT-Creation-Date: 2001-09-28 16:20+0200\n"
+"POT-Creation-Date: 2001-10-23 09:41+0200\n"
"PO-Revision-Date: 2001-04-16 14:20+0200\n"
"Last-Translator: Walter Koch <[email protected]>\n"
"Language-Team: German <[email protected]>\n"
@@ -43,7 +43,7 @@ msgstr "nein"
msgid "nN"
msgstr "nN"
-#: g10/keyedit.c:568 util/miscutil.c:326
+#: g10/keyedit.c:574 util/miscutil.c:326
msgid "quit"
msgstr "quit"
@@ -344,7 +344,7 @@ msgstr ""
"Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
"(Es werden noch %d Byte ben�tigt.)\n"
-#: g10/g10.c:237
+#: g10/g10.c:238
msgid ""
"@Commands:\n"
" "
@@ -352,145 +352,145 @@ msgstr ""
"@Befehle:\n"
" "
-#: g10/g10.c:239
+#: g10/g10.c:240
msgid "|[file]|make a signature"
msgstr "|[Datei]|Eine Unterschrift erzeugen"
-#: g10/g10.c:240
+#: g10/g10.c:241
msgid "|[file]|make a clear text signature"
msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
-#: g10/g10.c:241
+#: g10/g10.c:242
msgid "make a detached signature"
msgstr "Eine abgetrennte Unterschrift erzeugen"
-#: g10/g10.c:242
+#: g10/g10.c:243
msgid "encrypt data"
msgstr "Daten verschl�sseln"
-#: g10/g10.c:243
+#: g10/g10.c:244
msgid "encryption only with symmetric cipher"
msgstr "Daten symmetrisch verschl�sseln"
-#: g10/g10.c:244
+#: g10/g10.c:245
msgid "store only"
msgstr "Nur speichern"
-#: g10/g10.c:245
+#: g10/g10.c:246
msgid "decrypt data (default)"
msgstr "Daten entschl�sseln (Voreinstellung)"
-#: g10/g10.c:246
+#: g10/g10.c:247
msgid "verify a signature"
msgstr "Signatur pr�fen"
-#: g10/g10.c:248
+#: g10/g10.c:249
msgid "list keys"
msgstr "Liste der Schl�ssel"
-#: g10/g10.c:250
+#: g10/g10.c:251
msgid "list keys and signatures"
msgstr "Liste der Schl�ssel und ihrer Signaturen"
-#: g10/g10.c:251
+#: g10/g10.c:252
msgid "check key signatures"
msgstr "Signaturen der Schl�ssel pr�fen"
-#: g10/g10.c:252
+#: g10/g10.c:253
msgid "list keys and fingerprints"
msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
-#: g10/g10.c:253
+#: g10/g10.c:254
msgid "list secret keys"
msgstr "Liste der geheimen Schl�ssel"
-#: g10/g10.c:254
+#: g10/g10.c:255
msgid "generate a new key pair"
msgstr "Ein neues Schl�sselpaar erzeugen"
-#: g10/g10.c:255
+#: g10/g10.c:256
msgid "remove key from the public keyring"
msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
-#: g10/g10.c:257
+#: g10/g10.c:258
msgid "remove key from the secret keyring"
msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
-#: g10/g10.c:258
+#: g10/g10.c:259
msgid "sign a key"
msgstr "Schl�ssel signieren"
-#: g10/g10.c:259
+#: g10/g10.c:260
msgid "sign a key locally"
msgstr "Schl�ssel nur auf diesem Rechner signieren"
-#: g10/g10.c:260
+#: g10/g10.c:261
msgid "sign or edit a key"
msgstr "Unterschreiben oder Bearbeiten eines Schl."
-#: g10/g10.c:261
+#: g10/g10.c:262
msgid "generate a revocation certificate"
msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
-#: g10/g10.c:262
+#: g10/g10.c:263
msgid "export keys"
msgstr "Schl�ssel exportieren"
-#: g10/g10.c:263
+#: g10/g10.c:264
msgid "export keys to a key server"
msgstr "Schl�ssel zu einem Schl�.server exportieren"
-#: g10/g10.c:264
+#: g10/g10.c:265
msgid "import keys from a key server"
msgstr "Schl�ssel von einem Schl�.server importieren"
-#: g10/g10.c:266
+#: g10/g10.c:267
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "Schl�ssel von einem Schl�.server importieren"
-#: g10/g10.c:270
+#: g10/g10.c:271
msgid "import/merge keys"
msgstr "Schl�ssel importieren/kombinieren"
-#: g10/g10.c:272
+#: g10/g10.c:273
msgid "list only the sequence of packets"
msgstr "Lediglich Struktur der Datenpakete anzeigen"
-#: g10/g10.c:274
+#: g10/g10.c:275
msgid "export the ownertrust values"
msgstr "Exportieren der \"Owner trust\" Werte"
-#: g10/g10.c:276
+#: g10/g10.c:277
msgid "import ownertrust values"
msgstr "Importieren der \"Owner trust\" Werte"
-#: g10/g10.c:278
+#: g10/g10.c:279
msgid "update the trust database"
msgstr "�ndern der \"Trust\"-Datenbank"
-#: g10/g10.c:280
+#: g10/g10.c:281
#, fuzzy
msgid "unattended trust database update"
msgstr "�ndern der \"Trust\"-Datenbank"
-#: g10/g10.c:281
+#: g10/g10.c:282
msgid "fix a corrupted trust database"
msgstr "Reparieren einer besch�digten \"Trust\"-Datenb."
-#: g10/g10.c:282
+#: g10/g10.c:283
msgid "De-Armor a file or stdin"
msgstr "Datei oder stdin von der ASCII-H�lle befreien"
-#: g10/g10.c:284
+#: g10/g10.c:285
msgid "En-Armor a file or stdin"
msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
-#: g10/g10.c:286
+#: g10/g10.c:287
msgid "|algo [files]|print message digests"
msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
-#: g10/g10.c:290
+#: g10/g10.c:291
msgid ""
"@\n"
"Options:\n"
@@ -500,166 +500,171 @@ msgstr ""
"Optionen:\n"
" "
-#: g10/g10.c:292
+#: g10/g10.c:293
msgid "create ascii armored output"
msgstr "Ausgabe mit ASCII-H�lle versehen"
-#: g10/g10.c:294
+#: g10/g10.c:295
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|Verschl�sseln f�r NAME"
-#: g10/g10.c:297
+#: g10/g10.c:298
msgid "|NAME|use NAME as default recipient"
msgstr "|NAME|NAME als voreingestellten Empf�nger benutzen"
-#: g10/g10.c:299
+#: g10/g10.c:300
msgid "use the default key as default recipient"
msgstr ""
"Den Standardschl�ssel als voreingestellten\n"
"Empf�nger benutzen"
-#: g10/g10.c:303
+#: g10/g10.c:304
msgid "use this user-id to sign or decrypt"
msgstr "Mit dieser User-ID signieren"
-#: g10/g10.c:304
+#: g10/g10.c:305
msgid "|N|set compress level N (0 disables)"
msgstr "Kompressionsstufe auf N setzen (0=keine)"
-#: g10/g10.c:306
+#: g10/g10.c:307
msgid "use canonical text mode"
msgstr "Textmodus benutzen"
-#: g10/g10.c:307
+#: g10/g10.c:308
msgid "use as output file"
msgstr "Als Ausgabedatei benutzen"
-#: g10/g10.c:308
+#: g10/g10.c:309
msgid "verbose"
msgstr "Detaillierte Informationen"
-#: g10/g10.c:309
+#: g10/g10.c:310
msgid "be somewhat more quiet"
msgstr "Etwas weniger Infos"
-#: g10/g10.c:310
+#: g10/g10.c:311
msgid "don't use the terminal at all"
msgstr "das Terminal gar nicht benutzen"
-#: g10/g10.c:311
+#: g10/g10.c:312
msgid "force v3 signatures"
msgstr "v3 Signaturen erzwingen"
-#: g10/g10.c:312
+#: g10/g10.c:313
+#, fuzzy
+msgid "do not force v3 signatures"
+msgstr "v3 Signaturen erzwingen"
+
+#: g10/g10.c:314
msgid "always use a MDC for encryption"
msgstr "Beim Verschl�sseln ein Siegel (MDC) verwenden"
-#: g10/g10.c:313
+#: g10/g10.c:315
msgid "do not make any changes"
msgstr "Keine wirklichen �nderungen durchf�hren"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:315
+#: g10/g10.c:317
msgid "use the gpg-agent"
msgstr "verwende den GPG-Agent"
-#: g10/g10.c:316
+#: g10/g10.c:318
msgid "batch mode: never ask"
msgstr "Stapelmodus: Keine Abfragen"
-#: g10/g10.c:317
+#: g10/g10.c:319
msgid "assume yes on most questions"
msgstr "\"Ja\" als Standardantwort annehmen"
-#: g10/g10.c:318
+#: g10/g10.c:320
msgid "assume no on most questions"
msgstr "\"Nein\" als Standardantwort annehmen"
-#: g10/g10.c:319
+#: g10/g10.c:321
msgid "add this keyring to the list of keyrings"
msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
-#: g10/g10.c:320
+#: g10/g10.c:322
msgid "add this secret keyring to the list"
msgstr "Als geheimen Schl�sselbund mitbenutzen"
-#: g10/g10.c:321
+#: g10/g10.c:323
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
-#: g10/g10.c:322
+#: g10/g10.c:324
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|Schl�ssel bei diesem Server nachschlagen"
-#: g10/g10.c:323
+#: g10/g10.c:325
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAME|Terminalzeichensatz NAME benutzen"
-#: g10/g10.c:324
+#: g10/g10.c:326
msgid "read options from file"
msgstr "Optionen aus der Datei lesen"
-#: g10/g10.c:328
+#: g10/g10.c:330
msgid "|FD|write status info to this FD"
msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
-#: g10/g10.c:330
+#: g10/g10.c:332
#, fuzzy
msgid "|[file]|write status info to file"
msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
-#: g10/g10.c:336
+#: g10/g10.c:338
#, fuzzy
msgid "|KEYID|ultimately trust this key"
msgstr "|KEYID|diesem Schl�ssel uneingeschr�nkt vertrauen"
-#: g10/g10.c:337
+#: g10/g10.c:339
msgid "|FILE|load extension module FILE"
msgstr "|DATEI|Erweiterungsmodul DATEI laden"
-#: g10/g10.c:338
+#: g10/g10.c:340
msgid "emulate the mode described in RFC1991"
msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
-#: g10/g10.c:339
+#: g10/g10.c:341
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr ""
"alle Paket-, Verschl�sselungs- und\n"
"Hashoptionen auf OpenPGP-Verhalten einstellen"
-#: g10/g10.c:340
+#: g10/g10.c:342
msgid "|N|use passphrase mode N"
msgstr "|N|Verwenden des Mantra-Modus N"
-#: g10/g10.c:342
+#: g10/g10.c:344
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NAME|Hashverfahren NAME f�r Mantras benutzen"
-#: g10/g10.c:344
+#: g10/g10.c:346
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NAME|Verschl�.verfahren NAME f�r Mantras benutzen"
-#: g10/g10.c:345
+#: g10/g10.c:347
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|Verschl�.verfahren NAME benutzen"
-#: g10/g10.c:346
+#: g10/g10.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|Hashverfahren NAME benutzen"
-#: g10/g10.c:347
+#: g10/g10.c:349
msgid "|N|use compress algorithm N"
msgstr "|N|Komprimierverfahren N benutzen"
-#: g10/g10.c:348
+#: g10/g10.c:350
msgid "throw keyid field of encrypted packets"
msgstr "Entferne Empf�nger-ID verschl�sselter Pakete"
-#: g10/g10.c:349
+#: g10/g10.c:351
msgid "|NAME=VALUE|use this notation data"
msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
-#: g10/g10.c:352
+#: g10/g10.c:354
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -668,7 +673,7 @@ msgstr ""
"(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
"Optionen)\n"
-#: g10/g10.c:355
+#: g10/g10.c:357
msgid ""
"@\n"
"Examples:\n"
@@ -688,17 +693,17 @@ msgstr ""
" --list-keys [Namen] Schl�ssel anzeigen\n"
" --fingerprint [Namen] \"Fingerabdr�cke\" anzeigen\n"
-#: g10/g10.c:478
+#: g10/g10.c:480
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Berichte �ber Bugs (Programmfehler) bitte an <[email protected]>.\n"
"Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
-#: g10/g10.c:482
+#: g10/g10.c:484
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
-#: g10/g10.c:485
+#: g10/g10.c:487
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -708,7 +713,7 @@ msgstr ""
"Signieren, pr�fen, verschl�sseln, entschl�sseln\n"
"Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
-#: g10/g10.c:496
+#: g10/g10.c:498
msgid ""
"\n"
"Supported algorithms:\n"
@@ -716,202 +721,202 @@ msgstr ""
"\n"
"Unterst�tzte Verfahren:\n"
-#: g10/g10.c:570
+#: g10/g10.c:572
msgid "usage: gpg [options] "
msgstr "Aufruf: gpg [Optionen] "
-#: g10/g10.c:627
+#: g10/g10.c:629
msgid "conflicting commands\n"
msgstr "Widerspr�chliche Befehle\n"
-#: g10/g10.c:783
+#: g10/g10.c:785
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
-#: g10/g10.c:787
+#: g10/g10.c:789
#, c-format
msgid "option file `%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
-#: g10/g10.c:794
+#: g10/g10.c:796
#, c-format
msgid "reading options from `%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
-#: g10/g10.c:1038
+#: g10/g10.c:1041
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s ist kein g�ltiger Zeichensatz.\n"
-#: g10/g10.c:1122
+#: g10/g10.c:1125
msgid "WARNING: program may create a core file!\n"
msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
-#: g10/g10.c:1126 g10/g10.c:1135
+#: g10/g10.c:1129 g10/g10.c:1138
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
-#: g10/g10.c:1128
+#: g10/g10.c:1131
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
-#: g10/g10.c:1131
+#: g10/g10.c:1134
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
-#: g10/g10.c:1151 g10/g10.c:1163
+#: g10/g10.c:1154 g10/g10.c:1166
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgew�hlte Verschl�sslungsverfahren ist ung�ltig\n"
-#: g10/g10.c:1157 g10/g10.c:1169
+#: g10/g10.c:1160 g10/g10.c:1172
msgid "selected digest algorithm is invalid\n"
msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1176
msgid "the given policy URL is invalid\n"
msgstr "Die angegebene URL f�r Richtlinien ist ung�ltig\n"
-#: g10/g10.c:1176
+#: g10/g10.c:1179
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "Das Komprimierverfahren mu� im Bereich %d bis %d liegen\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1181
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed m�ssen gr��er als 0 sein\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1183
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1185
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1188
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
-#: g10/g10.c:1189
+#: g10/g10.c:1192
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ung�ltiger \"simple S2K\"-Modus; Wert mu� 0, 1 oder 3 sein\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1196
#, fuzzy
msgid "invalid preferences\n"
msgstr "Liste der Voreinstellungen"
-#: g10/g10.c:1276
+#: g10/g10.c:1279
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
-#: g10/g10.c:1282
+#: g10/g10.c:1285
msgid "--store [filename]"
msgstr "--store [Dateiname]"
-#: g10/g10.c:1289
+#: g10/g10.c:1292
msgid "--symmetric [filename]"
msgstr "--symmetric [Dateiname]"
-#: g10/g10.c:1297
+#: g10/g10.c:1300
msgid "--encrypt [filename]"
msgstr "--encrypt [Dateiname]"
-#: g10/g10.c:1310
+#: g10/g10.c:1313
msgid "--sign [filename]"
msgstr "--sign [Dateiname]"
-#: g10/g10.c:1323
+#: g10/g10.c:1326
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [Dateiname]"
-#: g10/g10.c:1337
+#: g10/g10.c:1340
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [Dateiname]"
-#: g10/g10.c:1346
+#: g10/g10.c:1349
msgid "--clearsign [filename]"
msgstr "--clearsign [Dateiname]"
-#: g10/g10.c:1364
+#: g10/g10.c:1367
msgid "--decrypt [filename]"
msgstr "--decrypt [Dateiname]"
-#: g10/g10.c:1372
+#: g10/g10.c:1375
msgid "--sign-key user-id"
msgstr "--sign-key User-ID"
-#: g10/g10.c:1380
+#: g10/g10.c:1383
msgid "--lsign-key user-id"
msgstr "--lsign-key User-ID"
-#: g10/g10.c:1388
+#: g10/g10.c:1391
msgid "--edit-key user-id [commands]"
msgstr "--edit-key User-ID [Befehle]"
-#: g10/g10.c:1404
+#: g10/g10.c:1407
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key User-ID"
-#: g10/g10.c:1407
+#: g10/g10.c:1410
msgid "--delete-key user-id"
msgstr "--delete-key User-ID"
-#: g10/g10.c:1415
+#: g10/g10.c:1418
msgid "--delete-secret-and-public-key user-id"
msgstr "--delete-secret-and-public-key User-ID"
-#: g10/encode.c:268 g10/g10.c:1452 g10/sign.c:632
+#: g10/encode.c:268 g10/g10.c:1455 g10/sign.c:632
#, c-format
msgid "can't open %s: %s\n"
msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
-#: g10/g10.c:1467
+#: g10/g10.c:1470
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
-#: g10/g10.c:1539
+#: g10/g10.c:1542
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
-#: g10/g10.c:1547
+#: g10/g10.c:1550
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
-#: g10/g10.c:1618
+#: g10/g10.c:1621
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "Ung�ltiges Hashverfahren '%s'\n"
-#: g10/g10.c:1704
+#: g10/g10.c:1707
msgid "[filename]"
msgstr "[Dateiname]"
-#: g10/g10.c:1708
+#: g10/g10.c:1711
msgid "Go ahead and type your message ...\n"
msgstr "Auf geht's - Botschaft eintippen ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1711 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1714 g10/verify.c:94 g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "'%s' kann nicht ge�ffnet werden\n"
-#: g10/g10.c:1920
+#: g10/g10.c:1923
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"Das erste Zeichen eines \"notation\"-Namens mu� ein Buchstabe oder\n"
"ein Unterstrich sein\n"
-#: g10/g10.c:1926
+#: g10/g10.c:1929
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -919,12 +924,12 @@ msgstr ""
"Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
"enthalten und mu� mit einem '=' enden\n"
-#: g10/g10.c:1932
+#: g10/g10.c:1935
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
"Punkte in einem \"notation\"-Namen m�ssen von anderen Zeichen umgeben sein\n"
-#: g10/g10.c:1940
+#: g10/g10.c:1943
msgid "a notation value must not use any control characters\n"
msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
@@ -1588,7 +1593,7 @@ msgstr ""
"Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu sch�tzen.\n"
"\n"
-#: g10/keyedit.c:456 g10/keygen.c:1171
+#: g10/keyedit.c:462 g10/keygen.c:1171
msgid "passphrase not correctly repeated; try again.\n"
msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n"
@@ -1727,27 +1732,27 @@ msgstr "Lesen von '%s'\n"
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s verschl�sselt f�r: %s\n"
-#: g10/delkey.c:69 g10/export.c:149
+#: g10/delkey.c:69 g10/export.c:148
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "Benutzer '%s' nicht gefunden: %s\n"
-#: g10/delkey.c:77 g10/export.c:159
+#: g10/delkey.c:77 g10/export.c:158
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
msgstr "Fehler beim Lesen von `%s': %s\n"
-#: g10/export.c:167
+#: g10/export.c:166
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "Schl�ssel %08lX: dies ist kein RFC2440-Sch�ssel - �bersprungen\n"
-#: g10/export.c:178
+#: g10/export.c:177
#, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "Schl�ssel %08lX: ungesch�tzt - �bersprungen\n"
-#: g10/export.c:234
+#: g10/export.c:233
msgid "WARNING: nothing exported\n"
msgstr "WARNUNG: Nichts exportiert\n"
@@ -1757,17 +1762,17 @@ msgstr "zu viele Eintr�ge im pk-Lager - abgeschaltet\n"
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:183 g10/getkey.c:2188
+#: g10/getkey.c:183 g10/getkey.c:2192
msgid "[User id not found]"
msgstr "[User-ID nicht gefunden]"
-#: g10/getkey.c:1911
+#: g10/getkey.c:1915
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr ""
"der Zweitschl�ssel %08lX wird anstelle des Hauptschl�ssels %08lX verwendet\n"
-#: g10/getkey.c:1952
+#: g10/getkey.c:1956
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr ""
@@ -2105,17 +2110,17 @@ msgstr "%d User-IDs ohne g�ltige Eigenbeglaubigung entdeckt\n"
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:296
+#: g10/keyedit.c:302
#, c-format
msgid "Already signed by key %08lX\n"
msgstr "Ist bereits durch Schl�ssel %08lX beglaubigt.\n"
-#: g10/keyedit.c:307
+#: g10/keyedit.c:313
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
-#: g10/keyedit.c:316
+#: g10/keyedit.c:322
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2123,7 +2128,7 @@ msgstr ""
"Sind Sie wirklich sicher, da� Sie vorstehenden Schl�ssel mit Ihrem\n"
"Schl�ssel beglaubigen wollen: \""
-#: g10/keyedit.c:325
+#: g10/keyedit.c:331
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
@@ -2131,33 +2136,33 @@ msgstr ""
"Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
"\n"
-#: g10/keyedit.c:330
+#: g10/keyedit.c:336
msgid "Really sign? "
msgstr "Wirklich unterschreiben? "
-#: g10/keyedit.c:361 g10/keyedit.c:2104 g10/keyedit.c:2166 g10/sign.c:225
+#: g10/keyedit.c:367 g10/keyedit.c:2110 g10/keyedit.c:2172 g10/sign.c:225
#, c-format
msgid "signing failed: %s\n"
msgstr "Beglaubigung fehlgeschlagen: %s\n"
-#: g10/keyedit.c:415
+#: g10/keyedit.c:421
msgid "This key is not protected.\n"
msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
-#: g10/keyedit.c:419
+#: g10/keyedit.c:425
msgid "Secret parts of primary key are not available.\n"
msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
-#: g10/keyedit.c:423
+#: g10/keyedit.c:429
msgid "Key is protected.\n"
msgstr "Schl�ssel ist gesch�tzt.\n"
-#: g10/keyedit.c:443
+#: g10/keyedit.c:449
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n"
-#: g10/keyedit.c:448
+#: g10/keyedit.c:454
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2165,7 +2170,7 @@ msgstr ""
"Geben Sie das neue Mantra f�r diesen geheimen Schl�ssel ein.\n"
"\n"
-#: g10/keyedit.c:460
+#: g10/keyedit.c:466
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2173,466 +2178,472 @@ msgstr ""
"Sie wollen kein Mantra - dies ist bestimmt *keine* gute Idee!\n"
"\n"
-#: g10/keyedit.c:463
+#: g10/keyedit.c:469
msgid "Do you really want to do this? "
msgstr "M�chten Sie dies wirklich tun? "
-#: g10/keyedit.c:527
+#: g10/keyedit.c:533
msgid "moving a key signature to the correct place\n"
msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
-#: g10/keyedit.c:568
+#: g10/keyedit.c:574
msgid "quit this menu"
msgstr "Men� verlassen"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:575
msgid "q"
msgstr "q"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save"
msgstr "save"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save and quit"
msgstr "speichern und Men� verlassen"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "help"
msgstr "help"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "show this help"
msgstr "Diese Hilfe zeigen"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "show fingerprint"
msgstr "\"Fingerabdruck\" anzeigen"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list"
msgstr "Liste der Schl�ssel"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list key and user IDs"
msgstr "Schl�ssel und User-IDs auflisten"
-#: g10/keyedit.c:575
+#: g10/keyedit.c:581
msgid "l"
msgstr "l"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "select user ID N"
msgstr "User-ID N ausw�hlen"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "key"
msgstr "key"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "select secondary key N"
msgstr "Zweitschl�ssel N ausw�hlen"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "check"
msgstr "check"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "list signatures"
msgstr "Liste der Signaturen"
-#: g10/keyedit.c:579
+#: g10/keyedit.c:585
msgid "c"
msgstr "c"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign the key"
msgstr "Den Schl�ssel signieren"
-#: g10/keyedit.c:581
+#: g10/keyedit.c:587
msgid "s"
msgstr "s"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "sign the key locally"
msgstr "Den Schl�ssel nur auf diesem Rechner signieren"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:589
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "add a user ID"
msgstr "Eine User-ID hinzuf�gen"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "delete user ID"
msgstr "User-ID entfernen"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "add a secondary key"
msgstr "Einen Zweitschl�ssel hinzuf�gen"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delete a secondary key"
msgstr "Einen Zweitschl�ssel entfernen"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delete signatures"
msgstr "Signatur entfernen"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "change the expire date"
msgstr "�ndern des Verfallsdatums"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "primary"
msgstr ""
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle between secret and public key listing"
msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:599
msgid "t"
msgstr "t"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:600
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:594 g10/keyedit.c:595
-msgid "list preferences"
+#: g10/keyedit.c:600
+#, fuzzy
+msgid "list preferences (expert)"
msgstr "Liste der Voreinstellungen"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:601
#, fuzzy
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:601
+#, fuzzy
+msgid "list preferences (verbose)"
+msgstr "Liste der Voreinstellungen"
+
+#: g10/keyedit.c:602
#, fuzzy
msgid "setpref"
msgstr "pref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:602
#, fuzzy
msgid "set preference list"
msgstr "Liste der Voreinstellungen"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updpref"
msgstr "pref"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updated preferences"
msgstr "Liste der Voreinstellungen"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "change the passphrase"
msgstr "Das Mantra �ndern"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "change the ownertrust"
msgstr "Den \"Owner trust\" �ndern"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revoke signatures"
msgstr "Signaturen widerrufen"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revoke a secondary key"
msgstr "Einen Zweitschl�ssel widerrufen"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable a key"
msgstr "Schl�ssel abschalten"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable a key"
msgstr "Schl�ssel anschalten"
-#: g10/delkey.c:112 g10/keyedit.c:623
+#: g10/delkey.c:112 g10/keyedit.c:629
msgid "can't do that in batchmode\n"
msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
-#: g10/keyedit.c:658
+#: g10/keyedit.c:664
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "Fehler beim Lesen von `%s': %s\n"
-#: g10/keyedit.c:676
+#: g10/keyedit.c:682
msgid "Secret key is available.\n"
msgstr "Geheimer Schl�ssel ist vorhanden.\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:712
msgid "Command> "
msgstr "Befehl> "
-#: g10/keyedit.c:737
+#: g10/keyedit.c:743
msgid "Need the secret key to do this.\n"
msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
-#: g10/keyedit.c:741
+#: g10/keyedit.c:747
msgid "Please use the command \"toggle\" first.\n"
msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
-#: g10/keyedit.c:788
+#: g10/keyedit.c:794
msgid "Really sign all user IDs? "
msgstr "Wirklich alle User-IDs beglaubigen? "
-#: g10/keyedit.c:789
+#: g10/keyedit.c:795
msgid "Hint: Select the user IDs to sign\n"
msgstr "Tip: W�hlen Sie die User-IDs, die beglaubigt werden sollen\n"
-#: g10/keyedit.c:821 g10/keyedit.c:842
+#: g10/keyedit.c:827 g10/keyedit.c:848
msgid "You must select at least one user ID.\n"
msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:829
msgid "You can't delete the last user ID!\n"
msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:832
msgid "Really remove all selected user IDs? "
msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
-#: g10/keyedit.c:827
+#: g10/keyedit.c:833
msgid "Really remove this user ID? "
msgstr "Diese User-ID wirklich entfernen? "
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:871 g10/keyedit.c:893
msgid "You must select at least one key.\n"
msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
-#: g10/keyedit.c:869
+#: g10/keyedit.c:875
msgid "Do you really want to delete the selected keys? "
msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
-#: g10/keyedit.c:870
+#: g10/keyedit.c:876
msgid "Do you really want to delete this key? "
msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
-#: g10/keyedit.c:891
+#: g10/keyedit.c:897
msgid "Do you really want to revoke the selected keys? "
msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:898
msgid "Do you really want to revoke this key? "
msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
-#: g10/keyedit.c:956
+#: g10/keyedit.c:962
#, fuzzy
msgid "Really update the preferences for the selected user IDs? "
msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
#, fuzzy
msgid "Really update the preferences? "
msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
-#: g10/keyedit.c:992
+#: g10/keyedit.c:998
msgid "Save changes? "
msgstr "�nderungen speichern? "
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1001
msgid "Quit without saving? "
msgstr "Beenden ohne zu speichern? "
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1012
#, c-format
msgid "update failed: %s\n"
msgstr "�nderung fehlgeschlagen: %s\n"
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1019
#, c-format
msgid "update secret failed: %s\n"
msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1026
msgid "Key not changed so no update needed.\n"
msgstr "Schl�ssel ist nicht ge�ndert worden, also ist kein Speichern n�tig.\n"
-#: g10/keyedit.c:1031
+#: g10/keyedit.c:1037
msgid "Invalid command (try \"help\")\n"
msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
-#: g10/keyedit.c:1139 g10/keyedit.c:1165
+#: g10/keyedit.c:1145 g10/keyedit.c:1171
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr "%s%c %4u%c/%08lX erstellt: %s verf�llt: %s"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1154
#, c-format
msgid " trust: %c/%c"
msgstr " Vertrauen: %c/%c"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1158
msgid "This key has been disabled"
msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1187
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! Unterschl�ssel wurde widerrufen: %s\n"
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1190
msgid "rev- faked revocation found\n"
msgstr "rev- gef�lschter Schl�sselwiderruf entdeckt\n"
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1192
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? Schwierigkeiten bei der Widerruf-�berpr�fung: %s\n"
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1408
msgid "Delete this good signature? (y/N/q)"
msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1412
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1416
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1422
msgid "Really delete this self-signature? (y/N)"
msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d Beglaubigungen entfernt.\n"
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d Beglaubigungen entfernt.\n"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
msgid "Nothing deleted.\n"
msgstr "Nichts entfernt.\n"
-#: g10/keyedit.c:1503
+#: g10/keyedit.c:1509
msgid "Please remove selections from the secret keys.\n"
msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
-#: g10/keyedit.c:1509
+#: g10/keyedit.c:1515
msgid "Please select at most one secondary key.\n"
msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1519
msgid "Changing expiration time for a secondary key.\n"
msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1521
msgid "Changing expiration time for the primary key.\n"
msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1563
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Sie k�nnen das Verfallsdatum eines v3-Schl�ssels nicht �ndern\n"
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1579
msgid "No corresponding signature in secret ring\n"
msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1662
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1837
#, c-format
msgid "No user ID with index %d\n"
msgstr "Keine User-ID mit Index %d\n"
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Kein Zweitschl�ssel mit Index %d\n"
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:1981
msgid "user ID: \""
msgstr "User-ID: \""
-#: g10/keyedit.c:1978
+#: g10/keyedit.c:1984
#, c-format
msgid ""
"\"\n"
@@ -2641,34 +2652,34 @@ msgstr ""
"\"\n"
"unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1988
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2012
msgid "You have signed these user IDs:\n"
msgstr "Sie haben folgende User-IDs beglaubigt:\n"
-#: g10/keyedit.c:2020 g10/keyedit.c:2055
+#: g10/keyedit.c:2026 g10/keyedit.c:2061
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " beglaubigt durch %08lX um %s\n"
-#: g10/keyedit.c:2025
+#: g10/keyedit.c:2031
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " widerrufen durch %08lX um %s\n"
-#: g10/keyedit.c:2045
+#: g10/keyedit.c:2051
msgid "You are about to revoke these signatures:\n"
msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:2069
msgid "Really create the revocation certificates? (y/N)"
msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2098
msgid "no secret key\n"
msgstr "Kein geheimer Schl�ssel\n"
@@ -2852,37 +2863,37 @@ msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
-#: g10/passphrase.c:277 g10/passphrase.c:319
+#: g10/passphrase.c:278 g10/passphrase.c:320
msgid "gpg-agent is not available in this session\n"
msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
-#: g10/passphrase.c:285
+#: g10/passphrase.c:286
msgid "can't set client pid for the agent\n"
msgstr ""
-#: g10/passphrase.c:293
+#: g10/passphrase.c:294
msgid "can't get server read FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:300
+#: g10/passphrase.c:301
msgid "can't get server write FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:325
+#: g10/passphrase.c:326
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
-#: g10/hkp.c:174 g10/passphrase.c:344
+#: g10/hkp.c:174 g10/passphrase.c:345
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
-#: g10/passphrase.c:415 g10/passphrase.c:677
+#: g10/passphrase.c:417 g10/passphrase.c:679
#, c-format
msgid " (main key ID %08lX)"
msgstr " (Hauptschl�ssel-ID %08lX)"
-#: g10/passphrase.c:425
+#: g10/passphrase.c:427
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -2893,32 +2904,32 @@ msgstr ""
"Benutzer: \"\"%.*s\"\n"
"%u-bit %s Schl�ssel, ID %08lX, erzeugt %s%s\n"
-#: g10/passphrase.c:446
+#: g10/passphrase.c:448
msgid "Enter passphrase\n"
msgstr "Geben Sie das Mantra ein\n"
-#: g10/passphrase.c:448
+#: g10/passphrase.c:450
msgid "Repeat passphrase\n"
msgstr "Geben Sie das Mantra nochmal ein\n"
-#: g10/passphrase.c:483
+#: g10/passphrase.c:485
msgid "passphrase too long\n"
msgstr "Mantra ist zu lang\n"
-#: g10/passphrase.c:495
+#: g10/passphrase.c:497
msgid "invalid response from agent\n"
msgstr "Falsche Antwort des Agenten\n"
-#: g10/passphrase.c:504
+#: g10/passphrase.c:506
msgid "cancelled by user\n"
msgstr "Abbruch durch Benutzer\n"
-#: g10/passphrase.c:507 g10/passphrase.c:580
+#: g10/passphrase.c:509 g10/passphrase.c:582
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
-#: g10/passphrase.c:663
+#: g10/passphrase.c:665
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -2928,20 +2939,20 @@ msgstr ""
"Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu entsperren.\n"
"Benutzer: \""
-#: g10/passphrase.c:672
+#: g10/passphrase.c:674
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
-#: g10/passphrase.c:710
+#: g10/passphrase.c:712
msgid "can't query password in batchmode\n"
msgstr "Mantra kann im Batchmodus nicht abgefragt werden\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:716
msgid "Enter passphrase: "
msgstr "Geben Sie das Mantra ein: "
-#: g10/passphrase.c:718
+#: g10/passphrase.c:720
msgid "Repeat passphrase: "
msgstr "Geben Sie das Mantra nochmal ein: "
@@ -3169,7 +3180,7 @@ msgstr "%s: Sperre kann nicht erzeugt werden\n"
msgid "%s: can't make lock\n"
msgstr "%s: Sperre kann nicht erzeugt werden\n"
-#: g10/keyring.c:1376 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
+#: g10/keyring.c:1420 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: kann nicht erzeugt werden: %s\n"
@@ -3308,22 +3319,32 @@ msgstr "trust record %lu, type %d: write failed: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
-#: g10/trustdb.c:688
+#: g10/trustdb.c:470
+#, fuzzy
+msgid "no need for a trustdb check\n"
+msgstr "%s: keine trustdb Datei\n"
+
+#: g10/trustdb.c:476 g10/trustdb.c:1458
+#, fuzzy, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
+
+#: g10/trustdb.c:709
#, fuzzy
msgid "checking the trustdb\n"
msgstr "Den \"Owner trust\" �ndern"
-#: g10/trustdb.c:839
+#: g10/trustdb.c:860
#, fuzzy, c-format
msgid "public key %08lX not found: %s\n"
msgstr "�ffentlicher Schl�ssel nicht gefunden"
-#: g10/trustdb.c:1304
+#: g10/trustdb.c:1338
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr ""
-#: g10/trustdb.c:1374
+#: g10/trustdb.c:1411
#, c-format
msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
msgstr ""
@@ -3775,60 +3796,60 @@ msgstr "Keine Hilfe vorhanden."
msgid "No help available for `%s'"
msgstr "Keine Hilfe f�r '%s' vorhanden."
-#: g10/keydb.c:170
+#: g10/keydb.c:175
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
-#: g10/keydb.c:179
+#: g10/keydb.c:184
#, c-format
msgid "changing permission of `%s' failed: %s\n"
msgstr ""
-#: g10/keydb.c:188
+#: g10/keydb.c:193
#, fuzzy, c-format
msgid "keyring `%s' created\n"
msgstr "%s: Schl�sselbund erstellt\n"
-#: g10/keydb.c:530
+#: g10/keydb.c:586
#, fuzzy, c-format
-msgid "failed to rebuild all keyring caches: %s\n"
+msgid "failed to rebuild keyring cache: %s\n"
msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
-#: g10/keyring.c:1179
+#: g10/keyring.c:1220
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
-#: g10/keyring.c:1181
+#: g10/keyring.c:1222
#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s ist der Unver�nderte\n"
-#: g10/keyring.c:1182
+#: g10/keyring.c:1223
#, c-format
msgid "%s is the new one\n"
msgstr "%s ist der Neue\n"
-#: g10/keyring.c:1183
+#: g10/keyring.c:1224
msgid "Please fix this possible security flaw\n"
msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
-#: g10/keyring.c:1281
+#: g10/keyring.c:1322
#, fuzzy, c-format
msgid "checking keyring `%s'\n"
msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
-#: g10/keyring.c:1312
+#: g10/keyring.c:1353
#, fuzzy, c-format
msgid "%lu keys so far checked (%lu signatures)\n"
msgstr "%lu Schl�ssel bislang bearbeitet\n"
-#: g10/keyring.c:1323
+#: g10/keyring.c:1364
#, fuzzy, c-format
msgid "%lu keys checked (%lu signatures)\n"
msgstr "Liste der Schl�ssel und ihrer Signaturen"
-#: g10/keyring.c:1381
+#: g10/keyring.c:1425
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: Schl�sselbund erstellt\n"
diff --git a/po/eo.po b/po/eo.po
index 57368766d..6f6708148 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.4\n"
-"POT-Creation-Date: 2001-09-28 16:20+0200\n"
+"POT-Creation-Date: 2001-10-23 09:41+0200\n"
"PO-Revision-Date: 2001-04-23 20:55+01:00\n"
"Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
"Language-Team: Esperanto <[email protected]>\n"
@@ -41,7 +41,7 @@ msgstr "ne"
msgid "nN"
msgstr "nN"
-#: g10/keyedit.c:568 util/miscutil.c:326
+#: g10/keyedit.c:574 util/miscutil.c:326
msgid "quit"
msgstr "fini"
@@ -342,7 +342,7 @@ msgstr ""
"Nesufi�e da stokastaj datenoj. Bonvolu fari ion por ebligi al la\n"
"mastruma sistemo kolekti pli da entropio! (Mankas %d bitokoj)\n"
-#: g10/g10.c:237
+#: g10/g10.c:238
msgid ""
"@Commands:\n"
" "
@@ -350,145 +350,145 @@ msgstr ""
"@Komandoj:\n"
" "
-#: g10/g10.c:239
+#: g10/g10.c:240
msgid "|[file]|make a signature"
msgstr "|[dosiero]|fari subskribon"
-#: g10/g10.c:240
+#: g10/g10.c:241
msgid "|[file]|make a clear text signature"
msgstr "|[dosiero]|fari klartekstan subskribon"
-#: g10/g10.c:241
+#: g10/g10.c:242
msgid "make a detached signature"
msgstr "fari apartan subskribon"
-#: g10/g10.c:242
+#: g10/g10.c:243
msgid "encrypt data"
msgstr "�ifri datenojn"
-#: g10/g10.c:243
+#: g10/g10.c:244
msgid "encryption only with symmetric cipher"
msgstr "�ifri nur kun simetria �ifro"
-#: g10/g10.c:244
+#: g10/g10.c:245
msgid "store only"
msgstr "nur skribi"
-#: g10/g10.c:245
+#: g10/g10.c:246
msgid "decrypt data (default)"
msgstr "mal�ifri datenojn (implicita elekto)"
-#: g10/g10.c:246
+#: g10/g10.c:247
msgid "verify a signature"
msgstr "kontroli subskribon"
-#: g10/g10.c:248
+#: g10/g10.c:249
msgid "list keys"
msgstr "listigi �losilojn"
-#: g10/g10.c:250
+#: g10/g10.c:251
msgid "list keys and signatures"
msgstr "listigi �losilojn kaj subskribojn"
-#: g10/g10.c:251
+#: g10/g10.c:252
msgid "check key signatures"
msgstr "kontroli �losilsubskribojn"
-#: g10/g10.c:252
+#: g10/g10.c:253
msgid "list keys and fingerprints"
msgstr "listigi �losilojn kaj fingro�purojn"
-#: g10/g10.c:253
+#: g10/g10.c:254
msgid "list secret keys"
msgstr "listigi sekretajn �losilojn"
-#: g10/g10.c:254
+#: g10/g10.c:255
msgid "generate a new key pair"
msgstr "krei novan �losilparon"
-#: g10/g10.c:255
+#: g10/g10.c:256
msgid "remove key from the public keyring"
msgstr "forigi �losilon de la publika �losilaro"
-#: g10/g10.c:257
+#: g10/g10.c:258
msgid "remove key from the secret keyring"
msgstr "forigi �losilon de la sekreta �losilaro"
-#: g10/g10.c:258
+#: g10/g10.c:259
msgid "sign a key"
msgstr "subskribi �losilon"
-#: g10/g10.c:259
+#: g10/g10.c:260
msgid "sign a key locally"
msgstr "subskribi �losilon loke"
-#: g10/g10.c:260
+#: g10/g10.c:261
msgid "sign or edit a key"
msgstr "subskribi a� redakti �losilon"
-#: g10/g10.c:261
+#: g10/g10.c:262
msgid "generate a revocation certificate"
msgstr "krei revokatestilon"
-#: g10/g10.c:262
+#: g10/g10.c:263
msgid "export keys"
msgstr "eksporti �losilojn"
-#: g10/g10.c:263
+#: g10/g10.c:264
msgid "export keys to a key server"
msgstr "eksporti �losilojn al �losilservilo"
-#: g10/g10.c:264
+#: g10/g10.c:265
msgid "import keys from a key server"
msgstr "importi �losilojn de �losilservilo"
-#: g10/g10.c:266
+#: g10/g10.c:267
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "importi �losilojn de �losilservilo"
-#: g10/g10.c:270
+#: g10/g10.c:271
msgid "import/merge keys"
msgstr "importi/kunfandi �losilojn"
-#: g10/g10.c:272
+#: g10/g10.c:273
msgid "list only the sequence of packets"
msgstr "listigi nur la sinsekvon de paketoj"
-#: g10/g10.c:274
+#: g10/g10.c:275
msgid "export the ownertrust values"
msgstr "eksporti la posedantofido-valorojn"
-#: g10/g10.c:276
+#: g10/g10.c:277
msgid "import ownertrust values"
msgstr "importi posedantofido-valorojn"
-#: g10/g10.c:278
+#: g10/g10.c:279
msgid "update the trust database"
msgstr "aktualigi la fido-datenaron"
-#: g10/g10.c:280
+#: g10/g10.c:281
#, fuzzy
msgid "unattended trust database update"
msgstr "aktualigi la fido-datenaron"
-#: g10/g10.c:281
+#: g10/g10.c:282
msgid "fix a corrupted trust database"
msgstr "ripari fu�itan fido-datenaron"
-#: g10/g10.c:282
+#: g10/g10.c:283
msgid "De-Armor a file or stdin"
msgstr "elkirasigi dosieron a� la normalan enigon"
-#: g10/g10.c:284
+#: g10/g10.c:285
msgid "En-Armor a file or stdin"
msgstr "enkirasigi dosieron a� la normalan enigon"
-#: g10/g10.c:286
+#: g10/g10.c:287
msgid "|algo [files]|print message digests"
msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
-#: g10/g10.c:290
+#: g10/g10.c:291
msgid ""
"@\n"
"Options:\n"
@@ -498,162 +498,167 @@ msgstr ""
"Opcioj:\n"
" "
-#: g10/g10.c:292
+#: g10/g10.c:293
msgid "create ascii armored output"
msgstr "krei eligon en askia kiraso"
-#: g10/g10.c:294
+#: g10/g10.c:295
msgid "|NAME|encrypt for NAME"
msgstr "|NOMO|�ifri por NOMO"
-#: g10/g10.c:297
+#: g10/g10.c:298
msgid "|NAME|use NAME as default recipient"
msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
-#: g10/g10.c:299
+#: g10/g10.c:300
msgid "use the default key as default recipient"
msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
-#: g10/g10.c:303
+#: g10/g10.c:304
msgid "use this user-id to sign or decrypt"
msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
-#: g10/g10.c:304
+#: g10/g10.c:305
msgid "|N|set compress level N (0 disables)"
msgstr "|N|difini densig-nivelon N (0=nenia)"
-#: g10/g10.c:306
+#: g10/g10.c:307
msgid "use canonical text mode"
msgstr "uzi tekstan re�imon"
-#: g10/g10.c:307
+#: g10/g10.c:308
msgid "use as output file"
msgstr "uzi dosieron por eligo"
-#: g10/g10.c:308
+#: g10/g10.c:309
msgid "verbose"
msgstr "detala eligo"
-#: g10/g10.c:309
+#: g10/g10.c:310
msgid "be somewhat more quiet"
msgstr "iom malpli da informoj"
-#: g10/g10.c:310
+#: g10/g10.c:311
msgid "don't use the terminal at all"
msgstr "tute ne uzi la terminalon"
-#: g10/g10.c:311
+#: g10/g10.c:312
msgid "force v3 signatures"
msgstr "devigi v3-subskribojn"
-#: g10/g10.c:312
+#: g10/g10.c:313
+#, fuzzy
+msgid "do not force v3 signatures"
+msgstr "devigi v3-subskribojn"
+
+#: g10/g10.c:314
msgid "always use a MDC for encryption"
msgstr "�iam uzi sigelon (MDC) por �ifrado"
-#: g10/g10.c:313
+#: g10/g10.c:315
msgid "do not make any changes"
msgstr "fari neniajn �an�ojn"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:315
+#: g10/g10.c:317
msgid "use the gpg-agent"
msgstr ""
-#: g10/g10.c:316
+#: g10/g10.c:318
msgid "batch mode: never ask"
msgstr "neinteraga re�imo: neniam demandi"
-#: g10/g10.c:317
+#: g10/g10.c:319
msgid "assume yes on most questions"
msgstr "supozi \"jes\" �e la plej multaj demandoj"
-#: g10/g10.c:318
+#: g10/g10.c:320
msgid "assume no on most questions"
msgstr "supozi \"ne\" �e la plej multaj demandoj"
-#: g10/g10.c:319
+#: g10/g10.c:321
msgid "add this keyring to the list of keyrings"
msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
-#: g10/g10.c:320
+#: g10/g10.c:322
msgid "add this secret keyring to the list"
msgstr "aldoni �i tiun sekretan �losilaron al la listo"
-#: g10/g10.c:321
+#: g10/g10.c:323
msgid "|NAME|use NAME as default secret key"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
-#: g10/g10.c:322
+#: g10/g10.c:324
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
-#: g10/g10.c:323
+#: g10/g10.c:325
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
-#: g10/g10.c:324
+#: g10/g10.c:326
msgid "read options from file"
msgstr "legi la opciojn el dosiero"
-#: g10/g10.c:328
+#: g10/g10.c:330
msgid "|FD|write status info to this FD"
msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
-#: g10/g10.c:330
+#: g10/g10.c:332
#, fuzzy
msgid "|[file]|write status info to file"
msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
-#: g10/g10.c:336
+#: g10/g10.c:338
#, fuzzy
msgid "|KEYID|ultimately trust this key"
msgstr "|KEYID|fidi �i tiun �losilon absolute"
-#: g10/g10.c:337
+#: g10/g10.c:339
msgid "|FILE|load extension module FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
-#: g10/g10.c:338
+#: g10/g10.c:340
msgid "emulate the mode described in RFC1991"
msgstr "imiti la re�imon priskribitan en RFC 1991"
-#: g10/g10.c:339
+#: g10/g10.c:341
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "�alti �iujn paket-, �ifrad- kaj kompendi-opciojn al OpenPGP-konduto"
-#: g10/g10.c:340
+#: g10/g10.c:342
msgid "|N|use passphrase mode N"
msgstr "|N|uzi pasfraz-re�imon N"
-#: g10/g10.c:342
+#: g10/g10.c:344
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
-#: g10/g10.c:344
+#: g10/g10.c:346
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
-#: g10/g10.c:345
+#: g10/g10.c:347
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOMO|uzi �ifrad-metodon NOMO"
-#: g10/g10.c:346
+#: g10/g10.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOMO|uzi kompendi-metodon NOMO"
-#: g10/g10.c:347
+#: g10/g10.c:349
msgid "|N|use compress algorithm N"
msgstr "|N|uzi densig-metodon N"
-#: g10/g10.c:348
+#: g10/g10.c:350
msgid "throw keyid field of encrypted packets"
msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
-#: g10/g10.c:349
+#: g10/g10.c:351
msgid "|NAME=VALUE|use this notation data"
msgstr "|NOMO=VALORO|uzi �i tiun notacian datenon"
-#: g10/g10.c:352
+#: g10/g10.c:354
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -661,7 +666,7 @@ msgstr ""
"@\n"
"(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
-#: g10/g10.c:355
+#: g10/g10.c:357
msgid ""
"@\n"
"Examples:\n"
@@ -681,15 +686,15 @@ msgstr ""
" --list-keys [nomoj] montri �losilojn\n"
" --fingerprint [nomoj] montri fingro�purojn\n"
-#: g10/g10.c:478
+#: g10/g10.c:480
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
-#: g10/g10.c:482
+#: g10/g10.c:484
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-#: g10/g10.c:485
+#: g10/g10.c:487
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -699,7 +704,7 @@ msgstr ""
"subskribi, kontroli, �ifri a� mal�ifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
-#: g10/g10.c:496
+#: g10/g10.c:498
msgid ""
"\n"
"Supported algorithms:\n"
@@ -707,201 +712,201 @@ msgstr ""
"\n"
"Realigitaj metodoj:\n"
-#: g10/g10.c:570
+#: g10/g10.c:572
msgid "usage: gpg [options] "
msgstr "uzado: gpg [opcioj] "
-#: g10/g10.c:627
+#: g10/g10.c:629
msgid "conflicting commands\n"
msgstr "malkongruaj komandoj\n"
-#: g10/g10.c:783
+#: g10/g10.c:785
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
-#: g10/g10.c:787
+#: g10/g10.c:789
#, c-format
msgid "option file `%s': %s\n"
msgstr "opcio-dosiero '%s': %s\n"
-#: g10/g10.c:794
+#: g10/g10.c:796
#, c-format
msgid "reading options from `%s'\n"
msgstr "legas opciojn el '%s'\n"
-#: g10/g10.c:1038
+#: g10/g10.c:1041
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s ne estas valida signaro\n"
-#: g10/g10.c:1122
+#: g10/g10.c:1125
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTO: programo povas krei core-dosieron!\n"
-#: g10/g10.c:1126 g10/g10.c:1135
+#: g10/g10.c:1129 g10/g10.c:1138
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTO: %s ne estas por normala uzado!\n"
-#: g10/g10.c:1128
+#: g10/g10.c:1131
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ne eblas kun %s!\n"
-#: g10/g10.c:1131
+#: g10/g10.c:1134
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ne havas sencon kun %s!\n"
-#: g10/g10.c:1151 g10/g10.c:1163
+#: g10/g10.c:1154 g10/g10.c:1166
msgid "selected cipher algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
-#: g10/g10.c:1157 g10/g10.c:1169
+#: g10/g10.c:1160 g10/g10.c:1172
msgid "selected digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1176
msgid "the given policy URL is invalid\n"
msgstr "la donita gvidlinia URL ne validas\n"
-#: g10/g10.c:1176
+#: g10/g10.c:1179
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "la densig-metodo devas esti inter %d kaj %d\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1181
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed devas esti pli granda ol 0\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1183
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed devas esti pli granda ol 1\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1185
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1188
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
-#: g10/g10.c:1189
+#: g10/g10.c:1192
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1196
#, fuzzy
msgid "invalid preferences\n"
msgstr "listigi preferojn"
-#: g10/g10.c:1276
+#: g10/g10.c:1279
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
-#: g10/g10.c:1282
+#: g10/g10.c:1285
msgid "--store [filename]"
msgstr "--store [dosiero]"
-#: g10/g10.c:1289
+#: g10/g10.c:1292
msgid "--symmetric [filename]"
msgstr "--symmetric [dosiero]"
-#: g10/g10.c:1297
+#: g10/g10.c:1300
msgid "--encrypt [filename]"
msgstr "--encrypt [dosiero]"
-#: g10/g10.c:1310
+#: g10/g10.c:1313
msgid "--sign [filename]"
msgstr "--sign [dosiero]"
-#: g10/g10.c:1323
+#: g10/g10.c:1326
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
-#: g10/g10.c:1337
+#: g10/g10.c:1340
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [dosiero]"
-#: g10/g10.c:1346
+#: g10/g10.c:1349
msgid "--clearsign [filename]"
msgstr "--clearsign [dosiero]"
-#: g10/g10.c:1364
+#: g10/g10.c:1367
msgid "--decrypt [filename]"
msgstr "--decrypt [dosiero]"
-#: g10/g10.c:1372
+#: g10/g10.c:1375
msgid "--sign-key user-id"
msgstr "--sign-key uzantidentigilo"
-#: g10/g10.c:1380
+#: g10/g10.c:1383
msgid "--lsign-key user-id"
msgstr "--lsign-key uzantidentigilo"
-#: g10/g10.c:1388
+#: g10/g10.c:1391
msgid "--edit-key user-id [commands]"
msgstr "--edit-key uzantidentigilo [komandoj]"
-#: g10/g10.c:1404
+#: g10/g10.c:1407
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key uzantidentigilo"
-#: g10/g10.c:1407
+#: g10/g10.c:1410
msgid "--delete-key user-id"
msgstr "--delete-key uzantidentigilo"
-#: g10/g10.c:1415
+#: g10/g10.c:1418
#, fuzzy
msgid "--delete-secret-and-public-key user-id"
msgstr "--delete-secret-and-public-key uzantidentigilo"
-#: g10/encode.c:268 g10/g10.c:1452 g10/sign.c:632
+#: g10/encode.c:268 g10/g10.c:1455 g10/sign.c:632
#, c-format
msgid "can't open %s: %s\n"
msgstr "ne povas malfermi %s: %s\n"
-#: g10/g10.c:1467
+#: g10/g10.c:1470
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
-#: g10/g10.c:1539
+#: g10/g10.c:1542
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "elkirasigo malsukcesis: %s\n"
-#: g10/g10.c:1547
+#: g10/g10.c:1550
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
-#: g10/g10.c:1618
+#: g10/g10.c:1621
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
-#: g10/g10.c:1704
+#: g10/g10.c:1707
msgid "[filename]"
msgstr "[dosiero]"
-#: g10/g10.c:1708
+#: g10/g10.c:1711
msgid "Go ahead and type your message ...\n"
msgstr "Ektajpu vian mesa�on ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1711 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1714 g10/verify.c:94 g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "ne povas malfermi '%s'\n"
-#: g10/g10.c:1920
+#: g10/g10.c:1923
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr "la unua signo de notacia nomo devas esti litero a� substreko\n"
-#: g10/g10.c:1926
+#: g10/g10.c:1929
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -909,11 +914,11 @@ msgstr ""
"notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
"kaj fini per '='\n"
-#: g10/g10.c:1932
+#: g10/g10.c:1935
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr "punktoj en notacia nomo devas esti inter aliaj signoj\n"
-#: g10/g10.c:1940
+#: g10/g10.c:1943
msgid "a notation value must not use any control characters\n"
msgstr "notacia valoro ne povas enhavi stirsignojn\n"
@@ -1564,7 +1569,7 @@ msgstr ""
"Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
"\n"
-#: g10/keyedit.c:456 g10/keygen.c:1171
+#: g10/keyedit.c:462 g10/keygen.c:1171
msgid "passphrase not correctly repeated; try again.\n"
msgstr "la pasfrazo ne estis �uste ripetita; provu denove.\n"
@@ -1702,27 +1707,27 @@ msgstr "legas el '%s'\n"
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s-�ifrita por: %s\n"
-#: g10/delkey.c:69 g10/export.c:149
+#: g10/delkey.c:69 g10/export.c:148
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "uzanto '%s' ne trovita: %s\n"
-#: g10/delkey.c:77 g10/export.c:159
+#: g10/delkey.c:77 g10/export.c:158
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: g10/export.c:167
+#: g10/export.c:166
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "�losilo %08lX: ne estas RFC-2440-�losilo - ignorita\n"
-#: g10/export.c:178
+#: g10/export.c:177
#, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "�losilo %08lX: ne protektita - ignorita\n"
-#: g10/export.c:234
+#: g10/export.c:233
msgid "WARNING: nothing exported\n"
msgstr "AVERTO: nenio estis eksportita\n"
@@ -1732,16 +1737,16 @@ msgstr "tro da registroj en pk-staplo - mal�altas\n"
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:183 g10/getkey.c:2188
+#: g10/getkey.c:183 g10/getkey.c:2192
msgid "[User id not found]"
msgstr "[Uzantidentigilo ne trovita]"
-#: g10/getkey.c:1911
+#: g10/getkey.c:1915
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
-#: g10/getkey.c:1952
+#: g10/getkey.c:1956
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
@@ -2072,17 +2077,17 @@ msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:296
+#: g10/keyedit.c:302
#, c-format
msgid "Already signed by key %08lX\n"
msgstr "Jam subskribita per �losilo %08lX\n"
-#: g10/keyedit.c:307
+#: g10/keyedit.c:313
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "Nenio por subskribi per �losilo %08lX\n"
-#: g10/keyedit.c:316
+#: g10/keyedit.c:322
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2090,7 +2095,7 @@ msgstr ""
"�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
"per via �losilo: \""
-#: g10/keyedit.c:325
+#: g10/keyedit.c:331
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
@@ -2098,33 +2103,33 @@ msgstr ""
"La subskribo estos markita kiel neeksportebla.\n"
"\n"
-#: g10/keyedit.c:330
+#: g10/keyedit.c:336
msgid "Really sign? "
msgstr "�u vere subskribi? "
-#: g10/keyedit.c:361 g10/keyedit.c:2104 g10/keyedit.c:2166 g10/sign.c:225
+#: g10/keyedit.c:367 g10/keyedit.c:2110 g10/keyedit.c:2172 g10/sign.c:225
#, c-format
msgid "signing failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
-#: g10/keyedit.c:415
+#: g10/keyedit.c:421
msgid "This key is not protected.\n"
msgstr "�i tiu �losilo ne estas protektita.\n"
-#: g10/keyedit.c:419
+#: g10/keyedit.c:425
msgid "Secret parts of primary key are not available.\n"
msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
-#: g10/keyedit.c:423
+#: g10/keyedit.c:429
msgid "Key is protected.\n"
msgstr "�losilo estas protektita.\n"
-#: g10/keyedit.c:443
+#: g10/keyedit.c:449
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Ne povas redakti �i tiun �losilon: %s\n"
-#: g10/keyedit.c:448
+#: g10/keyedit.c:454
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2132,7 +2137,7 @@ msgstr ""
"Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
"\n"
-#: g10/keyedit.c:460
+#: g10/keyedit.c:466
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2140,466 +2145,472 @@ msgstr ""
"Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
"\n"
-#: g10/keyedit.c:463
+#: g10/keyedit.c:469
msgid "Do you really want to do this? "
msgstr "�u vi vere volas fari tion? "
-#: g10/keyedit.c:527
+#: g10/keyedit.c:533
msgid "moving a key signature to the correct place\n"
msgstr "movas �losilsubskribon al la �usta loko\n"
-#: g10/keyedit.c:568
+#: g10/keyedit.c:574
msgid "quit this menu"
msgstr "forlasi �i tiun menuon"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:575
msgid "q"
msgstr "f"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save"
msgstr "skribi"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save and quit"
msgstr "skribi kaj fini"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "help"
msgstr "helpo"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "show this help"
msgstr "montri �i tiun helpon"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "fpr"
msgstr "fsp"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "show fingerprint"
msgstr "montri fingrospuron"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list"
msgstr "listo"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list key and user IDs"
msgstr "listigi �losilojn kaj uzantidentigilojn"
-#: g10/keyedit.c:575
+#: g10/keyedit.c:581
msgid "l"
msgstr "l"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "select user ID N"
msgstr "elekti uzantidentigilon N"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "key"
msgstr "�losilo"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "select secondary key N"
msgstr "elekti flankan �losilon N"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "check"
msgstr "kontroli"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "list signatures"
msgstr "listigi subskribojn"
-#: g10/keyedit.c:579
+#: g10/keyedit.c:585
msgid "c"
msgstr "k"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign"
msgstr "subskribi"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign the key"
msgstr "subskribi la �losilon"
-#: g10/keyedit.c:581
+#: g10/keyedit.c:587
msgid "s"
msgstr "s"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "lsign"
msgstr "lsub"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "sign the key locally"
msgstr "subskribi la �losilon loke"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:589
msgid "debug"
msgstr "spuri"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "adduid"
msgstr "aluid"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "add a user ID"
msgstr "aldoni uzantidentigilon"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "deluid"
msgstr "foruid"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "delete user ID"
msgstr "forvi�i uzantidentigilon"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "addkey"
msgstr "al"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "add a secondary key"
msgstr "aldoni flankan �losilon"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delkey"
msgstr "for"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delete a secondary key"
msgstr "forvi�i flankan �losilon"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delsig"
msgstr "forsig"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delete signatures"
msgstr "forvi�i subskribojn"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "expire"
msgstr "eksval"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "change the expire date"
msgstr "�an�i la daton de eksvalidi�o"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "primary"
msgstr ""
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle"
msgstr "alia"
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle between secret and public key listing"
msgstr "de sekreta a� publika listo iri al la alia"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:599
msgid "t"
msgstr "a"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:600
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:594 g10/keyedit.c:595
-msgid "list preferences"
+#: g10/keyedit.c:600
+#, fuzzy
+msgid "list preferences (expert)"
msgstr "listigi preferojn"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:601
#, fuzzy
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:601
+#, fuzzy
+msgid "list preferences (verbose)"
+msgstr "listigi preferojn"
+
+#: g10/keyedit.c:602
#, fuzzy
msgid "setpref"
msgstr "pref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:602
#, fuzzy
msgid "set preference list"
msgstr "listigi preferojn"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updpref"
msgstr "pref"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updated preferences"
msgstr "listigi preferojn"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "passwd"
msgstr "pasf"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "change the passphrase"
msgstr "�an�i la pasfrazon"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "trust"
msgstr "fido"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "change the ownertrust"
msgstr "�an�i la posedantofidon"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revoke signatures"
msgstr "revoki subskribojn"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revkey"
msgstr "rev"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revoke a secondary key"
msgstr "revoki flankan �losilon"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable"
msgstr "el"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable a key"
msgstr "mal�alti �losilon"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable"
msgstr "en"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable a key"
msgstr "�alti �losilon"
-#: g10/delkey.c:112 g10/keyedit.c:623
+#: g10/delkey.c:112 g10/keyedit.c:629
msgid "can't do that in batchmode\n"
msgstr "ne povas fari tion en neinteraga re�imo\n"
-#: g10/keyedit.c:658
+#: g10/keyedit.c:664
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: g10/keyedit.c:676
+#: g10/keyedit.c:682
msgid "Secret key is available.\n"
msgstr "Sekreta �losilo estas havebla.\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:712
msgid "Command> "
msgstr "Komando> "
-#: g10/keyedit.c:737
+#: g10/keyedit.c:743
msgid "Need the secret key to do this.\n"
msgstr "Bezonas la sekretan �losilon por fari tion.\n"
-#: g10/keyedit.c:741
+#: g10/keyedit.c:747
msgid "Please use the command \"toggle\" first.\n"
msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
-#: g10/keyedit.c:788
+#: g10/keyedit.c:794
msgid "Really sign all user IDs? "
msgstr "�u vere subskribi �iujn uzantidentigilojn? "
-#: g10/keyedit.c:789
+#: g10/keyedit.c:795
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
-#: g10/keyedit.c:821 g10/keyedit.c:842
+#: g10/keyedit.c:827 g10/keyedit.c:848
msgid "You must select at least one user ID.\n"
msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:829
msgid "You can't delete the last user ID!\n"
msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:832
msgid "Really remove all selected user IDs? "
msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
-#: g10/keyedit.c:827
+#: g10/keyedit.c:833
msgid "Really remove this user ID? "
msgstr "�u vere forigi �i tiun uzantidentigilon? "
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:871 g10/keyedit.c:893
msgid "You must select at least one key.\n"
msgstr "Vi devas elekti almena� unu �losilon.\n"
-#: g10/keyedit.c:869
+#: g10/keyedit.c:875
msgid "Do you really want to delete the selected keys? "
msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
-#: g10/keyedit.c:870
+#: g10/keyedit.c:876
msgid "Do you really want to delete this key? "
msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
-#: g10/keyedit.c:891
+#: g10/keyedit.c:897
msgid "Do you really want to revoke the selected keys? "
msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:898
msgid "Do you really want to revoke this key? "
msgstr "�u vi vere volas revoki �i tiun �losilon? "
-#: g10/keyedit.c:956
+#: g10/keyedit.c:962
#, fuzzy
msgid "Really update the preferences for the selected user IDs? "
msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
#, fuzzy
msgid "Really update the preferences? "
msgstr "�u vere krei la revokatestilojn? (j/N)"
-#: g10/keyedit.c:992
+#: g10/keyedit.c:998
msgid "Save changes? "
msgstr "�u skribi �an�ojn? "
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1001
msgid "Quit without saving? "
msgstr "�u fini sen skribi �an�ojn? "
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1012
#, c-format
msgid "update failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1019
#, c-format
msgid "update secret failed: %s\n"
msgstr "aktualigo de sekreto malsukcesis: %s\n"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1026
msgid "Key not changed so no update needed.\n"
msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
-#: g10/keyedit.c:1031
+#: g10/keyedit.c:1037
msgid "Invalid command (try \"help\")\n"
msgstr "Nevalida komando (provu per \"helpo\")\n"
-#: g10/keyedit.c:1139 g10/keyedit.c:1165
+#: g10/keyedit.c:1145 g10/keyedit.c:1171
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr "%s%c %4u%c/%08lX kreita: %s eksvalidi�os: %s"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1154
#, c-format
msgid " trust: %c/%c"
msgstr " fido: %c/%c"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1158
msgid "This key has been disabled"
msgstr "�i tiu �losilo estas mal�altita"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1187
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! sub�losilo estas revokita: %s\n"
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1190
msgid "rev- faked revocation found\n"
msgstr "rev- falsita revoko trovita\n"
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1192
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? problemo en kontrolo de revoko: %s\n"
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1408
msgid "Delete this good signature? (y/N/q)"
msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1412
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1416
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1422
msgid "Really delete this self-signature? (y/N)"
msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Forvi�is %d subskribon.\n"
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Forvi�is %d subskribojn.\n"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
msgid "Nothing deleted.\n"
msgstr "Nenio estis forvi�ita.\n"
-#: g10/keyedit.c:1503
+#: g10/keyedit.c:1509
msgid "Please remove selections from the secret keys.\n"
msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
-#: g10/keyedit.c:1509
+#: g10/keyedit.c:1515
msgid "Please select at most one secondary key.\n"
msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1519
msgid "Changing expiration time for a secondary key.\n"
msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1521
msgid "Changing expiration time for the primary key.\n"
msgstr "�an�as la daton de eksvalidi�o de la �efa �losilo.\n"
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1563
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1579
msgid "No corresponding signature in secret ring\n"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1662
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1837
#, c-format
msgid "No user ID with index %d\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Mankas flanka �losilo kun indekso %d\n"
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:1981
msgid "user ID: \""
msgstr "uzantidentigilo: \""
-#: g10/keyedit.c:1978
+#: g10/keyedit.c:1984
#, c-format
msgid ""
"\"\n"
@@ -2608,34 +2619,34 @@ msgstr ""
"\"\n"
"subskribita per via �losilo %08lX je %s\n"
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1988
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2012
msgid "You have signed these user IDs:\n"
msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
-#: g10/keyedit.c:2020 g10/keyedit.c:2055
+#: g10/keyedit.c:2026 g10/keyedit.c:2061
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " subskribita per %08lX je %s\n"
-#: g10/keyedit.c:2025
+#: g10/keyedit.c:2031
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " revokita de %08lX je %s\n"
-#: g10/keyedit.c:2045
+#: g10/keyedit.c:2051
msgid "You are about to revoke these signatures:\n"
msgstr "Vi revokos la sekvajn subskribojn:\n"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:2069
msgid "Really create the revocation certificates? (y/N)"
msgstr "�u vere krei la revokatestilojn? (j/N)"
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2098
msgid "no secret key\n"
msgstr "mankas sekreta �losilo\n"
@@ -2817,37 +2828,37 @@ msgstr "ne povas trakti publik�losilan metodon %d\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
-#: g10/passphrase.c:277 g10/passphrase.c:319
+#: g10/passphrase.c:278 g10/passphrase.c:320
msgid "gpg-agent is not available in this session\n"
msgstr ""
-#: g10/passphrase.c:285
+#: g10/passphrase.c:286
msgid "can't set client pid for the agent\n"
msgstr ""
-#: g10/passphrase.c:293
+#: g10/passphrase.c:294
msgid "can't get server read FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:300
+#: g10/passphrase.c:301
msgid "can't get server write FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:325
+#: g10/passphrase.c:326
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:174 g10/passphrase.c:344
+#: g10/hkp.c:174 g10/passphrase.c:345
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "ne povas konekti�i al '%s': %s\n"
-#: g10/passphrase.c:415 g10/passphrase.c:677
+#: g10/passphrase.c:417 g10/passphrase.c:679
#, c-format
msgid " (main key ID %08lX)"
msgstr " (�ef�losilo %08lX)"
-#: g10/passphrase.c:425
+#: g10/passphrase.c:427
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -2858,34 +2869,34 @@ msgstr ""
"por la uzanto: \"%.*s\"\n"
"%u-bit %s key, ID %08lX, created %s%s\n"
-#: g10/passphrase.c:446
+#: g10/passphrase.c:448
#, fuzzy
msgid "Enter passphrase\n"
msgstr "Donu pasfrazon: "
-#: g10/passphrase.c:448
+#: g10/passphrase.c:450
#, fuzzy
msgid "Repeat passphrase\n"
msgstr "Ripetu pasfrazon: "
-#: g10/passphrase.c:483
+#: g10/passphrase.c:485
msgid "passphrase too long\n"
msgstr ""
-#: g10/passphrase.c:495
+#: g10/passphrase.c:497
msgid "invalid response from agent\n"
msgstr ""
-#: g10/passphrase.c:504
+#: g10/passphrase.c:506
msgid "cancelled by user\n"
msgstr ""
-#: g10/passphrase.c:507 g10/passphrase.c:580
+#: g10/passphrase.c:509 g10/passphrase.c:582
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr ""
-#: g10/passphrase.c:663
+#: g10/passphrase.c:665
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -2895,20 +2906,20 @@ msgstr ""
"Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
"por la uzanto: \""
-#: g10/passphrase.c:672
+#: g10/passphrase.c:674
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
-#: g10/passphrase.c:710
+#: g10/passphrase.c:712
msgid "can't query password in batchmode\n"
msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:716
msgid "Enter passphrase: "
msgstr "Donu pasfrazon: "
-#: g10/passphrase.c:718
+#: g10/passphrase.c:720
msgid "Repeat passphrase: "
msgstr "Ripetu pasfrazon: "
@@ -3132,7 +3143,7 @@ msgstr "%s: ne povas krei �loson\n"
msgid "%s: can't make lock\n"
msgstr "%s: ne povas krei �loson\n"
-#: g10/keyring.c:1376 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
+#: g10/keyring.c:1420 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: ne povas krei: %s\n"
@@ -3267,22 +3278,32 @@ msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "fido-datenaro: sync malsukcesis: %s\n"
-#: g10/trustdb.c:688
+#: g10/trustdb.c:470
+#, fuzzy
+msgid "no need for a trustdb check\n"
+msgstr "%s: ne estas fido-datenaro\n"
+
+#: g10/trustdb.c:476 g10/trustdb.c:1458
+#, fuzzy, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
+
+#: g10/trustdb.c:709
#, fuzzy
msgid "checking the trustdb\n"
msgstr "�an�i la posedantofidon"
-#: g10/trustdb.c:839
+#: g10/trustdb.c:860
#, fuzzy, c-format
msgid "public key %08lX not found: %s\n"
msgstr "publika �losilo ne trovita"
-#: g10/trustdb.c:1304
+#: g10/trustdb.c:1338
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr ""
-#: g10/trustdb.c:1374
+#: g10/trustdb.c:1411
#, c-format
msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
msgstr ""
@@ -3699,60 +3720,60 @@ msgstr "Nenia helpo disponata"
msgid "No help available for `%s'"
msgstr "Nenia helpo disponata por '%s'"
-#: g10/keydb.c:170
+#: g10/keydb.c:175
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "eraro dum skribado de �losilaro '%s': %s\n"
-#: g10/keydb.c:179
+#: g10/keydb.c:184
#, c-format
msgid "changing permission of `%s' failed: %s\n"
msgstr ""
-#: g10/keydb.c:188
+#: g10/keydb.c:193
#, fuzzy, c-format
msgid "keyring `%s' created\n"
msgstr "%s: �losilaro kreita\n"
-#: g10/keydb.c:530
+#: g10/keydb.c:586
#, fuzzy, c-format
-msgid "failed to rebuild all keyring caches: %s\n"
+msgid "failed to rebuild keyring cache: %s\n"
msgstr "%s: malsukcesis krei haktabelon: %s\n"
-#: g10/keyring.c:1179
+#: g10/keyring.c:1220
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
-#: g10/keyring.c:1181
+#: g10/keyring.c:1222
#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s estas la ne�an�ita\n"
-#: g10/keyring.c:1182
+#: g10/keyring.c:1223
#, c-format
msgid "%s is the new one\n"
msgstr "%s estas la nova\n"
-#: g10/keyring.c:1183
+#: g10/keyring.c:1224
msgid "Please fix this possible security flaw\n"
msgstr "Bonvolu ripari �i tiun eblan sekurecproblemon\n"
-#: g10/keyring.c:1281
+#: g10/keyring.c:1322
#, fuzzy, c-format
msgid "checking keyring `%s'\n"
msgstr "eraro dum skribado de �losilaro '%s': %s\n"
-#: g10/keyring.c:1312
+#: g10/keyring.c:1353
#, fuzzy, c-format
msgid "%lu keys so far checked (%lu signatures)\n"
msgstr "%lu �losiloj jam traktitaj\n"
-#: g10/keyring.c:1323
+#: g10/keyring.c:1364
#, fuzzy, c-format
msgid "%lu keys checked (%lu signatures)\n"
msgstr "listigi �losilojn kaj subskribojn"
-#: g10/keyring.c:1381
+#: g10/keyring.c:1425
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: �losilaro kreita\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 93f60cf3e..d182b6227 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
# GPG version: 1.0.0
msgid ""
msgstr ""
-"POT-Creation-Date: 2001-09-28 16:20+0200\n"
+"POT-Creation-Date: 2001-10-23 09:41+0200\n"
"PO-Revision-Date: 1999-10-27 06:35+0200\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-13 10:49:25+0100\n"
@@ -50,7 +50,7 @@ msgstr ""
msgid "nN"
msgstr ""
-#: g10/keyedit.c:568 util/miscutil.c:326
+#: g10/keyedit.c:574 util/miscutil.c:326
msgid "quit"
msgstr ""
@@ -354,7 +354,7 @@ msgstr ""
"otro trabajo para que el sistema pueda recolectar m�s entrop�a\n"
"(se necesitan %d bytes m�s).\n"
-#: g10/g10.c:237
+#: g10/g10.c:238
msgid ""
"@Commands:\n"
" "
@@ -362,146 +362,146 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/g10.c:239
+#: g10/g10.c:240
msgid "|[file]|make a signature"
msgstr "|[file]|hace una firma"
-#: g10/g10.c:240
+#: g10/g10.c:241
msgid "|[file]|make a clear text signature"
msgstr "|[file]|hace una firma en texto claro"
-#: g10/g10.c:241
+#: g10/g10.c:242
msgid "make a detached signature"
msgstr "hace una firma separada"
-#: g10/g10.c:242
+#: g10/g10.c:243
msgid "encrypt data"
msgstr "cifra datos"
-#: g10/g10.c:243
+#: g10/g10.c:244
msgid "encryption only with symmetric cipher"
msgstr "cifra s�lo con un cifrado sim�trico"
-#: g10/g10.c:244
+#: g10/g10.c:245
msgid "store only"
msgstr "s�lo almacenar"
-#: g10/g10.c:245
+#: g10/g10.c:246
msgid "decrypt data (default)"
msgstr "descifra datos (predefinido)"
-#: g10/g10.c:246
+#: g10/g10.c:247
msgid "verify a signature"
msgstr "verifica una firma"
-#: g10/g10.c:248
+#: g10/g10.c:249
msgid "list keys"
msgstr "lista claves"
-#: g10/g10.c:250
+#: g10/g10.c:251
msgid "list keys and signatures"
msgstr "lista claves y firmas"
-#: g10/g10.c:251
+#: g10/g10.c:252
msgid "check key signatures"
msgstr "comprueba las firmas de las claves"
-#: g10/g10.c:252
+#: g10/g10.c:253
msgid "list keys and fingerprints"
msgstr "lista claves y huellas dactilares"
-#: g10/g10.c:253
+#: g10/g10.c:254
msgid "list secret keys"
msgstr "lista claves secretas"
-#: g10/g10.c:254
+#: g10/g10.c:255
msgid "generate a new key pair"
msgstr "genera un nuevo par de claves"
-#: g10/g10.c:255
+#: g10/g10.c:256
msgid "remove key from the public keyring"
msgstr "elimina la clave del anillo p�blico"
-#: g10/g10.c:257
+#: g10/g10.c:258
#, fuzzy
msgid "remove key from the secret keyring"
msgstr "elimina la clave del anillo p�blico"
-#: g10/g10.c:258
+#: g10/g10.c:259
msgid "sign a key"
msgstr "firma la clave"
-#: g10/g10.c:259
+#: g10/g10.c:260
msgid "sign a key locally"
msgstr "firma la clave localmente"
-#: g10/g10.c:260
+#: g10/g10.c:261
msgid "sign or edit a key"
msgstr "firma o modifica una clave"
-#: g10/g10.c:261
+#: g10/g10.c:262
msgid "generate a revocation certificate"
msgstr "genera un certificado de revocaci�n"
-#: g10/g10.c:262
+#: g10/g10.c:263
msgid "export keys"
msgstr "exporta claves"
-#: g10/g10.c:263
+#: g10/g10.c:264
msgid "export keys to a key server"
msgstr "exporta claves a un servidor de claves"
-#: g10/g10.c:264
+#: g10/g10.c:265
msgid "import keys from a key server"
msgstr "importa claves desde un servidor de claves"
-#: g10/g10.c:266
+#: g10/g10.c:267
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "importa claves desde un servidor de claves"
-#: g10/g10.c:270
+#: g10/g10.c:271
msgid "import/merge keys"
msgstr "importa/fusiona claves"
-#: g10/g10.c:272
+#: g10/g10.c:273
msgid "list only the sequence of packets"
msgstr "lista s�lo la secuencia de paquetes"
-#: g10/g10.c:274
+#: g10/g10.c:275
msgid "export the ownertrust values"
msgstr "exporta los valores de confianza"
-#: g10/g10.c:276
+#: g10/g10.c:277
msgid "import ownertrust values"
msgstr "importa los valores de confianza"
-#: g10/g10.c:278
+#: g10/g10.c:279
msgid "update the trust database"
msgstr "actualiza la base de datos de confianza"
-#: g10/g10.c:280
+#: g10/g10.c:281
#, fuzzy
msgid "unattended trust database update"
msgstr "actualiza la base de datos de confianza"
-#: g10/g10.c:281
+#: g10/g10.c:282
msgid "fix a corrupted trust database"
msgstr "arregla una base de datos de confianza da�ada"
-#: g10/g10.c:282
+#: g10/g10.c:283
msgid "De-Armor a file or stdin"
msgstr "quita la armadura de un fichero o stdin"
-#: g10/g10.c:284
+#: g10/g10.c:285
msgid "En-Armor a file or stdin"
msgstr "crea la armadura a un fichero o stdin"
-#: g10/g10.c:286
+#: g10/g10.c:287
msgid "|algo [files]|print message digests"
msgstr "|algo [ficheros]|imprime res�menes de mensaje"
-#: g10/g10.c:290
+#: g10/g10.c:291
msgid ""
"@\n"
"Options:\n"
@@ -511,174 +511,179 @@ msgstr ""
"Opciones:\n"
" "
-#: g10/g10.c:292
+#: g10/g10.c:293
msgid "create ascii armored output"
msgstr "crea una salida ascii con armadura"
-#: g10/g10.c:294
+#: g10/g10.c:295
msgid "|NAME|encrypt for NAME"
msgstr "|NOMBRE|cifra para NOMBRE"
-#: g10/g10.c:297
+#: g10/g10.c:298
msgid "|NAME|use NAME as default recipient"
msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
-#: g10/g10.c:299
+#: g10/g10.c:300
msgid "use the default key as default recipient"
msgstr "usa la clave por defecto como destinatario"
-#: g10/g10.c:303
+#: g10/g10.c:304
msgid "use this user-id to sign or decrypt"
msgstr "usa este usuario para firmar o descifrar"
-#: g10/g10.c:304
+#: g10/g10.c:305
msgid "|N|set compress level N (0 disables)"
msgstr "|N|nivel de compresi�n N (0 no comprime)"
-#: g10/g10.c:306
+#: g10/g10.c:307
msgid "use canonical text mode"
msgstr "usa modo de texto can�nico"
-#: g10/g10.c:307
+#: g10/g10.c:308
msgid "use as output file"
msgstr "usa como fichero de salida"
-#: g10/g10.c:308
+#: g10/g10.c:309
msgid "verbose"
msgstr "prolijo"
-#: g10/g10.c:309
+#: g10/g10.c:310
msgid "be somewhat more quiet"
msgstr "algo m�s discreto"
-#: g10/g10.c:310
+#: g10/g10.c:311
msgid "don't use the terminal at all"
msgstr "no usa la terminal en absoluto"
-#: g10/g10.c:311
+#: g10/g10.c:312
msgid "force v3 signatures"
msgstr "fuerza firmas v3"
-#: g10/g10.c:312
+#: g10/g10.c:313
+#, fuzzy
+msgid "do not force v3 signatures"
+msgstr "fuerza firmas v3"
+
+#: g10/g10.c:314
msgid "always use a MDC for encryption"
msgstr "siempre usa un MCD para cifrar"
-#: g10/g10.c:313
+#: g10/g10.c:315
msgid "do not make any changes"
msgstr "no hace ning�n cambio"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:315
+#: g10/g10.c:317
msgid "use the gpg-agent"
msgstr ""
-#: g10/g10.c:316
+#: g10/g10.c:318
msgid "batch mode: never ask"
msgstr "proceso por lotes: nunca preguntar"
-#: g10/g10.c:317
+#: g10/g10.c:319
msgid "assume yes on most questions"
msgstr "asume \"s�\" en casi todas las preguntas"
-#: g10/g10.c:318
+#: g10/g10.c:320
msgid "assume no on most questions"
msgstr "asume \"no\" en casi todas las preguntas"
-#: g10/g10.c:319
+#: g10/g10.c:321
msgid "add this keyring to the list of keyrings"
msgstr "a�ade este anillo a la lista de anillos"
-#: g10/g10.c:320
+#: g10/g10.c:322
msgid "add this secret keyring to the list"
msgstr "a�ade este anillo secreto a la lista"
-#: g10/g10.c:321
+#: g10/g10.c:323
msgid "|NAME|use NAME as default secret key"
msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
-#: g10/g10.c:322
+#: g10/g10.c:324
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|SERVIDOR|usa este servidor de claves"
-#: g10/g10.c:323
+#: g10/g10.c:325
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
-#: g10/g10.c:324
+#: g10/g10.c:326
msgid "read options from file"
msgstr "lee opciones del fichero"
-#: g10/g10.c:328
+#: g10/g10.c:330
msgid "|FD|write status info to this FD"
msgstr "|DF|escribe informaci�n de estado en descriptor DF"
-#: g10/g10.c:330
+#: g10/g10.c:332
#, fuzzy
msgid "|[file]|write status info to file"
msgstr "|DF|escribe informaci�n de estado en descriptor DF"
-#: g10/g10.c:336
+#: g10/g10.c:338
#, fuzzy
msgid "|KEYID|ultimately trust this key"
msgstr "|ID-CLAVE|conf�a plenamente en esta clave"
-#: g10/g10.c:337
+#: g10/g10.c:339
msgid "|FILE|load extension module FILE"
msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
-#: g10/g10.c:338
+#: g10/g10.c:340
msgid "emulate the mode described in RFC1991"
msgstr "emula el modo descrito en la RFC1991"
-#: g10/g10.c:339
+#: g10/g10.c:341
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr ""
"todas las opciones de paquete, cifrado y\n"
"resumen tipo OpenPGP"
-#: g10/g10.c:340
+#: g10/g10.c:342
msgid "|N|use passphrase mode N"
msgstr "|N|usa modo de contrase�a N"
-#: g10/g10.c:342
+#: g10/g10.c:344
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr ""
"|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE\n"
"para las contrase�as"
-#: g10/g10.c:344
+#: g10/g10.c:346
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr ""
"|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
"contrase�as"
-#: g10/g10.c:345
+#: g10/g10.c:347
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
-#: g10/g10.c:346
+#: g10/g10.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
-#: g10/g10.c:347
+#: g10/g10.c:349
msgid "|N|use compress algorithm N"
msgstr "|N|usa el algoritmo de compresi�n N"
-#: g10/g10.c:348
+#: g10/g10.c:350
msgid "throw keyid field of encrypted packets"
msgstr "elimina campo keyid de los paquetes cifrados"
-#: g10/g10.c:349
+#: g10/g10.c:351
msgid "|NAME=VALUE|use this notation data"
msgstr "|NOMBRE=VALOR|usa estos datos de notaci�n"
-#: g10/g10.c:352
+#: g10/g10.c:354
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/g10.c:355
+#: g10/g10.c:357
msgid ""
"@\n"
"Examples:\n"
@@ -698,15 +703,15 @@ msgstr ""
" --list-keys [nombres] muestra las claves\n"
" --fingerprint [nombres] muestra las huellas dactilares\n"
-#: g10/g10.c:478
+#: g10/g10.c:480
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
-#: g10/g10.c:482
+#: g10/g10.c:484
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
-#: g10/g10.c:485
+#: g10/g10.c:487
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -716,7 +721,7 @@ msgstr ""
"Firma, comprueba, cifra o descifra.\n"
"La operaci�n por defecto depende del tipo de datos de entrada.\n"
-#: g10/g10.c:496
+#: g10/g10.c:498
msgid ""
"\n"
"Supported algorithms:\n"
@@ -724,201 +729,201 @@ msgstr ""
"\n"
"Algoritmos soportados:\n"
-#: g10/g10.c:570
+#: g10/g10.c:572
msgid "usage: gpg [options] "
msgstr "uso: gpg [opciones] "
-#: g10/g10.c:627
+#: g10/g10.c:629
msgid "conflicting commands\n"
msgstr "comandos incompatibles\n"
-#: g10/g10.c:783
+#: g10/g10.c:785
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
-#: g10/g10.c:787
+#: g10/g10.c:789
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichero de opciones `%s': %s\n"
-#: g10/g10.c:794
+#: g10/g10.c:796
#, c-format
msgid "reading options from `%s'\n"
msgstr "leyendo opciones desde `%s'\n"
-#: g10/g10.c:1038
+#: g10/g10.c:1041
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s no es un juego de caracteres v�lido\n"
-#: g10/g10.c:1122
+#: g10/g10.c:1125
msgid "WARNING: program may create a core file!\n"
msgstr "ATENCI�N: �el programa podr�a crear un fichero core dump!\n"
-#: g10/g10.c:1126 g10/g10.c:1135
+#: g10/g10.c:1129 g10/g10.c:1138
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: �%s no es para uso normal!\n"
-#: g10/g10.c:1128
+#: g10/g10.c:1131
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s no permitido con %s!\n"
-#: g10/g10.c:1131
+#: g10/g10.c:1134
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s no tiene sentido con %s!\n"
-#: g10/g10.c:1151 g10/g10.c:1163
+#: g10/g10.c:1154 g10/g10.c:1166
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado no es v�lido\n"
-#: g10/g10.c:1157 g10/g10.c:1169
+#: g10/g10.c:1160 g10/g10.c:1172
msgid "selected digest algorithm is invalid\n"
msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1176
msgid "the given policy URL is invalid\n"
msgstr "URL de pol�tica no v�lida\n"
-#: g10/g10.c:1176
+#: g10/g10.c:1179
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "el algoritmo de compresi�n debe estar en el rango %d-%d\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1181
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser mayor que 0\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1183
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser mayor que 1\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1185
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth debe estar en el rango 1-255\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1188
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
-#: g10/g10.c:1189
+#: g10/g10.c:1192
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1196
#, fuzzy
msgid "invalid preferences\n"
msgstr "muestra preferencias"
-#: g10/g10.c:1276
+#: g10/g10.c:1279
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
-#: g10/g10.c:1282
+#: g10/g10.c:1285
msgid "--store [filename]"
msgstr "--store [nombre_fichero]"
-#: g10/g10.c:1289
+#: g10/g10.c:1292
msgid "--symmetric [filename]"
msgstr "--symmetric [nombre_fichero]"
-#: g10/g10.c:1297
+#: g10/g10.c:1300
msgid "--encrypt [filename]"
msgstr "--encrypt [nombre_fichero]"
-#: g10/g10.c:1310
+#: g10/g10.c:1313
msgid "--sign [filename]"
msgstr "--sign [nombre_fichero]"
-#: g10/g10.c:1323
+#: g10/g10.c:1326
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nombre_fichero]"
-#: g10/g10.c:1337
+#: g10/g10.c:1340
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [nombre_fichero]"
-#: g10/g10.c:1346
+#: g10/g10.c:1349
msgid "--clearsign [filename]"
msgstr "--clearsign [nombre_fichero]"
-#: g10/g10.c:1364
+#: g10/g10.c:1367
msgid "--decrypt [filename]"
msgstr "--decrypt [nombre_fichero]"
-#: g10/g10.c:1372
+#: g10/g10.c:1375
msgid "--sign-key user-id"
msgstr "--sign-key id-usuario"
-#: g10/g10.c:1380
+#: g10/g10.c:1383
msgid "--lsign-key user-id"
msgstr "--lsign-key id-usuario"
-#: g10/g10.c:1388
+#: g10/g10.c:1391
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-usuario [comandos]"
-#: g10/g10.c:1404
+#: g10/g10.c:1407
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key id-usuario"
-#: g10/g10.c:1407
+#: g10/g10.c:1410
msgid "--delete-key user-id"
msgstr "--delete-key id-usuario"
-#: g10/g10.c:1415
+#: g10/g10.c:1418
#, fuzzy
msgid "--delete-secret-and-public-key user-id"
msgstr "--delete-secret-key-and-public id-usuario"
-#: g10/encode.c:268 g10/g10.c:1452 g10/sign.c:632
+#: g10/encode.c:268 g10/g10.c:1455 g10/sign.c:632
#, c-format
msgid "can't open %s: %s\n"
msgstr "no puede abrirse `%s': %s\n"
-#: g10/g10.c:1467
+#: g10/g10.c:1470
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
-#: g10/g10.c:1539
+#: g10/g10.c:1542
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminaci�n de armadura fallida: %s\n"
-#: g10/g10.c:1547
+#: g10/g10.c:1550
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creaci�n de armadura fallida: %s\n"
-#: g10/g10.c:1618
+#: g10/g10.c:1621
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de distribuci�n no v�lido `%s'\n"
-#: g10/g10.c:1704
+#: g10/g10.c:1707
msgid "[filename]"
msgstr "[nombre_fichero]"
-#: g10/g10.c:1708
+#: g10/g10.c:1711
msgid "Go ahead and type your message ...\n"
msgstr "Adelante, teclee su mensaje...\n"
-#: g10/decrypt.c:59 g10/g10.c:1711 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1714 g10/verify.c:94 g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "no puede abrirse `%s'\n"
-#: g10/g10.c:1920
+#: g10/g10.c:1923
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr "El primer caracter de una notaci�n debe ser una letra o un subrayado\n"
-#: g10/g10.c:1926
+#: g10/g10.c:1929
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -926,11 +931,11 @@ msgstr ""
"un nombre de notaci�n debe tener s�lo letras, d�gitos, puntos o subrayados, "
"y acabar con un '='\n"
-#: g10/g10.c:1932
+#: g10/g10.c:1935
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr "los puntos en una notaci�n deben estar rodeados por otros caracteres\n"
-#: g10/g10.c:1940
+#: g10/g10.c:1943
msgid "a notation value must not use any control characters\n"
msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
@@ -1588,7 +1593,7 @@ msgstr ""
"Necesita una contrase�a para proteger su clave secreta.\n"
"\n"
-#: g10/keyedit.c:456 g10/keygen.c:1171
+#: g10/keyedit.c:462 g10/keygen.c:1171
msgid "passphrase not correctly repeated; try again.\n"
msgstr "contrase�a repetida incorrecta, int�ntelo de nuevo.\n"
@@ -1728,27 +1733,27 @@ msgstr "leyendo desde `%s'\n"
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s cifrado para: %s\n"
-#: g10/delkey.c:69 g10/export.c:149
+#: g10/delkey.c:69 g10/export.c:148
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "usuario '%s' no encontrado: %s\n"
-#: g10/delkey.c:77 g10/export.c:159
+#: g10/delkey.c:77 g10/export.c:158
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
msgstr "error leyendo `%s': %s\n"
-#: g10/export.c:167
+#: g10/export.c:166
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
-#: g10/export.c:178
+#: g10/export.c:177
#, fuzzy, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
-#: g10/export.c:234
+#: g10/export.c:233
msgid "WARNING: nothing exported\n"
msgstr "ATENCI�N: no se ha exportado nada\n"
@@ -1758,17 +1763,17 @@ msgstr "demasiados registros en la cache pk - anulada\n"
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:183 g10/getkey.c:2188
+#: g10/getkey.c:183 g10/getkey.c:2192
#, fuzzy
msgid "[User id not found]"
msgstr "[usuario no encontrado]"
-#: g10/getkey.c:1911
+#: g10/getkey.c:1915
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
-#: g10/getkey.c:1952
+#: g10/getkey.c:1956
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "clave %08lX: clave secreta sin clave p�blica - ignorada\n"
@@ -2101,17 +2106,17 @@ msgstr "Detectados %d identificativos de usuario sin autofirma v�lida\n"
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:296
+#: g10/keyedit.c:302
#, c-format
msgid "Already signed by key %08lX\n"
msgstr "Ya firmada por la clave %08lX\n"
-#: g10/keyedit.c:307
+#: g10/keyedit.c:313
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "Nada que firmar con la clave %08lX\n"
-#: g10/keyedit.c:316
+#: g10/keyedit.c:322
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2119,7 +2124,7 @@ msgstr ""
"�Est� realmente seguro de querer firmar esta clave\n"
"con su clave: \""
-#: g10/keyedit.c:325
+#: g10/keyedit.c:331
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
@@ -2127,34 +2132,34 @@ msgstr ""
"La firma se marcar� como no exportable.\n"
"\n"
-#: g10/keyedit.c:330
+#: g10/keyedit.c:336
msgid "Really sign? "
msgstr "�Firmar de verdad? "
-#: g10/keyedit.c:361 g10/keyedit.c:2104 g10/keyedit.c:2166 g10/sign.c:225
+#: g10/keyedit.c:367 g10/keyedit.c:2110 g10/keyedit.c:2172 g10/sign.c:225
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallida: %s\n"
-#: g10/keyedit.c:415
+#: g10/keyedit.c:421
msgid "This key is not protected.\n"
msgstr "Esta clave no est� protegida.\n"
-#: g10/keyedit.c:419
+#: g10/keyedit.c:425
#, fuzzy
msgid "Secret parts of primary key are not available.\n"
msgstr "Clave secreta no disponible"
-#: g10/keyedit.c:423
+#: g10/keyedit.c:429
msgid "Key is protected.\n"
msgstr "La clave est� protegida.\n"
-#: g10/keyedit.c:443
+#: g10/keyedit.c:449
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "No puede editarse esta clave: %s\n"
-#: g10/keyedit.c:448
+#: g10/keyedit.c:454
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2162,7 +2167,7 @@ msgstr ""
"Introduzca la nueva contrase�a para esta clave secreta.\n"
"\n"
-#: g10/keyedit.c:460
+#: g10/keyedit.c:466
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2170,464 +2175,470 @@ msgstr ""
"No ha especificado contrase�a. Esto es probablemente una *mala* idea.\n"
"\n"
-#: g10/keyedit.c:463
+#: g10/keyedit.c:469
msgid "Do you really want to do this? "
msgstr "�Realmente quiere hacer esto? "
-#: g10/keyedit.c:527
+#: g10/keyedit.c:533
msgid "moving a key signature to the correct place\n"
msgstr "moviendo la firma de la clave al lugar correcto\n"
-#: g10/keyedit.c:568
+#: g10/keyedit.c:574
msgid "quit this menu"
msgstr "sale de este men�"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:575
msgid "q"
msgstr ""
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save"
msgstr ""
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save and quit"
msgstr "graba y sale"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "help"
msgstr ""
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "show this help"
msgstr "muestra esta ayuda"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "fpr"
msgstr ""
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "show fingerprint"
msgstr "muestra huella dactilar"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list"
msgstr ""
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list key and user IDs"
msgstr "lista clave e identificativos de usuario"
-#: g10/keyedit.c:575
+#: g10/keyedit.c:581
msgid "l"
msgstr ""
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "uid"
msgstr ""
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "select user ID N"
msgstr "selecciona identificativo de usuario N"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "key"
msgstr ""
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "select secondary key N"
msgstr "selecciona clave secundaria N"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "check"
msgstr ""
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "list signatures"
msgstr "lista firmas"
-#: g10/keyedit.c:579
+#: g10/keyedit.c:585
msgid "c"
msgstr ""
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign"
msgstr ""
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign the key"
msgstr "firma la clave"
-#: g10/keyedit.c:581
+#: g10/keyedit.c:587
msgid "s"
msgstr ""
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "lsign"
msgstr ""
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "sign the key locally"
msgstr "firma la clave localmente"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:589
msgid "debug"
msgstr ""
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "adduid"
msgstr ""
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "add a user ID"
msgstr "a�ade un identificativo de usuario"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "deluid"
msgstr ""
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "delete user ID"
msgstr "borra un identificativo de usuario"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "addkey"
msgstr ""
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "add a secondary key"
msgstr "a�ade una clave secundaria"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delkey"
msgstr ""
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delete a secondary key"
msgstr "borra una clave secundaria"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delsig"
msgstr ""
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delete signatures"
msgstr "borra firmas"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "expire"
msgstr ""
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "change the expire date"
msgstr "cambia fecha de caducidad"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "primary"
msgstr ""
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle"
msgstr ""
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle between secret and public key listing"
msgstr "cambia entre lista de claves secretas y p�blicas"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:599
msgid "t"
msgstr ""
-#: g10/keyedit.c:594
+#: g10/keyedit.c:600
msgid "pref"
msgstr ""
-#: g10/keyedit.c:594 g10/keyedit.c:595
-msgid "list preferences"
+#: g10/keyedit.c:600
+#, fuzzy
+msgid "list preferences (expert)"
msgstr "muestra preferencias"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:601
msgid "showpref"
msgstr ""
-#: g10/keyedit.c:596
+#: g10/keyedit.c:601
+#, fuzzy
+msgid "list preferences (verbose)"
+msgstr "muestra preferencias"
+
+#: g10/keyedit.c:602
msgid "setpref"
msgstr ""
-#: g10/keyedit.c:596
+#: g10/keyedit.c:602
#, fuzzy
msgid "set preference list"
msgstr "muestra preferencias"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
msgid "updpref"
msgstr ""
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updated preferences"
msgstr "muestra preferencias"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "passwd"
msgstr ""
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "change the passphrase"
msgstr "cambia la contrase�a"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "trust"
msgstr ""
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "change the ownertrust"
msgstr "cambia valores de confianza"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revsig"
msgstr ""
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revoke signatures"
msgstr "revoca firmas"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revkey"
msgstr ""
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revoke a secondary key"
msgstr "revoca una clave secundaria"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable"
msgstr ""
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable a key"
msgstr "deshabilita una clave"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable"
msgstr ""
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable a key"
msgstr "habilita una clave"
-#: g10/delkey.c:112 g10/keyedit.c:623
+#: g10/delkey.c:112 g10/keyedit.c:629
msgid "can't do that in batchmode\n"
msgstr "imposible hacer esto en modo de proceso por lotes\n"
-#: g10/keyedit.c:658
+#: g10/keyedit.c:664
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "error leyendo `%s': %s\n"
-#: g10/keyedit.c:676
+#: g10/keyedit.c:682
msgid "Secret key is available.\n"
msgstr "Clave secreta disponible.\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:712
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:737
+#: g10/keyedit.c:743
msgid "Need the secret key to do this.\n"
msgstr "Se necesita la clave secreta para hacer esto.\n"
-#: g10/keyedit.c:741
+#: g10/keyedit.c:747
msgid "Please use the command \"toggle\" first.\n"
msgstr ""
-#: g10/keyedit.c:788
+#: g10/keyedit.c:794
msgid "Really sign all user IDs? "
msgstr "�Firmar realmente todos los identificativos de usuario? "
-#: g10/keyedit.c:789
+#: g10/keyedit.c:795
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugerencia: seleccione los identificativos de usuario a firmar\n"
-#: g10/keyedit.c:821 g10/keyedit.c:842
+#: g10/keyedit.c:827 g10/keyedit.c:848
msgid "You must select at least one user ID.\n"
msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:829
msgid "You can't delete the last user ID!\n"
msgstr "�No puede borrar el �ltimo identificativo de usuario!\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:832
msgid "Really remove all selected user IDs? "
msgstr "�Borrar realmente todos los identificativos seleccionados? "
-#: g10/keyedit.c:827
+#: g10/keyedit.c:833
msgid "Really remove this user ID? "
msgstr "�Borrar realmente este identificativo? "
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:871 g10/keyedit.c:893
msgid "You must select at least one key.\n"
msgstr "Debe seleccionar por lo menos una clave.\n"
-#: g10/keyedit.c:869
+#: g10/keyedit.c:875
msgid "Do you really want to delete the selected keys? "
msgstr "�Borrar realmente las claves seleccionadas? "
-#: g10/keyedit.c:870
+#: g10/keyedit.c:876
msgid "Do you really want to delete this key? "
msgstr "�Borrar realmente esta clave? "
-#: g10/keyedit.c:891
+#: g10/keyedit.c:897
msgid "Do you really want to revoke the selected keys? "
msgstr "�Revocar realmente las claves seleccionadas? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:898
msgid "Do you really want to revoke this key? "
msgstr "�Revocar realmente esta clave? "
-#: g10/keyedit.c:956
+#: g10/keyedit.c:962
#, fuzzy
msgid "Really update the preferences for the selected user IDs? "
msgstr "�Borrar realmente todos los identificativos seleccionados? "
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
#, fuzzy
msgid "Really update the preferences? "
msgstr "�Crear los certificados de revocaci�n realmente? (s/N)"
-#: g10/keyedit.c:992
+#: g10/keyedit.c:998
msgid "Save changes? "
msgstr "�Grabar cambios? "
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1001
msgid "Quit without saving? "
msgstr "�Salir sin grabar? "
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1012
#, c-format
msgid "update failed: %s\n"
msgstr "actualizaci�n fallida: %s\n"
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1019
#, c-format
msgid "update secret failed: %s\n"
msgstr "actualizaci�n de la clave secreta fallida: %s\n"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1026
msgid "Key not changed so no update needed.\n"
msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
-#: g10/keyedit.c:1031
+#: g10/keyedit.c:1037
msgid "Invalid command (try \"help\")\n"
msgstr "Comando no v�lido (pruebe \"help\")\n"
-#: g10/keyedit.c:1139 g10/keyedit.c:1165
+#: g10/keyedit.c:1145 g10/keyedit.c:1171
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr ""
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1154
#, c-format
msgid " trust: %c/%c"
msgstr ""
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1158
msgid "This key has been disabled"
msgstr "Esta clave est� deshabilitada"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1187
#, fuzzy, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! �esta subclave ha sido revocada! %s\n"
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1190
#, fuzzy
msgid "rev- faked revocation found\n"
msgstr "rev- incorrectas revocaciones\n"
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1192
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr ""
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1408
msgid "Delete this good signature? (y/N/q)"
msgstr "�Borrar esta firma correcta? (s/N/q)"
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1412
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�Borrar esta firma no v�lida? (s/N/q)"
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1416
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�Borrar esta firma desconocida? (s/N/q)"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1422
msgid "Really delete this self-signature? (y/N)"
msgstr "�Borrar realmente esta autofirma? (s/N)"
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d firmas borradas.\n"
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d firmas borradas\n"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
msgid "Nothing deleted.\n"
msgstr "No se borr� nada\n"
-#: g10/keyedit.c:1503
+#: g10/keyedit.c:1509
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor, quite la selecci�n de las claves secretas.\n"
-#: g10/keyedit.c:1509
+#: g10/keyedit.c:1515
msgid "Please select at most one secondary key.\n"
msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1519
msgid "Changing expiration time for a secondary key.\n"
msgstr "Cambiando caducidad de clave secundaria.\n"
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1521
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambiando caducidad de clave primaria.\n"
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1563
msgid "You can't change the expiration date of a v3 key\n"
msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1579
msgid "No corresponding signature in secret ring\n"
msgstr "No hay firma correspondiente en anillo secreto\n"
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1662
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1837
#, c-format
msgid "No user ID with index %d\n"
msgstr "No hay ning�n identificativo de usuario con el �ndice %d\n"
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
#, c-format
msgid "No secondary key with index %d\n"
msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:1981
msgid "user ID: \""
msgstr "ID de usuario: \""
-#: g10/keyedit.c:1978
+#: g10/keyedit.c:1984
#, c-format
msgid ""
"\"\n"
@@ -2636,34 +2647,34 @@ msgstr ""
"\"\n"
"firmada con su clave %08lX el %s\n"
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1988
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "�Crear un certificado de revocaci�n para esta clave (s/N)?"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2012
msgid "You have signed these user IDs:\n"
msgstr "Ha firmado los siguientes IDs de usuario:\n"
-#: g10/keyedit.c:2020 g10/keyedit.c:2055
+#: g10/keyedit.c:2026 g10/keyedit.c:2061
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " firmada por %08lX el %s\n"
-#: g10/keyedit.c:2025
+#: g10/keyedit.c:2031
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " revocada por %08lX el %s\n"
-#: g10/keyedit.c:2045
+#: g10/keyedit.c:2051
msgid "You are about to revoke these signatures:\n"
msgstr "Va Vd. a revocar las siguientes firmas:\n"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:2069
msgid "Really create the revocation certificates? (y/N)"
msgstr "�Crear los certificados de revocaci�n realmente? (s/N)"
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2098
msgid "no secret key\n"
msgstr "no hay clave secreta\n"
@@ -2847,37 +2858,37 @@ msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
-#: g10/passphrase.c:277 g10/passphrase.c:319
+#: g10/passphrase.c:278 g10/passphrase.c:320
msgid "gpg-agent is not available in this session\n"
msgstr ""
-#: g10/passphrase.c:285
+#: g10/passphrase.c:286
msgid "can't set client pid for the agent\n"
msgstr ""
-#: g10/passphrase.c:293
+#: g10/passphrase.c:294
msgid "can't get server read FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:300
+#: g10/passphrase.c:301
msgid "can't get server write FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:325
+#: g10/passphrase.c:326
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:174 g10/passphrase.c:344
+#: g10/hkp.c:174 g10/passphrase.c:345
#, fuzzy, c-format
msgid "can't connect to `%s': %s\n"
msgstr "no puede abrirse `%s': %s\n"
-#: g10/passphrase.c:415 g10/passphrase.c:677
+#: g10/passphrase.c:417 g10/passphrase.c:679
#, c-format
msgid " (main key ID %08lX)"
msgstr "(ID clave primaria %08lX)"
-#: g10/passphrase.c:425
+#: g10/passphrase.c:427
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -2889,35 +2900,35 @@ msgstr ""
"del usuario: \"%2$s\"\n"
"clave %4$s de %3$u bit, ID %5$08lX, creada el %6$s%7$s\n"
-#: g10/passphrase.c:446
+#: g10/passphrase.c:448
#, fuzzy
msgid "Enter passphrase\n"
msgstr "Introduzca contrase�a: "
-#: g10/passphrase.c:448
+#: g10/passphrase.c:450
#, fuzzy
msgid "Repeat passphrase\n"
msgstr "Repita contrase�a: "
-#: g10/passphrase.c:483
+#: g10/passphrase.c:485
#, fuzzy
msgid "passphrase too long\n"
msgstr "linea demasiado larga\n"
-#: g10/passphrase.c:495
+#: g10/passphrase.c:497
msgid "invalid response from agent\n"
msgstr ""
-#: g10/passphrase.c:504
+#: g10/passphrase.c:506
msgid "cancelled by user\n"
msgstr ""
-#: g10/passphrase.c:507 g10/passphrase.c:580
+#: g10/passphrase.c:509 g10/passphrase.c:582
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr ""
-#: g10/passphrase.c:663
+#: g10/passphrase.c:665
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -2927,20 +2938,20 @@ msgstr ""
"Necesita una contrase�a para desbloquear la clave secreta\n"
"del usuario: \""
-#: g10/passphrase.c:672
+#: g10/passphrase.c:674
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
-#: g10/passphrase.c:710
+#: g10/passphrase.c:712
msgid "can't query password in batchmode\n"
msgstr "imposible pedir contrase�a en modo de proceso por lotes\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:716
msgid "Enter passphrase: "
msgstr "Introduzca contrase�a: "
-#: g10/passphrase.c:718
+#: g10/passphrase.c:720
msgid "Repeat passphrase: "
msgstr "Repita contrase�a: "
@@ -3166,7 +3177,7 @@ msgstr "%s: no puede crearse bloqueo\n"
msgid "%s: can't make lock\n"
msgstr "%s: no puede crearse bloqueo\n"
-#: g10/keyring.c:1376 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
+#: g10/keyring.c:1420 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: no puede crearse: %s\n"
@@ -3303,22 +3314,32 @@ msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
-#: g10/trustdb.c:688
+#: g10/trustdb.c:470
+#, fuzzy
+msgid "no need for a trustdb check\n"
+msgstr "%s: no es una base de datos de confianza\n"
+
+#: g10/trustdb.c:476 g10/trustdb.c:1458
+#, fuzzy, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "inserci�n del registro de confianza fallida: %s\n"
+
+#: g10/trustdb.c:709
#, fuzzy
msgid "checking the trustdb\n"
msgstr "cambia valores de confianza"
-#: g10/trustdb.c:839
+#: g10/trustdb.c:860
#, fuzzy, c-format
msgid "public key %08lX not found: %s\n"
msgstr "Clave p�blica no encontrada"
-#: g10/trustdb.c:1304
+#: g10/trustdb.c:1338
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr ""
-#: g10/trustdb.c:1374
+#: g10/trustdb.c:1411
#, c-format
msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
msgstr ""
@@ -3715,60 +3736,60 @@ msgstr "Ayuda no disponible"
msgid "No help available for `%s'"
msgstr "Ayuda no disponible para `%s'"
-#: g10/keydb.c:170
+#: g10/keydb.c:175
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "error escribiendo anillo `%s': %s\n"
-#: g10/keydb.c:179
+#: g10/keydb.c:184
#, c-format
msgid "changing permission of `%s' failed: %s\n"
msgstr ""
-#: g10/keydb.c:188
+#: g10/keydb.c:193
#, fuzzy, c-format
msgid "keyring `%s' created\n"
msgstr "%s: anillo creado\n"
-#: g10/keydb.c:530
+#: g10/keydb.c:586
#, fuzzy, c-format
-msgid "failed to rebuild all keyring caches: %s\n"
+msgid "failed to rebuild keyring cache: %s\n"
msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
-#: g10/keyring.c:1179
+#: g10/keyring.c:1220
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
-#: g10/keyring.c:1181
+#: g10/keyring.c:1222
#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s es el que no se ha modificado\n"
-#: g10/keyring.c:1182
+#: g10/keyring.c:1223
#, c-format
msgid "%s is the new one\n"
msgstr "%s es el nuevo\n"
-#: g10/keyring.c:1183
+#: g10/keyring.c:1224
msgid "Please fix this possible security flaw\n"
msgstr "Por favor arregle este posible fallo de seguridad\n"
-#: g10/keyring.c:1281
+#: g10/keyring.c:1322
#, fuzzy, c-format
msgid "checking keyring `%s'\n"
msgstr "error escribiendo anillo `%s': %s\n"
-#: g10/keyring.c:1312
+#: g10/keyring.c:1353
#, fuzzy, c-format
msgid "%lu keys so far checked (%lu signatures)\n"
msgstr "hasta ahora se han procesado %lu claves\n"
-#: g10/keyring.c:1323
+#: g10/keyring.c:1364
#, fuzzy, c-format
msgid "%lu keys checked (%lu signatures)\n"
msgstr "lista claves y firmas"
-#: g10/keyring.c:1381
+#: g10/keyring.c:1425
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: anillo creado\n"
@@ -4222,9 +4243,6 @@ msgstr "%s: anillo creado\n"
#~ msgid "Oops: key is now in trustdb???\n"
#~ msgstr "Oh oh: la clave ahora est� en la tabla de confianza???\n"
-#~ msgid "insert trust record failed: %s\n"
-#~ msgstr "inserci�n del registro de confianza fallida: %s\n"
-
#~ msgid "Hmmm, public key lost?"
#~ msgstr "Oh oh, �se ha perdido la clave p�blica?"
diff --git a/po/et.po b/po/et.po
index fd787e4c8..dbc534350 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.4\n"
-"POT-Creation-Date: 2001-09-28 16:20+0200\n"
+"POT-Creation-Date: 2001-10-23 09:41+0200\n"
"PO-Revision-Date: 2001-01-04 12:01+02:00\n"
"Last-Translator: Toomas Soome <[email protected]>\n"
"Language-Team: Estonian <[email protected]>\n"
@@ -41,7 +41,7 @@ msgstr "ei"
msgid "nN"
msgstr "eE"
-#: g10/keyedit.c:568 util/miscutil.c:326
+#: g10/keyedit.c:574 util/miscutil.c:326
msgid "quit"
msgstr "v�lju"
@@ -342,7 +342,7 @@ msgstr ""
"Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid t�id,\n"
"et anda masinal v�imalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
-#: g10/g10.c:237
+#: g10/g10.c:238
msgid ""
"@Commands:\n"
" "
@@ -350,145 +350,145 @@ msgstr ""
"@K�sud:\n"
" "
-#: g10/g10.c:239
+#: g10/g10.c:240
msgid "|[file]|make a signature"
msgstr "|[fail]|loo allkiri"
-#: g10/g10.c:240
+#: g10/g10.c:241
msgid "|[file]|make a clear text signature"
msgstr "|[fail]|loo avateksti allkiri"
-#: g10/g10.c:241
+#: g10/g10.c:242
msgid "make a detached signature"
msgstr "loo eraldiseisev allkiri"
-#: g10/g10.c:242
+#: g10/g10.c:243
msgid "encrypt data"
msgstr "kr�pti andmed"
-#: g10/g10.c:243
+#: g10/g10.c:244
msgid "encryption only with symmetric cipher"
msgstr "kr�ptimine kasutades s�mmeetrilist �iffrit"
-#: g10/g10.c:244
+#: g10/g10.c:245
msgid "store only"
msgstr "salvesta ainult"
-#: g10/g10.c:245
+#: g10/g10.c:246
msgid "decrypt data (default)"
msgstr "dekr�pti andmed (vaikimisi)"
-#: g10/g10.c:246
+#: g10/g10.c:247
msgid "verify a signature"
msgstr "kontrolli allkirja"
-#: g10/g10.c:248
+#: g10/g10.c:249
msgid "list keys"
msgstr "n�ita v�tmeid"
-#: g10/g10.c:250
+#: g10/g10.c:251
msgid "list keys and signatures"
msgstr "n�ita v�tmeid ja allkirju"
-#: g10/g10.c:251
+#: g10/g10.c:252
msgid "check key signatures"
msgstr "kontrolli v�tmete allkirju"
-#: g10/g10.c:252
+#: g10/g10.c:253
msgid "list keys and fingerprints"
msgstr "n�ita v�tmeid ja s�rmej�lgi"
-#: g10/g10.c:253
+#: g10/g10.c:254
msgid "list secret keys"
msgstr "n�ita salajasi v�tmeid"
-#: g10/g10.c:254
+#: g10/g10.c:255
msgid "generate a new key pair"
msgstr "genereeri uus v�tmepaar"
-#: g10/g10.c:255
+#: g10/g10.c:256
msgid "remove key from the public keyring"
msgstr "eemalda v�ti avalike v�tmete hoidlast"
-#: g10/g10.c:257
+#: g10/g10.c:258
msgid "remove key from the secret keyring"
msgstr "eemalda v�ti salajaste v�tmete hoidlast"
-#: g10/g10.c:258
+#: g10/g10.c:259
msgid "sign a key"
msgstr "allkirjasta v�ti"
-#: g10/g10.c:259
+#: g10/g10.c:260
msgid "sign a key locally"
msgstr "allkirjasta v�ti lokaalselt"
-#: g10/g10.c:260
+#: g10/g10.c:261
msgid "sign or edit a key"
msgstr "allkirjasta v�i toimeta v�tit"
-#: g10/g10.c:261
+#: g10/g10.c:262
msgid "generate a revocation certificate"
msgstr "genereeri t�histamise sertifikaat"
-#: g10/g10.c:262
+#: g10/g10.c:263
msgid "export keys"
msgstr "ekspordi v�tmed"
-#: g10/g10.c:263
+#: g10/g10.c:264
msgid "export keys to a key server"
msgstr "ekspordi v�tmed v�tmeserverisse"
-#: g10/g10.c:264
+#: g10/g10.c:265
msgid "import keys from a key server"
msgstr "impordi v�tmed v�tmeserverist"
-#: g10/g10.c:266
+#: g10/g10.c:267
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "impordi v�tmed v�tmeserverist"
-#: g10/g10.c:270
+#: g10/g10.c:271
msgid "import/merge keys"
msgstr "impordi/mesti v�tmed"
-#: g10/g10.c:272
+#: g10/g10.c:273
msgid "list only the sequence of packets"
msgstr "n�ita ainult pakettide j�rjendeid"
-#: g10/g10.c:274
+#: g10/g10.c:275
msgid "export the ownertrust values"
msgstr "ekspordi usalduse v��rtused"
-#: g10/g10.c:276
+#: g10/g10.c:277
msgid "import ownertrust values"
msgstr "impordi usalduse v��rtused"
-#: g10/g10.c:278
+#: g10/g10.c:279
msgid "update the trust database"
msgstr "uuenda usalduse andmebaasi"
-#: g10/g10.c:280
+#: g10/g10.c:281
#, fuzzy
msgid "unattended trust database update"
msgstr "uuenda usalduse andmebaasi"
-#: g10/g10.c:281
+#: g10/g10.c:282
msgid "fix a corrupted trust database"
msgstr "paranda vigane usalduse andmebaas"
-#: g10/g10.c:282
+#: g10/g10.c:283
msgid "De-Armor a file or stdin"
msgstr "Pakenda fail v�i standardsisend lahti"
-#: g10/g10.c:284
+#: g10/g10.c:285
msgid "En-Armor a file or stdin"
msgstr "Pakenda fail v�i standardsisend"
-#: g10/g10.c:286
+#: g10/g10.c:287
msgid "|algo [files]|print message digests"
msgstr "|algo [failid]|tr�ki teatel�hendid"
-#: g10/g10.c:290
+#: g10/g10.c:291
msgid ""
"@\n"
"Options:\n"
@@ -498,162 +498,167 @@ msgstr ""
"V�tmed:\n"
" "
-#: g10/g10.c:292
+#: g10/g10.c:293
msgid "create ascii armored output"
msgstr "loo ascii pakendis v�ljund"
-#: g10/g10.c:294
+#: g10/g10.c:295
msgid "|NAME|encrypt for NAME"
msgstr "|NIMI|kr�pti NIMEle"
-#: g10/g10.c:297
+#: g10/g10.c:298
msgid "|NAME|use NAME as default recipient"
msgstr "|NIMI|kasuta NIME vaikimisi saajana"
-#: g10/g10.c:299
+#: g10/g10.c:300
msgid "use the default key as default recipient"
msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
-#: g10/g10.c:303
+#: g10/g10.c:304
msgid "use this user-id to sign or decrypt"
msgstr "kasuta seda kasutaja IDd"
-#: g10/g10.c:304
+#: g10/g10.c:305
msgid "|N|set compress level N (0 disables)"
msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
-#: g10/g10.c:306
+#: g10/g10.c:307
msgid "use canonical text mode"
msgstr "kasuta kanoonilist tekstimoodi"
-#: g10/g10.c:307
+#: g10/g10.c:308
msgid "use as output file"
msgstr "kasuta v�ljundfailina"
-#: g10/g10.c:308
+#: g10/g10.c:309
msgid "verbose"
msgstr "ole jutukas"
-#: g10/g10.c:309
+#: g10/g10.c:310
msgid "be somewhat more quiet"
msgstr "ole m�nev�rra vaiksem"
-#: g10/g10.c:310
+#: g10/g10.c:311
msgid "don't use the terminal at all"
msgstr "�ra kasuta terminali"
-#: g10/g10.c:311
+#: g10/g10.c:312
msgid "force v3 signatures"
msgstr "kasuta v3 allkirju"
-#: g10/g10.c:312
+#: g10/g10.c:313
+#, fuzzy
+msgid "do not force v3 signatures"
+msgstr "kasuta v3 allkirju"
+
+#: g10/g10.c:314
msgid "always use a MDC for encryption"
msgstr "kr�ptimisel kasuta alati MDC"
-#: g10/g10.c:313
+#: g10/g10.c:315
msgid "do not make any changes"
msgstr "�ra tee mingeid muutuseid"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:315
+#: g10/g10.c:317
msgid "use the gpg-agent"
msgstr ""
-#: g10/g10.c:316
+#: g10/g10.c:318
msgid "batch mode: never ask"
msgstr "pakettmood: �ra k�si kunagi"
-#: g10/g10.c:317
+#: g10/g10.c:319
msgid "assume yes on most questions"
msgstr "eelda enamus k�simustele jah vastust"
-#: g10/g10.c:318
+#: g10/g10.c:320
msgid "assume no on most questions"
msgstr "eelda enamus k�simustele ei vastust"
-#: g10/g10.c:319
+#: g10/g10.c:321
msgid "add this keyring to the list of keyrings"
msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
-#: g10/g10.c:320
+#: g10/g10.c:322
msgid "add this secret keyring to the list"
msgstr "lisa see salajaste v�tmete hoidla nimekirja"
-#: g10/g10.c:321
+#: g10/g10.c:323
msgid "|NAME|use NAME as default secret key"
msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
-#: g10/g10.c:322
+#: g10/g10.c:324
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|kasuta seda v�tmeserverit"
-#: g10/g10.c:323
+#: g10/g10.c:325
msgid "|NAME|set terminal charset to NAME"
msgstr "|NIMI|terminali kooditabel on NIMI"
-#: g10/g10.c:324
+#: g10/g10.c:326
msgid "read options from file"
msgstr "loe v�tmed failist"
-#: g10/g10.c:328
+#: g10/g10.c:330
msgid "|FD|write status info to this FD"
msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
-#: g10/g10.c:330
+#: g10/g10.c:332
#, fuzzy
msgid "|[file]|write status info to file"
msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
-#: g10/g10.c:336
+#: g10/g10.c:338
#, fuzzy
msgid "|KEYID|ultimately trust this key"
msgstr "|V�TMEID|usalda seda v�tit t�ielikult"
-#: g10/g10.c:337
+#: g10/g10.c:339
msgid "|FILE|load extension module FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
-#: g10/g10.c:338
+#: g10/g10.c:340
msgid "emulate the mode described in RFC1991"
msgstr "emuleeri dokumendis RFC1991 kirjeldatud moodi"
-#: g10/g10.c:339
+#: g10/g10.c:341
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "kasuta k�ikides tegevustes OpenPGP v�tmeid"
-#: g10/g10.c:340
+#: g10/g10.c:342
msgid "|N|use passphrase mode N"
msgstr "|N|kasuta parooli moodi N"
-#: g10/g10.c:342
+#: g10/g10.c:344
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NIMI|kasuta paroolidega l�hendialgoritmi NIMI"
-#: g10/g10.c:344
+#: g10/g10.c:346
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NIMI|kasuta paroolidega �iffri algoritmi NIMI"
-#: g10/g10.c:345
+#: g10/g10.c:347
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NIMI|kasuta �iffri algoritmi NIMI"
-#: g10/g10.c:346
+#: g10/g10.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
-#: g10/g10.c:347
+#: g10/g10.c:349
msgid "|N|use compress algorithm N"
msgstr "|N|kasuta pakkimisalgoritmi N"
-#: g10/g10.c:348
+#: g10/g10.c:350
msgid "throw keyid field of encrypted packets"
msgstr "�ra lisa kr�ptimisel v�tme id"
-#: g10/g10.c:349
+#: g10/g10.c:351
msgid "|NAME=VALUE|use this notation data"
msgstr "|NIMI=V��RTUS|kasuta neid noteerimise andmeid"
-#: g10/g10.c:352
+#: g10/g10.c:354
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -661,7 +666,7 @@ msgstr ""
"@\n"
"(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
-#: g10/g10.c:355
+#: g10/g10.c:357
msgid ""
"@\n"
"Examples:\n"
@@ -681,15 +686,15 @@ msgstr ""
" --list-keys [nimed] n�ita v�tmeid\n"
" --fingerprint [nimed] n�ita s�rmej�lgi\n"
-#: g10/g10.c:478
+#: g10/g10.c:480
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
-#: g10/g10.c:482
+#: g10/g10.c:484
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
-#: g10/g10.c:485
+#: g10/g10.c:487
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -699,7 +704,7 @@ msgstr ""
"allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
"vaikimisi operatsioon s�ltub sisendandmetest\n"
-#: g10/g10.c:496
+#: g10/g10.c:498
msgid ""
"\n"
"Supported algorithms:\n"
@@ -707,201 +712,201 @@ msgstr ""
"\n"
"Toetatud algoritmid:\n"
-#: g10/g10.c:570
+#: g10/g10.c:572
msgid "usage: gpg [options] "
msgstr "kasuta: gpg [v�tmed] "
-#: g10/g10.c:627
+#: g10/g10.c:629
msgid "conflicting commands\n"
msgstr "konfliktsed k�sud\n"
-#: g10/g10.c:783
+#: g10/g10.c:785
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
-#: g10/g10.c:787
+#: g10/g10.c:789
#, c-format
msgid "option file `%s': %s\n"
msgstr "v�tmete fail `%s': %s\n"
-#: g10/g10.c:794
+#: g10/g10.c:796
#, c-format
msgid "reading options from `%s'\n"
msgstr "loen v�tmeid failist `%s'\n"
-#: g10/g10.c:1038
+#: g10/g10.c:1041
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s ei ole lubatud kooditabel\n"
-#: g10/g10.c:1122
+#: g10/g10.c:1125
msgid "WARNING: program may create a core file!\n"
msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
-#: g10/g10.c:1126 g10/g10.c:1135
+#: g10/g10.c:1129 g10/g10.c:1138
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
-#: g10/g10.c:1128
+#: g10/g10.c:1131
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
-#: g10/g10.c:1131
+#: g10/g10.c:1134
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s ei oma koos m�tet!\n"
-#: g10/g10.c:1151 g10/g10.c:1163
+#: g10/g10.c:1154 g10/g10.c:1166
msgid "selected cipher algorithm is invalid\n"
msgstr "valitud �iffri algoritm ei ole lubatud\n"
-#: g10/g10.c:1157 g10/g10.c:1169
+#: g10/g10.c:1160 g10/g10.c:1172
msgid "selected digest algorithm is invalid\n"
msgstr "valitud l�hendi algoritm ei ole lubatud\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1176
msgid "the given policy URL is invalid\n"
msgstr "anti vigane poliisi URL\n"
-#: g10/g10.c:1176
+#: g10/g10.c:1179
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "pakkimise algoritm peab olema vahemikust %d..%d\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1181
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed peab olema suurem, kui 0\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1183
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed peab olema suurem, kui 1\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1185
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1188
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
-#: g10/g10.c:1189
+#: g10/g10.c:1192
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1196
#, fuzzy
msgid "invalid preferences\n"
msgstr "n�ita eelistusi"
-#: g10/g10.c:1276
+#: g10/g10.c:1279
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
-#: g10/g10.c:1282
+#: g10/g10.c:1285
msgid "--store [filename]"
msgstr "--store [failinimi]"
-#: g10/g10.c:1289
+#: g10/g10.c:1292
msgid "--symmetric [filename]"
msgstr "--symmetric [failinimi]"
-#: g10/g10.c:1297
+#: g10/g10.c:1300
msgid "--encrypt [filename]"
msgstr "--encrypt [failinimi]"
-#: g10/g10.c:1310
+#: g10/g10.c:1313
msgid "--sign [filename]"
msgstr "--sign [failinimi]"
-#: g10/g10.c:1323
+#: g10/g10.c:1326
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
-#: g10/g10.c:1337
+#: g10/g10.c:1340
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [failinimi]"
-#: g10/g10.c:1346
+#: g10/g10.c:1349
msgid "--clearsign [filename]"
msgstr "--clearsign [failinimi]"
-#: g10/g10.c:1364
+#: g10/g10.c:1367
msgid "--decrypt [filename]"
msgstr "--decrypt [failinimi]"
-#: g10/g10.c:1372
+#: g10/g10.c:1375
msgid "--sign-key user-id"
msgstr "--sign-key kasutaja-id"
-#: g10/g10.c:1380
+#: g10/g10.c:1383
msgid "--lsign-key user-id"
msgstr "--lsign-key kasutaja-id"
-#: g10/g10.c:1388
+#: g10/g10.c:1391
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kasutaja-id [k�sud]"
-#: g10/g10.c:1404
+#: g10/g10.c:1407
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key kasutaja-id"
-#: g10/g10.c:1407
+#: g10/g10.c:1410
msgid "--delete-key user-id"
msgstr "--delete-key kasutaja-id"
-#: g10/g10.c:1415
+#: g10/g10.c:1418
#, fuzzy
msgid "--delete-secret-and-public-key user-id"
msgstr "--delete-secret-and-public-key kasutaja-id"
-#: g10/encode.c:268 g10/g10.c:1452 g10/sign.c:632
+#: g10/encode.c:268 g10/g10.c:1455 g10/sign.c:632
#, c-format
msgid "can't open %s: %s\n"
msgstr "%s ei saa avada: %s\n"
-#: g10/g10.c:1467
+#: g10/g10.c:1470
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
-#: g10/g10.c:1539
+#: g10/g10.c:1542
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "lahtipakendamine eba�nnestus: %s\n"
-#: g10/g10.c:1547
+#: g10/g10.c:1550
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
-#: g10/g10.c:1618
+#: g10/g10.c:1621
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "vigane teatel�hendi algoritm `%s'\n"
-#: g10/g10.c:1704
+#: g10/g10.c:1707
msgid "[filename]"
msgstr "[failinimi]"
-#: g10/g10.c:1708
+#: g10/g10.c:1711
msgid "Go ahead and type your message ...\n"
msgstr "Kirjutage n��d oma teade ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1711 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1714 g10/verify.c:94 g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "`%s' ei saa avada\n"
-#: g10/g10.c:1920
+#: g10/g10.c:1923
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr "esimene s�mbol noteerimise nimes peab olema t�ht v�i alakriips\n"
-#: g10/g10.c:1926
+#: g10/g10.c:1929
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -909,12 +914,12 @@ msgstr ""
"noteerimise nimes v�ivad olla ainult t�hed, numbrid, punktid ja alakriipsud\n"
"ning l�pus peab olema '='\n"
-#: g10/g10.c:1932
+#: g10/g10.c:1935
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
"punktid noteerimise nimes peavad olema �mbritsetud teiste s�mbolitega\n"
-#: g10/g10.c:1940
+#: g10/g10.c:1943
msgid "a notation value must not use any control characters\n"
msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
@@ -1561,7 +1566,7 @@ msgstr ""
"Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
"\n"
-#: g10/keyedit.c:456 g10/keygen.c:1171
+#: g10/keyedit.c:462 g10/keygen.c:1171
msgid "passphrase not correctly repeated; try again.\n"
msgstr "parooli ei korratud �ieti; proovige uuesti.\n"
@@ -1696,27 +1701,27 @@ msgstr "loen failist `%s'\n"
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s kr�ptitud kasutajale: %s\n"
-#: g10/delkey.c:69 g10/export.c:149
+#: g10/delkey.c:69 g10/export.c:148
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "kasutajat '%s' ei leitud: %s\n"
-#: g10/delkey.c:77 g10/export.c:159
+#: g10/delkey.c:77 g10/export.c:158
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
-#: g10/export.c:167
+#: g10/export.c:166
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "v�ti %08lX: ei ole rfc2440 v�ti - j�tsin vahele\n"
-#: g10/export.c:178
+#: g10/export.c:177
#, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
-#: g10/export.c:234
+#: g10/export.c:233
msgid "WARNING: nothing exported\n"
msgstr "HOIATUS: midagi ei eksporditud\n"
@@ -1726,16 +1731,16 @@ msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:183 g10/getkey.c:2188
+#: g10/getkey.c:183 g10/getkey.c:2192
msgid "[User id not found]"
msgstr "[Kasutaja id ei leitud]"
-#: g10/getkey.c:1911
+#: g10/getkey.c:1915
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
-#: g10/getkey.c:1952
+#: g10/getkey.c:1956
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
@@ -2066,17 +2071,17 @@ msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:296
+#: g10/keyedit.c:302
#, c-format
msgid "Already signed by key %08lX\n"
msgstr "On juba allkirjastatud v�tmega %08lX\n"
-#: g10/keyedit.c:307
+#: g10/keyedit.c:313
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "V�tmega %08lX pole midagi allkirjastada\n"
-#: g10/keyedit.c:316
+#: g10/keyedit.c:322
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2084,7 +2089,7 @@ msgstr ""
"Olete t�esti kindel, et soovite seda v�tit oma\n"
"v�tmega allkirjastada: \""
-#: g10/keyedit.c:325
+#: g10/keyedit.c:331
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
@@ -2092,33 +2097,33 @@ msgstr ""
"Allkiri m�rgitakse mitte-eksporditavaks.\n"
"\n"
-#: g10/keyedit.c:330
+#: g10/keyedit.c:336
msgid "Really sign? "
msgstr "Allkirjastan t�esti? "
-#: g10/keyedit.c:361 g10/keyedit.c:2104 g10/keyedit.c:2166 g10/sign.c:225
+#: g10/keyedit.c:367 g10/keyedit.c:2110 g10/keyedit.c:2172 g10/sign.c:225
#, c-format
msgid "signing failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
-#: g10/keyedit.c:415
+#: g10/keyedit.c:421
msgid "This key is not protected.\n"
msgstr "See v�ti ei ole kaitstud.\n"
-#: g10/keyedit.c:419
+#: g10/keyedit.c:425
msgid "Secret parts of primary key are not available.\n"
msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
-#: g10/keyedit.c:423
+#: g10/keyedit.c:429
msgid "Key is protected.\n"
msgstr "V�ti on kaitstud.\n"
-#: g10/keyedit.c:443
+#: g10/keyedit.c:449
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Seda v�tit ei saa toimetada: %s\n"
-#: g10/keyedit.c:448
+#: g10/keyedit.c:454
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2126,7 +2131,7 @@ msgstr ""
"Sisestage sellele salajasele v�tmele uus parool.\n"
"\n"
-#: g10/keyedit.c:460
+#: g10/keyedit.c:466
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2134,466 +2139,472 @@ msgstr ""
"Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
"\n"
-#: g10/keyedit.c:463
+#: g10/keyedit.c:469
msgid "Do you really want to do this? "
msgstr "Kas te t�esti soovite seda teha? "
-#: g10/keyedit.c:527
+#: g10/keyedit.c:533
msgid "moving a key signature to the correct place\n"
msgstr "t�stan v�tme allkirja �igesse kohta\n"
-#: g10/keyedit.c:568
+#: g10/keyedit.c:574
msgid "quit this menu"
msgstr "v�lju sellest men��st"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:575
msgid "q"
msgstr "v"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save"
msgstr "save"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save and quit"
msgstr "salvesta ja v�lju"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "help"
msgstr "help"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "show this help"
msgstr "n�ita seda abiinfot"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "show fingerprint"
msgstr "n�ita s�rmej�lge"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list"
msgstr "list"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list key and user IDs"
msgstr "n�ita v�tit ja kasutaja IDd"
-#: g10/keyedit.c:575
+#: g10/keyedit.c:581
msgid "l"
msgstr "l"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "select user ID N"
msgstr "vali kasutaja ID N"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "key"
msgstr "key"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "select secondary key N"
msgstr "vali sekundaarne v�ti N"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "check"
msgstr "check"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "list signatures"
msgstr "n�ita allkirju"
-#: g10/keyedit.c:579
+#: g10/keyedit.c:585
msgid "c"
msgstr "c"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign the key"
msgstr "allkirjasta v�ti"
-#: g10/keyedit.c:581
+#: g10/keyedit.c:587
msgid "s"
msgstr "s"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "sign the key locally"
msgstr "allkirjasta v�ti lokaalselt"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:589
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "add a user ID"
msgstr "lisa kasutaja ID"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "delete user ID"
msgstr "kustuta kasutaja ID"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "add a secondary key"
msgstr "lisa sekundaarne v�ti"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delete a secondary key"
msgstr "kustuta sekundaarne v�ti"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delete signatures"
msgstr "kustuta allkirjad"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "change the expire date"
msgstr "muuda aegumise kuup�eva"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "primary"
msgstr ""
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle between secret and public key listing"
msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:599
msgid "t"
msgstr "t"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:600
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:594 g10/keyedit.c:595
-msgid "list preferences"
+#: g10/keyedit.c:600
+#, fuzzy
+msgid "list preferences (expert)"
msgstr "n�ita eelistusi"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:601
#, fuzzy
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:601
+#, fuzzy
+msgid "list preferences (verbose)"
+msgstr "n�ita eelistusi"
+
+#: g10/keyedit.c:602
#, fuzzy
msgid "setpref"
msgstr "pref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:602
#, fuzzy
msgid "set preference list"
msgstr "n�ita eelistusi"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updpref"
msgstr "pref"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updated preferences"
msgstr "n�ita eelistusi"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "change the passphrase"
msgstr "muuda parooli"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "change the ownertrust"
msgstr "muuda omaniku usaldust"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revoke signatures"
msgstr "t�hista allkirjad"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revoke a secondary key"
msgstr "t�hista sekundaarne v�ti"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable a key"
msgstr "blokeeri v�ti"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable a key"
msgstr "luba v�ti"
-#: g10/delkey.c:112 g10/keyedit.c:623
+#: g10/delkey.c:112 g10/keyedit.c:629
msgid "can't do that in batchmode\n"
msgstr "seda ei saa teha pakettmoodis\n"
-#: g10/keyedit.c:658
+#: g10/keyedit.c:664
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
-#: g10/keyedit.c:676
+#: g10/keyedit.c:682
msgid "Secret key is available.\n"
msgstr "Salajane v�ti on kasutatav.\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:712
msgid "Command> "
msgstr "K�sklus> "
-#: g10/keyedit.c:737
+#: g10/keyedit.c:743
msgid "Need the secret key to do this.\n"
msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
-#: g10/keyedit.c:741
+#: g10/keyedit.c:747
msgid "Please use the command \"toggle\" first.\n"
msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
-#: g10/keyedit.c:788
+#: g10/keyedit.c:794
msgid "Really sign all user IDs? "
msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
-#: g10/keyedit.c:789
+#: g10/keyedit.c:795
msgid "Hint: Select the user IDs to sign\n"
msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
-#: g10/keyedit.c:821 g10/keyedit.c:842
+#: g10/keyedit.c:827 g10/keyedit.c:848
msgid "You must select at least one user ID.\n"
msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:829
msgid "You can't delete the last user ID!\n"
msgstr "Viimast kasutaja ID ei saa kustutada!\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:832
msgid "Really remove all selected user IDs? "
msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
-#: g10/keyedit.c:827
+#: g10/keyedit.c:833
msgid "Really remove this user ID? "
msgstr "Kas eemaldan t�esti selle kasutaja ID? "
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:871 g10/keyedit.c:893
msgid "You must select at least one key.\n"
msgstr "Te peata valima v�hemalt �he v�tme.\n"
-#: g10/keyedit.c:869
+#: g10/keyedit.c:875
msgid "Do you really want to delete the selected keys? "
msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
-#: g10/keyedit.c:870
+#: g10/keyedit.c:876
msgid "Do you really want to delete this key? "
msgstr "Kas te t�esti soovite seda v�tit kustutada? "
-#: g10/keyedit.c:891
+#: g10/keyedit.c:897
msgid "Do you really want to revoke the selected keys? "
msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:898
msgid "Do you really want to revoke this key? "
msgstr "Kas te t�esti soovite seda v�tit t�histada? "
-#: g10/keyedit.c:956
+#: g10/keyedit.c:962
#, fuzzy
msgid "Really update the preferences for the selected user IDs? "
msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
#, fuzzy
msgid "Really update the preferences? "
msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E)"
-#: g10/keyedit.c:992
+#: g10/keyedit.c:998
msgid "Save changes? "
msgstr "Salvestan muutused? "
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1001
msgid "Quit without saving? "
msgstr "V�ljun salvestamata? "
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1012
#, c-format
msgid "update failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1019
#, c-format
msgid "update secret failed: %s\n"
msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1026
msgid "Key not changed so no update needed.\n"
msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
-#: g10/keyedit.c:1031
+#: g10/keyedit.c:1037
msgid "Invalid command (try \"help\")\n"
msgstr "Vigane k�sklus (proovige \"help\")\n"
-#: g10/keyedit.c:1139 g10/keyedit.c:1165
+#: g10/keyedit.c:1145 g10/keyedit.c:1171
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr "%s%c %4u%c/%08lX loodud: %s aegub: %s"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1154
#, c-format
msgid " trust: %c/%c"
msgstr " usaldus: %c/%c"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1158
msgid "This key has been disabled"
msgstr "See v�ti on blokeeritud"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1187
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! alamv�ti on t�histatud: %s\n"
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1190
msgid "rev- faked revocation found\n"
msgstr "rev- leitud v�ltsitud t�histamine\n"
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1192
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1408
msgid "Delete this good signature? (y/N/q)"
msgstr "Kustutan selle hea allkirja? (j/E/v)"
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1412
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Kustutan selle vigase allkirja? (j/E/v)"
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1416
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1422
msgid "Really delete this self-signature? (y/N)"
msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Kustutatud %d allkiri.\n"
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Kustutatud %d allkirja.\n"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
msgid "Nothing deleted.\n"
msgstr "Midagi ei kustutatud.\n"
-#: g10/keyedit.c:1503
+#: g10/keyedit.c:1509
msgid "Please remove selections from the secret keys.\n"
msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
-#: g10/keyedit.c:1509
+#: g10/keyedit.c:1515
msgid "Please select at most one secondary key.\n"
msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1519
msgid "Changing expiration time for a secondary key.\n"
msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1521
msgid "Changing expiration time for the primary key.\n"
msgstr "Muudan primaarse v�tme aegumise aega.\n"
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1563
msgid "You can't change the expiration date of a v3 key\n"
msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1579
msgid "No corresponding signature in secret ring\n"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1662
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1837
#, c-format
msgid "No user ID with index %d\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Sekundaarne v�ti numbriga %d puudub\n"
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:1981
msgid "user ID: \""
msgstr "kasutaja ID: \""
-#: g10/keyedit.c:1978
+#: g10/keyedit.c:1984
#, c-format
msgid ""
"\"\n"
@@ -2602,34 +2613,34 @@ msgstr ""
"\"\n"
"allkirjastatud teie v�tmega %08lX %s\n"
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1988
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E)"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2012
msgid "You have signed these user IDs:\n"
msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
-#: g10/keyedit.c:2020 g10/keyedit.c:2055
+#: g10/keyedit.c:2026 g10/keyedit.c:2061
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " allkirjastanud %08lX %s\n"
-#: g10/keyedit.c:2025
+#: g10/keyedit.c:2031
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " t�histanud %08lX %s\n"
-#: g10/keyedit.c:2045
+#: g10/keyedit.c:2051
msgid "You are about to revoke these signatures:\n"
msgstr "Te asute t�histama j�rgmisi allkirju:\n"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:2069
msgid "Really create the revocation certificates? (y/N)"
msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E)"
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2098
msgid "no secret key\n"
msgstr "salajast v�tit pole\n"
@@ -2812,37 +2823,37 @@ msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
-#: g10/passphrase.c:277 g10/passphrase.c:319
+#: g10/passphrase.c:278 g10/passphrase.c:320
msgid "gpg-agent is not available in this session\n"
msgstr ""
-#: g10/passphrase.c:285
+#: g10/passphrase.c:286
msgid "can't set client pid for the agent\n"
msgstr ""
-#: g10/passphrase.c:293
+#: g10/passphrase.c:294
msgid "can't get server read FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:300
+#: g10/passphrase.c:301
msgid "can't get server write FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:325
+#: g10/passphrase.c:326
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:174 g10/passphrase.c:344
+#: g10/hkp.c:174 g10/passphrase.c:345
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
-#: g10/passphrase.c:415 g10/passphrase.c:677
+#: g10/passphrase.c:417 g10/passphrase.c:679
#, c-format
msgid " (main key ID %08lX)"
msgstr " (peamise v�tme ID %08lX)"
-#: g10/passphrase.c:425
+#: g10/passphrase.c:427
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -2854,34 +2865,34 @@ msgstr ""
"parooli: \"%*.s\"\n"
"%u-bit %s key, ID %08lX, created %s%s\n"
-#: g10/passphrase.c:446
+#: g10/passphrase.c:448
#, fuzzy
msgid "Enter passphrase\n"
msgstr "Sisestage parool: "
-#: g10/passphrase.c:448
+#: g10/passphrase.c:450
#, fuzzy
msgid "Repeat passphrase\n"
msgstr "Korrake parooli: "
-#: g10/passphrase.c:483
+#: g10/passphrase.c:485
msgid "passphrase too long\n"
msgstr ""
-#: g10/passphrase.c:495
+#: g10/passphrase.c:497
msgid "invalid response from agent\n"
msgstr ""
-#: g10/passphrase.c:504
+#: g10/passphrase.c:506
msgid "cancelled by user\n"
msgstr ""
-#: g10/passphrase.c:507 g10/passphrase.c:580
+#: g10/passphrase.c:509 g10/passphrase.c:582
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr ""
-#: g10/passphrase.c:663
+#: g10/passphrase.c:665
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -2891,20 +2902,20 @@ msgstr ""
"Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
"parooli: \""
-#: g10/passphrase.c:672
+#: g10/passphrase.c:674
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
-#: g10/passphrase.c:710
+#: g10/passphrase.c:712
msgid "can't query password in batchmode\n"
msgstr "pakettmoodis ei saa parooli k�sida\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:716
msgid "Enter passphrase: "
msgstr "Sisestage parool: "
-#: g10/passphrase.c:718
+#: g10/passphrase.c:720
msgid "Repeat passphrase: "
msgstr "Korrake parooli: "
@@ -3125,7 +3136,7 @@ msgstr "%s: lukku ei �nnestu luua\n"
msgid "%s: can't make lock\n"
msgstr "%s: lukku ei �nnestu luua\n"
-#: g10/keyring.c:1376 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
+#: g10/keyring.c:1420 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: ei saa luua: %s\n"
@@ -3260,22 +3271,32 @@ msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync eba�nnestus: %s\n"
-#: g10/trustdb.c:688
+#: g10/trustdb.c:470
+#, fuzzy
+msgid "no need for a trustdb check\n"
+msgstr "%s: ei ole trustdb fail\n"
+
+#: g10/trustdb.c:476 g10/trustdb.c:1458
+#, fuzzy, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "trustdb kirje %lu: lseek eba�nnestus: %s\n"
+
+#: g10/trustdb.c:709
#, fuzzy
msgid "checking the trustdb\n"
msgstr "muuda omaniku usaldust"
-#: g10/trustdb.c:839
+#: g10/trustdb.c:860
#, fuzzy, c-format
msgid "public key %08lX not found: %s\n"
msgstr "ei leia avalikku v�tit"
-#: g10/trustdb.c:1304
+#: g10/trustdb.c:1338
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr ""
-#: g10/trustdb.c:1374
+#: g10/trustdb.c:1411
#, c-format
msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
msgstr ""
@@ -3685,60 +3706,60 @@ msgstr "Abiinfo puudub"
msgid "No help available for `%s'"
msgstr "`%s' kohta abiinfo puudub"
-#: g10/keydb.c:170
+#: g10/keydb.c:175
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/keydb.c:179
+#: g10/keydb.c:184
#, c-format
msgid "changing permission of `%s' failed: %s\n"
msgstr ""
-#: g10/keydb.c:188
+#: g10/keydb.c:193
#, fuzzy, c-format
msgid "keyring `%s' created\n"
msgstr "%s: v�tmehoidla on loodud\n"
-#: g10/keydb.c:530
+#: g10/keydb.c:586
#, fuzzy, c-format
-msgid "failed to rebuild all keyring caches: %s\n"
+msgid "failed to rebuild keyring cache: %s\n"
msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
-#: g10/keyring.c:1179
+#: g10/keyring.c:1220
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr "HOIATUS: on olemas 2 faili konfidentsiaalse infoga.\n"
-#: g10/keyring.c:1181
+#: g10/keyring.c:1222
#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s ei ole muudetud\n"
-#: g10/keyring.c:1182
+#: g10/keyring.c:1223
#, c-format
msgid "%s is the new one\n"
msgstr "%s on uus\n"
-#: g10/keyring.c:1183
+#: g10/keyring.c:1224
msgid "Please fix this possible security flaw\n"
msgstr "Palun parandage see v�imalik turvaprobleem\n"
-#: g10/keyring.c:1281
+#: g10/keyring.c:1322
#, fuzzy, c-format
msgid "checking keyring `%s'\n"
msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/keyring.c:1312
+#: g10/keyring.c:1353
#, fuzzy, c-format
msgid "%lu keys so far checked (%lu signatures)\n"
msgstr "%lu v�tit on seni t��deldud\n"
-#: g10/keyring.c:1323
+#: g10/keyring.c:1364
#, fuzzy, c-format
msgid "%lu keys checked (%lu signatures)\n"
msgstr "n�ita v�tmeid ja allkirju"
-#: g10/keyring.c:1381
+#: g10/keyring.c:1425
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: v�tmehoidla on loodud\n"
diff --git a/po/fr.po b/po/fr.po
index 786f1c0f5..b00f37fba 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.4t\n"
-"POT-Creation-Date: 2001-09-28 16:20+0200\n"
+"POT-Creation-Date: 2001-10-23 09:41+0200\n"
"PO-Revision-Date: 2001-04-24 17:46+02:00\n"
"Last-Translator: Ga�l Qu�ri <[email protected]>\n"
"Language-Team: French <[email protected]>\n"
@@ -48,7 +48,7 @@ msgstr "non"
msgid "nN"
msgstr "nN"
-#: g10/keyedit.c:568 util/miscutil.c:326
+#: g10/keyedit.c:574 util/miscutil.c:326
msgid "quit"
msgstr "quitter"
@@ -350,7 +350,7 @@ msgstr ""
"Il n'y a pas assez d'octets al�atoires disponibles. Faites autre chose\n"
"pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n"
-#: g10/g10.c:237
+#: g10/g10.c:238
msgid ""
"@Commands:\n"
" "
@@ -358,145 +358,145 @@ msgstr ""
"@Commandes:\n"
" "
-#: g10/g10.c:239
+#: g10/g10.c:240
msgid "|[file]|make a signature"
msgstr "|[fichier]|faire une signature"
-#: g10/g10.c:240
+#: g10/g10.c:241
msgid "|[file]|make a clear text signature"
msgstr "|[fichier]|faire une signature en texte clair"
-#: g10/g10.c:241
+#: g10/g10.c:242
msgid "make a detached signature"
msgstr "faire une signature d�tach�e"
-#: g10/g10.c:242
+#: g10/g10.c:243
msgid "encrypt data"
msgstr "chiffrer les donn�es"
-#: g10/g10.c:243
+#: g10/g10.c:244
msgid "encryption only with symmetric cipher"
msgstr "chiffrement sym�trique seulement"
-#: g10/g10.c:244
+#: g10/g10.c:245
msgid "store only"
msgstr "pas d'action"
-#: g10/g10.c:245
+#: g10/g10.c:246
msgid "decrypt data (default)"
msgstr "d�chiffrer les donn�es (d�faut)"
-#: g10/g10.c:246
+#: g10/g10.c:247
msgid "verify a signature"
msgstr "v�rifier une signature"
-#: g10/g10.c:248
+#: g10/g10.c:249
msgid "list keys"
msgstr "lister les cl�s"
-#: g10/g10.c:250
+#: g10/g10.c:251
msgid "list keys and signatures"
msgstr "lister les cl�s et les signatures"
-#: g10/g10.c:251
+#: g10/g10.c:252
msgid "check key signatures"
msgstr "v�rifier les signatures des cl�s"
-#: g10/g10.c:252
+#: g10/g10.c:253
msgid "list keys and fingerprints"
msgstr "lister les cl�s et les empreintes"
-#: g10/g10.c:253
+#: g10/g10.c:254
msgid "list secret keys"
msgstr "lister les cl�s secr�tes"
-#: g10/g10.c:254
+#: g10/g10.c:255
msgid "generate a new key pair"
msgstr "g�n�rer une nouvelle paire de cl�s"
-#: g10/g10.c:255
+#: g10/g10.c:256
msgid "remove key from the public keyring"
msgstr "enlever la cl� du porte-cl�s public"
-#: g10/g10.c:257
+#: g10/g10.c:258
msgid "remove key from the secret keyring"
msgstr "enlever la cl� du porte-cl�s secret"
-#: g10/g10.c:258
+#: g10/g10.c:259
msgid "sign a key"
msgstr "signer une cl�"
-#: g10/g10.c:259
+#: g10/g10.c:260
msgid "sign a key locally"
msgstr "signer une cl� localement"
-#: g10/g10.c:260
+#: g10/g10.c:261
msgid "sign or edit a key"
msgstr "signer ou �diter une cl�"
-#: g10/g10.c:261
+#: g10/g10.c:262
msgid "generate a revocation certificate"
msgstr "g�n�rer un certificat de r�vocation"
-#: g10/g10.c:262
+#: g10/g10.c:263
msgid "export keys"
msgstr "exporter les cl�s"
-#: g10/g10.c:263
+#: g10/g10.c:264
msgid "export keys to a key server"
msgstr "exporter les cl�s vers un serveur de cl�s"
-#: g10/g10.c:264
+#: g10/g10.c:265
msgid "import keys from a key server"
msgstr "importer les cl�s d'un serveur de cl�s"
-#: g10/g10.c:266
+#: g10/g10.c:267
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "importer les cl�s d'un serveur de cl�s"
-#: g10/g10.c:270
+#: g10/g10.c:271
msgid "import/merge keys"
msgstr "importer/fusionner les cl�s"
-#: g10/g10.c:272
+#: g10/g10.c:273
msgid "list only the sequence of packets"
msgstr "ne lister que les paquets"
-#: g10/g10.c:274
+#: g10/g10.c:275
msgid "export the ownertrust values"
msgstr "exporter les indices de confiance"
-#: g10/g10.c:276
+#: g10/g10.c:277
msgid "import ownertrust values"
msgstr "importer les indices de confiance"
-#: g10/g10.c:278
+#: g10/g10.c:279
msgid "update the trust database"
msgstr "mettre la base de confiance � jour"
-#: g10/g10.c:280
+#: g10/g10.c:281
#, fuzzy
msgid "unattended trust database update"
msgstr "mettre la base de confiance � jour"
-#: g10/g10.c:281
+#: g10/g10.c:282
msgid "fix a corrupted trust database"
msgstr "r�parer une base de confiance corrompue"
-#: g10/g10.c:282
+#: g10/g10.c:283
msgid "De-Armor a file or stdin"
msgstr "Enlever l'armure d'un fichier ou de stdin"
-#: g10/g10.c:284
+#: g10/g10.c:285
msgid "En-Armor a file or stdin"
msgstr "Mettre une armure � un fichier ou � stdin"
-#: g10/g10.c:286
+#: g10/g10.c:287
msgid "|algo [files]|print message digests"
msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
-#: g10/g10.c:290
+#: g10/g10.c:291
msgid ""
"@\n"
"Options:\n"
@@ -506,162 +506,167 @@ msgstr ""
"Options:\n"
" "
-#: g10/g10.c:292
+#: g10/g10.c:293
msgid "create ascii armored output"
msgstr "cr�er une sortie ascii avec armure"
-#: g10/g10.c:294
+#: g10/g10.c:295
msgid "|NAME|encrypt for NAME"
msgstr "|NOM|chiffrer pour NOM"
-#: g10/g10.c:297
+#: g10/g10.c:298
msgid "|NAME|use NAME as default recipient"
msgstr "|NOM|utiliser NOM comme r�cipient par d�faut"
-#: g10/g10.c:299
+#: g10/g10.c:300
msgid "use the default key as default recipient"
msgstr "utiliser la cl� par d�f. comme r�cipient"
-#: g10/g10.c:303
+#: g10/g10.c:304
msgid "use this user-id to sign or decrypt"
msgstr "utiliser ce nom pour signer ou d�chiffrer"
-#: g10/g10.c:304
+#: g10/g10.c:305
msgid "|N|set compress level N (0 disables)"
msgstr "|N|niveau de compression N (0 d�sactive)"
-#: g10/g10.c:306
+#: g10/g10.c:307
msgid "use canonical text mode"
msgstr "utiliser le mode texte canonique"
-#: g10/g10.c:307
+#: g10/g10.c:308
msgid "use as output file"
msgstr "utiliser comme fichier de sortie"
-#: g10/g10.c:308
+#: g10/g10.c:309
msgid "verbose"
msgstr "bavard"
-#: g10/g10.c:309
+#: g10/g10.c:310
msgid "be somewhat more quiet"
msgstr "devenir beaucoup plus silencieux"
-#: g10/g10.c:310
+#: g10/g10.c:311
msgid "don't use the terminal at all"
msgstr "ne pas utiliser du tout le terminal"
-#: g10/g10.c:311
+#: g10/g10.c:312
msgid "force v3 signatures"
msgstr "forcer les signatures en v3"
-#: g10/g10.c:312
+#: g10/g10.c:313
+#, fuzzy
+msgid "do not force v3 signatures"
+msgstr "forcer les signatures en v3"
+
+#: g10/g10.c:314
msgid "always use a MDC for encryption"
msgstr "toujours utiliser un sceau pour le chiffrement"
-#: g10/g10.c:313
+#: g10/g10.c:315
msgid "do not make any changes"
msgstr "ne rien changer"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:315
+#: g10/g10.c:317
msgid "use the gpg-agent"
msgstr "utiliser gpg-agent"
-#: g10/g10.c:316
+#: g10/g10.c:318
msgid "batch mode: never ask"
msgstr "mode automatique: ne jamais rien demander"
-#: g10/g10.c:317
+#: g10/g10.c:319
msgid "assume yes on most questions"
msgstr "r�pondre oui � la plupart des questions"
-#: g10/g10.c:318
+#: g10/g10.c:320
msgid "assume no on most questions"
msgstr "r�pondre non � la plupart des questions"
-#: g10/g10.c:319
+#: g10/g10.c:321
msgid "add this keyring to the list of keyrings"
msgstr "ajouter ce porte-cl�s � la liste"
-#: g10/g10.c:320
+#: g10/g10.c:322
msgid "add this secret keyring to the list"
msgstr "ajouter ce porte-cl�s secret � la liste"
-#: g10/g10.c:321
+#: g10/g10.c:323
msgid "|NAME|use NAME as default secret key"
msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
-#: g10/g10.c:322
+#: g10/g10.c:324
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
-#: g10/g10.c:323
+#: g10/g10.c:325
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOM|le terminal utilise la table de caract�res NOM"
-#: g10/g10.c:324
+#: g10/g10.c:326
msgid "read options from file"
msgstr "lire les options du fichier"
-#: g10/g10.c:328
+#: g10/g10.c:330
msgid "|FD|write status info to this FD"
msgstr "|FD|�crire l'�tat sur ce descripteur"
-#: g10/g10.c:330
+#: g10/g10.c:332
#, fuzzy
msgid "|[file]|write status info to file"
msgstr "|FD|�crire l'�tat sur ce descripteur"
-#: g10/g10.c:336
+#: g10/g10.c:338
#, fuzzy
msgid "|KEYID|ultimately trust this key"
msgstr "|IDCL�|donner une confiance ultime � cette cl�"
-#: g10/g10.c:337
+#: g10/g10.c:339
msgid "|FILE|load extension module FILE"
msgstr "|FICH|charger le module d'extension FICH"
-#: g10/g10.c:338
+#: g10/g10.c:340
msgid "emulate the mode described in RFC1991"
msgstr "imiter le mode d�crit dans la RFC1991"
-#: g10/g10.c:339
+#: g10/g10.c:341
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "utiliser le comportement d�fini par OpenPGP"
-#: g10/g10.c:340
+#: g10/g10.c:342
msgid "|N|use passphrase mode N"
msgstr "|N|coder les mots de passe suivant le mode N"
-#: g10/g10.c:342
+#: g10/g10.c:344
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
-#: g10/g10.c:344
+#: g10/g10.c:346
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
-#: g10/g10.c:345
+#: g10/g10.c:347
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
-#: g10/g10.c:346
+#: g10/g10.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOM|utiliser la fonction de hachage NOM"
-#: g10/g10.c:347
+#: g10/g10.c:349
msgid "|N|use compress algorithm N"
msgstr "|N|utiliser l'algorithme de compression N"
-#: g10/g10.c:348
+#: g10/g10.c:350
msgid "throw keyid field of encrypted packets"
msgstr "supprimer l'ident. des paquets chiffr�s"
-#: g10/g10.c:349
+#: g10/g10.c:351
msgid "|NAME=VALUE|use this notation data"
msgstr "|NOM=VALEUR|utiliser ces donn�es de notation"
-#: g10/g10.c:352
+#: g10/g10.c:354
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -669,7 +674,7 @@ msgstr ""
"@\n"
"(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
-#: g10/g10.c:355
+#: g10/g10.c:357
msgid ""
"@\n"
"Examples:\n"
@@ -689,17 +694,17 @@ msgstr ""
" --list-keys [utilisateur] montrer les cl�s\n"
" --fingerprint [utilisateur] montrer les empreintes\n"
-#: g10/g10.c:478
+#: g10/g10.c:480
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Signaler toutes anomalies � <[email protected]> (en anglais)\n"
"et tout probl�me de traduction � <[email protected]>.\n"
-#: g10/g10.c:482
+#: g10/g10.c:484
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
-#: g10/g10.c:485
+#: g10/g10.c:487
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -709,7 +714,7 @@ msgstr ""
"signer, v�rifier, chiffrer ou d�chiffrer\n"
"l'op�ration par d�faut d�pend des donn�es entr�es\n"
-#: g10/g10.c:496
+#: g10/g10.c:498
msgid ""
"\n"
"Supported algorithms:\n"
@@ -717,202 +722,202 @@ msgstr ""
"\n"
"Algorithmes support�s:\n"
-#: g10/g10.c:570
+#: g10/g10.c:572
msgid "usage: gpg [options] "
msgstr "utilisation: gpg [options] "
-#: g10/g10.c:627
+#: g10/g10.c:629
msgid "conflicting commands\n"
msgstr "commandes en conflit\n"
-#: g10/g10.c:783
+#: g10/g10.c:785
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
-#: g10/g10.c:787
+#: g10/g10.c:789
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichier d'options `%s': %s\n"
-#: g10/g10.c:794
+#: g10/g10.c:796
#, c-format
msgid "reading options from `%s'\n"
msgstr "lire les options de `%s'\n"
-#: g10/g10.c:1038
+#: g10/g10.c:1041
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s n'est pas une table de caract�res valide\n"
-#: g10/g10.c:1122
+#: g10/g10.c:1125
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
-#: g10/g10.c:1126 g10/g10.c:1135
+#: g10/g10.c:1129 g10/g10.c:1138
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
-#: g10/g10.c:1128
+#: g10/g10.c:1131
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n'est pas permis avec %s !\n"
-#: g10/g10.c:1131
+#: g10/g10.c:1134
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n'a aucun sens avec %s !\n"
-#: g10/g10.c:1151 g10/g10.c:1163
+#: g10/g10.c:1154 g10/g10.c:1166
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
-#: g10/g10.c:1157 g10/g10.c:1169
+#: g10/g10.c:1160 g10/g10.c:1172
msgid "selected digest algorithm is invalid\n"
msgstr "la fonction de hachage s�lectionn�e est invalide\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1176
msgid "the given policy URL is invalid\n"
msgstr "l'URL de politique donn�e est invalide\n"
-#: g10/g10.c:1176
+#: g10/g10.c:1179
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1181
msgid "completes-needed must be greater than 0\n"
msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1183
msgid "marginals-needed must be greater than 1\n"
msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1185
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "�max-cert-depth� doit �tre compris entre 1 et 255\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1188
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
-#: g10/g10.c:1189
+#: g10/g10.c:1192
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1196
#, fuzzy
msgid "invalid preferences\n"
msgstr "lister les pr�f�rences"
-#: g10/g10.c:1276
+#: g10/g10.c:1279
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "impossible d'initialiser la base de confiance: %s\n"
-#: g10/g10.c:1282
+#: g10/g10.c:1285
msgid "--store [filename]"
msgstr "--store [nom du fichier]"
-#: g10/g10.c:1289
+#: g10/g10.c:1292
msgid "--symmetric [filename]"
msgstr "--symmetric [nom du fichier]"
-#: g10/g10.c:1297
+#: g10/g10.c:1300
msgid "--encrypt [filename]"
msgstr "--encrypt [nom du fichier]"
-#: g10/g10.c:1310
+#: g10/g10.c:1313
msgid "--sign [filename]"
msgstr "--sign [nom du fichier]"
-#: g10/g10.c:1323
+#: g10/g10.c:1326
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nom du fichier]"
-#: g10/g10.c:1337
+#: g10/g10.c:1340
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [nom du fichier]"
-#: g10/g10.c:1346
+#: g10/g10.c:1349
msgid "--clearsign [filename]"
msgstr "--clearsign [nom du fichier]"
-#: g10/g10.c:1364
+#: g10/g10.c:1367
msgid "--decrypt [filename]"
msgstr "--decrypt [nom du fichier]"
-#: g10/g10.c:1372
+#: g10/g10.c:1375
msgid "--sign-key user-id"
msgstr "--sign-key utilisateur"
-#: g10/g10.c:1380
+#: g10/g10.c:1383
msgid "--lsign-key user-id"
msgstr "--lsign-key utilisateur"
-#: g10/g10.c:1388
+#: g10/g10.c:1391
msgid "--edit-key user-id [commands]"
msgstr "--edit-key utilisateur [commandes]"
-#: g10/g10.c:1404
+#: g10/g10.c:1407
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key utilisateur"
-#: g10/g10.c:1407
+#: g10/g10.c:1410
msgid "--delete-key user-id"
msgstr "--delete-key utilisateur"
-#: g10/g10.c:1415
+#: g10/g10.c:1418
msgid "--delete-secret-and-public-key user-id"
msgstr "--delete-secret-and-public-key utilisateur"
-#: g10/encode.c:268 g10/g10.c:1452 g10/sign.c:632
+#: g10/encode.c:268 g10/g10.c:1455 g10/sign.c:632
#, c-format
msgid "can't open %s: %s\n"
msgstr "impossible d'ouvrir %s: %s\n"
-#: g10/g10.c:1467
+#: g10/g10.c:1470
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
-#: g10/g10.c:1539
+#: g10/g10.c:1542
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "la suppression d'une armure a �chou�: %s\n"
-#: g10/g10.c:1547
+#: g10/g10.c:1550
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "la construction d'une armure a �chou�: %s \n"
-#: g10/g10.c:1618
+#: g10/g10.c:1621
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algorithme de hachage `%s' invalide\n"
-#: g10/g10.c:1704
+#: g10/g10.c:1707
msgid "[filename]"
msgstr "[nom du fichier]"
-#: g10/g10.c:1708
+#: g10/g10.c:1711
msgid "Go ahead and type your message ...\n"
msgstr "Vous pouvez taper votre message...\n"
-#: g10/decrypt.c:59 g10/g10.c:1711 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1714 g10/verify.c:94 g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "impossible d'ouvrir `%s'\n"
-#: g10/g10.c:1920
+#: g10/g10.c:1923
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"le premier caract�re du nom d'une notation doit �tre un lettre ou un trait\n"
"de soulignement\n"
-#: g10/g10.c:1926
+#: g10/g10.c:1929
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -921,13 +926,13 @@ msgstr ""
"des points ou des traits de soulignement et doit se terminer par un signe "
"�gal\n"
-#: g10/g10.c:1932
+#: g10/g10.c:1935
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
"les points dans le nom d'une notation doivent �tre entour�s d'autes "
"caract�res\n"
-#: g10/g10.c:1940
+#: g10/g10.c:1943
msgid "a notation value must not use any control characters\n"
msgstr "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
@@ -1589,7 +1594,7 @@ msgstr ""
"Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
"\n"
-#: g10/keyedit.c:456 g10/keygen.c:1171
+#: g10/keyedit.c:462 g10/keygen.c:1171
msgid "passphrase not correctly repeated; try again.\n"
msgstr "le mot de passe n'a pas �t� r�p�t� � l'identique; recommencez.\n"
@@ -1729,27 +1734,27 @@ msgstr "lecture de `%s'\n"
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s chiffr� pour: %s\n"
-#: g10/delkey.c:69 g10/export.c:149
+#: g10/delkey.c:69 g10/export.c:148
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "l'utilisateur '%s' n'a pas �t� trouv�: %s\n"
-#: g10/delkey.c:77 g10/export.c:159
+#: g10/delkey.c:77 g10/export.c:158
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
-#: g10/export.c:167
+#: g10/export.c:166
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "cl� %08lX: ce n'est pas une cl� rfc2440 - ignor�e\n"
-#: g10/export.c:178
+#: g10/export.c:177
#, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "cl� %08lX: non prot�g�e - ignor�e\n"
-#: g10/export.c:234
+#: g10/export.c:233
msgid "WARNING: nothing exported\n"
msgstr "ATTENTION: rien n'a �t� export�\n"
@@ -1759,18 +1764,18 @@ msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:183 g10/getkey.c:2188
+#: g10/getkey.c:183 g10/getkey.c:2192
msgid "[User id not found]"
msgstr "[Nom utilisateur introuvable]"
-#: g10/getkey.c:1911
+#: g10/getkey.c:1915
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr ""
"utilisation de la cl� secondaire %08lX � la place de la cl�\n"
"principale %08lX\n"
-#: g10/getkey.c:1952
+#: g10/getkey.c:1956
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "cl� %08lX: cl� secr�te sans cl� publique - non prise en compte\n"
@@ -2102,17 +2107,17 @@ msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n"
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:296
+#: g10/keyedit.c:302
#, c-format
msgid "Already signed by key %08lX\n"
msgstr "D�j� sign� par la cl� %08lX\n"
-#: g10/keyedit.c:307
+#: g10/keyedit.c:313
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "Rien � signer avec la cl� %08lX\n"
-#: g10/keyedit.c:316
+#: g10/keyedit.c:322
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2120,7 +2125,7 @@ msgstr ""
"Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
"avec la v�tre: \""
-#: g10/keyedit.c:325
+#: g10/keyedit.c:331
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
@@ -2128,39 +2133,39 @@ msgstr ""
"La signature sera marqu�e comme non-exportable.\n"
"\n"
-#: g10/keyedit.c:330
+#: g10/keyedit.c:336
msgid "Really sign? "
msgstr "Signer r�ellement ? "
-#: g10/keyedit.c:361 g10/keyedit.c:2104 g10/keyedit.c:2166 g10/sign.c:225
+#: g10/keyedit.c:367 g10/keyedit.c:2110 g10/keyedit.c:2172 g10/sign.c:225
#, c-format
msgid "signing failed: %s\n"
msgstr "la signature a �chou�: %s\n"
-#: g10/keyedit.c:415
+#: g10/keyedit.c:421
msgid "This key is not protected.\n"
msgstr "Cette cl� n'est pas prot�g�e.\n"
-#: g10/keyedit.c:419
+#: g10/keyedit.c:425
msgid "Secret parts of primary key are not available.\n"
msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
-#: g10/keyedit.c:423
+#: g10/keyedit.c:429
msgid "Key is protected.\n"
msgstr "La cl� est prot�g�e.\n"
-#: g10/keyedit.c:443
+#: g10/keyedit.c:449
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Impossible d'�diter cette cl�: %s\n"
-#: g10/keyedit.c:448
+#: g10/keyedit.c:454
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
msgstr "Entrez le nouveau mot de passe pour cette cl� secr�te.\n"
-#: g10/keyedit.c:460
+#: g10/keyedit.c:466
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2169,466 +2174,472 @@ msgstr ""
"*mauvaise* id�e\n"
"\n"
-#: g10/keyedit.c:463
+#: g10/keyedit.c:469
msgid "Do you really want to do this? "
msgstr "Voulez-vous vraiment faire cela ? "
-#: g10/keyedit.c:527
+#: g10/keyedit.c:533
msgid "moving a key signature to the correct place\n"
msgstr "replacer la signature d'une cl� � l'endroit correct\n"
-#: g10/keyedit.c:568
+#: g10/keyedit.c:574
msgid "quit this menu"
msgstr "quitter ce menu"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:575
msgid "q"
msgstr "q"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save"
msgstr "enregistrer"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save and quit"
msgstr "enregistrer et quitter"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "help"
msgstr "help"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "show this help"
msgstr "afficher cette aide"
# g10/keyedit.c:556 ???
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "show fingerprint"
msgstr "afficher l'empreinte"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list"
msgstr "lister"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list key and user IDs"
msgstr "lister la cl� et les noms d'utilisateurs"
-#: g10/keyedit.c:575
+#: g10/keyedit.c:581
msgid "l"
msgstr "l"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "select user ID N"
msgstr "s�lectionner le nom d'utilisateur N"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "key"
msgstr "cl�"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "select secondary key N"
msgstr "s�lectionner la cl� secondaire N"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "check"
msgstr "v�rifier"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "list signatures"
msgstr "lister les signatures"
-#: g10/keyedit.c:579
+#: g10/keyedit.c:585
msgid "c"
msgstr "c"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign"
msgstr "signer"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign the key"
msgstr "signer la cl�"
-#: g10/keyedit.c:581
+#: g10/keyedit.c:587
msgid "s"
msgstr "s"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "lsign"
msgstr "lsigner"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "sign the key locally"
msgstr "signer la cl� localement"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:589
msgid "debug"
msgstr "d�boguer"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "adduid"
msgstr "aj.ut"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "add a user ID"
msgstr "ajouter un utilisateur"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "deluid"
msgstr "suppr.ut"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "delete user ID"
msgstr "enlever un utilisateur"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "addkey"
msgstr "aj.cl�"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "add a secondary key"
msgstr "ajouter une cl� secondaire"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delkey"
msgstr "suppr.cl�"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delete a secondary key"
msgstr "enlever une cl� secondaire"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delsig"
msgstr "suppr.sign"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delete signatures"
msgstr "supprimer les signatures"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "change the expire date"
msgstr "changer la date d'expiration"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "primary"
msgstr ""
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle"
msgstr "changer"
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle between secret and public key listing"
msgstr "passer de la liste des cl�s secr�tes aux cl�s priv�es et inversement"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:599
msgid "t"
msgstr "t"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:600
msgid "pref"
msgstr "pr�f"
-#: g10/keyedit.c:594 g10/keyedit.c:595
-msgid "list preferences"
+#: g10/keyedit.c:600
+#, fuzzy
+msgid "list preferences (expert)"
msgstr "lister les pr�f�rences"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:601
msgid "showpref"
msgstr ""
-#: g10/keyedit.c:596
+#: g10/keyedit.c:601
+#, fuzzy
+msgid "list preferences (verbose)"
+msgstr "lister les pr�f�rences"
+
+#: g10/keyedit.c:602
#, fuzzy
msgid "setpref"
msgstr "pr�f"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:602
#, fuzzy
msgid "set preference list"
msgstr "lister les pr�f�rences"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updpref"
msgstr "pr�f"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updated preferences"
msgstr "lister les pr�f�rences"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "passwd"
msgstr "mot.pas"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "change the passphrase"
msgstr "changer le mot de passe"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "trust"
msgstr "confi."
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "change the ownertrust"
msgstr "changer la confiance"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revoke signatures"
msgstr "r�voquer les signatures"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revkey"
msgstr "revcl�"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revoke a secondary key"
msgstr "r�voquer une cl� secondaire"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable"
msgstr "d�sactiver"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable a key"
msgstr "d�sactiver une cl�"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable"
msgstr "activer"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable a key"
msgstr "activer une cl�"
-#: g10/delkey.c:112 g10/keyedit.c:623
+#: g10/delkey.c:112 g10/keyedit.c:629
msgid "can't do that in batchmode\n"
msgstr "impossible de faire cela en mode automatique\n"
-#: g10/keyedit.c:658
+#: g10/keyedit.c:664
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
-#: g10/keyedit.c:676
+#: g10/keyedit.c:682
msgid "Secret key is available.\n"
msgstr "La cl� secr�te est disponible.\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:712
msgid "Command> "
msgstr "Commande> "
-#: g10/keyedit.c:737
+#: g10/keyedit.c:743
msgid "Need the secret key to do this.\n"
msgstr "Il faut la cl� secr�te pour faire cela.\n"
-#: g10/keyedit.c:741
+#: g10/keyedit.c:747
msgid "Please use the command \"toggle\" first.\n"
msgstr "Utilisez la commande �toggle� d'abord.\n"
-#: g10/keyedit.c:788
+#: g10/keyedit.c:794
msgid "Really sign all user IDs? "
msgstr "Signer vraiment tous les utilisateurs ? "
-#: g10/keyedit.c:789
+#: g10/keyedit.c:795
msgid "Hint: Select the user IDs to sign\n"
msgstr "Aide: S�lectionner les utilisateurs � signer\n"
-#: g10/keyedit.c:821 g10/keyedit.c:842
+#: g10/keyedit.c:827 g10/keyedit.c:848
msgid "You must select at least one user ID.\n"
msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:829
msgid "You can't delete the last user ID!\n"
msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:832
msgid "Really remove all selected user IDs? "
msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
-#: g10/keyedit.c:827
+#: g10/keyedit.c:833
msgid "Really remove this user ID? "
msgstr "Enlever r�ellement cet utilisateur ? "
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:871 g10/keyedit.c:893
msgid "You must select at least one key.\n"
msgstr "Vous devez s�lectionner au moins une cl�.\n"
-#: g10/keyedit.c:869
+#: g10/keyedit.c:875
msgid "Do you really want to delete the selected keys? "
msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
-#: g10/keyedit.c:870
+#: g10/keyedit.c:876
msgid "Do you really want to delete this key? "
msgstr "Voulez-vous vraiment supprimer cette cl� ? "
-#: g10/keyedit.c:891
+#: g10/keyedit.c:897
msgid "Do you really want to revoke the selected keys? "
msgstr "Voulez-vous vraiment r�voquer les cl�s s�lectionn�es ? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:898
msgid "Do you really want to revoke this key? "
msgstr "Voulez-vous vraiment r�voquer cette cl� ? "
-#: g10/keyedit.c:956
+#: g10/keyedit.c:962
#, fuzzy
msgid "Really update the preferences for the selected user IDs? "
msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
#, fuzzy
msgid "Really update the preferences? "
msgstr "Faut-il vraiment g�n�rer les certificats de r�vocation ? (o/N)"
-#: g10/keyedit.c:992
+#: g10/keyedit.c:998
msgid "Save changes? "
msgstr "Enregistrer les changements? "
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1001
msgid "Quit without saving? "
msgstr "Quitter sans enregistrer? "
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1012
#, c-format
msgid "update failed: %s\n"
msgstr "la mise � jour a �chou�: %s\n"
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1019
#, c-format
msgid "update secret failed: %s\n"
msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1026
msgid "Key not changed so no update needed.\n"
msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n"
-#: g10/keyedit.c:1031
+#: g10/keyedit.c:1037
msgid "Invalid command (try \"help\")\n"
msgstr "Commande invalide (essayez �help�)\n"
-#: g10/keyedit.c:1139 g10/keyedit.c:1165
+#: g10/keyedit.c:1145 g10/keyedit.c:1171
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr "%s%c %4u%c/%08lX cr��e: %s expire: %s"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1154
#, c-format
msgid " trust: %c/%c"
msgstr " confiance: %c/%c"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1158
msgid "This key has been disabled"
msgstr "Cette cl� a �t� d�sactiv�e"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1187
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! la sous-cl� a �t� r�voqu�e: %s\n"
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1190
msgid "rev- faked revocation found\n"
msgstr "rev- une r�vocation truqu�e a �t� trouv�e\n"
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1192
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? probl�me de v�rification de la r�vocation: %s\n"
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1408
msgid "Delete this good signature? (y/N/q)"
msgstr "Supprimer cette bonne signature ? (o/N/q)"
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1412
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Supprimer cette signature invalide ? (o/N/q)"
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1416
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Supprimer cette signature inconnue ? (o/N/q)"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1422
msgid "Really delete this self-signature? (y/N)"
msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d signature supprim�e.\n"
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d signatures supprim�es\n"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
msgid "Nothing deleted.\n"
msgstr "Rien n'a �t� supprim�.\n"
-#: g10/keyedit.c:1503
+#: g10/keyedit.c:1509
msgid "Please remove selections from the secret keys.\n"
msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
-#: g10/keyedit.c:1509
+#: g10/keyedit.c:1515
msgid "Please select at most one secondary key.\n"
msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1519
msgid "Changing expiration time for a secondary key.\n"
msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1521
msgid "Changing expiration time for the primary key.\n"
msgstr "Changer la date d'expiration de la cl� principale.\n"
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1563
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1579
msgid "No corresponding signature in secret ring\n"
msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1662
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1837
#, c-format
msgid "No user ID with index %d\n"
msgstr "Pas d'utilisateur avec l'index %d\n"
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Pas de cl� secondaire avec l'index %d\n"
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:1981
msgid "user ID: \""
msgstr "nom d'utilisateur: �"
-#: g10/keyedit.c:1978
+#: g10/keyedit.c:1984
#, c-format
msgid ""
"\"\n"
@@ -2637,34 +2648,34 @@ msgstr ""
"�\n"
"sign� avec votre cl� %08lX � %s\n"
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1988
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "G�n�rer un certificat de r�vocation pour cette signature ? (o/N)"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2012
msgid "You have signed these user IDs:\n"
msgstr "Vous avez sign� ces noms d'utilisateurs:\n"
-#: g10/keyedit.c:2020 g10/keyedit.c:2055
+#: g10/keyedit.c:2026 g10/keyedit.c:2061
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " sign� par %08lX � %s\n"
-#: g10/keyedit.c:2025
+#: g10/keyedit.c:2031
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " r�voqu� par %08lX � %s\n"
-#: g10/keyedit.c:2045
+#: g10/keyedit.c:2051
msgid "You are about to revoke these signatures:\n"
msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:2069
msgid "Really create the revocation certificates? (y/N)"
msgstr "Faut-il vraiment g�n�rer les certificats de r�vocation ? (o/N)"
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2098
msgid "no secret key\n"
msgstr "pas de cl� secr�te\n"
@@ -2846,37 +2857,37 @@ msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "un sous-paquet de type %d poss�de un bit critique\n"
-#: g10/passphrase.c:277 g10/passphrase.c:319
+#: g10/passphrase.c:278 g10/passphrase.c:320
msgid "gpg-agent is not available in this session\n"
msgstr "gpg-agent n'est pas disponible dans cette session\n"
-#: g10/passphrase.c:285
+#: g10/passphrase.c:286
msgid "can't set client pid for the agent\n"
msgstr ""
-#: g10/passphrase.c:293
+#: g10/passphrase.c:294
msgid "can't get server read FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:300
+#: g10/passphrase.c:301
msgid "can't get server write FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:325
+#: g10/passphrase.c:326
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
-#: g10/hkp.c:174 g10/passphrase.c:344
+#: g10/hkp.c:174 g10/passphrase.c:345
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "impossible de se connecter � `%s': %s\n"
-#: g10/passphrase.c:415 g10/passphrase.c:677
+#: g10/passphrase.c:417 g10/passphrase.c:679
#, c-format
msgid " (main key ID %08lX)"
msgstr " (ID cl� principale %08lX)"
-#: g10/passphrase.c:425
+#: g10/passphrase.c:427
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -2888,32 +2899,32 @@ msgstr ""
"\"%.*s\"\n"
"cl� %u bits %s, ID %08lX, cr��e %s%s\n"
-#: g10/passphrase.c:446
+#: g10/passphrase.c:448
msgid "Enter passphrase\n"
msgstr "Entrez le mot de passe\n"
-#: g10/passphrase.c:448
+#: g10/passphrase.c:450
msgid "Repeat passphrase\n"
msgstr "R�p�tez le mot de passe\n"
-#: g10/passphrase.c:483
+#: g10/passphrase.c:485
msgid "passphrase too long\n"
msgstr "mot de passe trop long\n"
-#: g10/passphrase.c:495
+#: g10/passphrase.c:497
msgid "invalid response from agent\n"
msgstr "r�ponse de l'agent invalide\n"
-#: g10/passphrase.c:504
+#: g10/passphrase.c:506
msgid "cancelled by user\n"
msgstr "annul� par l'utilisateur\n"
-#: g10/passphrase.c:507 g10/passphrase.c:580
+#: g10/passphrase.c:509 g10/passphrase.c:582
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "probl�me avec l'agent : l'agent renvoie 0x%lx\n"
-#: g10/passphrase.c:663
+#: g10/passphrase.c:665
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -2923,20 +2934,20 @@ msgstr ""
"Vous avez besoin d'un mot de passe pour d�verrouiller la cl� secr�te pour\n"
"l'utilisateur: \""
-#: g10/passphrase.c:672
+#: g10/passphrase.c:674
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "cl� de %u bits %s, ID %08lX, cr��e le %s"
-#: g10/passphrase.c:710
+#: g10/passphrase.c:712
msgid "can't query password in batchmode\n"
msgstr "impossible de demander un mot de passe en mode automatique\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:716
msgid "Enter passphrase: "
msgstr "Entrez le mot de passe: "
-#: g10/passphrase.c:718
+#: g10/passphrase.c:720
msgid "Repeat passphrase: "
msgstr "R�p�tez le mot de passe: "
@@ -3165,7 +3176,7 @@ msgstr "%s: impossible de cr�er le verrouillage\n"
msgid "%s: can't make lock\n"
msgstr "%s: impossible de cr�er le verrouillage\n"
-#: g10/keyring.c:1376 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
+#: g10/keyring.c:1420 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: impossible de cr�er: %s\n"
@@ -3304,22 +3315,32 @@ msgstr "enregistrement de confiance %lu, type %d: l'�criture a �chou�: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "base de confiance: la synchronisation a �chou�: %s\n"
-#: g10/trustdb.c:688
+#: g10/trustdb.c:470
+#, fuzzy
+msgid "no need for a trustdb check\n"
+msgstr "%s: ce n'est pas un fichier de base de confiance\n"
+
+#: g10/trustdb.c:476 g10/trustdb.c:1458
+#, fuzzy, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "enregistrement de base de confiance %lu: lseek a �chou�: %s\n"
+
+#: g10/trustdb.c:709
#, fuzzy
msgid "checking the trustdb\n"
msgstr "changer la confiance"
-#: g10/trustdb.c:839
+#: g10/trustdb.c:860
#, fuzzy, c-format
msgid "public key %08lX not found: %s\n"
msgstr "cl� publique non trouv�e"
-#: g10/trustdb.c:1304
+#: g10/trustdb.c:1338
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr ""
-#: g10/trustdb.c:1374
+#: g10/trustdb.c:1411
#, c-format
msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
msgstr ""
@@ -3743,61 +3764,61 @@ msgstr "Pas d'aide disponible"
msgid "No help available for `%s'"
msgstr "Pas d'aide disponible pour `%s'"
-#: g10/keydb.c:170
+#: g10/keydb.c:175
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
-#: g10/keydb.c:179
+#: g10/keydb.c:184
#, c-format
msgid "changing permission of `%s' failed: %s\n"
msgstr ""
-#: g10/keydb.c:188
+#: g10/keydb.c:193
#, fuzzy, c-format
msgid "keyring `%s' created\n"
msgstr "%s: porte-cl�s cr��\n"
-#: g10/keydb.c:530
+#: g10/keydb.c:586
#, fuzzy, c-format
-msgid "failed to rebuild all keyring caches: %s\n"
+msgid "failed to rebuild keyring cache: %s\n"
msgstr "%s: la cr�ation de la table de hachage a �chou�: %s\n"
-#: g10/keyring.c:1179
+#: g10/keyring.c:1220
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr ""
"ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
-#: g10/keyring.c:1181
+#: g10/keyring.c:1222
#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s est le fichier original\n"
-#: g10/keyring.c:1182
+#: g10/keyring.c:1223
#, c-format
msgid "%s is the new one\n"
msgstr "%s est le nouveau\n"
-#: g10/keyring.c:1183
+#: g10/keyring.c:1224
msgid "Please fix this possible security flaw\n"
msgstr "R�parez ce probl�me de s�curit� possible\n"
-#: g10/keyring.c:1281
+#: g10/keyring.c:1322
#, fuzzy, c-format
msgid "checking keyring `%s'\n"
msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
-#: g10/keyring.c:1312
+#: g10/keyring.c:1353
#, fuzzy, c-format
msgid "%lu keys so far checked (%lu signatures)\n"
msgstr "%lu cl�s trait�es jusqu'ici\n"
-#: g10/keyring.c:1323
+#: g10/keyring.c:1364
#, fuzzy, c-format
msgid "%lu keys checked (%lu signatures)\n"
msgstr "lister les cl�s et les signatures"
-#: g10/keyring.c:1381
+#: g10/keyring.c:1425
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: porte-cl�s cr��\n"
diff --git a/po/id.po b/po/id.po
index 3ef494189..4817a8471 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNUPG 1.0.6\n"
-"POT-Creation-Date: 2001-09-28 16:20+0200\n"
+"POT-Creation-Date: 2001-10-23 09:41+0200\n"
"PO-Revision-Date: 2001-06-01 16:41GMT+0700\n"
"Last-Translator: Tedi Heriyanto <[email protected]>\n"
"Language-Team: Indonesian <[email protected]>\n"
@@ -42,7 +42,7 @@ msgstr "tidak"
msgid "nN"
msgstr "tT"
-#: g10/keyedit.c:568 util/miscutil.c:326
+#: g10/keyedit.c:574 util/miscutil.c:326
msgid "quit"
msgstr "keluar"
@@ -341,7 +341,7 @@ msgstr ""
"Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n"
"memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n"
-#: g10/g10.c:237
+#: g10/g10.c:238
msgid ""
"@Commands:\n"
" "
@@ -349,145 +349,145 @@ msgstr ""
"@Perintah:\n"
" "
-#: g10/g10.c:239
+#: g10/g10.c:240
msgid "|[file]|make a signature"
msgstr "|[file]|buat signature"
-#: g10/g10.c:240
+#: g10/g10.c:241
msgid "|[file]|make a clear text signature"
msgstr "|[file]|buat signature teks"
-#: g10/g10.c:241
+#: g10/g10.c:242
msgid "make a detached signature"
msgstr "buat detached signature"
-#: g10/g10.c:242
+#: g10/g10.c:243
msgid "encrypt data"
msgstr "enkripsi data"
-#: g10/g10.c:243
+#: g10/g10.c:244
msgid "encryption only with symmetric cipher"
msgstr "enkripsi hanya dengan symmetric cipher"
-#: g10/g10.c:244
+#: g10/g10.c:245
msgid "store only"
msgstr "hanya disimpan"
-#: g10/g10.c:245
+#: g10/g10.c:246
msgid "decrypt data (default)"
msgstr "dekripsi data (default)"
-#: g10/g10.c:246
+#: g10/g10.c:247
msgid "verify a signature"
msgstr "verifikasi signature"
-#: g10/g10.c:248
+#: g10/g10.c:249
msgid "list keys"
msgstr "tampilkan kunci"
-#: g10/g10.c:250
+#: g10/g10.c:251
msgid "list keys and signatures"
msgstr "tampilkan kunci dan signature"
-#: g10/g10.c:251
+#: g10/g10.c:252
msgid "check key signatures"
msgstr "periksa signature kunci"
-#: g10/g10.c:252
+#: g10/g10.c:253
msgid "list keys and fingerprints"
msgstr "tampilkan kunci dan fingerprint"
-#: g10/g10.c:253
+#: g10/g10.c:254
msgid "list secret keys"
msgstr "tampilkan kunci rahasia"
-#: g10/g10.c:254
+#: g10/g10.c:255
msgid "generate a new key pair"
msgstr "buat sepasang kunci baru"
-#: g10/g10.c:255
+#: g10/g10.c:256
msgid "remove key from the public keyring"
msgstr "hapus kunci dari keyring publik"
-#: g10/g10.c:257
+#: g10/g10.c:258
msgid "remove key from the secret keyring"
msgstr "hapus kunci dari keyring pribadi"
-#: g10/g10.c:258
+#: g10/g10.c:259
msgid "sign a key"
msgstr "tandai kunci"
-#: g10/g10.c:259
+#: g10/g10.c:260
msgid "sign a key locally"
msgstr "tandai kunci secara lokal"
-#: g10/g10.c:260
+#: g10/g10.c:261
msgid "sign or edit a key"
msgstr "tandai atau edit kunci"
-#: g10/g10.c:261
+#: g10/g10.c:262
msgid "generate a revocation certificate"
msgstr "buat sertifikat revokasi"
-#: g10/g10.c:262
+#: g10/g10.c:263
msgid "export keys"
msgstr "ekspor kunci"
-#: g10/g10.c:263
+#: g10/g10.c:264
msgid "export keys to a key server"
msgstr "ekspor kunci ke key server"
-#: g10/g10.c:264
+#: g10/g10.c:265
msgid "import keys from a key server"
msgstr "impor kunci dari key server"
-#: g10/g10.c:266
+#: g10/g10.c:267
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "impor kunci dari key server"
-#: g10/g10.c:270
+#: g10/g10.c:271
msgid "import/merge keys"
msgstr "impor/gabung kunci"
-#: g10/g10.c:272
+#: g10/g10.c:273
msgid "list only the sequence of packets"
msgstr "tampilkan hanya urutan paket"
-#: g10/g10.c:274
+#: g10/g10.c:275
msgid "export the ownertrust values"
msgstr "ekspor nilai ownertrust"
-#: g10/g10.c:276
+#: g10/g10.c:277
msgid "import ownertrust values"
msgstr "impor nilai ownertrust"
-#: g10/g10.c:278
+#: g10/g10.c:279
msgid "update the trust database"
msgstr "perbarui database trust"
-#: g10/g10.c:280
+#: g10/g10.c:281
#, fuzzy
msgid "unattended trust database update"
msgstr "perbarui database trust"
-#: g10/g10.c:281
+#: g10/g10.c:282
msgid "fix a corrupted trust database"
msgstr "perbaiki database trust yang terkorupsi"
-#: g10/g10.c:282
+#: g10/g10.c:283
msgid "De-Armor a file or stdin"
msgstr "De-Armor file atau stdin"
-#: g10/g10.c:284
+#: g10/g10.c:285
msgid "En-Armor a file or stdin"
msgstr "En-Armor file atau stdin"
-#: g10/g10.c:286
+#: g10/g10.c:287
msgid "|algo [files]|print message digests"
msgstr "|algo [file]|cetak digest pesan"
-#: g10/g10.c:290
+#: g10/g10.c:291
msgid ""
"@\n"
"Options:\n"
@@ -497,161 +497,166 @@ msgstr ""
"Pilihan:\n"
" "
-#: g10/g10.c:292
+#: g10/g10.c:293
msgid "create ascii armored output"
msgstr "ciptakan output ascii"
-#: g10/g10.c:294
+#: g10/g10.c:295
msgid "|NAME|encrypt for NAME"
msgstr "|NAMA|enkripsi untuk NAMA"
-#: g10/g10.c:297
+#: g10/g10.c:298
msgid "|NAME|use NAME as default recipient"
msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
-#: g10/g10.c:299
+#: g10/g10.c:300
msgid "use the default key as default recipient"
msgstr "gunakan kunci baku sebagai penerima baku"
-#: g10/g10.c:303
+#: g10/g10.c:304
msgid "use this user-id to sign or decrypt"
msgstr "gunakan id-user ini untuk menandai/dekripsi"
-#: g10/g10.c:304
+#: g10/g10.c:305
msgid "|N|set compress level N (0 disables)"
msgstr "|N|set tingkat kompresi N (0 tidak ada)"
-#: g10/g10.c:306
+#: g10/g10.c:307
msgid "use canonical text mode"
msgstr "gunakan mode teks kanonikal"
-#: g10/g10.c:307
+#: g10/g10.c:308
msgid "use as output file"
msgstr "gunakan sebagai file output"
-#: g10/g10.c:308
+#: g10/g10.c:309
msgid "verbose"
msgstr "detil"
-#: g10/g10.c:309
+#: g10/g10.c:310
msgid "be somewhat more quiet"
msgstr "lebih diam"
-#: g10/g10.c:310
+#: g10/g10.c:311
msgid "don't use the terminal at all"
msgstr "jangan menggunakan terminal"
-#: g10/g10.c:311
+#: g10/g10.c:312
msgid "force v3 signatures"
msgstr "paksa signature v3"
-#: g10/g10.c:312
+#: g10/g10.c:313
+#, fuzzy
+msgid "do not force v3 signatures"
+msgstr "paksa signature v3"
+
+#: g10/g10.c:314
msgid "always use a MDC for encryption"
msgstr "selalu gunakan MDC untuk enkripsi"
-#: g10/g10.c:313
+#: g10/g10.c:315
msgid "do not make any changes"
msgstr "jangan buat perubahan"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:315
+#: g10/g10.c:317
msgid "use the gpg-agent"
msgstr "gunakan gpg-agent"
-#: g10/g10.c:316
+#: g10/g10.c:318
msgid "batch mode: never ask"
msgstr "mode batch: tanpa tanya"
-#: g10/g10.c:317
+#: g10/g10.c:319
msgid "assume yes on most questions"
msgstr "asumsikan ya untuk seluruh pertanyaan"
-#: g10/g10.c:318
+#: g10/g10.c:320
msgid "assume no on most questions"
msgstr "asumsikan tidak untuk seluruh pertanyaan"
-#: g10/g10.c:319
+#: g10/g10.c:321
msgid "add this keyring to the list of keyrings"
msgstr "tambah keyring ini ke daftar keyring"
-#: g10/g10.c:320
+#: g10/g10.c:322
msgid "add this secret keyring to the list"
msgstr "tambah keyring rahasia ini ke daftar"
-#: g10/g10.c:321
+#: g10/g10.c:323
msgid "|NAME|use NAME as default secret key"
msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
-#: g10/g10.c:322
+#: g10/g10.c:324
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
-#: g10/g10.c:323
+#: g10/g10.c:325
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAMA|set charset terminal ke NAMA"
-#: g10/g10.c:324
+#: g10/g10.c:326
msgid "read options from file"
msgstr "baca pilihan dari file"
-#: g10/g10.c:328
+#: g10/g10.c:330
msgid "|FD|write status info to this FD"
msgstr "|FD|tulis info status ke FD ini"
-#: g10/g10.c:330
+#: g10/g10.c:332
#, fuzzy
msgid "|[file]|write status info to file"
msgstr "|FD|tulis info status ke FD ini"
-#: g10/g10.c:336
+#: g10/g10.c:338
msgid "|KEYID|ultimately trust this key"
msgstr "|KEYID|sangat percayai kunci ini"
-#: g10/g10.c:337
+#: g10/g10.c:339
msgid "|FILE|load extension module FILE"
msgstr "|FILE|muat modul ekstensi FILE"
-#: g10/g10.c:338
+#: g10/g10.c:340
msgid "emulate the mode described in RFC1991"
msgstr "emulasikan mode seperti dalam RFC1991"
-#: g10/g10.c:339
+#: g10/g10.c:341
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "set pilihan paket, cipher, digest ke OpenPGP"
-#: g10/g10.c:340
+#: g10/g10.c:342
msgid "|N|use passphrase mode N"
msgstr "|N|gunakan passphrase mode N"
-#: g10/g10.c:342
+#: g10/g10.c:344
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
-#: g10/g10.c:344
+#: g10/g10.c:346
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
-#: g10/g10.c:345
+#: g10/g10.c:347
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAMA|gunakan algoritma cipher NAMA"
-#: g10/g10.c:346
+#: g10/g10.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
-#: g10/g10.c:347
+#: g10/g10.c:349
msgid "|N|use compress algorithm N"
msgstr "|N|gunakan algoritma kompresi N"
-#: g10/g10.c:348
+#: g10/g10.c:350
msgid "throw keyid field of encrypted packets"
msgstr "buang field keyid paket terenkripsi"
-#: g10/g10.c:349
+#: g10/g10.c:351
msgid "|NAME=VALUE|use this notation data"
msgstr "|NAMA=NILAI|gunakan notasi data ini"
-#: g10/g10.c:352
+#: g10/g10.c:354
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -659,7 +664,7 @@ msgstr ""
"@\n"
"(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
-#: g10/g10.c:355
+#: g10/g10.c:357
msgid ""
"@\n"
"Examples:\n"
@@ -679,15 +684,15 @@ msgstr ""
" --list-keys [nama] tampilkan kunci\n"
" --fingerprint [nama] tampilkan fingerprint\n"
-#: g10/g10.c:478
+#: g10/g10.c:480
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Silakan laporkan kesalahan ke <[email protected]>.\n"
-#: g10/g10.c:482
+#: g10/g10.c:484
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
-#: g10/g10.c:485
+#: g10/g10.c:487
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -697,7 +702,7 @@ msgstr ""
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
-#: g10/g10.c:496
+#: g10/g10.c:498
msgid ""
"\n"
"Supported algorithms:\n"
@@ -705,200 +710,200 @@ msgstr ""
"\n"
"Algoritma yang didukung:\n"
-#: g10/g10.c:570
+#: g10/g10.c:572
msgid "usage: gpg [options] "
msgstr "pemakaian: gpg [pilihan] "
-#: g10/g10.c:627
+#: g10/g10.c:629
msgid "conflicting commands\n"
msgstr "perintah saling konflik\n"
-#: g10/g10.c:783
+#: g10/g10.c:785
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
-#: g10/g10.c:787
+#: g10/g10.c:789
#, c-format
msgid "option file `%s': %s\n"
msgstr "file pilihan `%s': %s\n"
-#: g10/g10.c:794
+#: g10/g10.c:796
#, c-format
msgid "reading options from `%s'\n"
msgstr "membaca pilihan dari `%s'\n"
-#: g10/g10.c:1038
+#: g10/g10.c:1041
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s bukanlah set karakter yang valid\n"
-#: g10/g10.c:1122
+#: g10/g10.c:1125
msgid "WARNING: program may create a core file!\n"
msgstr "PERINGATAN: program mungkin membuat file core!\n"
-#: g10/g10.c:1126 g10/g10.c:1135
+#: g10/g10.c:1129 g10/g10.c:1138
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
-#: g10/g10.c:1128
+#: g10/g10.c:1131
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
-#: g10/g10.c:1131
+#: g10/g10.c:1134
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s tidak masuk akal dengan %s!\n"
-#: g10/g10.c:1151 g10/g10.c:1163
+#: g10/g10.c:1154 g10/g10.c:1166
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
-#: g10/g10.c:1157 g10/g10.c:1169
+#: g10/g10.c:1160 g10/g10.c:1172
msgid "selected digest algorithm is invalid\n"
msgstr "algoritma digest yang dipilih tidak valid\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1176
msgid "the given policy URL is invalid\n"
msgstr "kebijakan URL yang diberikan tidak valid\n"
-#: g10/g10.c:1176
+#: g10/g10.c:1179
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "algoritma kompresi harus di antara %d..%d\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1181
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed harus lebih dari 0\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1183
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed harus lebih dari 1\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1185
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth harus di antara 1 hingga 255\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1188
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
-#: g10/g10.c:1189
+#: g10/g10.c:1192
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1196
#, fuzzy
msgid "invalid preferences\n"
msgstr "tampilkan preferensi"
-#: g10/g10.c:1276
+#: g10/g10.c:1279
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
-#: g10/g10.c:1282
+#: g10/g10.c:1285
msgid "--store [filename]"
msgstr "--store [namafile]"
-#: g10/g10.c:1289
+#: g10/g10.c:1292
msgid "--symmetric [filename]"
msgstr "--symmetric [namafile]"
-#: g10/g10.c:1297
+#: g10/g10.c:1300
msgid "--encrypt [filename]"
msgstr "--encrypt [namafile]"
-#: g10/g10.c:1310
+#: g10/g10.c:1313
msgid "--sign [filename]"
msgstr "--sign [namafile]"
-#: g10/g10.c:1323
+#: g10/g10.c:1326
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
-#: g10/g10.c:1337
+#: g10/g10.c:1340
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [namafile]"
-#: g10/g10.c:1346
+#: g10/g10.c:1349
msgid "--clearsign [filename]"
msgstr "--clearsign [namafile]"
-#: g10/g10.c:1364
+#: g10/g10.c:1367
msgid "--decrypt [filename]"
msgstr "--decrypt [namafile]"
-#: g10/g10.c:1372
+#: g10/g10.c:1375
msgid "--sign-key user-id"
msgstr "--sign-key id-user"
-#: g10/g10.c:1380
+#: g10/g10.c:1383
msgid "--lsign-key user-id"
msgstr "--lsign-key id-user"
-#: g10/g10.c:1388
+#: g10/g10.c:1391
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-user [perintah]"
-#: g10/g10.c:1404
+#: g10/g10.c:1407
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key id-user"
-#: g10/g10.c:1407
+#: g10/g10.c:1410
msgid "--delete-key user-id"
msgstr "--delete-key id-user"
-#: g10/g10.c:1415
+#: g10/g10.c:1418
msgid "--delete-secret-and-public-key user-id"
msgstr "--delete-secret-and-public-key id-user"
-#: g10/encode.c:268 g10/g10.c:1452 g10/sign.c:632
+#: g10/encode.c:268 g10/g10.c:1455 g10/sign.c:632
#, c-format
msgid "can't open %s: %s\n"
msgstr "tidak dapat membuka %s: %s\n"
-#: g10/g10.c:1467
+#: g10/g10.c:1470
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-user] [keyring]"
-#: g10/g10.c:1539
+#: g10/g10.c:1542
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "gagal dearmoring: %s\n"
-#: g10/g10.c:1547
+#: g10/g10.c:1550
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "gagal enarmoring: %s\n"
-#: g10/g10.c:1618
+#: g10/g10.c:1621
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritma hash tidak valid `%s'\n"
-#: g10/g10.c:1704
+#: g10/g10.c:1707
msgid "[filename]"
msgstr "[namafile]"
-#: g10/g10.c:1708
+#: g10/g10.c:1711
msgid "Go ahead and type your message ...\n"
msgstr "Teruskan dan ketikkan pesan anda ....\n"
-#: g10/decrypt.c:59 g10/g10.c:1711 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1714 g10/verify.c:94 g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "tidak dapat membuka `%s'\n"
-#: g10/g10.c:1920
+#: g10/g10.c:1923
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr "karakter pertama nama notasi harus huruf atau garis bawah\n"
-#: g10/g10.c:1926
+#: g10/g10.c:1929
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -906,11 +911,11 @@ msgstr ""
"nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan "
"diakhiri dengan sebuah '='\n"
-#: g10/g10.c:1932
+#: g10/g10.c:1935
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr "titik dalam nama notasi harus diapit oleh karakter lain\n"
-#: g10/g10.c:1940
+#: g10/g10.c:1943
msgid "a notation value must not use any control characters\n"
msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
@@ -1557,7 +1562,7 @@ msgstr ""
"Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
"\n"
-#: g10/keyedit.c:456 g10/keygen.c:1171
+#: g10/keyedit.c:462 g10/keygen.c:1171
msgid "passphrase not correctly repeated; try again.\n"
msgstr "passphrase tidak diulang dengan benar; coba lagi.\n"
@@ -1694,27 +1699,27 @@ msgstr "Membaca dari `%s'\n"
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s dienkripsi untuk: %s\n"
-#: g10/delkey.c:69 g10/export.c:149
+#: g10/delkey.c:69 g10/export.c:148
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "user '%s' tidak ditemukan: %s\n"
-#: g10/delkey.c:77 g10/export.c:159
+#: g10/delkey.c:77 g10/export.c:158
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: g10/export.c:167
+#: g10/export.c:166
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
-#: g10/export.c:178
+#: g10/export.c:177
#, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
-#: g10/export.c:234
+#: g10/export.c:233
msgid "WARNING: nothing exported\n"
msgstr "PERINGATAN: tidak ada yang diekspor\n"
@@ -1724,16 +1729,16 @@ msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:183 g10/getkey.c:2188
+#: g10/getkey.c:183 g10/getkey.c:2192
msgid "[User id not found]"
msgstr "[User id tidak ditemukan]"
-#: g10/getkey.c:1911
+#: g10/getkey.c:1915
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "menggunakan kunci sekunder %08lX selain kunci primer %08lX\n"
-#: g10/getkey.c:1952
+#: g10/getkey.c:1956
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
@@ -2065,17 +2070,17 @@ msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:296
+#: g10/keyedit.c:302
#, c-format
msgid "Already signed by key %08lX\n"
msgstr "Sudah ditandai dengan kunci %08lX\n"
-#: g10/keyedit.c:307
+#: g10/keyedit.c:313
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
-#: g10/keyedit.c:316
+#: g10/keyedit.c:322
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2083,7 +2088,7 @@ msgstr ""
"Apakah anda yakin untuk menandai kunci ini \n"
"dengan kunci anda: "
-#: g10/keyedit.c:325
+#: g10/keyedit.c:331
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
@@ -2091,33 +2096,33 @@ msgstr ""
"Signature akan ditandai sebagai tidak dapat diekspor.\n"
"\n"
-#: g10/keyedit.c:330
+#: g10/keyedit.c:336
msgid "Really sign? "
msgstr "Ditandai? "
-#: g10/keyedit.c:361 g10/keyedit.c:2104 g10/keyedit.c:2166 g10/sign.c:225
+#: g10/keyedit.c:367 g10/keyedit.c:2110 g10/keyedit.c:2172 g10/sign.c:225
#, c-format
msgid "signing failed: %s\n"
msgstr "gagal menandai: %s\n"
-#: g10/keyedit.c:415
+#: g10/keyedit.c:421
msgid "This key is not protected.\n"
msgstr "Kunci ini tidak diproteksi.\n"
-#: g10/keyedit.c:419
+#: g10/keyedit.c:425
msgid "Secret parts of primary key are not available.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
-#: g10/keyedit.c:423
+#: g10/keyedit.c:429
msgid "Key is protected.\n"
msgstr "Kunci diproteksi.\n"
-#: g10/keyedit.c:443
+#: g10/keyedit.c:449
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Tidak dapat mengedit kunci ini: %s\n"
-#: g10/keyedit.c:448
+#: g10/keyedit.c:454
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2125,7 +2130,7 @@ msgstr ""
"Masukkan passphrase baru untuk kunci rahasia ini.\n"
"\n"
-#: g10/keyedit.c:460
+#: g10/keyedit.c:466
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2133,499 +2138,505 @@ msgstr ""
"Anda tidak ingin passphrase - bukan ide yang baik!\n"
"\n"
-#: g10/keyedit.c:463
+#: g10/keyedit.c:469
msgid "Do you really want to do this? "
msgstr "Apakah anda ingin melakukan hal ini? "
-#: g10/keyedit.c:527
+#: g10/keyedit.c:533
msgid "moving a key signature to the correct place\n"
msgstr "memindahkan signature kunci ke tempat yang tepat\n"
-#: g10/keyedit.c:568
+#: g10/keyedit.c:574
msgid "quit this menu"
msgstr "berhenti dari menu ini"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:575
msgid "q"
msgstr "q"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save"
msgstr "simpan"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save and quit"
msgstr "simpan dan berhenti"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "help"
msgstr "bantuan"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "show this help"
msgstr "tampilkan bantuan"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "show fingerprint"
msgstr "tampilkan fingerprint"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list"
msgstr "tampilkan"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list key and user IDs"
msgstr "tampilkan kunci dan ID user"
-#: g10/keyedit.c:575
+#: g10/keyedit.c:581
msgid "l"
msgstr "l"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "select user ID N"
msgstr "pilih ID user N"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "key"
msgstr "kunci"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "select secondary key N"
msgstr "pilih kunci sekunder N"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "check"
msgstr "periksa"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "list signatures"
msgstr "tampilkan signature"
-#: g10/keyedit.c:579
+#: g10/keyedit.c:585
msgid "c"
msgstr "c"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign"
msgstr "tandai"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign the key"
msgstr "tandai kunci"
-#: g10/keyedit.c:581
+#: g10/keyedit.c:587
msgid "s"
msgstr "s"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "sign the key locally"
msgstr "tandai kunci secara lokal"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:589
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "add a user ID"
msgstr "tambah sebuah ID user"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "delete user ID"
msgstr "hapus ID user"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "add a secondary key"
msgstr "tambah kunci sekunder"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delete a secondary key"
msgstr "hapus kunci sekunder"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delete signatures"
msgstr "hapus signature"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "change the expire date"
msgstr "ubah tanggal kadaluarsa"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "primary"
msgstr ""
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle between secret and public key listing"
msgstr "ubah tampilan kunci rahasia dan publik"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:599
msgid "t"
msgstr "t"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:600
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:594 g10/keyedit.c:595
-msgid "list preferences"
+#: g10/keyedit.c:600
+#, fuzzy
+msgid "list preferences (expert)"
msgstr "tampilkan preferensi"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:601
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:601
+#, fuzzy
+msgid "list preferences (verbose)"
+msgstr "tampilkan preferensi"
+
+#: g10/keyedit.c:602
#, fuzzy
msgid "setpref"
msgstr "pref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:602
#, fuzzy
msgid "set preference list"
msgstr "tampilkan preferensi"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updpref"
msgstr "pref"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updated preferences"
msgstr "tampilkan preferensi"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "change the passphrase"
msgstr "ubah passphrase"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "change the ownertrust"
msgstr "ubah ownertrust"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revoke signatures"
msgstr "batalkan signature"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revoke a secondary key"
msgstr "batalkan kunci sekunder"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable a key"
msgstr "tiadakan kunci"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable a key"
msgstr "aktifkan kunci"
-#: g10/delkey.c:112 g10/keyedit.c:623
+#: g10/delkey.c:112 g10/keyedit.c:629
msgid "can't do that in batchmode\n"
msgstr "tidak dapat dilakukan dalam mode batch\n"
-#: g10/keyedit.c:658
+#: g10/keyedit.c:664
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: g10/keyedit.c:676
+#: g10/keyedit.c:682
msgid "Secret key is available.\n"
msgstr "Kunci rahasia tersedia.\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:712
msgid "Command> "
msgstr "Perintah> "
-#: g10/keyedit.c:737
+#: g10/keyedit.c:743
msgid "Need the secret key to do this.\n"
msgstr "Perlu kunci rahasia.\n"
-#: g10/keyedit.c:741
+#: g10/keyedit.c:747
msgid "Please use the command \"toggle\" first.\n"
msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
-#: g10/keyedit.c:788
+#: g10/keyedit.c:794
msgid "Really sign all user IDs? "
msgstr "Tandai ID seluruh user? "
-#: g10/keyedit.c:789
+#: g10/keyedit.c:795
msgid "Hint: Select the user IDs to sign\n"
msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
-#: g10/keyedit.c:821 g10/keyedit.c:842
+#: g10/keyedit.c:827 g10/keyedit.c:848
msgid "You must select at least one user ID.\n"
msgstr "Anda harus memilih minimum satu ID user.\n"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:829
msgid "You can't delete the last user ID!\n"
msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:832
msgid "Really remove all selected user IDs? "
msgstr "Hapus seluruh ID user terpilih? "
-#: g10/keyedit.c:827
+#: g10/keyedit.c:833
msgid "Really remove this user ID? "
msgstr "Hapus ID user ini? "
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:871 g10/keyedit.c:893
msgid "You must select at least one key.\n"
msgstr "Anda harus memilih minimum satu kunci.\n"
-#: g10/keyedit.c:869
+#: g10/keyedit.c:875
msgid "Do you really want to delete the selected keys? "
msgstr "Anda ingin menghapus kunci terpilih ini? "
-#: g10/keyedit.c:870
+#: g10/keyedit.c:876
msgid "Do you really want to delete this key? "
msgstr "Anda ingin menghapus kunci ini? "
-#: g10/keyedit.c:891
+#: g10/keyedit.c:897
msgid "Do you really want to revoke the selected keys? "
msgstr "Anda ingin membatalkan kunci terpilih ini? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:898
msgid "Do you really want to revoke this key? "
msgstr "Anda ingin membatalkan kunci ini? "
-#: g10/keyedit.c:956
+#: g10/keyedit.c:962
#, fuzzy
msgid "Really update the preferences for the selected user IDs? "
msgstr "Hapus seluruh ID user terpilih? "
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
#, fuzzy
msgid "Really update the preferences? "
msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
-#: g10/keyedit.c:992
+#: g10/keyedit.c:998
msgid "Save changes? "
msgstr "Simpan perubahan? "
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1001
msgid "Quit without saving? "
msgstr "Berhenti tanpa menyimpan? "
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1012
#, c-format
msgid "update failed: %s\n"
msgstr "gagal memperbarui: %s\n"
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1019
#, c-format
msgid "update secret failed: %s\n"
msgstr "gagal perbarui rahasia: %s\n"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1026
msgid "Key not changed so no update needed.\n"
msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
-#: g10/keyedit.c:1031
+#: g10/keyedit.c:1037
msgid "Invalid command (try \"help\")\n"
msgstr "Perintah tidak valid (coba \"help\")\n"
-#: g10/keyedit.c:1139 g10/keyedit.c:1165
+#: g10/keyedit.c:1145 g10/keyedit.c:1171
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr "%s%c %4u%c/%08lX diciptakan: %s berakhir: %s"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1154
#, c-format
msgid " trust: %c/%c"
msgstr " kepercayaan: %c/%c"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1158
msgid "This key has been disabled"
msgstr "Kunci ini telah ditiadakan"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1187
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! subkey telah dibatalkan: %s\n"
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1190
msgid "rev- faked revocation found\n"
msgstr "rev - ditemukan pembatalan palsu\n"
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1192
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? masalah memeriksa pembatalan: %s\n"
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1408
msgid "Delete this good signature? (y/N/q)"
msgstr "Hapus signature baik ini? (y/T/q)"
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1412
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Hapus signature tidak valid ini? (y/T/q)"
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1416
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1422
msgid "Really delete this self-signature? (y/N)"
msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Menghapus %d signature.\n"
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Menghapus %d signature.\n"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
msgid "Nothing deleted.\n"
msgstr "Tidak ada yang dihapus.\n"
-#: g10/keyedit.c:1503
+#: g10/keyedit.c:1509
msgid "Please remove selections from the secret keys.\n"
msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
-#: g10/keyedit.c:1509
+#: g10/keyedit.c:1515
msgid "Please select at most one secondary key.\n"
msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1519
msgid "Changing expiration time for a secondary key.\n"
msgstr "Merubah batas waktu untuk kunci sekunder.\n"
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1521
msgid "Changing expiration time for the primary key.\n"
msgstr "Merubah batas waktu untuk kunci primer.\n"
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1563
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1579
msgid "No corresponding signature in secret ring\n"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1662
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "Anda harus memilih minimum satu ID user.\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1837
#, c-format
msgid "No user ID with index %d\n"
msgstr "Tidak ada ID user dengan index %d\n"
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Tidak ada kunci sekunder dengan index %d\n"
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:1981
msgid "user ID: \""
msgstr "ID user: "
-#: g10/keyedit.c:1978
+#: g10/keyedit.c:1984
#, c-format
msgid ""
"\"\n"
"signed with your key %08lX at %s\n"
msgstr "ditandai dengan kunci anda %08lX pada %s\n"
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1988
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2012
msgid "You have signed these user IDs:\n"
msgstr "Anda telah menandai ID user ini:\n"
-#: g10/keyedit.c:2020 g10/keyedit.c:2055
+#: g10/keyedit.c:2026 g10/keyedit.c:2061
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " ditandai oleh %08lX pada %s\n"
-#: g10/keyedit.c:2025
+#: g10/keyedit.c:2031
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " dibatalkan oleh %08lX pada %s\n"
-#: g10/keyedit.c:2045
+#: g10/keyedit.c:2051
msgid "You are about to revoke these signatures:\n"
msgstr "Anda akan membatalkan signature ini:\n"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:2069
msgid "Really create the revocation certificates? (y/N)"
msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2098
msgid "no secret key\n"
msgstr "tidak ada kunci rahasia\n"
@@ -2805,37 +2816,37 @@ msgstr "tidak dapat menangani algoritma kunci publik %d\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaket tipe %d memiliki bit kritis terset\n"
-#: g10/passphrase.c:277 g10/passphrase.c:319
+#: g10/passphrase.c:278 g10/passphrase.c:320
msgid "gpg-agent is not available in this session\n"
msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
-#: g10/passphrase.c:285
+#: g10/passphrase.c:286
msgid "can't set client pid for the agent\n"
msgstr ""
-#: g10/passphrase.c:293
+#: g10/passphrase.c:294
msgid "can't get server read FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:300
+#: g10/passphrase.c:301
msgid "can't get server write FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:325
+#: g10/passphrase.c:326
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
-#: g10/hkp.c:174 g10/passphrase.c:344
+#: g10/hkp.c:174 g10/passphrase.c:345
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "tidak dapat terkoneksi ke `%s': %s\n"
-#: g10/passphrase.c:415 g10/passphrase.c:677
+#: g10/passphrase.c:417 g10/passphrase.c:679
#, c-format
msgid " (main key ID %08lX)"
msgstr " (ID kunci utama %08lX)"
-#: g10/passphrase.c:425
+#: g10/passphrase.c:427
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -2846,32 +2857,32 @@ msgstr ""
"\"%.*s\"\n"
"%u-bit %s key, ID %08lX, tercipta %s%s\n"
-#: g10/passphrase.c:446
+#: g10/passphrase.c:448
msgid "Enter passphrase\n"
msgstr "Masukkan passphrase\n"
-#: g10/passphrase.c:448
+#: g10/passphrase.c:450
msgid "Repeat passphrase\n"
msgstr "Ulangi passphrase\n"
-#: g10/passphrase.c:483
+#: g10/passphrase.c:485
msgid "passphrase too long\n"
msgstr "passphrase terlalu panjang\n"
-#: g10/passphrase.c:495
+#: g10/passphrase.c:497
msgid "invalid response from agent\n"
msgstr "respon tidak valid dari agen\n"
-#: g10/passphrase.c:504
+#: g10/passphrase.c:506
msgid "cancelled by user\n"
msgstr "dibatalkan oleh user\n"
-#: g10/passphrase.c:507 g10/passphrase.c:580
+#: g10/passphrase.c:509 g10/passphrase.c:582
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
-#: g10/passphrase.c:663
+#: g10/passphrase.c:665
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -2881,20 +2892,20 @@ msgstr ""
"Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
"pemakai: \""
-#: g10/passphrase.c:672
+#: g10/passphrase.c:674
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
-#: g10/passphrase.c:710
+#: g10/passphrase.c:712
msgid "can't query password in batchmode\n"
msgstr "tidak dapat meminta password dalam mode batch\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:716
msgid "Enter passphrase: "
msgstr "Masukkan passphrase: "
-#: g10/passphrase.c:718
+#: g10/passphrase.c:720
msgid "Repeat passphrase: "
msgstr "Ulangi passphrase: "
@@ -3115,7 +3126,7 @@ msgstr "%s: tidak dapat membuat lock\n"
msgid "%s: can't make lock\n"
msgstr "%s: tidak dapat membuat lock\n"
-#: g10/keyring.c:1376 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
+#: g10/keyring.c:1420 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: tidak dapat membuat: %s\n"
@@ -3250,22 +3261,32 @@ msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: gagal sync: %s\n"
-#: g10/trustdb.c:688
+#: g10/trustdb.c:470
+#, fuzzy
+msgid "no need for a trustdb check\n"
+msgstr "%s: bukan file trustdb\n"
+
+#: g10/trustdb.c:476 g10/trustdb.c:1458
+#, fuzzy, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "trustdb rec %lu: lseek gagal: %s\n"
+
+#: g10/trustdb.c:709
#, fuzzy
msgid "checking the trustdb\n"
msgstr "ubah ownertrust"
-#: g10/trustdb.c:839
+#: g10/trustdb.c:860
#, fuzzy, c-format
msgid "public key %08lX not found: %s\n"
msgstr "kunci publik tidak ditemukan"
-#: g10/trustdb.c:1304
+#: g10/trustdb.c:1338
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr ""
-#: g10/trustdb.c:1374
+#: g10/trustdb.c:1411
#, c-format
msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
msgstr ""
@@ -3681,60 +3702,60 @@ msgstr "Tidak tersedia bantuan"
msgid "No help available for `%s'"
msgstr "Tidak tersedia bantuan untuk `%s'"
-#: g10/keydb.c:170
+#: g10/keydb.c:175
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
-#: g10/keydb.c:179
+#: g10/keydb.c:184
#, c-format
msgid "changing permission of `%s' failed: %s\n"
msgstr ""
-#: g10/keydb.c:188
+#: g10/keydb.c:193
#, fuzzy, c-format
msgid "keyring `%s' created\n"
msgstr "%s: keyring tercipta\n"
-#: g10/keydb.c:530
+#: g10/keydb.c:586
#, fuzzy, c-format
-msgid "failed to rebuild all keyring caches: %s\n"
+msgid "failed to rebuild keyring cache: %s\n"
msgstr "%s: gagal membuat hashtable: %s\n"
-#: g10/keyring.c:1179
+#: g10/keyring.c:1220
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
-#: g10/keyring.c:1181
+#: g10/keyring.c:1222
#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s adalah yang tidak berubah\n"
-#: g10/keyring.c:1182
+#: g10/keyring.c:1223
#, c-format
msgid "%s is the new one\n"
msgstr "%s adalah yang baru\n"
-#: g10/keyring.c:1183
+#: g10/keyring.c:1224
msgid "Please fix this possible security flaw\n"
msgstr "Silakan perbaikan kemungkinan lubang keamanan\n"
-#: g10/keyring.c:1281
+#: g10/keyring.c:1322
#, fuzzy, c-format
msgid "checking keyring `%s'\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
-#: g10/keyring.c:1312
+#: g10/keyring.c:1353
#, fuzzy, c-format
msgid "%lu keys so far checked (%lu signatures)\n"
msgstr "%lu kunci telah diproses\n"
-#: g10/keyring.c:1323
+#: g10/keyring.c:1364
#, fuzzy, c-format
msgid "%lu keys checked (%lu signatures)\n"
msgstr "tampilkan kunci dan signature"
-#: g10/keyring.c:1381
+#: g10/keyring.c:1425
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: keyring tercipta\n"
diff --git a/po/it.po b/po/it.po
index 105a6ff1d..719577f11 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.0.5\n"
-"POT-Creation-Date: 2001-09-28 16:20+0200\n"
+"POT-Creation-Date: 2001-10-23 09:41+0200\n"
"PO-Revision-Date: 2001-04-23 21:15+02:00\n"
"Last-Translator: Marco d'Itri <[email protected]>\n"
"Language-Team: Italian <[email protected]>\n"
@@ -41,7 +41,7 @@ msgstr "no"
msgid "nN"
msgstr "nN"
-#: g10/keyedit.c:568 util/miscutil.c:326
+#: g10/keyedit.c:574 util/miscutil.c:326
msgid "quit"
msgstr "quit"
@@ -344,7 +344,7 @@ msgstr ""
"altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
"(Servono altri %d byte)\n"
-#: g10/g10.c:237
+#: g10/g10.c:238
msgid ""
"@Commands:\n"
" "
@@ -352,145 +352,145 @@ msgstr ""
"@Comandi:\n"
" "
-#: g10/g10.c:239
+#: g10/g10.c:240
msgid "|[file]|make a signature"
msgstr "|[file]|fai una firma"
-#: g10/g10.c:240
+#: g10/g10.c:241
msgid "|[file]|make a clear text signature"
msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
-#: g10/g10.c:241
+#: g10/g10.c:242
msgid "make a detached signature"
msgstr "fai una firma separata"
-#: g10/g10.c:242
+#: g10/g10.c:243
msgid "encrypt data"
msgstr "cifra dati"
-#: g10/g10.c:243
+#: g10/g10.c:244
msgid "encryption only with symmetric cipher"
msgstr "cifra solo con un cifrario simmetrico"
-#: g10/g10.c:244
+#: g10/g10.c:245
msgid "store only"
msgstr "immagazzina soltanto"
-#: g10/g10.c:245
+#: g10/g10.c:246
msgid "decrypt data (default)"
msgstr "decifra dati (predefinito)"
-#: g10/g10.c:246
+#: g10/g10.c:247
msgid "verify a signature"
msgstr "verifica una firma"
-#: g10/g10.c:248
+#: g10/g10.c:249
msgid "list keys"
msgstr "elenca le chiavi"
-#: g10/g10.c:250
+#: g10/g10.c:251
msgid "list keys and signatures"
msgstr "elenca le chiavi e le firme"
-#: g10/g10.c:251
+#: g10/g10.c:252
msgid "check key signatures"
msgstr "controlla le firme delle chiavi"
-#: g10/g10.c:252
+#: g10/g10.c:253
msgid "list keys and fingerprints"
msgstr "elenca le chiavi e le impronte digitali"
-#: g10/g10.c:253
+#: g10/g10.c:254
msgid "list secret keys"
msgstr "elenca le chiavi segrete"
-#: g10/g10.c:254
+#: g10/g10.c:255
msgid "generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
-#: g10/g10.c:255
+#: g10/g10.c:256
msgid "remove key from the public keyring"
msgstr "rimuove una chiave dal portachiavi pubblico"
-#: g10/g10.c:257
+#: g10/g10.c:258
msgid "remove key from the secret keyring"
msgstr "rimuove una chiave dal portachiavi privato"
-#: g10/g10.c:258
+#: g10/g10.c:259
msgid "sign a key"
msgstr "firma una chiave"
-#: g10/g10.c:259
+#: g10/g10.c:260
msgid "sign a key locally"
msgstr "firma localmente una chiave"
-#: g10/g10.c:260
+#: g10/g10.c:261
msgid "sign or edit a key"
msgstr "firma o modifica una chiave"
-#: g10/g10.c:261
+#: g10/g10.c:262
msgid "generate a revocation certificate"
msgstr "genera un certificato di revoca"
-#: g10/g10.c:262
+#: g10/g10.c:263
msgid "export keys"
msgstr "esporta delle chiavi"
-#: g10/g10.c:263
+#: g10/g10.c:264
msgid "export keys to a key server"
msgstr "esporta le chiavi a un key server"
-#: g10/g10.c:264
+#: g10/g10.c:265
msgid "import keys from a key server"
msgstr "importa le chiavi da un key server"
-#: g10/g10.c:266
+#: g10/g10.c:267
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "importa le chiavi da un key server"
-#: g10/g10.c:270
+#: g10/g10.c:271
msgid "import/merge keys"
msgstr "importa/aggiungi delle chiavi"
-#: g10/g10.c:272
+#: g10/g10.c:273
msgid "list only the sequence of packets"
msgstr "elenca solo la sequenza dei pacchetti"
-#: g10/g10.c:274
+#: g10/g10.c:275
msgid "export the ownertrust values"
msgstr "esporta i valori di fiducia"
-#: g10/g10.c:276
+#: g10/g10.c:277
msgid "import ownertrust values"
msgstr "importa i valori di fiducia"
-#: g10/g10.c:278
+#: g10/g10.c:279
msgid "update the trust database"
msgstr "aggiorna il database della fiducia"
-#: g10/g10.c:280
+#: g10/g10.c:281
#, fuzzy
msgid "unattended trust database update"
msgstr "aggiorna il database della fiducia"
-#: g10/g10.c:281
+#: g10/g10.c:282
msgid "fix a corrupted trust database"
msgstr "ripara un database della fiducia rovinato"
-#: g10/g10.c:282
+#: g10/g10.c:283
msgid "De-Armor a file or stdin"
msgstr "rimuovi l'armatura a un file o a stdin"
-#: g10/g10.c:284
+#: g10/g10.c:285
msgid "En-Armor a file or stdin"
msgstr "crea l'armatura a un file o a stdin"
-#: g10/g10.c:286
+#: g10/g10.c:287
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|stampa tutti i message digests"
-#: g10/g10.c:290
+#: g10/g10.c:291
msgid ""
"@\n"
"Options:\n"
@@ -500,164 +500,169 @@ msgstr ""
"Opzioni:\n"
" "
-#: g10/g10.c:292
+#: g10/g10.c:293
msgid "create ascii armored output"
msgstr "crea un output ascii con armatura"
-#: g10/g10.c:294
+#: g10/g10.c:295
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|cifra per NOME"
-#: g10/g10.c:297
+#: g10/g10.c:298
msgid "|NAME|use NAME as default recipient"
msgstr "|NOME|usa NOME come destinatario predefinito"
-#: g10/g10.c:299
+#: g10/g10.c:300
msgid "use the default key as default recipient"
msgstr "usa la chiave predefinita come destinatario predefinito"
-#: g10/g10.c:303
+#: g10/g10.c:304
msgid "use this user-id to sign or decrypt"
msgstr "usa questo user-id per firmare o decifrare"
-#: g10/g10.c:304
+#: g10/g10.c:305
msgid "|N|set compress level N (0 disables)"
msgstr "|N|imposta il livello di compressione (0 disab.)"
-#: g10/g10.c:306
+#: g10/g10.c:307
msgid "use canonical text mode"
msgstr "usa il modo testo canonico"
-#: g10/g10.c:307
+#: g10/g10.c:308
msgid "use as output file"
msgstr "usa come file di output"
-#: g10/g10.c:308
+#: g10/g10.c:309
msgid "verbose"
msgstr "prolisso"
-#: g10/g10.c:309
+#: g10/g10.c:310
msgid "be somewhat more quiet"
msgstr "meno prolisso"
-#: g10/g10.c:310
+#: g10/g10.c:311
msgid "don't use the terminal at all"
msgstr "non usa per niente il terminale"
-#: g10/g10.c:311
+#: g10/g10.c:312
msgid "force v3 signatures"
msgstr "forza l'uso di firme v3"
-#: g10/g10.c:312
+#: g10/g10.c:313
+#, fuzzy
+msgid "do not force v3 signatures"
+msgstr "forza l'uso di firme v3"
+
+#: g10/g10.c:314
msgid "always use a MDC for encryption"
msgstr "usa sempre un MDC per cifrare"
-#: g10/g10.c:313
+#: g10/g10.c:315
msgid "do not make any changes"
msgstr "non fa cambiamenti"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:315
+#: g10/g10.c:317
msgid "use the gpg-agent"
msgstr "usa gpg-agent"
-#: g10/g10.c:316
+#: g10/g10.c:318
msgid "batch mode: never ask"
msgstr "modo batch: non fa domande"
-#: g10/g10.c:317
+#: g10/g10.c:319
msgid "assume yes on most questions"
msgstr "assumi \"s�\" per quasi tutte le domande"
-#: g10/g10.c:318
+#: g10/g10.c:320
msgid "assume no on most questions"
msgstr "assumi \"no\" per quasi tutte le domande"
-#: g10/g10.c:319
+#: g10/g10.c:321
msgid "add this keyring to the list of keyrings"
msgstr "aggiungi questo portachiavi alla lista"
-#: g10/g10.c:320
+#: g10/g10.c:322
msgid "add this secret keyring to the list"
msgstr "aggiungi questo portachiavi segreto alla lista"
-#: g10/g10.c:321
+#: g10/g10.c:323
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usa NOME come chiave segreta predefinita"
-#: g10/g10.c:322
+#: g10/g10.c:324
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|cerca le chiavi in questo keyserver"
-#: g10/g10.c:323
+#: g10/g10.c:325
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOME|imposta il set di caratteri del terminale NOME"
-#: g10/g10.c:324
+#: g10/g10.c:326
msgid "read options from file"
msgstr "leggi le opzioni dal file"
-#: g10/g10.c:328
+#: g10/g10.c:330
msgid "|FD|write status info to this FD"
msgstr "|FD|scrivi le informazioni di stato su questo FD"
-#: g10/g10.c:330
+#: g10/g10.c:332
#, fuzzy
msgid "|[file]|write status info to file"
msgstr "|FD|scrivi le informazioni di stato su questo FD"
-#: g10/g10.c:336
+#: g10/g10.c:338
#, fuzzy
msgid "|KEYID|ultimately trust this key"
msgstr "|KEYID|assegna fiducia definitiva a questa chiave"
-#: g10/g10.c:337
+#: g10/g10.c:339
msgid "|FILE|load extension module FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
-#: g10/g10.c:338
+#: g10/g10.c:340
msgid "emulate the mode described in RFC1991"
msgstr "emula il modo descritto in RFC 1991"
-#: g10/g10.c:339
+#: g10/g10.c:341
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr ""
"imposta tutte le opzioni di pacchetto,\n"
"cifrario e digest per OpenPGP"
-#: g10/g10.c:340
+#: g10/g10.c:342
msgid "|N|use passphrase mode N"
msgstr "|N|usa il modo N per la passphrase"
-#: g10/g10.c:342
+#: g10/g10.c:344
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
-#: g10/g10.c:344
+#: g10/g10.c:346
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
-#: g10/g10.c:345
+#: g10/g10.c:347
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usa l'algoritmo di cifratura NOME"
-#: g10/g10.c:346
+#: g10/g10.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usa l'algoritmo di message digest NOME"
-#: g10/g10.c:347
+#: g10/g10.c:349
msgid "|N|use compress algorithm N"
msgstr "|N|usa l'algoritmo di compressione N"
-#: g10/g10.c:348
+#: g10/g10.c:350
msgid "throw keyid field of encrypted packets"
msgstr "elimina il campo keyid dei pacchetti cifrati"
-#: g10/g10.c:349
+#: g10/g10.c:351
msgid "|NAME=VALUE|use this notation data"
msgstr "|NOME=VALORE|usa questi dati per una nota"
-#: g10/g10.c:352
+#: g10/g10.c:354
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -665,7 +670,7 @@ msgstr ""
"@\n"
"(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
-#: g10/g10.c:355
+#: g10/g10.c:357
msgid ""
"@\n"
"Examples:\n"
@@ -685,15 +690,15 @@ msgstr ""
" --list-keys [nomi] mostra le chiavi\n"
" --fingerprint [nomi] mostra le impronte digitali\n"
-#: g10/g10.c:478
+#: g10/g10.c:480
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Per favore segnala i bug a <[email protected]>.\n"
-#: g10/g10.c:482
+#: g10/g10.c:484
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-#: g10/g10.c:485
+#: g10/g10.c:487
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -703,7 +708,7 @@ msgstr ""
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
-#: g10/g10.c:496
+#: g10/g10.c:498
msgid ""
"\n"
"Supported algorithms:\n"
@@ -711,202 +716,202 @@ msgstr ""
"\n"
"Algoritmi gestiti:\n"
-#: g10/g10.c:570
+#: g10/g10.c:572
msgid "usage: gpg [options] "
msgstr "uso: gpg [opzioni] "
-#: g10/g10.c:627
+#: g10/g10.c:629
msgid "conflicting commands\n"
msgstr "comandi in conflitto\n"
-#: g10/g10.c:783
+#: g10/g10.c:785
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
-#: g10/g10.c:787
+#: g10/g10.c:789
#, c-format
msgid "option file `%s': %s\n"
msgstr "file con le opzioni `%s': %s\n"
-#: g10/g10.c:794
+#: g10/g10.c:796
#, c-format
msgid "reading options from `%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
-#: g10/g10.c:1038
+#: g10/g10.c:1041
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s non � un set di caratteri valido\n"
-#: g10/g10.c:1122
+#: g10/g10.c:1125
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
-#: g10/g10.c:1126 g10/g10.c:1135
+#: g10/g10.c:1129 g10/g10.c:1138
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s normalmente non deve essere usato!\n"
-#: g10/g10.c:1128
+#: g10/g10.c:1131
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Non � permesso usare %s con %s!\n"
-#: g10/g10.c:1131
+#: g10/g10.c:1134
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "Non ha senso usare %s con %s!\n"
-#: g10/g10.c:1151 g10/g10.c:1163
+#: g10/g10.c:1154 g10/g10.c:1166
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
-#: g10/g10.c:1157 g10/g10.c:1169
+#: g10/g10.c:1160 g10/g10.c:1172
msgid "selected digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1176
msgid "the given policy URL is invalid\n"
msgstr "L'URL della policy indicato non � valido\n"
-#: g10/g10.c:1176
+#: g10/g10.c:1179
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "l'algoritmo di compressione deve essere tra %d e %d\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1181
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve essere maggiore di 0\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1183
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve essere maggiore di 1\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1185
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth deve essere tra 1 e 255\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1188
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
-#: g10/g10.c:1189
+#: g10/g10.c:1192
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1196
#, fuzzy
msgid "invalid preferences\n"
msgstr "elenca le impostazioni"
-#: g10/g10.c:1276
+#: g10/g10.c:1279
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
-#: g10/g10.c:1282
+#: g10/g10.c:1285
msgid "--store [filename]"
msgstr "--store [nomefile]"
-#: g10/g10.c:1289
+#: g10/g10.c:1292
msgid "--symmetric [filename]"
msgstr "--symmetric [nomefile]"
-#: g10/g10.c:1297
+#: g10/g10.c:1300
msgid "--encrypt [filename]"
msgstr "--encrypt [nomefile]"
-#: g10/g10.c:1310
+#: g10/g10.c:1313
msgid "--sign [filename]"
msgstr "--sign [nomefile]"
-#: g10/g10.c:1323
+#: g10/g10.c:1326
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
-#: g10/g10.c:1337
+#: g10/g10.c:1340
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [nomefile]"
-#: g10/g10.c:1346
+#: g10/g10.c:1349
msgid "--clearsign [filename]"
msgstr "--clearsign [nomefile]"
-#: g10/g10.c:1364
+#: g10/g10.c:1367
msgid "--decrypt [filename]"
msgstr "--decrypt [nomefile]"
-#: g10/g10.c:1372
+#: g10/g10.c:1375
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/g10.c:1380
+#: g10/g10.c:1383
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/g10.c:1388
+#: g10/g10.c:1391
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [comandi]"
-#: g10/g10.c:1404
+#: g10/g10.c:1407
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key user-id"
-#: g10/g10.c:1407
+#: g10/g10.c:1410
msgid "--delete-key user-id"
msgstr "--delete-key user-id"
-#: g10/g10.c:1415
+#: g10/g10.c:1418
msgid "--delete-secret-and-public-key user-id"
msgstr "--delete-secret-and-public-key user-id"
-#: g10/encode.c:268 g10/g10.c:1452 g10/sign.c:632
+#: g10/encode.c:268 g10/g10.c:1455 g10/sign.c:632
#, c-format
msgid "can't open %s: %s\n"
msgstr "impossibile aprire `%s': %s\n"
-#: g10/g10.c:1467
+#: g10/g10.c:1470
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
-#: g10/g10.c:1539
+#: g10/g10.c:1542
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "rimozione dell'armatura fallita: %s\n"
-#: g10/g10.c:1547
+#: g10/g10.c:1550
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
-#: g10/g10.c:1618
+#: g10/g10.c:1621
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo di hash non valido `%s'\n"
-#: g10/g10.c:1704
+#: g10/g10.c:1707
msgid "[filename]"
msgstr "[nomefile]"
-#: g10/g10.c:1708
+#: g10/g10.c:1711
msgid "Go ahead and type your message ...\n"
msgstr "Vai avanti e scrivi il messaggio...\n"
-#: g10/decrypt.c:59 g10/g10.c:1711 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1714 g10/verify.c:94 g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "impossibile aprire `%s'\n"
-#: g10/g10.c:1920
+#: g10/g10.c:1923
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"il primo carattere del nome di una nota deve essere una lettera o un\n"
"underscore\n"
-#: g10/g10.c:1926
+#: g10/g10.c:1929
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -914,11 +919,11 @@ msgstr ""
"il nome di una nota deve essere formato solo da lettere, numeri, punti o\n"
"underscore e deve finire con `='\n"
-#: g10/g10.c:1932
+#: g10/g10.c:1935
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr "nel nome di una nota i punti devono avere altri caratteri intorno\n"
-#: g10/g10.c:1940
+#: g10/g10.c:1943
msgid "a notation value must not use any control characters\n"
msgstr "il valore di una nota non deve usare caratteri di controllo\n"
@@ -1572,7 +1577,7 @@ msgstr ""
"Ti serve una passphrase per proteggere la tua chiave segreta.\n"
"\n"
-#: g10/keyedit.c:456 g10/keygen.c:1171
+#: g10/keyedit.c:462 g10/keygen.c:1171
msgid "passphrase not correctly repeated; try again.\n"
msgstr "passphrase non ripetuta correttamente; riprova.\n"
@@ -1711,27 +1716,27 @@ msgstr "lettura da `%s'\n"
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s cifrato per: %s\n"
-#: g10/delkey.c:69 g10/export.c:149
+#: g10/delkey.c:69 g10/export.c:148
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "utente `%s' non trovato: %s\n"
-#: g10/delkey.c:77 g10/export.c:159
+#: g10/delkey.c:77 g10/export.c:158
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: g10/export.c:167
+#: g10/export.c:166
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
-#: g10/export.c:178
+#: g10/export.c:177
#, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "chiave %08lX: non protetta - saltata\n"
-#: g10/export.c:234
+#: g10/export.c:233
msgid "WARNING: nothing exported\n"
msgstr "ATTENZIONE: non � stato esportato nulla\n"
@@ -1741,16 +1746,16 @@ msgstr "troppe voci nella pk cache - disabilitata\n"
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:183 g10/getkey.c:2188
+#: g10/getkey.c:183 g10/getkey.c:2192
msgid "[User id not found]"
msgstr "[User ID non trovato]"
-#: g10/getkey.c:1911
+#: g10/getkey.c:1915
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
-#: g10/getkey.c:1952
+#: g10/getkey.c:1956
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
@@ -2082,17 +2087,17 @@ msgstr "Trovati %d user ID senza autofirme valide\n"
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:296
+#: g10/keyedit.c:302
#, c-format
msgid "Already signed by key %08lX\n"
msgstr "Gi� firmato dalla chiave %08lX\n"
-#: g10/keyedit.c:307
+#: g10/keyedit.c:313
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "Niente da firmare con la chiave %08lX\n"
-#: g10/keyedit.c:316
+#: g10/keyedit.c:322
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2100,7 +2105,7 @@ msgstr ""
"Sei davvero sicuro di volere firmare questa chiave\n"
"con la tua chiave: \""
-#: g10/keyedit.c:325
+#: g10/keyedit.c:331
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
@@ -2108,33 +2113,33 @@ msgstr ""
"La firma sar� segnata come non esportabile.\n"
"\n"
-#: g10/keyedit.c:330
+#: g10/keyedit.c:336
msgid "Really sign? "
msgstr "Firmo davvero? "
-#: g10/keyedit.c:361 g10/keyedit.c:2104 g10/keyedit.c:2166 g10/sign.c:225
+#: g10/keyedit.c:367 g10/keyedit.c:2110 g10/keyedit.c:2172 g10/sign.c:225
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallita: %s\n"
-#: g10/keyedit.c:415
+#: g10/keyedit.c:421
msgid "This key is not protected.\n"
msgstr "Questa chiave non � protetta.\n"
-#: g10/keyedit.c:419
+#: g10/keyedit.c:425
msgid "Secret parts of primary key are not available.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
-#: g10/keyedit.c:423
+#: g10/keyedit.c:429
msgid "Key is protected.\n"
msgstr "La chiave � protetta.\n"
-#: g10/keyedit.c:443
+#: g10/keyedit.c:449
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Impossibile modificare questa chiave: %s\n"
-#: g10/keyedit.c:448
+#: g10/keyedit.c:454
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2142,7 +2147,7 @@ msgstr ""
"Inserisci la nuova passphrase per questa chiave segreta.\n"
"\n"
-#: g10/keyedit.c:460
+#: g10/keyedit.c:466
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2150,466 +2155,472 @@ msgstr ""
"Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
"\n"
-#: g10/keyedit.c:463
+#: g10/keyedit.c:469
msgid "Do you really want to do this? "
msgstr "Vuoi veramente farlo?"
-#: g10/keyedit.c:527
+#: g10/keyedit.c:533
msgid "moving a key signature to the correct place\n"
msgstr "spostamento della firma di una chiave nel posto corretto\n"
-#: g10/keyedit.c:568
+#: g10/keyedit.c:574
msgid "quit this menu"
msgstr "abbandona questo men�"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:575
msgid "q"
msgstr "q"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save"
msgstr "save"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save and quit"
msgstr "salva ed esci"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "help"
msgstr "help"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "show this help"
msgstr "mostra questo aiuto"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "show fingerprint"
msgstr "mostra le impronte digitali"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list"
msgstr "list"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list key and user IDs"
msgstr "elenca le chiavi e gli user ID"
-#: g10/keyedit.c:575
+#: g10/keyedit.c:581
msgid "l"
msgstr "l"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "select user ID N"
msgstr "scegli l'user ID N"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "key"
msgstr "key"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "select secondary key N"
msgstr "scegli la chiave secondaria N"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "check"
msgstr "check"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "list signatures"
msgstr "elenca le firme"
-#: g10/keyedit.c:579
+#: g10/keyedit.c:585
msgid "c"
msgstr "c"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign the key"
msgstr "firma la chiave"
-#: g10/keyedit.c:581
+#: g10/keyedit.c:587
msgid "s"
msgstr "s"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "sign the key locally"
msgstr "firma la chiave localmente"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:589
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "add a user ID"
msgstr "aggiungi un user ID"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "delete user ID"
msgstr "cancella un user ID"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "add a secondary key"
msgstr "aggiungi una chiave secondaria"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delete a secondary key"
msgstr "cancella una chiave secondaria"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delsig"
msgstr "delsign"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delete signatures"
msgstr "cancella le firme"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "change the expire date"
msgstr "cambia la data di scadenza"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "primary"
msgstr ""
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle between secret and public key listing"
msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:599
msgid "t"
msgstr "t"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:600
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:594 g10/keyedit.c:595
-msgid "list preferences"
+#: g10/keyedit.c:600
+#, fuzzy
+msgid "list preferences (expert)"
msgstr "elenca le impostazioni"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:601
#, fuzzy
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:601
+#, fuzzy
+msgid "list preferences (verbose)"
+msgstr "elenca le impostazioni"
+
+#: g10/keyedit.c:602
#, fuzzy
msgid "setpref"
msgstr "pref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:602
#, fuzzy
msgid "set preference list"
msgstr "elenca le impostazioni"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updpref"
msgstr "pref"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updated preferences"
msgstr "elenca le impostazioni"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "change the passphrase"
msgstr "cambia la passphrase"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "change the ownertrust"
msgstr "cambia il valore di fiducia"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revoke signatures"
msgstr "revoca firme"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revoke a secondary key"
msgstr "revoca una chiave secondaria"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable a key"
msgstr "disabilita una chiave"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable"
msgstr "abilita"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable a key"
msgstr "abilita una chiave"
-#: g10/delkey.c:112 g10/keyedit.c:623
+#: g10/delkey.c:112 g10/keyedit.c:629
msgid "can't do that in batchmode\n"
msgstr "impossibile fare questo in modo batch\n"
-#: g10/keyedit.c:658
+#: g10/keyedit.c:664
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: g10/keyedit.c:676
+#: g10/keyedit.c:682
msgid "Secret key is available.\n"
msgstr "� disponibile una chiave segreta.\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:712
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:737
+#: g10/keyedit.c:743
msgid "Need the secret key to do this.\n"
msgstr "Per fare questo serve la chiave segreta.\n"
-#: g10/keyedit.c:741
+#: g10/keyedit.c:747
msgid "Please use the command \"toggle\" first.\n"
msgstr "Per favore usa prima il comando \"toggle\".\n"
-#: g10/keyedit.c:788
+#: g10/keyedit.c:794
msgid "Really sign all user IDs? "
msgstr "Firmo davvero tutti gli user ID? "
-#: g10/keyedit.c:789
+#: g10/keyedit.c:795
msgid "Hint: Select the user IDs to sign\n"
msgstr "Suggerimento: seleziona gli user ID da firmare\n"
-#: g10/keyedit.c:821 g10/keyedit.c:842
+#: g10/keyedit.c:827 g10/keyedit.c:848
msgid "You must select at least one user ID.\n"
msgstr "Devi selezionare almeno un user ID.\n"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:829
msgid "You can't delete the last user ID!\n"
msgstr "Non puoi cancellare l'ultimo user ID!\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:832
msgid "Really remove all selected user IDs? "
msgstr "Tolgo davvero tutti gli user ID selezionati? "
-#: g10/keyedit.c:827
+#: g10/keyedit.c:833
msgid "Really remove this user ID? "
msgstr "Tolgo davvero questo user ID? "
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:871 g10/keyedit.c:893
msgid "You must select at least one key.\n"
msgstr "Devi selezionare almeno una chiave.\n"
-#: g10/keyedit.c:869
+#: g10/keyedit.c:875
msgid "Do you really want to delete the selected keys? "
msgstr "Vuoi davvero cancellare le chiavi selezionate? "
-#: g10/keyedit.c:870
+#: g10/keyedit.c:876
msgid "Do you really want to delete this key? "
msgstr "Vuoi davvero cancellare questa chiave? "
-#: g10/keyedit.c:891
+#: g10/keyedit.c:897
msgid "Do you really want to revoke the selected keys? "
msgstr "Vuoi davvero revocare le chiavi selezionate? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:898
msgid "Do you really want to revoke this key? "
msgstr "Vuoi davvero revocare questa chiave? "
-#: g10/keyedit.c:956
+#: g10/keyedit.c:962
#, fuzzy
msgid "Really update the preferences for the selected user IDs? "
msgstr "Tolgo davvero tutti gli user ID selezionati? "
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
#, fuzzy
msgid "Really update the preferences? "
msgstr "Creare davvero i certificati di revoca? (s/N)"
-#: g10/keyedit.c:992
+#: g10/keyedit.c:998
msgid "Save changes? "
msgstr "Salvo i cambiamenti? "
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1001
msgid "Quit without saving? "
msgstr "Esco senza salvare? "
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1012
#, c-format
msgid "update failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1019
#, c-format
msgid "update secret failed: %s\n"
msgstr "aggiornamento della chiave segreta fallito: %s\n"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1026
msgid "Key not changed so no update needed.\n"
msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
-#: g10/keyedit.c:1031
+#: g10/keyedit.c:1037
msgid "Invalid command (try \"help\")\n"
msgstr "Comando non valido (prova \"help\")\n"
-#: g10/keyedit.c:1139 g10/keyedit.c:1165
+#: g10/keyedit.c:1145 g10/keyedit.c:1171
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr "%s%c %4u%c/%08lX creata: %s scade: %s"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1154
#, c-format
msgid " trust: %c/%c"
msgstr " fiducia: %c/%c"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1158
msgid "This key has been disabled"
msgstr "Questa chiave � stata disabilitata"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1187
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! la subchiave � stata revocata: %s\n"
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1190
msgid "rev- faked revocation found\n"
msgstr "rev- trovata una revoca falsificata\n"
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1192
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? problema controllando la revoca: %s\n"
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1408
msgid "Delete this good signature? (y/N/q)"
msgstr "Cancellare questa firma corretta? (s/N/q)"
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1412
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Cancellare questa firma non valida? (s/N/q)"
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1416
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1422
msgid "Really delete this self-signature? (y/N)"
msgstr "Cancellare davvero questa autofirma? (s/N)"
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Cancellata %d firma.\n"
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Cancellate %d firme.\n"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
msgid "Nothing deleted.\n"
msgstr "Non � stato cancellato nulla.\n"
-#: g10/keyedit.c:1503
+#: g10/keyedit.c:1509
msgid "Please remove selections from the secret keys.\n"
msgstr "Togli le selezioni dalle chiavi segrete.\n"
-#: g10/keyedit.c:1509
+#: g10/keyedit.c:1515
msgid "Please select at most one secondary key.\n"
msgstr "Seleziona al massimo una chiave secondaria.\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1519
msgid "Changing expiration time for a secondary key.\n"
msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1521
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambio la data di scadenza per la chiave primaria.\n"
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1563
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1579
msgid "No corresponding signature in secret ring\n"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1662
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "Devi selezionare almeno un user ID.\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1837
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nessun user ID con l'indice %d\n"
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Nessuna chiave secondaria con l'indice %d\n"
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:1981
msgid "user ID: \""
msgstr "user ID: \""
-#: g10/keyedit.c:1978
+#: g10/keyedit.c:1984
#, c-format
msgid ""
"\"\n"
@@ -2619,34 +2630,34 @@ msgstr ""
"firmata con la tua chiave %08lX a %s\n"
"\n"
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1988
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "Creare un certificato di revoca per questa firma? (s/N)"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2012
msgid "You have signed these user IDs:\n"
msgstr "Non puoi cancellare l'ultimo user ID!\n"
-#: g10/keyedit.c:2020 g10/keyedit.c:2055
+#: g10/keyedit.c:2026 g10/keyedit.c:2061
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " firmata da %08lX il %s\n"
-#: g10/keyedit.c:2025
+#: g10/keyedit.c:2031
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " revocata da %08lX il %s\n"
-#: g10/keyedit.c:2045
+#: g10/keyedit.c:2051
msgid "You are about to revoke these signatures:\n"
msgstr "Stai per revocare queste firme:\n"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:2069
msgid "Really create the revocation certificates? (y/N)"
msgstr "Creare davvero i certificati di revoca? (s/N)"
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2098
msgid "no secret key\n"
msgstr "manca la chiave segreta\n"
@@ -2826,37 +2837,37 @@ msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
-#: g10/passphrase.c:277 g10/passphrase.c:319
+#: g10/passphrase.c:278 g10/passphrase.c:320
msgid "gpg-agent is not available in this session\n"
msgstr "gpg-agent non � disponibile in questa sessione\n"
-#: g10/passphrase.c:285
+#: g10/passphrase.c:286
msgid "can't set client pid for the agent\n"
msgstr ""
-#: g10/passphrase.c:293
+#: g10/passphrase.c:294
msgid "can't get server read FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:300
+#: g10/passphrase.c:301
msgid "can't get server write FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:325
+#: g10/passphrase.c:326
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
-#: g10/hkp.c:174 g10/passphrase.c:344
+#: g10/hkp.c:174 g10/passphrase.c:345
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "impossibile connettersi a `%s': %s\n"
-#: g10/passphrase.c:415 g10/passphrase.c:677
+#: g10/passphrase.c:417 g10/passphrase.c:679
#, c-format
msgid " (main key ID %08lX)"
msgstr " (key ID principale %08lX)"
-#: g10/passphrase.c:425
+#: g10/passphrase.c:427
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -2867,32 +2878,32 @@ msgstr ""
"\"%.*s\"\n"
"%u-bit %s key, ID %08lX, created %s%s\n"
-#: g10/passphrase.c:446
+#: g10/passphrase.c:448
msgid "Enter passphrase\n"
msgstr "Inserisci la passphrase\n"
-#: g10/passphrase.c:448
+#: g10/passphrase.c:450
msgid "Repeat passphrase\n"
msgstr "Ripeti la passphrase\n"
-#: g10/passphrase.c:483
+#: g10/passphrase.c:485
msgid "passphrase too long\n"
msgstr "passphrase troppo lunga\n"
-#: g10/passphrase.c:495
+#: g10/passphrase.c:497
msgid "invalid response from agent\n"
msgstr "risposta non valida dall'agent\n"
-#: g10/passphrase.c:504
+#: g10/passphrase.c:506
msgid "cancelled by user\n"
msgstr "interrotto dall'utente\n"
-#: g10/passphrase.c:507 g10/passphrase.c:580
+#: g10/passphrase.c:509 g10/passphrase.c:582
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "problema con l'agent: ha restituito 0x%lx\n"
-#: g10/passphrase.c:663
+#: g10/passphrase.c:665
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -2902,20 +2913,20 @@ msgstr ""
"Ti serve una passphrase per sbloccare la chiave segreta\n"
"dell'utente: \""
-#: g10/passphrase.c:672
+#: g10/passphrase.c:674
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
-#: g10/passphrase.c:710
+#: g10/passphrase.c:712
msgid "can't query password in batchmode\n"
msgstr "impossibile chiedere la password in modo batch\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:716
msgid "Enter passphrase: "
msgstr "Inserisci la passphrase: "
-#: g10/passphrase.c:718
+#: g10/passphrase.c:720
msgid "Repeat passphrase: "
msgstr "Ripeti la passphrase: "
@@ -3141,7 +3152,7 @@ msgstr "%s: impossibile creare il lock\n"
msgid "%s: can't make lock\n"
msgstr "%s: impossibile creare il lock\n"
-#: g10/keyring.c:1376 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
+#: g10/keyring.c:1420 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: impossibile creare: %s\n"
@@ -3277,22 +3288,32 @@ msgstr "trust record %lu, req type %d: write fallita: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync fallita: %s\n"
-#: g10/trustdb.c:688
+#: g10/trustdb.c:470
+#, fuzzy
+msgid "no need for a trustdb check\n"
+msgstr "%s: non � un file di trustdb\n"
+
+#: g10/trustdb.c:476 g10/trustdb.c:1458
+#, fuzzy, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "trustdb rec %lu: lseek fallita: %s\n"
+
+#: g10/trustdb.c:709
#, fuzzy
msgid "checking the trustdb\n"
msgstr "cambia il valore di fiducia"
-#: g10/trustdb.c:839
+#: g10/trustdb.c:860
#, fuzzy, c-format
msgid "public key %08lX not found: %s\n"
msgstr "chiave pubblica non trovata"
-#: g10/trustdb.c:1304
+#: g10/trustdb.c:1338
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr ""
-#: g10/trustdb.c:1374
+#: g10/trustdb.c:1411
#, c-format
msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
msgstr ""
@@ -3714,60 +3735,60 @@ msgstr "Non � disponibile un aiuto"
msgid "No help available for `%s'"
msgstr "Non � disponibile un aiuto per `%s'"
-#: g10/keydb.c:170
+#: g10/keydb.c:175
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
-#: g10/keydb.c:179
+#: g10/keydb.c:184
#, c-format
msgid "changing permission of `%s' failed: %s\n"
msgstr ""
-#: g10/keydb.c:188
+#: g10/keydb.c:193
#, fuzzy, c-format
msgid "keyring `%s' created\n"
msgstr "%s: portachiavi creato\n"
-#: g10/keydb.c:530
+#: g10/keydb.c:586
#, fuzzy, c-format
-msgid "failed to rebuild all keyring caches: %s\n"
+msgid "failed to rebuild keyring cache: %s\n"
msgstr "%s: creazione della tabella hash fallita: %s\n"
-#: g10/keyring.c:1179
+#: g10/keyring.c:1220
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
-#: g10/keyring.c:1181
+#: g10/keyring.c:1222
#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s � quello non modificato\n"
-#: g10/keyring.c:1182
+#: g10/keyring.c:1223
#, c-format
msgid "%s is the new one\n"
msgstr "%s � quello nuovo\n"
-#: g10/keyring.c:1183
+#: g10/keyring.c:1224
msgid "Please fix this possible security flaw\n"
msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
-#: g10/keyring.c:1281
+#: g10/keyring.c:1322
#, fuzzy, c-format
msgid "checking keyring `%s'\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
-#: g10/keyring.c:1312
+#: g10/keyring.c:1353
#, fuzzy, c-format
msgid "%lu keys so far checked (%lu signatures)\n"
msgstr "Per ora sono state esaminate %lu chiavi\n"
-#: g10/keyring.c:1323
+#: g10/keyring.c:1364
#, fuzzy, c-format
msgid "%lu keys checked (%lu signatures)\n"
msgstr "elenca le chiavi e le firme"
-#: g10/keyring.c:1381
+#: g10/keyring.c:1425
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: portachiavi creato\n"
diff --git a/po/ja.po b/po/ja.po
index 1fe01fa08..9f9abd1c9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.4\n"
-"POT-Creation-Date: 2001-09-28 16:20+0200\n"
+"POT-Creation-Date: 2001-10-23 09:41+0200\n"
"PO-Revision-Date: 2000-10-19 23:08+09:00\n"
"Last-Translator: IIDA Yosiaki <[email protected]>\n"
"Language-Team: Japanese <[email protected]>\n"
@@ -43,7 +43,7 @@ msgstr "no"
msgid "nN"
msgstr "nN"
-#: g10/keyedit.c:568 util/miscutil.c:326
+#: g10/keyedit.c:574 util/miscutil.c:326
msgid "quit"
msgstr "quit"
@@ -344,7 +344,7 @@ msgstr ""
"��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
"�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
-#: g10/g10.c:237
+#: g10/g10.c:238
msgid ""
"@Commands:\n"
" "
@@ -352,147 +352,147 @@ msgstr ""
"@���ޥ��:\n"
" "
-#: g10/g10.c:239
+#: g10/g10.c:240
msgid "|[file]|make a signature"
msgstr "|[�ե�����]|��̾�����"
-#: g10/g10.c:240
+#: g10/g10.c:241
msgid "|[file]|make a clear text signature"
msgstr "|[�ե�����]|���ꥢ��̾�����"
-#: g10/g10.c:241
+#: g10/g10.c:242
msgid "make a detached signature"
msgstr "ʬΥ��̾�����"
-#: g10/g10.c:242
+#: g10/g10.c:243
msgid "encrypt data"
msgstr "�ǡ�����Ź沽"
-#: g10/g10.c:243
+#: g10/g10.c:244
msgid "encryption only with symmetric cipher"
msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
-#: g10/g10.c:244
+#: g10/g10.c:245
msgid "store only"
msgstr "��¸�Τ�"
-#: g10/g10.c:245
+#: g10/g10.c:246
msgid "decrypt data (default)"
msgstr "�ǡ��������� (����)"
-#: g10/g10.c:246
+#: g10/g10.c:247
msgid "verify a signature"
msgstr "��̾�򸡾�"
-#: g10/g10.c:248
+#: g10/g10.c:249
msgid "list keys"
msgstr "�����"
-#: g10/g10.c:250
+#: g10/g10.c:251
msgid "list keys and signatures"
msgstr "���Ƚ�̾�ΰ���"
-#: g10/g10.c:251
+#: g10/g10.c:252
msgid "check key signatures"
msgstr "���ν�̾�򸡾�"
-#: g10/g10.c:252
+#: g10/g10.c:253
msgid "list keys and fingerprints"
msgstr "���Ȼ���ΰ���"
-#: g10/g10.c:253
+#: g10/g10.c:254
msgid "list secret keys"
msgstr "��̩���ΰ���"
-#: g10/g10.c:254
+#: g10/g10.c:255
msgid "generate a new key pair"
msgstr "��������������"
-#: g10/g10.c:255
+#: g10/g10.c:256
msgid "remove key from the public keyring"
msgstr "�������ؤ��鸰����"
-#: g10/g10.c:257
+#: g10/g10.c:258
msgid "remove key from the secret keyring"
msgstr "��̩���ؤ��鸰����"
-#: g10/g10.c:258
+#: g10/g10.c:259
msgid "sign a key"
msgstr "���˽�̾"
-#: g10/g10.c:259
+#: g10/g10.c:260
msgid "sign a key locally"
msgstr "��������Ū�˽�̾"
-#: g10/g10.c:260
+#: g10/g10.c:261
msgid "sign or edit a key"
msgstr "���ؤν�̾���Խ�"
-#: g10/g10.c:261
+#: g10/g10.c:262
msgid "generate a revocation certificate"
msgstr "�˴������������"
-#: g10/g10.c:262
+#: g10/g10.c:263
msgid "export keys"
msgstr "����񤭽Ф�"
-#: g10/g10.c:263
+#: g10/g10.c:264
msgid "export keys to a key server"
msgstr "�������С��˸���񤭽Ф�"
-#: g10/g10.c:264
+#: g10/g10.c:265
msgid "import keys from a key server"
msgstr "�������С����鸰���ɤ߹���"
-#: g10/g10.c:266
+#: g10/g10.c:267
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "�������С����鸰���ɤ߹���"
-#: g10/g10.c:270
+#: g10/g10.c:271
msgid "import/merge keys"
msgstr "�����ɹ���/ʻ��"
-#: g10/g10.c:272
+#: g10/g10.c:273
msgid "list only the sequence of packets"
msgstr "�ѥ��å���Τߤΰ���"
-#: g10/g10.c:274
+#: g10/g10.c:275
msgid "export the ownertrust values"
msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
-#: g10/g10.c:276
+#: g10/g10.c:277
msgid "import ownertrust values"
msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
-#: g10/g10.c:278
+#: g10/g10.c:279
msgid "update the trust database"
msgstr "���ѥǡ����١����򹹿�"
-#: g10/g10.c:280
+#: g10/g10.c:281
#, fuzzy
msgid "unattended trust database update"
msgstr "���ѥǡ����١����򹹿�"
-#: g10/g10.c:281
+#: g10/g10.c:282
msgid "fix a corrupted trust database"
msgstr "���줿���ѥǡ����١�������"
-#: g10/g10.c:282
+#: g10/g10.c:283
msgid "De-Armor a file or stdin"
msgstr ""
"�ե�����ޤ���ɸ�����Ϥ�\n"
"��������"
-#: g10/g10.c:284
+#: g10/g10.c:285
msgid "En-Armor a file or stdin"
msgstr "�ե�����ޤ���ɸ�����Ϥ�������"
-#: g10/g10.c:286
+#: g10/g10.c:287
msgid "|algo [files]|print message digests"
msgstr "|���르�ꥺ�� [�ե�����]|��å�������������"
-#: g10/g10.c:290
+#: g10/g10.c:291
msgid ""
"@\n"
"Options:\n"
@@ -502,200 +502,205 @@ msgstr ""
"���ץ����:\n"
" "
-#: g10/g10.c:292
+#: g10/g10.c:293
msgid "create ascii armored output"
msgstr "ASCII���������������"
-#: g10/g10.c:294
+#: g10/g10.c:295
msgid "|NAME|encrypt for NAME"
msgstr "|̾��|��̾�����Ѥ˰Ź沽"
-#: g10/g10.c:297
+#: g10/g10.c:298
msgid "|NAME|use NAME as default recipient"
msgstr ""
"|̾��|����μ����ԤȤ���\n"
"��̾���פ����"
-#: g10/g10.c:299
+#: g10/g10.c:300
msgid "use the default key as default recipient"
msgstr "����μ����Ԥ˴���θ������"
-#: g10/g10.c:303
+#: g10/g10.c:304
msgid "use this user-id to sign or decrypt"
msgstr ""
"��̾������ˤ��Υ桼����id\n"
"�����"
-#: g10/g10.c:304
+#: g10/g10.c:305
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|���̥�٥��N������\n"
"(0���󰵽�)"
-#: g10/g10.c:306
+#: g10/g10.c:307
msgid "use canonical text mode"
msgstr "����ƥ����ȡ��⡼�ɤ����"
-#: g10/g10.c:307
+#: g10/g10.c:308
msgid "use as output file"
msgstr "���ϥե�����Ȥ��ƻ���"
-#: g10/g10.c:308
+#: g10/g10.c:309
msgid "verbose"
msgstr "��Ĺ"
-#: g10/g10.c:309
+#: g10/g10.c:310
msgid "be somewhat more quiet"
msgstr "����Ť�"
-#: g10/g10.c:310
+#: g10/g10.c:311
msgid "don't use the terminal at all"
msgstr "ü�����Ի���"
-#: g10/g10.c:311
+#: g10/g10.c:312
msgid "force v3 signatures"
msgstr "����Ū��v3��̾"
-#: g10/g10.c:312
+#: g10/g10.c:313
+#, fuzzy
+msgid "do not force v3 signatures"
+msgstr "����Ū��v3��̾"
+
+#: g10/g10.c:314
msgid "always use a MDC for encryption"
msgstr "�Ź沽�ˤϾ��MDC�����"
-#: g10/g10.c:313
+#: g10/g10.c:315
msgid "do not make any changes"
msgstr "̵�ѹ�"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:315
+#: g10/g10.c:317
msgid "use the gpg-agent"
msgstr ""
-#: g10/g10.c:316
+#: g10/g10.c:318
msgid "batch mode: never ask"
msgstr "�Хå����⡼��: ��ǧ��ά"
-#: g10/g10.c:317
+#: g10/g10.c:319
msgid "assume yes on most questions"
msgstr ""
"�����Ƥ��μ����������yes\n"
"�Ȥߤʤ�"
-#: g10/g10.c:318
+#: g10/g10.c:320
msgid "assume no on most questions"
msgstr ""
"�����Ƥ��μ����������no\n"
"�Ȥߤʤ�"
-#: g10/g10.c:319
+#: g10/g10.c:321
msgid "add this keyring to the list of keyrings"
msgstr "���ؤΰ����ˤ��θ��ؤ��ɲ�"
-#: g10/g10.c:320
+#: g10/g10.c:322
msgid "add this secret keyring to the list"
msgstr "�����ˤ�����̩���ؤ��ɲ�"
-#: g10/g10.c:321
+#: g10/g10.c:323
msgid "|NAME|use NAME as default secret key"
msgstr ""
"|̾��|�������̩���Ȥ���\n"
"��̾���פ����"
-#: g10/g10.c:322
+#: g10/g10.c:324
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|�ۥ���|���θ����ˤ��θ������С������"
-#: g10/g10.c:323
+#: g10/g10.c:325
msgid "|NAME|set terminal charset to NAME"
msgstr ""
"|CHARSET̾|ü����charset���CHARSET̾��\n"
"������"
-#: g10/g10.c:324
+#: g10/g10.c:326
msgid "read options from file"
msgstr ""
"�ե����뤫�饪�ץ�����\n"
"�ɤ߹���"
-#: g10/g10.c:328
+#: g10/g10.c:330
msgid "|FD|write status info to this FD"
msgstr ""
"|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
"�񤭽Ф�"
-#: g10/g10.c:330
+#: g10/g10.c:332
#, fuzzy
msgid "|[file]|write status info to file"
msgstr ""
"|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
"�񤭽Ф�"
-#: g10/g10.c:336
+#: g10/g10.c:338
#, fuzzy
msgid "|KEYID|ultimately trust this key"
msgstr "|��ID|���Ρָ��פ���Ū�˿��Ѥ���"
-#: g10/g10.c:337
+#: g10/g10.c:339
msgid "|FILE|load extension module FILE"
msgstr ""
"|�ե�����|��ĥ�⥸�塼��Υե������\n"
"�ɤ߹���"
-#: g10/g10.c:338
+#: g10/g10.c:340
msgid "emulate the mode described in RFC1991"
msgstr ""
"RFC1991�˵��Ҥ��줿�⡼�ɤ�\n"
"����"
-#: g10/g10.c:339
+#: g10/g10.c:341
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr ""
"�ѥ��åȤȰŹ�Ƚ�̾�Υ��ץ���\n"
"�������OpenPGP��������"
-#: g10/g10.c:340
+#: g10/g10.c:342
msgid "|N|use passphrase mode N"
msgstr "|N|�ѥ��ե졼�����⡼��N�����"
-#: g10/g10.c:342
+#: g10/g10.c:344
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr ""
"|̾��|�ѥ��ե졼���ˡ�̾���פΥ��\n"
"���������󥢥르�ꥺ������"
-#: g10/g10.c:344
+#: g10/g10.c:346
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr ""
"|̾��|�ѥ��ե졼���ˡ�̾���פΰŹ�\n"
"���르�ꥺ������"
-#: g10/g10.c:345
+#: g10/g10.c:347
msgid "|NAME|use cipher algorithm NAME"
msgstr ""
"|̾��|��̾���פΰŹ楢�르�ꥺ���\n"
"����"
-#: g10/g10.c:346
+#: g10/g10.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr ""
"|̾��|��̾���פΥ�å���������\n"
"���르�ꥺ������"
-#: g10/g10.c:347
+#: g10/g10.c:349
msgid "|N|use compress algorithm N"
msgstr ""
"|̾��|��̾���פΰ��̥��르�ꥺ���\n"
"����"
-#: g10/g10.c:348
+#: g10/g10.c:350
msgid "throw keyid field of encrypted packets"
msgstr ""
"�Ź�ѥ��åȤθ�ID�ե������\n"
"������"
-#: g10/g10.c:349
+#: g10/g10.c:351
msgid "|NAME=VALUE|use this notation data"
msgstr "|̾��=��|��������ǡ��������"
-#: g10/g10.c:352
+#: g10/g10.c:354
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -704,7 +709,7 @@ msgstr ""
"(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
"�ޥ˥奢�롦�ڡ���������������)\n"
-#: g10/g10.c:355
+#: g10/g10.c:357
msgid ""
"@\n"
"Examples:\n"
@@ -724,15 +729,15 @@ msgstr ""
" --list-keys [̾��] ����ɽ��\n"
" --fingerprint [̾��] �����ɽ��\n"
-#: g10/g10.c:478
+#: g10/g10.c:480
msgid "Please report bugs to <[email protected]>.\n"
msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
-#: g10/g10.c:482
+#: g10/g10.c:484
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
-#: g10/g10.c:485
+#: g10/g10.c:487
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -742,7 +747,7 @@ msgstr ""
"��̾�����ڡ��Ź沽������\n"
"�����ư��ϡ����ϥǡ����˰�¸\n"
-#: g10/g10.c:496
+#: g10/g10.c:498
msgid ""
"\n"
"Supported algorithms:\n"
@@ -750,201 +755,201 @@ msgstr ""
"\n"
"���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
-#: g10/g10.c:570
+#: g10/g10.c:572
msgid "usage: gpg [options] "
msgstr "�Ȥ���: gpg [���ץ����] "
-#: g10/g10.c:627
+#: g10/g10.c:629
msgid "conflicting commands\n"
msgstr "���ޥ�ɤξ���\n"
-#: g10/g10.c:783
+#: g10/g10.c:785
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "����: ����Υ��ץ���󡦥ե�����`%s'������ޤ���\n"
-#: g10/g10.c:787
+#: g10/g10.c:789
#, c-format
msgid "option file `%s': %s\n"
msgstr "���ץ���󡦥ե�����`%s': %s\n"
-#: g10/g10.c:794
+#: g10/g10.c:796
#, c-format
msgid "reading options from `%s'\n"
msgstr "`%s'���饪�ץ������ɤ߹��ߤޤ�\n"
-#: g10/g10.c:1038
+#: g10/g10.c:1041
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s��������ʸ������ǤϤ���ޤ���\n"
-#: g10/g10.c:1122
+#: g10/g10.c:1125
msgid "WARNING: program may create a core file!\n"
msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
-#: g10/g10.c:1126 g10/g10.c:1135
+#: g10/g10.c:1129 g10/g10.c:1138
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "����: ����%s���Ѥ��ޤ���!\n"
-#: g10/g10.c:1128
+#: g10/g10.c:1131
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
-#: g10/g10.c:1131
+#: g10/g10.c:1134
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
-#: g10/g10.c:1151 g10/g10.c:1163
+#: g10/g10.c:1154 g10/g10.c:1166
msgid "selected cipher algorithm is invalid\n"
msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
-#: g10/g10.c:1157 g10/g10.c:1169
+#: g10/g10.c:1160 g10/g10.c:1172
msgid "selected digest algorithm is invalid\n"
msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1176
msgid "the given policy URL is invalid\n"
msgstr "��������줿�ݥꥷ��URL��̵���Ǥ�\n"
-#: g10/g10.c:1176
+#: g10/g10.c:1179
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1181
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1183
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1185
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1188
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
-#: g10/g10.c:1189
+#: g10/g10.c:1192
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1196
#, fuzzy
msgid "invalid preferences\n"
msgstr "ͥ���̤ΰ���"
-#: g10/g10.c:1276
+#: g10/g10.c:1279
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:1282
+#: g10/g10.c:1285
msgid "--store [filename]"
msgstr "--store [�ե�����̾]"
-#: g10/g10.c:1289
+#: g10/g10.c:1292
msgid "--symmetric [filename]"
msgstr "--symmetric [�ե�����̾]"
-#: g10/g10.c:1297
+#: g10/g10.c:1300
msgid "--encrypt [filename]"
msgstr "--encrypt [�ե�����̾]"
-#: g10/g10.c:1310
+#: g10/g10.c:1313
msgid "--sign [filename]"
msgstr "--sign [�ե�����̾]"
-#: g10/g10.c:1323
+#: g10/g10.c:1326
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [�ե�����̾]"
-#: g10/g10.c:1337
+#: g10/g10.c:1340
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [�ե�����̾]"
-#: g10/g10.c:1346
+#: g10/g10.c:1349
msgid "--clearsign [filename]"
msgstr "--clearsign [�ե�����̾]"
-#: g10/g10.c:1364
+#: g10/g10.c:1367
msgid "--decrypt [filename]"
msgstr "--decrypt [�ե�����̾]"
-#: g10/g10.c:1372
+#: g10/g10.c:1375
msgid "--sign-key user-id"
msgstr "--sign-key �桼����id"
-#: g10/g10.c:1380
+#: g10/g10.c:1383
msgid "--lsign-key user-id"
msgstr "--lsign-key �桼����id"
-#: g10/g10.c:1388
+#: g10/g10.c:1391
msgid "--edit-key user-id [commands]"
msgstr "--edit-key �桼����id [���ޥ��]"
-#: g10/g10.c:1404
+#: g10/g10.c:1407
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key �桼����id"
-#: g10/g10.c:1407
+#: g10/g10.c:1410
msgid "--delete-key user-id"
msgstr "--delete-key �桼����id"
-#: g10/g10.c:1415
+#: g10/g10.c:1418
#, fuzzy
msgid "--delete-secret-and-public-key user-id"
msgstr "--delete-secret-and-public-key �桼����id"
-#: g10/encode.c:268 g10/g10.c:1452 g10/sign.c:632
+#: g10/encode.c:268 g10/g10.c:1455 g10/sign.c:632
#, c-format
msgid "can't open %s: %s\n"
msgstr "%s�������ޤ���: %s\n"
-#: g10/g10.c:1467
+#: g10/g10.c:1470
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [�桼����id] [����]"
-#: g10/g10.c:1539
+#: g10/g10.c:1542
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "��������˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:1547
+#: g10/g10.c:1550
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:1618
+#: g10/g10.c:1621
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
-#: g10/g10.c:1704
+#: g10/g10.c:1707
msgid "[filename]"
msgstr "[�ե�����̾]"
-#: g10/g10.c:1708
+#: g10/g10.c:1711
msgid "Go ahead and type your message ...\n"
msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1711 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1714 g10/verify.c:94 g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "`%s'�������ޤ���\n"
-#: g10/g10.c:1920
+#: g10/g10.c:1923
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1926
+#: g10/g10.c:1929
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -952,11 +957,11 @@ msgstr ""
"����̾�ˤ�ʸ�����������ɥåȡ���������������Τߤ��Ѥ���\n"
"'='�ǽ����ʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1932
+#: g10/g10.c:1935
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1940
+#: g10/g10.c:1943
msgid "a notation value must not use any control characters\n"
msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
@@ -1604,7 +1609,7 @@ msgstr ""
"��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
"\n"
-#: g10/keyedit.c:456 g10/keygen.c:1171
+#: g10/keyedit.c:462 g10/keygen.c:1171
msgid "passphrase not correctly repeated; try again.\n"
msgstr "�ѥ��ե졼�����ۤʤ�ޤ����⤦�������ꤷ�Ƥ���������\n"
@@ -1737,27 +1742,27 @@ msgstr "`%s'�����ɤ߹��ߤޤ�\n"
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s�Ź沽 ������: %s\n"
-#: g10/delkey.c:69 g10/export.c:149
+#: g10/delkey.c:69 g10/export.c:148
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "�桼����'%s'�����Ĥ���ޤ���: %s\n"
-#: g10/delkey.c:77 g10/export.c:159
+#: g10/delkey.c:77 g10/export.c:158
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
msgstr "`%s'���ɹ��ߥ��顼: %s\n"
-#: g10/export.c:167
+#: g10/export.c:166
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "�� %08lX: rfc2440�θ��ǤϤ���ޤ��� - �����å�\n"
-#: g10/export.c:178
+#: g10/export.c:177
#, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "�� %08lX: �ݸ��Ƥ��ޤ��� - �����å�\n"
-#: g10/export.c:234
+#: g10/export.c:233
msgid "WARNING: nothing exported\n"
msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
@@ -1767,16 +1772,16 @@ msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:183 g10/getkey.c:2188
+#: g10/getkey.c:183 g10/getkey.c:2192
msgid "[User id not found]"
msgstr "[�桼����id�����Ĥ���ޤ���]"
-#: g10/getkey.c:1911
+#: g10/getkey.c:1915
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "����%08lX��縰%08lX�����Ѥ��ޤ�\n"
-#: g10/getkey.c:1952
+#: g10/getkey.c:1956
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "��%08lX: �������Τʤ���̩���Ǥ��������å�\n"
@@ -2106,23 +2111,23 @@ msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:296
+#: g10/keyedit.c:302
#, c-format
msgid "Already signed by key %08lX\n"
msgstr "��%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n"
-#: g10/keyedit.c:307
+#: g10/keyedit.c:313
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "��%08lX�ǽ�̾�����ΤϤ���ޤ���\n"
-#: g10/keyedit.c:316
+#: g10/keyedit.c:322
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
msgstr "�����ˤ��θ��ˤ��ʤ��θ��ǽ�̾���Ƥ褤�Ǥ���: \""
-#: g10/keyedit.c:325
+#: g10/keyedit.c:331
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
@@ -2130,33 +2135,33 @@ msgstr ""
"��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n"
"\n"
-#: g10/keyedit.c:330
+#: g10/keyedit.c:336
msgid "Really sign? "
msgstr "�����˽�̾���ޤ���? "
-#: g10/keyedit.c:361 g10/keyedit.c:2104 g10/keyedit.c:2166 g10/sign.c:225
+#: g10/keyedit.c:367 g10/keyedit.c:2110 g10/keyedit.c:2172 g10/sign.c:225
#, c-format
msgid "signing failed: %s\n"
msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:415
+#: g10/keyedit.c:421
msgid "This key is not protected.\n"
msgstr "���θ����ݸ��Ƥ��ޤ���\n"
-#: g10/keyedit.c:419
+#: g10/keyedit.c:425
msgid "Secret parts of primary key are not available.\n"
msgstr "�縰����̩��ʬ�������ޤ���\n"
-#: g10/keyedit.c:423
+#: g10/keyedit.c:429
msgid "Key is protected.\n"
msgstr "�����ݸ��Ƥ��ޤ���\n"
-#: g10/keyedit.c:443
+#: g10/keyedit.c:449
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
-#: g10/keyedit.c:448
+#: g10/keyedit.c:454
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2164,7 +2169,7 @@ msgstr ""
"������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
"\n"
-#: g10/keyedit.c:460
+#: g10/keyedit.c:466
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2173,466 +2178,472 @@ msgstr ""
"�����餯����Ϥ����ʹͤ��ǤϤ���ޤ���!\n"
"\n"
-#: g10/keyedit.c:463
+#: g10/keyedit.c:469
msgid "Do you really want to do this? "
msgstr "�����˼¹Ԥ��ޤ���? "
-#: g10/keyedit.c:527
+#: g10/keyedit.c:533
msgid "moving a key signature to the correct place\n"
msgstr "���ν�̾�����������˰�ư���ޤ�\n"
-#: g10/keyedit.c:568
+#: g10/keyedit.c:574
msgid "quit this menu"
msgstr "���Υ�˥塼��λ"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:575
msgid "q"
msgstr "q"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save"
msgstr "save"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save and quit"
msgstr "��¸���ƽ�λ"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "help"
msgstr "help"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "show this help"
msgstr "���Υإ�פ򸫤�"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "show fingerprint"
msgstr "����򸫤�"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list"
msgstr "list"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list key and user IDs"
msgstr "���ȥ桼����ID�ΰ���"
-#: g10/keyedit.c:575
+#: g10/keyedit.c:581
msgid "l"
msgstr "l"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "select user ID N"
msgstr "�桼����ID N������"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "key"
msgstr "key"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "select secondary key N"
msgstr "����N������"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "check"
msgstr "check"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "list signatures"
msgstr "��̾�ΰ���"
-#: g10/keyedit.c:579
+#: g10/keyedit.c:585
msgid "c"
msgstr "c"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign the key"
msgstr "���ؽ�̾"
-#: g10/keyedit.c:581
+#: g10/keyedit.c:587
msgid "s"
msgstr "s"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "sign the key locally"
msgstr "��������Ū�˽�̾"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:589
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "add a user ID"
msgstr "�桼����ID���ɲ�"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "delete user ID"
msgstr "�桼����ID�κ��"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "add a secondary key"
msgstr "�������ɲ�"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delete a secondary key"
msgstr "������"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delete signatures"
msgstr "��̾�κ��"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "change the expire date"
msgstr "ͭ�����¤��ѹ�"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "primary"
msgstr ""
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle between secret and public key listing"
msgstr "��̩���ȸ������ΰ��������ؤ�"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:599
msgid "t"
msgstr "t"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:600
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:594 g10/keyedit.c:595
-msgid "list preferences"
+#: g10/keyedit.c:600
+#, fuzzy
+msgid "list preferences (expert)"
msgstr "ͥ���̤ΰ���"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:601
#, fuzzy
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:601
+#, fuzzy
+msgid "list preferences (verbose)"
+msgstr "ͥ���̤ΰ���"
+
+#: g10/keyedit.c:602
#, fuzzy
msgid "setpref"
msgstr "pref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:602
#, fuzzy
msgid "set preference list"
msgstr "ͥ���̤ΰ���"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updpref"
msgstr "pref"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updated preferences"
msgstr "ͥ���̤ΰ���"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "change the passphrase"
msgstr "�ѥ��ե졼�����ѹ�"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "change the ownertrust"
msgstr "��ͭ�Կ��Ѥ��ѹ�"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revoke signatures"
msgstr "��̾���˴�"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revoke a secondary key"
msgstr "�������˴�"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable a key"
msgstr "���λ��Ѥ�ػߤ���"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable a key"
msgstr "���λ��Ѥ���Ĥ���"
-#: g10/delkey.c:112 g10/keyedit.c:623
+#: g10/delkey.c:112 g10/keyedit.c:629
msgid "can't do that in batchmode\n"
msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n"
-#: g10/keyedit.c:658
+#: g10/keyedit.c:664
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "`%s'���ɹ��ߥ��顼: %s\n"
-#: g10/keyedit.c:676
+#: g10/keyedit.c:682
msgid "Secret key is available.\n"
msgstr "��̩�������ѤǤ��ޤ���\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:712
msgid "Command> "
msgstr "���ޥ��> "
-#: g10/keyedit.c:737
+#: g10/keyedit.c:743
msgid "Need the secret key to do this.\n"
msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
-#: g10/keyedit.c:741
+#: g10/keyedit.c:747
msgid "Please use the command \"toggle\" first.\n"
msgstr "�ޤ���toggle�ץ��ޥ�ɤ�ȤäƤ�������\n"
-#: g10/keyedit.c:788
+#: g10/keyedit.c:794
msgid "Really sign all user IDs? "
msgstr "���������桼����ID�˽�̾���ޤ���? "
-#: g10/keyedit.c:789
+#: g10/keyedit.c:795
msgid "Hint: Select the user IDs to sign\n"
msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
-#: g10/keyedit.c:821 g10/keyedit.c:842
+#: g10/keyedit.c:827 g10/keyedit.c:848
msgid "You must select at least one user ID.\n"
msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:829
msgid "You can't delete the last user ID!\n"
msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:832
msgid "Really remove all selected user IDs? "
msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
-#: g10/keyedit.c:827
+#: g10/keyedit.c:833
msgid "Really remove this user ID? "
msgstr "���Υ桼����ID�������˺�����ޤ���? "
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:871 g10/keyedit.c:893
msgid "You must select at least one key.\n"
msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:869
+#: g10/keyedit.c:875
msgid "Do you really want to delete the selected keys? "
msgstr "���򤷤����������˺�����ޤ���? "
-#: g10/keyedit.c:870
+#: g10/keyedit.c:876
msgid "Do you really want to delete this key? "
msgstr "���θ��������˺�����ޤ���? "
-#: g10/keyedit.c:891
+#: g10/keyedit.c:897
msgid "Do you really want to revoke the selected keys? "
msgstr "���򤷤������������˴����ޤ���? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:898
msgid "Do you really want to revoke this key? "
msgstr "���θ����������˴����ޤ���? "
-#: g10/keyedit.c:956
+#: g10/keyedit.c:962
#, fuzzy
msgid "Really update the preferences for the selected user IDs? "
msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
#, fuzzy
msgid "Really update the preferences? "
msgstr "�˴�������������˺��ޤ���? (y/N)"
-#: g10/keyedit.c:992
+#: g10/keyedit.c:998
msgid "Save changes? "
msgstr "�ѹ�����¸���ޤ���? "
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1001
msgid "Quit without saving? "
msgstr "��¸�����˽�λ���ޤ���? "
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1012
#, c-format
msgid "update failed: %s\n"
msgstr "�����˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1019
#, c-format
msgid "update secret failed: %s\n"
msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1026
msgid "Key not changed so no update needed.\n"
msgstr "����̵�ѹ��ʤΤǹ����Ϥ���ޤ���\n"
-#: g10/keyedit.c:1031
+#: g10/keyedit.c:1037
msgid "Invalid command (try \"help\")\n"
msgstr "̵���ʥ��ޥ�� (��help�פ򻲾�)\n"
-#: g10/keyedit.c:1139 g10/keyedit.c:1165
+#: g10/keyedit.c:1145 g10/keyedit.c:1171
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr "%s%c %4u%c/%08lX ����: %s ����: %s"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1154
#, c-format
msgid " trust: %c/%c"
msgstr " trust: %c/%c"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1158
msgid "This key has been disabled"
msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1187
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! �������˴��ѤߤǤ�: %s\n"
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1190
msgid "rev- faked revocation found\n"
msgstr "rev- �Ǥä��������˴���ȯ��\n"
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1192
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? �˴���ǧ�㳲: %s\n"
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1408
msgid "Delete this good signature? (y/N/q)"
msgstr "������������̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1412
msgid "Delete this invalid signature? (y/N/q)"
msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1416
msgid "Delete this unknown signature? (y/N/q)"
msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1422
msgid "Really delete this self-signature? (y/N)"
msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d�Ĥν�̾�������ޤ�����\n"
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d�Ĥν�̾�������ޤ�����\n"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
msgid "Nothing deleted.\n"
msgstr "���������Ƥ��ޤ���\n"
-#: g10/keyedit.c:1503
+#: g10/keyedit.c:1509
msgid "Please remove selections from the secret keys.\n"
msgstr "��̩���������Ȥ��Ƥ���������\n"
-#: g10/keyedit.c:1509
+#: g10/keyedit.c:1515
msgid "Please select at most one secondary key.\n"
msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1519
msgid "Changing expiration time for a secondary key.\n"
msgstr "������ͭ�����¤��ѹ����ޤ���\n"
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1521
msgid "Changing expiration time for the primary key.\n"
msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1563
msgid "You can't change the expiration date of a v3 key\n"
msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1579
msgid "No corresponding signature in secret ring\n"
msgstr "��̩���ؤ��б������̾������ޤ���\n"
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1662
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1837
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
#, c-format
msgid "No secondary key with index %d\n"
msgstr "%d�֤������Ϥ���ޤ���\n"
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:1981
msgid "user ID: \""
msgstr "�桼����ID: \""
-#: g10/keyedit.c:1978
+#: g10/keyedit.c:1984
#, c-format
msgid ""
"\"\n"
@@ -2641,34 +2652,34 @@ msgstr ""
"\"\n"
"���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1988
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "���ν�̾�ˤ��������˴����������ޤ���? (y/N)"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2012
msgid "You have signed these user IDs:\n"
msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
-#: g10/keyedit.c:2020 g10/keyedit.c:2055
+#: g10/keyedit.c:2026 g10/keyedit.c:2061
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " %08lX��%s�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:2025
+#: g10/keyedit.c:2031
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " %08lX��%s���˴�����Ƥ��ޤ�\n"
-#: g10/keyedit.c:2045
+#: g10/keyedit.c:2051
msgid "You are about to revoke these signatures:\n"
msgstr "�����ν�̾���˴����褦�Ȥ��Ƥ��ޤ�:\n"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:2069
msgid "Really create the revocation certificates? (y/N)"
msgstr "�˴�������������˺��ޤ���? (y/N)"
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2098
msgid "no secret key\n"
msgstr "��̩��������ޤ���\n"
@@ -2852,37 +2863,37 @@ msgstr "�������Υ��르�ꥺ��%d�ϻ��ѤǤ��ޤ���\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "������%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
-#: g10/passphrase.c:277 g10/passphrase.c:319
+#: g10/passphrase.c:278 g10/passphrase.c:320
msgid "gpg-agent is not available in this session\n"
msgstr ""
-#: g10/passphrase.c:285
+#: g10/passphrase.c:286
msgid "can't set client pid for the agent\n"
msgstr ""
-#: g10/passphrase.c:293
+#: g10/passphrase.c:294
msgid "can't get server read FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:300
+#: g10/passphrase.c:301
msgid "can't get server write FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:325
+#: g10/passphrase.c:326
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:174 g10/passphrase.c:344
+#: g10/hkp.c:174 g10/passphrase.c:345
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "`%s'����³�Ǥ��ޤ���: %s\n"
-#: g10/passphrase.c:415 g10/passphrase.c:677
+#: g10/passphrase.c:417 g10/passphrase.c:679
#, c-format
msgid " (main key ID %08lX)"
msgstr " (�縰ID %08lX)"
-#: g10/passphrase.c:425
+#: g10/passphrase.c:427
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -2894,34 +2905,34 @@ msgstr ""
"�ѥ��ե졼��������ޤ�: \"%.*s\"\n"
"%u-bit %s key, ID %08lX, created %s%s\n"
-#: g10/passphrase.c:446
+#: g10/passphrase.c:448
#, fuzzy
msgid "Enter passphrase\n"
msgstr "�ѥ��ե졼��������: "
-#: g10/passphrase.c:448
+#: g10/passphrase.c:450
#, fuzzy
msgid "Repeat passphrase\n"
msgstr "�ѥ��ե졼���������: "
-#: g10/passphrase.c:483
+#: g10/passphrase.c:485
msgid "passphrase too long\n"
msgstr ""
-#: g10/passphrase.c:495
+#: g10/passphrase.c:497
msgid "invalid response from agent\n"
msgstr ""
-#: g10/passphrase.c:504
+#: g10/passphrase.c:506
msgid "cancelled by user\n"
msgstr ""
-#: g10/passphrase.c:507 g10/passphrase.c:580
+#: g10/passphrase.c:509 g10/passphrase.c:582
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr ""
-#: g10/passphrase.c:663
+#: g10/passphrase.c:665
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -2931,20 +2942,20 @@ msgstr ""
"���Υ桼��������̩���Υ��å���������ˤ�\n"
"�ѥ��ե졼��������ޤ�: \""
-#: g10/passphrase.c:672
+#: g10/passphrase.c:674
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "%u�ӥå�%s��, ID %08lX�������դ�%s"
-#: g10/passphrase.c:710
+#: g10/passphrase.c:712
msgid "can't query password in batchmode\n"
msgstr "�Хå��⡼�ɤǤϥѥ���ɤ���礻���Ǥ��ޤ���\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:716
msgid "Enter passphrase: "
msgstr "�ѥ��ե졼��������: "
-#: g10/passphrase.c:718
+#: g10/passphrase.c:720
msgid "Repeat passphrase: "
msgstr "�ѥ��ե졼���������: "
@@ -3169,7 +3180,7 @@ msgstr "%s: ���å����Ǥ��ޤ���\n"
msgid "%s: can't make lock\n"
msgstr "%s: ���å����Ǥ��ޤ���\n"
-#: g10/keyring.c:1376 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
+#: g10/keyring.c:1420 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: �����Ǥ��ޤ���: %s\n"
@@ -3305,22 +3316,32 @@ msgstr "���ѥ쥳����%lu, ������%d: ����ߤ˼��Ԥ��ޤ���: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "���ѥǡ����١���: Ʊ���˼��Ԥ��ޤ���: %s\n"
-#: g10/trustdb.c:688
+#: g10/trustdb.c:470
+#, fuzzy
+msgid "no need for a trustdb check\n"
+msgstr "%s: ���ѥǡ����١������ե�����ǤϤ���ޤ���\n"
+
+#: g10/trustdb.c:476 g10/trustdb.c:1458
+#, fuzzy, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "���ѥǡ����١��� �쥳����%lu: �������˼��Ԥ��ޤ���: %s\n"
+
+#: g10/trustdb.c:709
#, fuzzy
msgid "checking the trustdb\n"
msgstr "��ͭ�Կ��Ѥ��ѹ�"
-#: g10/trustdb.c:839
+#: g10/trustdb.c:860
#, fuzzy, c-format
msgid "public key %08lX not found: %s\n"
msgstr "�����������Ĥ���ޤ���"
-#: g10/trustdb.c:1304
+#: g10/trustdb.c:1338
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr ""
-#: g10/trustdb.c:1374
+#: g10/trustdb.c:1411
#, c-format
msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
msgstr ""
@@ -3732,60 +3753,60 @@ msgstr "�إ�פϤ���ޤ���"
msgid "No help available for `%s'"
msgstr "`%s'�Υإ�פϤ���ޤ���"
-#: g10/keydb.c:170
+#: g10/keydb.c:175
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "����`%s'�ν���ߥ��顼: %s\n"
-#: g10/keydb.c:179
+#: g10/keydb.c:184
#, c-format
msgid "changing permission of `%s' failed: %s\n"
msgstr ""
-#: g10/keydb.c:188
+#: g10/keydb.c:193
#, fuzzy, c-format
msgid "keyring `%s' created\n"
msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
-#: g10/keydb.c:530
+#: g10/keydb.c:586
#, fuzzy, c-format
-msgid "failed to rebuild all keyring caches: %s\n"
+msgid "failed to rebuild keyring cache: %s\n"
msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
-#: g10/keyring.c:1179
+#: g10/keyring.c:1220
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr "�ٹ�: ���Ѿ�����ä�2�ĤΥե����뤬¸�ߤ��ޤ���\n"
-#: g10/keyring.c:1181
+#: g10/keyring.c:1222
#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s���ѹ��Τʤ����Ǥ�\n"
-#: g10/keyring.c:1182
+#: g10/keyring.c:1223
#, c-format
msgid "%s is the new one\n"
msgstr "%s�Ͽ��������Ǥ�\n"
-#: g10/keyring.c:1183
+#: g10/keyring.c:1224
msgid "Please fix this possible security flaw\n"
msgstr "���ΰ�����η�٤������Ƥ�������\n"
-#: g10/keyring.c:1281
+#: g10/keyring.c:1322
#, fuzzy, c-format
msgid "checking keyring `%s'\n"
msgstr "����`%s'�ν���ߥ��顼: %s\n"
-#: g10/keyring.c:1312
+#: g10/keyring.c:1353
#, fuzzy, c-format
msgid "%lu keys so far checked (%lu signatures)\n"
msgstr "%lu���ޤǽ���\n"
-#: g10/keyring.c:1323
+#: g10/keyring.c:1364
#, fuzzy, c-format
msgid "%lu keys checked (%lu signatures)\n"
msgstr "���Ƚ�̾�ΰ���"
-#: g10/keyring.c:1381
+#: g10/keyring.c:1425
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
diff --git a/po/nl.po b/po/nl.po
index ce212a818..3bad6f2c3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2001-09-28 16:20+0200\n"
+"POT-Creation-Date: 2001-10-23 09:41+0200\n"
"PO-Revision-Date: 2000-02-20 21:30+01:00\n"
"Last-Translator: Ivo Timmermans <[email protected]>\n"
"Language-Team: Dutch <[email protected]>\n"
@@ -41,7 +41,7 @@ msgstr "nee"
msgid "nN"
msgstr "nN"
-#: g10/keyedit.c:568 util/miscutil.c:326
+#: g10/keyedit.c:574 util/miscutil.c:326
msgid "quit"
msgstr "einde"
@@ -343,7 +343,7 @@ msgstr ""
"om het besturingssysteem de kans te geven om meer entropie te\n"
"verzamelen! (Nog %d bytes nodig)\n"
-#: g10/g10.c:237
+#: g10/g10.c:238
msgid ""
"@Commands:\n"
" "
@@ -351,145 +351,145 @@ msgstr ""
"@Opdrachten:\n"
" "
-#: g10/g10.c:239
+#: g10/g10.c:240
msgid "|[file]|make a signature"
msgstr "|[bestand]|maak een ondertekening"
-#: g10/g10.c:240
+#: g10/g10.c:241
msgid "|[file]|make a clear text signature"
msgstr "|[bestand]|maak een niet versleutelde ondertekening"
-#: g10/g10.c:241
+#: g10/g10.c:242
msgid "make a detached signature"
msgstr "maak een losstaande ondertekening"
-#: g10/g10.c:242
+#: g10/g10.c:243
msgid "encrypt data"
msgstr "versleutel gegevens"
-#: g10/g10.c:243
+#: g10/g10.c:244
msgid "encryption only with symmetric cipher"
msgstr "versleutel slechts met een symmetrische versleutelmethode"
-#: g10/g10.c:244
+#: g10/g10.c:245
msgid "store only"
msgstr "alleen bewaren"
-#: g10/g10.c:245
+#: g10/g10.c:246
msgid "decrypt data (default)"
msgstr "gegevens decoderen (standaard)"
-#: g10/g10.c:246
+#: g10/g10.c:247
msgid "verify a signature"
msgstr "ondertekening controleren"
-#: g10/g10.c:248
+#: g10/g10.c:249
msgid "list keys"
msgstr "lijst van sleutels genereren"
-#: g10/g10.c:250
+#: g10/g10.c:251
msgid "list keys and signatures"
msgstr "sleutels en ondertekeningen opnoemen"
-#: g10/g10.c:251
+#: g10/g10.c:252
msgid "check key signatures"
msgstr "sleutelverificaties controleren"
-#: g10/g10.c:252
+#: g10/g10.c:253
msgid "list keys and fingerprints"
msgstr "sleutels en vingerafdrukken opnoemen"
-#: g10/g10.c:253
+#: g10/g10.c:254
msgid "list secret keys"
msgstr "geheime sleutels opnoemen"
-#: g10/g10.c:254
+#: g10/g10.c:255
msgid "generate a new key pair"
msgstr "nieuw sleutelpaar genereren"
-#: g10/g10.c:255
+#: g10/g10.c:256
msgid "remove key from the public keyring"
msgstr "sleutel weghalen uit de publieke sleutelbos"
-#: g10/g10.c:257
+#: g10/g10.c:258
msgid "remove key from the secret keyring"
msgstr "sleutel weghalen uit de geheime sleutelbos"
-#: g10/g10.c:258
+#: g10/g10.c:259
msgid "sign a key"
msgstr "onderteken een sleutel"
-#: g10/g10.c:259
+#: g10/g10.c:260
msgid "sign a key locally"
msgstr "onderteken een sleutel lokaal"
-#: g10/g10.c:260
+#: g10/g10.c:261
msgid "sign or edit a key"
msgstr "onderteken of bewerk een sleutel"
-#: g10/g10.c:261
+#: g10/g10.c:262
msgid "generate a revocation certificate"
msgstr "genereer een terugtrekkings-certificaat"
-#: g10/g10.c:262
+#: g10/g10.c:263
msgid "export keys"
msgstr "exporteer sleutels"
-#: g10/g10.c:263
+#: g10/g10.c:264
msgid "export keys to a key server"
msgstr "exporteer sleutels naar een sleutelserver"
-#: g10/g10.c:264
+#: g10/g10.c:265
msgid "import keys from a key server"
msgstr "importeer sleutels van een sleutelserver"
-#: g10/g10.c:266
+#: g10/g10.c:267
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "importeer sleutels van een sleutelserver"
-#: g10/g10.c:270
+#: g10/g10.c:271
msgid "import/merge keys"
msgstr "sleutels importeren/samenvoegen"
-#: g10/g10.c:272
+#: g10/g10.c:273
msgid "list only the sequence of packets"
msgstr "noem alleen de volgorde van pakketten"
-#: g10/g10.c:274
+#: g10/g10.c:275
msgid "export the ownertrust values"
msgstr "exporteer het vertrouwen in de eigenaars"
-#: g10/g10.c:276
+#: g10/g10.c:277
msgid "import ownertrust values"
msgstr "importeer het vertrouwen in de eigenaars"
-#: g10/g10.c:278
+#: g10/g10.c:279
msgid "update the trust database"
msgstr "werk de vertrouwensdatabase bij"
-#: g10/g10.c:280
+#: g10/g10.c:281
#, fuzzy
msgid "unattended trust database update"
msgstr "werk de vertrouwensdatabase bij"
-#: g10/g10.c:281
+#: g10/g10.c:282
msgid "fix a corrupted trust database"
msgstr "repareer een beschadigde vertrouwensdatabase"
-#: g10/g10.c:282
+#: g10/g10.c:283
msgid "De-Armor a file or stdin"
msgstr "Verwijder de beveiliging op bestand of standaard invoer"
-#: g10/g10.c:284
+#: g10/g10.c:285
msgid "En-Armor a file or stdin"
msgstr "Voeg beveiliging toe aan bestad of standaard invoer"
-#: g10/g10.c:286
+#: g10/g10.c:287
msgid "|algo [files]|print message digests"
msgstr "|algo [bestanden]|geef controlegetal van berichten weer"
-#: g10/g10.c:290
+#: g10/g10.c:291
msgid ""
"@\n"
"Options:\n"
@@ -499,168 +499,173 @@ msgstr ""
"Opties:\n"
" "
-#: g10/g10.c:292
+#: g10/g10.c:293
msgid "create ascii armored output"
msgstr "genereer beveiliging in ASCII"
-#: g10/g10.c:294
+#: g10/g10.c:295
msgid "|NAME|encrypt for NAME"
msgstr "|NAAM|versleutel voor NAAM"
-#: g10/g10.c:297
+#: g10/g10.c:298
msgid "|NAME|use NAME as default recipient"
msgstr "|NAAM|gebruik NAAM als standaard ontvanger"
-#: g10/g10.c:299
+#: g10/g10.c:300
msgid "use the default key as default recipient"
msgstr "gebruik de standaard sleutel als standaard ontvanger"
-#: g10/g10.c:303
+#: g10/g10.c:304
msgid "use this user-id to sign or decrypt"
msgstr ""
"gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen"
-#: g10/g10.c:304
+#: g10/g10.c:305
msgid "|N|set compress level N (0 disables)"
msgstr "|N|stel compressieniveau in op N (uitzetten met 0)"
-#: g10/g10.c:306
+#: g10/g10.c:307
msgid "use canonical text mode"
msgstr "gebruik de verkorte tekstmodus"
-#: g10/g10.c:307
+#: g10/g10.c:308
msgid "use as output file"
msgstr "gebruik als uitvoerbestand"
-#: g10/g10.c:308
+#: g10/g10.c:309
msgid "verbose"
msgstr "geef meer informatie"
-#: g10/g10.c:309
+#: g10/g10.c:310
msgid "be somewhat more quiet"
msgstr "wees iets stiller"
-#: g10/g10.c:310
+#: g10/g10.c:311
msgid "don't use the terminal at all"
msgstr "gebruik de terminal helemaal niet"
-#: g10/g10.c:311
+#: g10/g10.c:312
msgid "force v3 signatures"
msgstr "forcees v3 ondertekening"
-#: g10/g10.c:312
+#: g10/g10.c:313
+#, fuzzy
+msgid "do not force v3 signatures"
+msgstr "forcees v3 ondertekening"
+
+#: g10/g10.c:314
msgid "always use a MDC for encryption"
msgstr "gebruik altijd een MDC voor versleuteling"
-#: g10/g10.c:313
+#: g10/g10.c:315
msgid "do not make any changes"
msgstr "maak geen enkele verandering"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:315
+#: g10/g10.c:317
msgid "use the gpg-agent"
msgstr ""
-#: g10/g10.c:316
+#: g10/g10.c:318
msgid "batch mode: never ask"
msgstr "doorlopende modus: vraag nooit"
-#: g10/g10.c:317
+#: g10/g10.c:319
msgid "assume yes on most questions"
msgstr "veronderstel ja als antwoord op de meeste vragen"
-#: g10/g10.c:318
+#: g10/g10.c:320
msgid "assume no on most questions"
msgstr "veronderstel nee als antwoord op de meeste vragen"
-#: g10/g10.c:319
+#: g10/g10.c:321
msgid "add this keyring to the list of keyrings"
msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen"
-#: g10/g10.c:320
+#: g10/g10.c:322
msgid "add this secret keyring to the list"
msgstr "voeg deze geheime sleutelbos toe aan de lijst"
-#: g10/g10.c:321
+#: g10/g10.c:323
msgid "|NAME|use NAME as default secret key"
msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel"
-#: g10/g10.c:322
+#: g10/g10.c:324
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken"
-#: g10/g10.c:323
+#: g10/g10.c:325
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAAM|zet tekenverzameling van terminal op NAAM"
-#: g10/g10.c:324
+#: g10/g10.c:326
msgid "read options from file"
msgstr "lees opties uit bestand"
-#: g10/g10.c:328
+#: g10/g10.c:330
msgid "|FD|write status info to this FD"
msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
-#: g10/g10.c:330
+#: g10/g10.c:332
#, fuzzy
msgid "|[file]|write status info to file"
msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
-#: g10/g10.c:336
+#: g10/g10.c:338
msgid "|KEYID|ultimately trust this key"
msgstr ""
-#: g10/g10.c:337
+#: g10/g10.c:339
msgid "|FILE|load extension module FILE"
msgstr "|BESTAND|laad extensiemodule BESTAND"
-#: g10/g10.c:338
+#: g10/g10.c:340
msgid "emulate the mode described in RFC1991"
msgstr "doe als RFC1991 voorschrijft"
-#: g10/g10.c:339
+#: g10/g10.c:341
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "zet alle pakket-, versleutel- en controle-opties naar OpenPGP gedrag"
-#: g10/g10.c:340
+#: g10/g10.c:342
msgid "|N|use passphrase mode N"
msgstr "|N|gebruik sleuteltekst modus N"
-#: g10/g10.c:342
+#: g10/g10.c:344
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM voor sleutelteksten"
-#: g10/g10.c:344
+#: g10/g10.c:346
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NAAM|gebruik versleutelalgoritme NAAM voor sleutelteksten"
-#: g10/g10.c:345
+#: g10/g10.c:347
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAAM|gebruik versleutelalgoritme NAAM"
-#: g10/g10.c:346
+#: g10/g10.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM"
-#: g10/g10.c:347
+#: g10/g10.c:349
msgid "|N|use compress algorithm N"
msgstr "|N|gebruik compressiealgoritme N"
-#: g10/g10.c:348
+#: g10/g10.c:350
msgid "throw keyid field of encrypted packets"
msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
-#: g10/g10.c:349
+#: g10/g10.c:351
msgid "|NAME=VALUE|use this notation data"
msgstr "|NAAM=WAARDE|gebruik deze notitiegegevens"
-#: g10/g10.c:352
+#: g10/g10.c:354
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/g10.c:355
+#: g10/g10.c:357
msgid ""
"@\n"
"Examples:\n"
@@ -680,17 +685,17 @@ msgstr ""
" --list-keys [namen] toon sleutels\n"
" --fingerprints [namen] toon vingerafdrukken\n"
-#: g10/g10.c:478
+#: g10/g10.c:480
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Meld fouten in het programma a.u.b. aan <[email protected]>;\n"
"fouten in de vertaling aan <[email protected]>.\n"
-#: g10/g10.c:482
+#: g10/g10.c:484
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
-#: g10/g10.c:485
+#: g10/g10.c:487
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -700,7 +705,7 @@ msgstr ""
"onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
"standaardactie hangt af van de gegevens\n"
-#: g10/g10.c:496
+#: g10/g10.c:498
msgid ""
"\n"
"Supported algorithms:\n"
@@ -708,203 +713,203 @@ msgstr ""
"\n"
"Ondersteunde algoritmes:\n"
-#: g10/g10.c:570
+#: g10/g10.c:572
msgid "usage: gpg [options] "
msgstr "gebruik: gpg [opties] "
-#: g10/g10.c:627
+#: g10/g10.c:629
msgid "conflicting commands\n"
msgstr "tegenstrijdige commando's\n"
-#: g10/g10.c:783
+#: g10/g10.c:785
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "LET OP: geen bestand `%s' met standaardopties\n"
-#: g10/g10.c:787
+#: g10/g10.c:789
#, c-format
msgid "option file `%s': %s\n"
msgstr "optiebestand `%s': %s\n"
-#: g10/g10.c:794
+#: g10/g10.c:796
#, c-format
msgid "reading options from `%s'\n"
msgstr "opties inlezen van `%s'\n"
-#: g10/g10.c:1038
+#: g10/g10.c:1041
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s is een onbekende tekenverzameling\n"
-#: g10/g10.c:1122
+#: g10/g10.c:1125
msgid "WARNING: program may create a core file!\n"
msgstr "LET OP: programma zou een geheugendump kunnen maken!\n"
-#: g10/g10.c:1126 g10/g10.c:1135
+#: g10/g10.c:1129 g10/g10.c:1138
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "LET OP: %s is niet voor gewoon gebruik!\n"
-#: g10/g10.c:1128
+#: g10/g10.c:1131
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s is niet toegestaan met deze %s!\n"
-#: g10/g10.c:1131
+#: g10/g10.c:1134
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s heeft geen betekenis met %s!\n"
-#: g10/g10.c:1151 g10/g10.c:1163
+#: g10/g10.c:1154 g10/g10.c:1166
msgid "selected cipher algorithm is invalid\n"
msgstr "geselecteerd versleutelalgoritme is ongeldig\n"
-#: g10/g10.c:1157 g10/g10.c:1169
+#: g10/g10.c:1160 g10/g10.c:1172
msgid "selected digest algorithm is invalid\n"
msgstr "geselecteerd controle-algoritme is ongeldig\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1176
msgid "the given policy URL is invalid\n"
msgstr "de gegeven beleids-URL is ongeldig\n"
-#: g10/g10.c:1176
+#: g10/g10.c:1179
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "compressie-algoritme moet in het bereik %d..%d liggen\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1181
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed(?) moet groter zijn dan 0\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1183
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed(?) moet groter zijn dan 1\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1185
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth moet tussen de 1 en de 255 (inclusief) liggen\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1188
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "LET OP: simpele S2K mode (0) wordt met klem afgeraden\n"
-#: g10/g10.c:1189
+#: g10/g10.c:1192
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1196
#, fuzzy
msgid "invalid preferences\n"
msgstr "toon voorkeuren"
-#: g10/g10.c:1276
+#: g10/g10.c:1279
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n"
-#: g10/g10.c:1282
+#: g10/g10.c:1285
msgid "--store [filename]"
msgstr "--store [bestandsnaam]"
-#: g10/g10.c:1289
+#: g10/g10.c:1292
msgid "--symmetric [filename]"
msgstr "--symmetric [bestandsnaam]"
-#: g10/g10.c:1297
+#: g10/g10.c:1300
msgid "--encrypt [filename]"
msgstr "--encrypt [bestandsnaam]"
-#: g10/g10.c:1310
+#: g10/g10.c:1313
msgid "--sign [filename]"
msgstr "--sign [bestandsnaam]"
-#: g10/g10.c:1323
+#: g10/g10.c:1326
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [bestandsnaam]"
-#: g10/g10.c:1337
+#: g10/g10.c:1340
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [bestandsnaam]"
-#: g10/g10.c:1346
+#: g10/g10.c:1349
msgid "--clearsign [filename]"
msgstr "--clearsign [bestandsnaam]"
-#: g10/g10.c:1364
+#: g10/g10.c:1367
msgid "--decrypt [filename]"
msgstr "--decrypt [bestandsnaam]"
-#: g10/g10.c:1372
+#: g10/g10.c:1375
msgid "--sign-key user-id"
msgstr "--sign-key gebruikersidentificatie"
-#: g10/g10.c:1380
+#: g10/g10.c:1383
msgid "--lsign-key user-id"
msgstr "--lsign-key gebruikers-identificatie"
-#: g10/g10.c:1388
+#: g10/g10.c:1391
msgid "--edit-key user-id [commands]"
msgstr "--edit-key gebruikersidentificatie [opdrachten]"
-#: g10/g10.c:1404
+#: g10/g10.c:1407
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key gebruikersidentificatie"
-#: g10/g10.c:1407
+#: g10/g10.c:1410
msgid "--delete-key user-id"
msgstr "--delete-key gebruikersidentificatie"
-#: g10/g10.c:1415
+#: g10/g10.c:1418
#, fuzzy
msgid "--delete-secret-and-public-key user-id"
msgstr "--delete-secret-and-public-key gebruikersidentificatie"
-#: g10/encode.c:268 g10/g10.c:1452 g10/sign.c:632
+#: g10/encode.c:268 g10/g10.c:1455 g10/sign.c:632
#, c-format
msgid "can't open %s: %s\n"
msgstr "kan %s niet openen: %s\n"
-#: g10/g10.c:1467
+#: g10/g10.c:1470
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]"
-#: g10/g10.c:1539
+#: g10/g10.c:1542
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "opheffen van beveiliging mislukt: %s\n"
-#: g10/g10.c:1547
+#: g10/g10.c:1550
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "beveiligen mislukt: %s\n"
-#: g10/g10.c:1618
+#: g10/g10.c:1621
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "ongeldig frommelalgoritme `%s'\n"
-#: g10/g10.c:1704
+#: g10/g10.c:1707
msgid "[filename]"
msgstr "[bestandsnaam]"
-#: g10/g10.c:1708
+#: g10/g10.c:1711
msgid "Go ahead and type your message ...\n"
msgstr "Gaat uw gang, type het bericht ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1711 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1714 g10/verify.c:94 g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "kan `%s' niet openen\n"
-#: g10/g10.c:1920
+#: g10/g10.c:1923
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"het eerste teken van een notitienaam moet een letter of laag liggend steepje "
"zijn\n"
-#: g10/g10.c:1926
+#: g10/g10.c:1929
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -912,11 +917,11 @@ msgstr ""
"een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
"en eindig met een =\n"
-#: g10/g10.c:1932
+#: g10/g10.c:1935
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr "punten in notitienamen moeten omgeven zijn door andere tekens\n"
-#: g10/g10.c:1940
+#: g10/g10.c:1943
msgid "a notation value must not use any control characters\n"
msgstr "een notitienaam mag geen controletekens bevatten\n"
@@ -1583,7 +1588,7 @@ msgstr ""
"Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n"
"\n"
-#: g10/keyedit.c:456 g10/keygen.c:1171
+#: g10/keyedit.c:462 g10/keygen.c:1171
msgid "passphrase not correctly repeated; try again.\n"
msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n"
@@ -1723,27 +1728,27 @@ msgstr "lezen uit `%s'\n"
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s versleuteld voor: %s\n"
-#: g10/delkey.c:69 g10/export.c:149
+#: g10/delkey.c:69 g10/export.c:148
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "gebruiker `%s' niet gevonden: %s\n"
-#: g10/delkey.c:77 g10/export.c:159
+#: g10/delkey.c:77 g10/export.c:158
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
msgstr "fout bij lezen `%s': %s\n"
-#: g10/export.c:167
+#: g10/export.c:166
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
-#: g10/export.c:178
+#: g10/export.c:177
#, fuzzy, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
-#: g10/export.c:234
+#: g10/export.c:233
msgid "WARNING: nothing exported\n"
msgstr "LET OP: er is niets ge�xporteerd\n"
@@ -1753,17 +1758,17 @@ msgstr "te veel ingangen in de pk cache - uitgezet\n"
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:183 g10/getkey.c:2188
+#: g10/getkey.c:183 g10/getkey.c:2192
#, fuzzy
msgid "[User id not found]"
msgstr "[gebruiker niet gevonden]"
-#: g10/getkey.c:1911
+#: g10/getkey.c:1915
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "gebruik secundaire sleutel %08lx in plaats van de primaire %08lx\n"
-#: g10/getkey.c:1952
+#: g10/getkey.c:1956
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr ""
@@ -2104,17 +2109,17 @@ msgstr ""
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:296
+#: g10/keyedit.c:302
#, c-format
msgid "Already signed by key %08lX\n"
msgstr "Reeds ondertekend met sleutel %08lx\n"
-#: g10/keyedit.c:307
+#: g10/keyedit.c:313
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "Niets te tekenen met sleutel %08lX\n"
-#: g10/keyedit.c:316
+#: g10/keyedit.c:322
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2122,7 +2127,7 @@ msgstr ""
"Bent u er echt zeker van dat u deze sleutel wilt tekenen\n"
"met uw sleutel: \""
-#: g10/keyedit.c:325
+#: g10/keyedit.c:331
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
@@ -2130,34 +2135,34 @@ msgstr ""
"Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
"\n"
-#: g10/keyedit.c:330
+#: g10/keyedit.c:336
msgid "Really sign? "
msgstr "Echt tekenen? "
-#: g10/keyedit.c:361 g10/keyedit.c:2104 g10/keyedit.c:2166 g10/sign.c:225
+#: g10/keyedit.c:367 g10/keyedit.c:2110 g10/keyedit.c:2172 g10/sign.c:225
#, c-format
msgid "signing failed: %s\n"
msgstr "ondertekening mislukt: %s\n"
-#: g10/keyedit.c:415
+#: g10/keyedit.c:421
msgid "This key is not protected.\n"
msgstr "Deze sleutel is niet beveiligd.\n"
-#: g10/keyedit.c:419
+#: g10/keyedit.c:425
#, fuzzy
msgid "Secret parts of primary key are not available.\n"
msgstr "geheime sleutel niet beschikbaar"
-#: g10/keyedit.c:423
+#: g10/keyedit.c:429
msgid "Key is protected.\n"
msgstr "Sleutel is beveiligd.\n"
-#: g10/keyedit.c:443
+#: g10/keyedit.c:449
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Kan deze sleutel niet bewerken: %s\n"
-#: g10/keyedit.c:448
+#: g10/keyedit.c:454
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2165,7 +2170,7 @@ msgstr ""
"Geef de sleuteltekst voor deze geheime sleutel.\n"
"\n"
-#: g10/keyedit.c:460
+#: g10/keyedit.c:466
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2173,467 +2178,473 @@ msgstr ""
"U wilt geen sleuteltekst - dit is waaschijnlijk een *slecht* idee!\n"
"\n"
-#: g10/keyedit.c:463
+#: g10/keyedit.c:469
msgid "Do you really want to do this? "
msgstr "Wilt u dit echt? "
-#: g10/keyedit.c:527
+#: g10/keyedit.c:533
msgid "moving a key signature to the correct place\n"
msgstr "sleutelondertekening naar de juiste plaats schuiven\n"
-#: g10/keyedit.c:568
+#: g10/keyedit.c:574
msgid "quit this menu"
msgstr "be�indig dit menu"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:575
msgid "q"
msgstr "q"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save"
msgstr "bewaar"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save and quit"
msgstr "opslaan en be�indigen"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "help"
msgstr "hulp"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "show this help"
msgstr "geef deze hulp"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "show fingerprint"
msgstr "toon vingerafdruk"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list"
msgstr "lijst"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list key and user IDs"
msgstr "lijst van sleutel- en gebruikersidentificaties"
-#: g10/keyedit.c:575
+#: g10/keyedit.c:581
msgid "l"
msgstr "l"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "uid"
msgstr "gebruikersidentificatie"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "select user ID N"
msgstr "selecteer gebruikersidentificatie N"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "key"
msgstr "sleutel"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "select secondary key N"
msgstr "selecteer subsleutel N"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "check"
msgstr "controleer"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "list signatures"
msgstr "toon ondertekeningen"
-#: g10/keyedit.c:579
+#: g10/keyedit.c:585
msgid "c"
msgstr "c"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign"
msgstr "onderteken"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign the key"
msgstr "onderteken de sleutel"
-#: g10/keyedit.c:581
+#: g10/keyedit.c:587
msgid "s"
msgstr "s"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "lsign"
msgstr "lteken"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "sign the key locally"
msgstr "teken de sleutel lokaal"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:589
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "add a user ID"
msgstr "voeg een gebruikersidentificatie toe"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "delete user ID"
msgstr "verwijder gebruikersidentificatie"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "add a secondary key"
msgstr "voeg een secundaire sleutel toe"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delete a secondary key"
msgstr "verwijder een secundaire sleutel"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delete signatures"
msgstr "verwijder ondertekeningen"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "change the expire date"
msgstr "verander de vervaldatum"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "primary"
msgstr ""
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle"
msgstr "wissel"
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle between secret and public key listing"
msgstr "wissel tussen geheime en openbare sleutels"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:599
msgid "t"
msgstr "t"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:600
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:594 g10/keyedit.c:595
-msgid "list preferences"
+#: g10/keyedit.c:600
+#, fuzzy
+msgid "list preferences (expert)"
msgstr "toon voorkeuren"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:601
#, fuzzy
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:601
+#, fuzzy
+msgid "list preferences (verbose)"
+msgstr "toon voorkeuren"
+
+#: g10/keyedit.c:602
#, fuzzy
msgid "setpref"
msgstr "pref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:602
#, fuzzy
msgid "set preference list"
msgstr "toon voorkeuren"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updpref"
msgstr "pref"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updated preferences"
msgstr "toon voorkeuren"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "change the passphrase"
msgstr "verander de sleuteltekst"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "change the ownertrust"
msgstr "verander het vertrouwen in de eigenaar"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revoke signatures"
msgstr "roep ondertekeningen terug"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revoke a secondary key"
msgstr "trek secundaire sleutel in"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable a key"
msgstr "sta het gebruik van een sleutel niet toe"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable a key"
msgstr "sta gebruik van een sleutel toe"
-#: g10/delkey.c:112 g10/keyedit.c:623
+#: g10/delkey.c:112 g10/keyedit.c:629
msgid "can't do that in batchmode\n"
msgstr "kan dat niet doen in lopende band-modus\n"
-#: g10/keyedit.c:658
+#: g10/keyedit.c:664
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "fout bij lezen `%s': %s\n"
-#: g10/keyedit.c:676
+#: g10/keyedit.c:682
msgid "Secret key is available.\n"
msgstr "Geheime sleutel is beschikbaar.\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:712
msgid "Command> "
msgstr "Commando> "
-#: g10/keyedit.c:737
+#: g10/keyedit.c:743
msgid "Need the secret key to do this.\n"
msgstr "Ik heb de geheime sleutel nodig om dat te doen.\n"
-#: g10/keyedit.c:741
+#: g10/keyedit.c:747
msgid "Please use the command \"toggle\" first.\n"
msgstr ""
-#: g10/keyedit.c:788
+#: g10/keyedit.c:794
msgid "Really sign all user IDs? "
msgstr "Echt alle gebruikers tekenen? "
-#: g10/keyedit.c:789
+#: g10/keyedit.c:795
msgid "Hint: Select the user IDs to sign\n"
msgstr "Hint: Selecteer de gebruikersidentificaties om te tekenen\n"
-#: g10/keyedit.c:821 g10/keyedit.c:842
+#: g10/keyedit.c:827 g10/keyedit.c:848
msgid "You must select at least one user ID.\n"
msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:829
msgid "You can't delete the last user ID!\n"
msgstr "U kunt de laatste gebruiker niet verwijderen!\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:832
msgid "Really remove all selected user IDs? "
msgstr "Al deze gebruikers echt verwijderen? "
-#: g10/keyedit.c:827
+#: g10/keyedit.c:833
msgid "Really remove this user ID? "
msgstr "Deze gebruiker echt verwijderen? "
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:871 g10/keyedit.c:893
msgid "You must select at least one key.\n"
msgstr "U moet op zijn minst een sleutel selecteren.\n"
-#: g10/keyedit.c:869
+#: g10/keyedit.c:875
msgid "Do you really want to delete the selected keys? "
msgstr "Wilt u echt alle geselecteerde sleutels verwijderen? "
-#: g10/keyedit.c:870
+#: g10/keyedit.c:876
msgid "Do you really want to delete this key? "
msgstr "Wilt u deze sleutel echt verwijderen? "
-#: g10/keyedit.c:891
+#: g10/keyedit.c:897
msgid "Do you really want to revoke the selected keys? "
msgstr "Wilt u echt alle geselecteerde sleutels intrekken? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:898
msgid "Do you really want to revoke this key? "
msgstr "Wilt u deze sleutel echt intrekken? "
-#: g10/keyedit.c:956
+#: g10/keyedit.c:962
#, fuzzy
msgid "Really update the preferences for the selected user IDs? "
msgstr "Al deze gebruikers echt verwijderen? "
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
#, fuzzy
msgid "Really update the preferences? "
msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
-#: g10/keyedit.c:992
+#: g10/keyedit.c:998
msgid "Save changes? "
msgstr "Veranderingen bewaren? "
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1001
msgid "Quit without saving? "
msgstr "Be�indigen zonder te bewaren? "
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1012
#, c-format
msgid "update failed: %s\n"
msgstr "bijwerken ging niet: %s\n"
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1019
#, c-format
msgid "update secret failed: %s\n"
msgstr "bijwerken van de geheime sleutel mislukte: %s\n"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1026
msgid "Key not changed so no update needed.\n"
msgstr "sleutel is niet veranderd en hoeft dus niet bijgewerkt te worden.\n"
-#: g10/keyedit.c:1031
+#: g10/keyedit.c:1037
msgid "Invalid command (try \"help\")\n"
msgstr "Foutief commando (probeer \"help\")\n"
-#: g10/keyedit.c:1139 g10/keyedit.c:1165
+#: g10/keyedit.c:1145 g10/keyedit.c:1171
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr ""
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1154
#, c-format
msgid " trust: %c/%c"
msgstr ""
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1158
msgid "This key has been disabled"
msgstr "Deze sleutel is niet beschikbaar"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1187
#, fuzzy, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! subsleutel is teruggeroepen: %s\n"
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1190
#, fuzzy
msgid "rev- faked revocation found\n"
msgstr "rev- vervalste sleutelterugtrekking gevonden\n"
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1192
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr ""
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1408
msgid "Delete this good signature? (y/N/q)"
msgstr "Verwijder deze goede ondertekening? (j/N/q)"
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1412
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Verwijder deze ongeldige ondertekening? (j/N/q)"
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1416
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Verwijder deze onbekende ondertekening? (j/N/q)"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1422
msgid "Really delete this self-signature? (y/N)"
msgstr "Deze zelfondertekening echt verwijderen? (j/N)"
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d ondertekening verwijderd.\n"
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d ondertekeningen verwijderd.\n"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
msgid "Nothing deleted.\n"
msgstr "Niets verwijderd.\n"
-#: g10/keyedit.c:1503
+#: g10/keyedit.c:1509
msgid "Please remove selections from the secret keys.\n"
msgstr "Haal a.u.b. de selecties weg voor de geheime sleutels.\n"
-#: g10/keyedit.c:1509
+#: g10/keyedit.c:1515
msgid "Please select at most one secondary key.\n"
msgstr "Selecteer a.u.b. maximaal ��n secundaire sleutel.\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1519
msgid "Changing expiration time for a secondary key.\n"
msgstr "Vervaldatum voor secundaire sleutel instellen.\n"
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1521
msgid "Changing expiration time for the primary key.\n"
msgstr "Vervaldatum voor primaire sleutel instellen.\n"
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1563
msgid "You can't change the expiration date of a v3 key\n"
msgstr "U kunt de vervaldatum van een v3 sleutel niet wijzigen\n"
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1579
msgid "No corresponding signature in secret ring\n"
msgstr "Geen overeenkomende ondertekening in de geheime sleutelbos\n"
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1662
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1837
#, c-format
msgid "No user ID with index %d\n"
msgstr "Geen gebruikersidentificatie met index %d\n"
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Geen secundaire sleutel met index %d\n"
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:1981
msgid "user ID: \""
msgstr "gebruikersidentificatie: \""
-#: g10/keyedit.c:1978
+#: g10/keyedit.c:1984
#, c-format
msgid ""
"\"\n"
@@ -2642,34 +2653,34 @@ msgstr ""
"\"\n"
"tekende met uw sleutel %08lX op %s\n"
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1988
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "Terugtrekkingscertificaat maken voor deze ondertekening? (j/N)"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2012
msgid "You have signed these user IDs:\n"
msgstr "U heeft deze gebruikers ondertekend:\n"
-#: g10/keyedit.c:2020 g10/keyedit.c:2055
+#: g10/keyedit.c:2026 g10/keyedit.c:2061
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " getekend door %08lX op %s\n"
-#: g10/keyedit.c:2025
+#: g10/keyedit.c:2031
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " ingetrokken door %08lX op %s\n"
-#: g10/keyedit.c:2045
+#: g10/keyedit.c:2051
msgid "You are about to revoke these signatures:\n"
msgstr "U staat op het punt om deze ondertekeningen in te trekken:\n"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:2069
msgid "Really create the revocation certificates? (y/N)"
msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2098
msgid "no secret key\n"
msgstr "geen geheime sleutel\n"
@@ -2852,37 +2863,37 @@ msgstr "kan openbare sleutel-algoritme %d niet behandelen\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpakket type %d heeft kritische bit gezet\n"
-#: g10/passphrase.c:277 g10/passphrase.c:319
+#: g10/passphrase.c:278 g10/passphrase.c:320
msgid "gpg-agent is not available in this session\n"
msgstr ""
-#: g10/passphrase.c:285
+#: g10/passphrase.c:286
msgid "can't set client pid for the agent\n"
msgstr ""
-#: g10/passphrase.c:293
+#: g10/passphrase.c:294
msgid "can't get server read FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:300
+#: g10/passphrase.c:301
msgid "can't get server write FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:325
+#: g10/passphrase.c:326
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:174 g10/passphrase.c:344
+#: g10/hkp.c:174 g10/passphrase.c:345
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "kan geen verbinding maken met `%s': %s\n"
-#: g10/passphrase.c:415 g10/passphrase.c:677
+#: g10/passphrase.c:417 g10/passphrase.c:679
#, c-format
msgid " (main key ID %08lX)"
msgstr " (hoofdsleutelnummer %08lX)"
-#: g10/passphrase.c:425
+#: g10/passphrase.c:427
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -2894,34 +2905,34 @@ msgstr ""
"sleutel op te heffen voor gebruiker \"%.*s\"\n"
"%u-bit %s sleutel, ID %08lX, gemaakt op %s%s\n"
-#: g10/passphrase.c:446
+#: g10/passphrase.c:448
#, fuzzy
msgid "Enter passphrase\n"
msgstr "Geef de sleuteltekst: "
-#: g10/passphrase.c:448
+#: g10/passphrase.c:450
#, fuzzy
msgid "Repeat passphrase\n"
msgstr "Herhaal de sleuteltekst: "
-#: g10/passphrase.c:483
+#: g10/passphrase.c:485
msgid "passphrase too long\n"
msgstr ""
-#: g10/passphrase.c:495
+#: g10/passphrase.c:497
msgid "invalid response from agent\n"
msgstr ""
-#: g10/passphrase.c:504
+#: g10/passphrase.c:506
msgid "cancelled by user\n"
msgstr ""
-#: g10/passphrase.c:507 g10/passphrase.c:580
+#: g10/passphrase.c:509 g10/passphrase.c:582
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr ""
-#: g10/passphrase.c:663
+#: g10/passphrase.c:665
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -2931,20 +2942,20 @@ msgstr ""
"U heeft een sleuteltekst nodig om de beveiliging voor de geheime\n"
"sleutel voor gebruiker op te heffen: \""
-#: g10/passphrase.c:672
+#: g10/passphrase.c:674
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "%u-bit %s sleutel, nummer %08lX, gemaakt op %s"
-#: g10/passphrase.c:710
+#: g10/passphrase.c:712
msgid "can't query password in batchmode\n"
msgstr "kan niet om wachtwoord vragen in lopende band-modus\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:716
msgid "Enter passphrase: "
msgstr "Geef de sleuteltekst: "
-#: g10/passphrase.c:718
+#: g10/passphrase.c:720
msgid "Repeat passphrase: "
msgstr "Herhaal de sleuteltekst: "
@@ -3172,7 +3183,7 @@ msgstr "%s: kan hem niet vergrendelen\n"
msgid "%s: can't make lock\n"
msgstr "%s: kan hem niet vergrendelen\n"
-#: g10/keyring.c:1376 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
+#: g10/keyring.c:1420 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: kan hem niet aanmaken: %s\n"
@@ -3309,22 +3320,33 @@ msgstr "vertrouwensveld %lu, type %d: schrijven mislukte: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "vertrouwensdatabase: synchronisatie mislukte: %s\n"
-#: g10/trustdb.c:688
+#: g10/trustdb.c:470
+#, fuzzy
+msgid "no need for a trustdb check\n"
+msgstr "%s: is geen vertrouwensdatabasebestand\n"
+
+# Untranslated.
+#: g10/trustdb.c:476 g10/trustdb.c:1458
+#, fuzzy, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "trustdb rec %lu: lseed failed: %s\n"
+
+#: g10/trustdb.c:709
#, fuzzy
msgid "checking the trustdb\n"
msgstr "verander het vertrouwen in de eigenaar"
-#: g10/trustdb.c:839
+#: g10/trustdb.c:860
#, fuzzy, c-format
msgid "public key %08lX not found: %s\n"
msgstr "publieke sleutel niet gevonden"
-#: g10/trustdb.c:1304
+#: g10/trustdb.c:1338
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr ""
-#: g10/trustdb.c:1374
+#: g10/trustdb.c:1411
#, c-format
msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
msgstr ""
@@ -3735,60 +3757,60 @@ msgstr "Geen hulp beschikbaar"
msgid "No help available for `%s'"
msgstr "Geen hulp beschikbaar voor `%s'"
-#: g10/keydb.c:170
+#: g10/keydb.c:175
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
-#: g10/keydb.c:179
+#: g10/keydb.c:184
#, c-format
msgid "changing permission of `%s' failed: %s\n"
msgstr ""
-#: g10/keydb.c:188
+#: g10/keydb.c:193
#, fuzzy, c-format
msgid "keyring `%s' created\n"
msgstr "%s: sleutelbos aangemaakt\n"
-#: g10/keydb.c:530
+#: g10/keydb.c:586
#, fuzzy, c-format
-msgid "failed to rebuild all keyring caches: %s\n"
+msgid "failed to rebuild keyring cache: %s\n"
msgstr "%s: kon frommeltabel niet aanmaken: %s\n"
-#: g10/keyring.c:1179
+#: g10/keyring.c:1220
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr "LET OP: er zijn 2 bestanden met vertrouwelijke informatie.\n"
-#: g10/keyring.c:1181
+#: g10/keyring.c:1222
#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s is de onveranderde\n"
-#: g10/keyring.c:1182
+#: g10/keyring.c:1223
#, c-format
msgid "%s is the new one\n"
msgstr "%s is de nieuwe\n"
-#: g10/keyring.c:1183
+#: g10/keyring.c:1224
msgid "Please fix this possible security flaw\n"
msgstr "Dicht dit mogelijke beveiligingsgat\n"
-#: g10/keyring.c:1281
+#: g10/keyring.c:1322
#, fuzzy, c-format
msgid "checking keyring `%s'\n"
msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
-#: g10/keyring.c:1312
+#: g10/keyring.c:1353
#, fuzzy, c-format
msgid "%lu keys so far checked (%lu signatures)\n"
msgstr "%lu sleutels zijn tot nu toe behandeld\n"
-#: g10/keyring.c:1323
+#: g10/keyring.c:1364
#, fuzzy, c-format
msgid "%lu keys checked (%lu signatures)\n"
msgstr "sleutels en ondertekeningen opnoemen"
-#: g10/keyring.c:1381
+#: g10/keyring.c:1425
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: sleutelbos aangemaakt\n"
diff --git a/po/pl.po b/po/pl.po
index 90209cec3..bdc964eb5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.0.4\n"
-"POT-Creation-Date: 2001-09-28 16:20+0200\n"
+"POT-Creation-Date: 2001-10-23 09:41+0200\n"
"PO-Revision-Date: 2001-04-21 01:03+02:00\n"
"Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
"Language-Team: Polish <[email protected]>\n"
@@ -51,7 +51,7 @@ msgstr "nie"
msgid "nN"
msgstr "nN"
-#: g10/keyedit.c:568 util/miscutil.c:326
+#: g10/keyedit.c:574 util/miscutil.c:326
msgid "quit"
msgstr "wyj�cie"
@@ -354,7 +354,7 @@ msgstr ""
"Prosz� kontynuowa� inne dzia�ania aby system m�g� zebra� odpowiedni�\n"
"ilo�� entropii do ich wygenerowania (brakuje %d bajt�w).\n"
-#: g10/g10.c:237
+#: g10/g10.c:238
msgid ""
"@Commands:\n"
" "
@@ -362,145 +362,145 @@ msgstr ""
"@Polecenia:\n"
" "
-#: g10/g10.c:239
+#: g10/g10.c:240
msgid "|[file]|make a signature"
msgstr "|[plik]|z�o�enie podpisu"
-#: g10/g10.c:240
+#: g10/g10.c:241
msgid "|[file]|make a clear text signature"
msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
-#: g10/g10.c:241
+#: g10/g10.c:242
msgid "make a detached signature"
msgstr "z�o�enie podpisu oddzielonego od dokumentu"
-#: g10/g10.c:242
+#: g10/g10.c:243
msgid "encrypt data"
msgstr "szyfrowanie danych"
-#: g10/g10.c:243
+#: g10/g10.c:244
msgid "encryption only with symmetric cipher"
msgstr "szyfrowanie tylko szyfrem symetrycznym"
-#: g10/g10.c:244
+#: g10/g10.c:245
msgid "store only"
msgstr "tylko zapis"
-#: g10/g10.c:245
+#: g10/g10.c:246
msgid "decrypt data (default)"
msgstr "odszyfrowywanie danych (domy�lnie)"
-#: g10/g10.c:246
+#: g10/g10.c:247
msgid "verify a signature"
msgstr "sprawdzenie podpisu"
-#: g10/g10.c:248
+#: g10/g10.c:249
msgid "list keys"
msgstr "lista kluczy"
-#: g10/g10.c:250
+#: g10/g10.c:251
msgid "list keys and signatures"
msgstr "lista kluczy i podpis�w"
-#: g10/g10.c:251
+#: g10/g10.c:252
msgid "check key signatures"
msgstr "sprawdzenie podpis�w kluczy"
-#: g10/g10.c:252
+#: g10/g10.c:253
msgid "list keys and fingerprints"
msgstr "lista kluczy i ich odcisk�w"
-#: g10/g10.c:253
+#: g10/g10.c:254
msgid "list secret keys"
msgstr "lista kluczy tajnych"
-#: g10/g10.c:254
+#: g10/g10.c:255
msgid "generate a new key pair"
msgstr "generacja nowej pary klucza"
-#: g10/g10.c:255
+#: g10/g10.c:256
msgid "remove key from the public keyring"
msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
-#: g10/g10.c:257
+#: g10/g10.c:258
msgid "remove key from the secret keyring"
msgstr "usuni�cie klucza ze zbioru kluczy tajnych"
-#: g10/g10.c:258
+#: g10/g10.c:259
msgid "sign a key"
msgstr "z�o�enie podpisu na kluczu"
-#: g10/g10.c:259
+#: g10/g10.c:260
msgid "sign a key locally"
msgstr "z�o�enie lokalnego podpisu na kluczu"
-#: g10/g10.c:260
+#: g10/g10.c:261
msgid "sign or edit a key"
msgstr "podpisanie lub modyfikacja klucza"
-#: g10/g10.c:261
+#: g10/g10.c:262
msgid "generate a revocation certificate"
msgstr "generacja certyfikatu uniewa�nienia klucza"
-#: g10/g10.c:262
+#: g10/g10.c:263
msgid "export keys"
msgstr "eksport kluczy do pliku"
-#: g10/g10.c:263
+#: g10/g10.c:264
msgid "export keys to a key server"
msgstr "eksport kluczy do serwera kluczy"
-#: g10/g10.c:264
+#: g10/g10.c:265
msgid "import keys from a key server"
msgstr "import kluczy z serwera kluczy"
-#: g10/g10.c:266
+#: g10/g10.c:267
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "import kluczy z serwera kluczy"
-#: g10/g10.c:270
+#: g10/g10.c:271
msgid "import/merge keys"
msgstr "import/do��czenie kluczy"
-#: g10/g10.c:272
+#: g10/g10.c:273
msgid "list only the sequence of packets"
msgstr "wypisane sekwencji pakiet�w"
-#: g10/g10.c:274
+#: g10/g10.c:275
msgid "export the ownertrust values"
msgstr "eksport warto�ci zaufania"
-#: g10/g10.c:276
+#: g10/g10.c:277
msgid "import ownertrust values"
msgstr "wczytanie warto��i zaufania"
-#: g10/g10.c:278
+#: g10/g10.c:279
msgid "update the trust database"
msgstr "uaktualnienie bazy zaufania"
-#: g10/g10.c:280
+#: g10/g10.c:281
#, fuzzy
msgid "unattended trust database update"
msgstr "uaktualnienie bazy zaufania"
-#: g10/g10.c:281
+#: g10/g10.c:282
msgid "fix a corrupted trust database"
msgstr "naprawa uszkodzonej bazy zaufania"
-#: g10/g10.c:282
+#: g10/g10.c:283
msgid "De-Armor a file or stdin"
msgstr "zdj�cie opakowania ASCII pliku lub potoku"
-#: g10/g10.c:284
+#: g10/g10.c:285
msgid "En-Armor a file or stdin"
msgstr "opakowanie ASCII pliku lub potoku"
-#: g10/g10.c:286
+#: g10/g10.c:287
msgid "|algo [files]|print message digests"
msgstr "|algo [pliki]|skr�ty wiadomo�ci"
-#: g10/g10.c:290
+#: g10/g10.c:291
msgid ""
"@\n"
"Options:\n"
@@ -510,162 +510,167 @@ msgstr ""
"Opcje:\n"
" "
-#: g10/g10.c:292
+#: g10/g10.c:293
msgid "create ascii armored output"
msgstr "plik wynikowy w opakowaniu ASCII"
-#: g10/g10.c:294
+#: g10/g10.c:295
msgid "|NAME|encrypt for NAME"
msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
-#: g10/g10.c:297
+#: g10/g10.c:298
msgid "|NAME|use NAME as default recipient"
msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
-#: g10/g10.c:299
+#: g10/g10.c:300
msgid "use the default key as default recipient"
msgstr "domy�lny klucz jest domy�lnym adresatem"
-#: g10/g10.c:303
+#: g10/g10.c:304
msgid "use this user-id to sign or decrypt"
msgstr "identyfikator do podpisania lub odszyfrowania"
-#: g10/g10.c:304
+#: g10/g10.c:305
msgid "|N|set compress level N (0 disables)"
msgstr "|N|poziom kompresji N (0 - brak)"
-#: g10/g10.c:306
+#: g10/g10.c:307
msgid "use canonical text mode"
msgstr "kanoniczny format tekstowy"
-#: g10/g10.c:307
+#: g10/g10.c:308
msgid "use as output file"
msgstr "plik wyj�ciowy"
-#: g10/g10.c:308
+#: g10/g10.c:309
msgid "verbose"
msgstr "z informacjami dodatkowymi"
-#: g10/g10.c:309
+#: g10/g10.c:310
msgid "be somewhat more quiet"
msgstr "mniej komunikat�ww"
-#: g10/g10.c:310
+#: g10/g10.c:311
msgid "don't use the terminal at all"
msgstr "bez odwo�a� do terminala"
-#: g10/g10.c:311
+#: g10/g10.c:312
msgid "force v3 signatures"
msgstr "wymuszenie trzeciej wersji formatu podpis�w"
-#: g10/g10.c:312
+#: g10/g10.c:313
+#, fuzzy
+msgid "do not force v3 signatures"
+msgstr "wymuszenie trzeciej wersji formatu podpis�w"
+
+#: g10/g10.c:314
msgid "always use a MDC for encryption"
msgstr "do szyfrowania b�dzie u�ywany MDC"
-#: g10/g10.c:313
+#: g10/g10.c:315
msgid "do not make any changes"
msgstr "pozostawienie bez zmian"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:315
+#: g10/g10.c:317
msgid "use the gpg-agent"
msgstr "u�yj gpg-agenta"
-#: g10/g10.c:316
+#: g10/g10.c:318
msgid "batch mode: never ask"
msgstr "tryb wsadowy: �adnych pyta�"
-#: g10/g10.c:317
+#: g10/g10.c:319
msgid "assume yes on most questions"
msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
-#: g10/g10.c:318
+#: g10/g10.c:320
msgid "assume no on most questions"
msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
-#: g10/g10.c:319
+#: g10/g10.c:321
msgid "add this keyring to the list of keyrings"
msgstr "doda� zbi�r kluczy do listy u�ywanych"
-#: g10/g10.c:320
+#: g10/g10.c:322
msgid "add this secret keyring to the list"
msgstr "doda� zbi�r kluczy tajnych do listy"
-#: g10/g10.c:321
+#: g10/g10.c:323
msgid "|NAME|use NAME as default secret key"
msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
-#: g10/g10.c:322
+#: g10/g10.c:324
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
-#: g10/g10.c:323
+#: g10/g10.c:325
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
-#: g10/g10.c:324
+#: g10/g10.c:326
msgid "read options from file"
msgstr "wczytanie opcji z pliku"
-#: g10/g10.c:328
+#: g10/g10.c:330
msgid "|FD|write status info to this FD"
msgstr "|FD|zapisa� opis stanu do FD"
-#: g10/g10.c:330
+#: g10/g10.c:332
#, fuzzy
msgid "|[file]|write status info to file"
msgstr "|FD|zapisa� opis stanu do FD"
-#: g10/g10.c:336
+#: g10/g10.c:338
#, fuzzy
msgid "|KEYID|ultimately trust this key"
msgstr "|KLUCZ|ca�kowite zaufanie dla tego klucza"
-#: g10/g10.c:337
+#: g10/g10.c:339
msgid "|FILE|load extension module FILE"
msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
-#: g10/g10.c:338
+#: g10/g10.c:340
msgid "emulate the mode described in RFC1991"
msgstr "emulacja trybu opisanego w RFC1991"
-#: g10/g10.c:339
+#: g10/g10.c:341
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "zgodno�� ustawie� pakiet�w, szyfr�w i skr�t�w z OpenPGP"
-#: g10/g10.c:340
+#: g10/g10.c:342
msgid "|N|use passphrase mode N"
msgstr "|N|N-ty tryb wprowadzania wyra�enia przej�ciowego"
-#: g10/g10.c:342
+#: g10/g10.c:344
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|ALG|algorytm obliczania skr�t�w wiadomo�ci ALG"
-#: g10/g10.c:344
+#: g10/g10.c:346
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
-#: g10/g10.c:345
+#: g10/g10.c:347
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
-#: g10/g10.c:346
+#: g10/g10.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
-#: g10/g10.c:347
+#: g10/g10.c:349
msgid "|N|use compress algorithm N"
msgstr "|N|algorytm kompresji N"
-#: g10/g10.c:348
+#: g10/g10.c:350
msgid "throw keyid field of encrypted packets"
msgstr "usuni�cie identyfikator�w kluczy z pakiet�w"
-#: g10/g10.c:349
+#: g10/g10.c:351
msgid "|NAME=VALUE|use this notation data"
msgstr "|NAZWA=TRE��|adnotacje"
-#: g10/g10.c:352
+#: g10/g10.c:354
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -673,7 +678,7 @@ msgstr ""
"@\n"
"(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
-#: g10/g10.c:355
+#: g10/g10.c:357
msgid ""
"@\n"
"Examples:\n"
@@ -694,15 +699,15 @@ msgstr ""
" --list-keys [nazwy] pokazuje klucze\n"
" --fingerprint [nazwy] pokazuje odciski kluczy\n"
-#: g10/g10.c:478
+#: g10/g10.c:480
msgid "Please report bugs to <[email protected]>.\n"
msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
-#: g10/g10.c:482
+#: g10/g10.c:484
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
-#: g10/g10.c:485
+#: g10/g10.c:487
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -712,7 +717,7 @@ msgstr ""
"podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
"domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
-#: g10/g10.c:496
+#: g10/g10.c:498
msgid ""
"\n"
"Supported algorithms:\n"
@@ -720,200 +725,200 @@ msgstr ""
"\n"
"Obs�ugiwane algorytmy:\n"
-#: g10/g10.c:570
+#: g10/g10.c:572
msgid "usage: gpg [options] "
msgstr "wywo�anie: gpg [opcje]"
-#: g10/g10.c:627
+#: g10/g10.c:629
msgid "conflicting commands\n"
msgstr "sprzeczne polecenia\n"
-#: g10/g10.c:783
+#: g10/g10.c:785
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
-#: g10/g10.c:787
+#: g10/g10.c:789
#, c-format
msgid "option file `%s': %s\n"
msgstr "plik opcji '%s': %s\n"
-#: g10/g10.c:794
+#: g10/g10.c:796
#, c-format
msgid "reading options from `%s'\n"
msgstr "odczyt opcji z '%s'\n"
-#: g10/g10.c:1038
+#: g10/g10.c:1041
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
-#: g10/g10.c:1122
+#: g10/g10.c:1125
msgid "WARNING: program may create a core file!\n"
msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
-#: g10/g10.c:1126 g10/g10.c:1135
+#: g10/g10.c:1129 g10/g10.c:1138
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
-#: g10/g10.c:1128
+#: g10/g10.c:1131
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie wolno u�ywa� %s z %s!\n"
-#: g10/g10.c:1131
+#: g10/g10.c:1134
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nie ma sensu z %s!\n"
-#: g10/g10.c:1151 g10/g10.c:1163
+#: g10/g10.c:1154 g10/g10.c:1166
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
-#: g10/g10.c:1157 g10/g10.c:1169
+#: g10/g10.c:1160 g10/g10.c:1172
msgid "selected digest algorithm is invalid\n"
msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1176
msgid "the given policy URL is invalid\n"
msgstr "podany URL regulaminu jest niepoprawny\n"
-#: g10/g10.c:1176
+#: g10/g10.c:1179
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "ustawienie algortytmu kompresji musi pochodzi� z zakresu %d..%d\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1181
msgid "completes-needed must be greater than 0\n"
msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1183
msgid "marginals-needed must be greater than 1\n"
msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1185
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1188
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
-#: g10/g10.c:1189
+#: g10/g10.c:1192
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1196
#, fuzzy
msgid "invalid preferences\n"
msgstr "lista opcji"
-#: g10/g10.c:1276
+#: g10/g10.c:1279
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
-#: g10/g10.c:1282
+#: g10/g10.c:1285
msgid "--store [filename]"
msgstr "--store [plik]"
-#: g10/g10.c:1289
+#: g10/g10.c:1292
msgid "--symmetric [filename]"
msgstr "--symmetric [plik]"
-#: g10/g10.c:1297
+#: g10/g10.c:1300
msgid "--encrypt [filename]"
msgstr "--encrypt [plik]"
-#: g10/g10.c:1310
+#: g10/g10.c:1313
msgid "--sign [filename]"
msgstr "--sign [plik]"
-#: g10/g10.c:1323
+#: g10/g10.c:1326
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [plik]"
-#: g10/g10.c:1337
+#: g10/g10.c:1340
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [plik]"
-#: g10/g10.c:1346
+#: g10/g10.c:1349
msgid "--clearsign [filename]"
msgstr "--clearsign [plik]\""
-#: g10/g10.c:1364
+#: g10/g10.c:1367
msgid "--decrypt [filename]"
msgstr "--decrypt [plik]"
-#: g10/g10.c:1372
+#: g10/g10.c:1375
msgid "--sign-key user-id"
msgstr "--sign-key nazwa u�ytkownika"
-#: g10/g10.c:1380
+#: g10/g10.c:1383
msgid "--lsign-key user-id"
msgstr "--lsign-key nazwa u�ytkownika"
-#: g10/g10.c:1388
+#: g10/g10.c:1391
msgid "--edit-key user-id [commands]"
msgstr "--edit-key nazwa u�ytkownika [polecenia]"
-#: g10/g10.c:1404
+#: g10/g10.c:1407
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key nazwa u�ytkownika"
-#: g10/g10.c:1407
+#: g10/g10.c:1410
msgid "--delete-key user-id"
msgstr "--delete-key nazwa u�ytkownika"
-#: g10/g10.c:1415
+#: g10/g10.c:1418
msgid "--delete-secret-and-public-key user-id"
msgstr "--delete-secret-and-public-key key nazwa u�ytkownika"
-#: g10/encode.c:268 g10/g10.c:1452 g10/sign.c:632
+#: g10/encode.c:268 g10/g10.c:1455 g10/sign.c:632
#, c-format
msgid "can't open %s: %s\n"
msgstr "nie mo�na otworzy� %s: %s\n"
-#: g10/g10.c:1467
+#: g10/g10.c:1470
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
-#: g10/g10.c:1539
+#: g10/g10.c:1542
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
-#: g10/g10.c:1547
+#: g10/g10.c:1550
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
-#: g10/g10.c:1618
+#: g10/g10.c:1621
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "niew�a�ciwy algorytm skr�tu '%s'\n"
-#: g10/g10.c:1704
+#: g10/g10.c:1707
msgid "[filename]"
msgstr "[nazwa pliku]"
-#: g10/g10.c:1708
+#: g10/g10.c:1711
msgid "Go ahead and type your message ...\n"
msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1711 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1714 g10/verify.c:94 g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "nie mo�na otworzy� '%s'\n"
-#: g10/g10.c:1920
+#: g10/g10.c:1923
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr "adnotacja musi zaczyna� si� od podkre�lenia lub litery\n"
-#: g10/g10.c:1926
+#: g10/g10.c:1929
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -921,11 +926,11 @@ msgstr ""
"nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki,\n"
"podkre�lenia, i musi ko�czy� si� '='\n"
-#: g10/g10.c:1932
+#: g10/g10.c:1935
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr "kropki w adnotacji musz� znajdowa� si� pomi�dzy innymi znakami\n"
-#: g10/g10.c:1940
+#: g10/g10.c:1943
msgid "a notation value must not use any control characters\n"
msgstr "warto�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
@@ -1586,7 +1591,7 @@ msgid ""
msgstr ""
"Musisz poda� wyra�enie przej�ciowe (has�o) aby ochroni� sw�j klucz tajny.\n"
-#: g10/keyedit.c:456 g10/keygen.c:1171
+#: g10/keyedit.c:462 g10/keygen.c:1171
msgid "passphrase not correctly repeated; try again.\n"
msgstr ""
"Powt�rzone wyra�enie przej�ciowe nie zgadza si� z podanym w pierwszej "
@@ -1729,27 +1734,27 @@ msgstr "odczyt z '%s'\n"
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s zaszyfrowany dla: %s\n"
-#: g10/delkey.c:69 g10/export.c:149
+#: g10/delkey.c:69 g10/export.c:148
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "u�ytkownik '%s' nie odnaleziony: %s\n"
-#: g10/delkey.c:77 g10/export.c:159
+#: g10/delkey.c:77 g10/export.c:158
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
msgstr "b��d odczytu '%s': %s\n"
-#: g10/export.c:167
+#: g10/export.c:166
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pomini�ty\n"
-#: g10/export.c:178
+#: g10/export.c:177
#, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
-#: g10/export.c:234
+#: g10/export.c:233
msgid "WARNING: nothing exported\n"
msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
@@ -1759,16 +1764,16 @@ msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:183 g10/getkey.c:2188
+#: g10/getkey.c:183 g10/getkey.c:2192
msgid "[User id not found]"
msgstr "[brak identyfikatora u�ytkownika]"
-#: g10/getkey.c:1911
+#: g10/getkey.c:1915
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
-#: g10/getkey.c:1952
+#: g10/getkey.c:1956
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
@@ -2104,17 +2109,17 @@ msgstr ""
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:296
+#: g10/keyedit.c:302
#, c-format
msgid "Already signed by key %08lX\n"
msgstr "Ju� podpisano kluczem %08lX.\n"
-#: g10/keyedit.c:307
+#: g10/keyedit.c:313
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
-#: g10/keyedit.c:316
+#: g10/keyedit.c:322
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2122,7 +2127,7 @@ msgstr ""
"Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
"swoim kluczem: \""
-#: g10/keyedit.c:325
+#: g10/keyedit.c:331
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
@@ -2130,33 +2135,33 @@ msgstr ""
"Podpis zostanie oznaczony jako nieeksportowalny.\n"
"\n"
-#: g10/keyedit.c:330
+#: g10/keyedit.c:336
msgid "Really sign? "
msgstr "Na pewno podpisa�? "
-#: g10/keyedit.c:361 g10/keyedit.c:2104 g10/keyedit.c:2166 g10/sign.c:225
+#: g10/keyedit.c:367 g10/keyedit.c:2110 g10/keyedit.c:2172 g10/sign.c:225
#, c-format
msgid "signing failed: %s\n"
msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
-#: g10/keyedit.c:415
+#: g10/keyedit.c:421
msgid "This key is not protected.\n"
msgstr "Ten klucz nie jest chroniony.\n"
-#: g10/keyedit.c:419
+#: g10/keyedit.c:425
msgid "Secret parts of primary key are not available.\n"
msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
-#: g10/keyedit.c:423
+#: g10/keyedit.c:429
msgid "Key is protected.\n"
msgstr "Klucz jest chroniony.\n"
-#: g10/keyedit.c:443
+#: g10/keyedit.c:449
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
-#: g10/keyedit.c:448
+#: g10/keyedit.c:454
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2164,7 +2169,7 @@ msgstr ""
"Wprowad� nowe wyra�enie przej�ciowe (has�o) dla tego klucza tajnego.\n"
"\n"
-#: g10/keyedit.c:460
+#: g10/keyedit.c:466
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2172,466 +2177,472 @@ msgstr ""
"Nie chcesz poda� wyra�enia przej�ciowego (has�a) - to *z�y* pomys�!\n"
"\n"
-#: g10/keyedit.c:463
+#: g10/keyedit.c:469
msgid "Do you really want to do this? "
msgstr "Czy na pewno chcesz to zrobi�? "
-#: g10/keyedit.c:527
+#: g10/keyedit.c:533
msgid "moving a key signature to the correct place\n"
msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
-#: g10/keyedit.c:568
+#: g10/keyedit.c:574
msgid "quit this menu"
msgstr "wyj�cie z tego menu"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:575
msgid "q"
msgstr "w"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save"
msgstr "zapis"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save and quit"
msgstr "zapis zmian i wyj�cie"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "help"
msgstr "pomoc"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "show this help"
msgstr "ten tekst pomocy"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "fpr"
msgstr "odc"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "show fingerprint"
msgstr "okazanie odcisku klucza"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list"
msgstr "lista"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list key and user IDs"
msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
-#: g10/keyedit.c:575
+#: g10/keyedit.c:581
msgid "l"
msgstr "l"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "uid"
msgstr "id"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "select user ID N"
msgstr "wyb�r identyfikatora u�ytkownika N"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "key"
msgstr "klucz"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "select secondary key N"
msgstr "wyb�r podklucza N"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "check"
msgstr "lista"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "list signatures"
msgstr "lista podpis�w"
-#: g10/keyedit.c:579
+#: g10/keyedit.c:585
msgid "c"
msgstr "l"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign"
msgstr "podpis"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign the key"
msgstr "z�o�enie podpisu na kluczu"
-#: g10/keyedit.c:581
+#: g10/keyedit.c:587
msgid "s"
msgstr "p"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "lsign"
msgstr "lpodpis"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "sign the key locally"
msgstr "z�o�enie lokalnego podpisu na kluczu"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:589
msgid "debug"
msgstr "�ledzenia"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "adduid"
msgstr "dodid"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "add a user ID"
msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "deluid"
msgstr "usid"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "delete user ID"
msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "addkey"
msgstr "dodkl"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "add a secondary key"
msgstr "dodanie podklucza"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delkey"
msgstr "uskl"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delete a secondary key"
msgstr "usuni�cie podklucza"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delsig"
msgstr "uspod"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delete signatures"
msgstr "usuni�cie podpis�w"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "expire"
msgstr "data"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "change the expire date"
msgstr "zmiana daty wa�no�ci klucza"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "primary"
msgstr ""
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle"
msgstr "prze�"
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle between secret and public key listing"
msgstr "prze��czenie pomi�dzy list� kluczy publicznych i tajnych"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:599
msgid "t"
msgstr "p"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:600
msgid "pref"
msgstr "opcje"
-#: g10/keyedit.c:594 g10/keyedit.c:595
-msgid "list preferences"
+#: g10/keyedit.c:600
+#, fuzzy
+msgid "list preferences (expert)"
msgstr "lista opcji"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:601
msgid "showpref"
msgstr ""
-#: g10/keyedit.c:596
+#: g10/keyedit.c:601
+#, fuzzy
+msgid "list preferences (verbose)"
+msgstr "lista opcji"
+
+#: g10/keyedit.c:602
#, fuzzy
msgid "setpref"
msgstr "opcje"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:602
#, fuzzy
msgid "set preference list"
msgstr "lista opcji"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updpref"
msgstr "opcje"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updated preferences"
msgstr "lista opcji"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "passwd"
msgstr "has�o"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "change the passphrase"
msgstr "zmiana wyra�enia przej�ciowego (has�a)"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "trust"
msgstr "zaufanie"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "change the ownertrust"
msgstr "zmiana zaufania w�a�ciciela"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revsig"
msgstr "unpod"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revoke signatures"
msgstr "uniewa�nienie podpisu"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revkey"
msgstr "unpkl"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revoke a secondary key"
msgstr "uniewa�nienie podklucza"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable"
msgstr "wy�kl"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable a key"
msgstr "wy��czy� klucz z u�ycia"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable"
msgstr "w�kl"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable a key"
msgstr "w��czy� klucz do u�ycia"
-#: g10/delkey.c:112 g10/keyedit.c:623
+#: g10/delkey.c:112 g10/keyedit.c:629
msgid "can't do that in batchmode\n"
msgstr "nie dzia�a w trybie wsadowym\n"
-#: g10/keyedit.c:658
+#: g10/keyedit.c:664
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "b��d odczytu '%s': %s\n"
-#: g10/keyedit.c:676
+#: g10/keyedit.c:682
msgid "Secret key is available.\n"
msgstr "Dost�pny jest klucz tajny.\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:712
msgid "Command> "
msgstr "Polecenie> "
-#: g10/keyedit.c:737
+#: g10/keyedit.c:743
msgid "Need the secret key to do this.\n"
msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
-#: g10/keyedit.c:741
+#: g10/keyedit.c:747
msgid "Please use the command \"toggle\" first.\n"
msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
-#: g10/keyedit.c:788
+#: g10/keyedit.c:794
msgid "Really sign all user IDs? "
msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
-#: g10/keyedit.c:789
+#: g10/keyedit.c:795
msgid "Hint: Select the user IDs to sign\n"
msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
-#: g10/keyedit.c:821 g10/keyedit.c:842
+#: g10/keyedit.c:827 g10/keyedit.c:848
msgid "You must select at least one user ID.\n"
msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:829
msgid "You can't delete the last user ID!\n"
msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:832
msgid "Really remove all selected user IDs? "
msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
-#: g10/keyedit.c:827
+#: g10/keyedit.c:833
msgid "Really remove this user ID? "
msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:871 g10/keyedit.c:893
msgid "You must select at least one key.\n"
msgstr "Musisz wybra� co najmniej jeden klucz.\n"
-#: g10/keyedit.c:869
+#: g10/keyedit.c:875
msgid "Do you really want to delete the selected keys? "
msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
-#: g10/keyedit.c:870
+#: g10/keyedit.c:876
msgid "Do you really want to delete this key? "
msgstr "Czy na pewno chcesz usun�� ten klucz? "
-#: g10/keyedit.c:891
+#: g10/keyedit.c:897
msgid "Do you really want to revoke the selected keys? "
msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:898
msgid "Do you really want to revoke this key? "
msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
-#: g10/keyedit.c:956
+#: g10/keyedit.c:962
#, fuzzy
msgid "Really update the preferences for the selected user IDs? "
msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
#, fuzzy
msgid "Really update the preferences? "
msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N)"
-#: g10/keyedit.c:992
+#: g10/keyedit.c:998
msgid "Save changes? "
msgstr "Zapisa� zmiany? "
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1001
msgid "Quit without saving? "
msgstr "Wyj�� bez zapisania zmian? "
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1012
#, c-format
msgid "update failed: %s\n"
msgstr "naniesienie poprawek nie powiod�o si�: %s\n"
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1019
#, c-format
msgid "update secret failed: %s\n"
msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1026
msgid "Key not changed so no update needed.\n"
msgstr ""
"Klucz nie zosta� zmieniony wi�c naniesienie poprawek nie jest konieczne.\n"
-#: g10/keyedit.c:1031
+#: g10/keyedit.c:1037
msgid "Invalid command (try \"help\")\n"
msgstr "Niepoprawna komenda (spr�buj \"help\")\n"
-#: g10/keyedit.c:1139 g10/keyedit.c:1165
+#: g10/keyedit.c:1145 g10/keyedit.c:1171
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr "%s%c %4u%c/%08lX utworzony: %s wygasa %s"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1154
#, c-format
msgid " trust: %c/%c"
msgstr "zaufanie: %c/%c"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1158
msgid "This key has been disabled"
msgstr "Ten klucz zosta� wy��czony z u�ytku"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1187
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "podklucz zosta� uniewa�niony: %s\n"
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1190
msgid "rev- faked revocation found\n"
msgstr "fa�szywy certyfikat uniewa�nienia\n"
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1192
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "problem przy sprawdzaniu uniewa�nienia: %s\n"
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1408
msgid "Delete this good signature? (y/N/q)"
msgstr "Usun�� ten poprawny podpis? (t/N/w)"
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1412
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Usun�� ten niepoprawny podpis? (t/N/w)"
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1416
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Usun�� ten nieznany podpis? (t/N/w)"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1422
msgid "Really delete this self-signature? (y/N)"
msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N)"
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d podpis usuni�ty.\n"
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d podpis�w usuni�tych.\n"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
msgid "Nothing deleted.\n"
msgstr "Nic nie zosta�o usuni�te.\n"
-#: g10/keyedit.c:1503
+#: g10/keyedit.c:1509
msgid "Please remove selections from the secret keys.\n"
msgstr "Prosz� usun�� znacznik wyboru z kluczy tajnych.\n"
-#: g10/keyedit.c:1509
+#: g10/keyedit.c:1515
msgid "Please select at most one secondary key.\n"
msgstr "Prosz� wybra� najwy�ej jeden podklucz.\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1519
msgid "Changing expiration time for a secondary key.\n"
msgstr "Zmiana daty wa�no�ci podklucza.\n"
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1521
msgid "Changing expiration time for the primary key.\n"
msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1563
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1579
msgid "No corresponding signature in secret ring\n"
msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy tajnych\n"
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1662
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1837
#, c-format
msgid "No user ID with index %d\n"
msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Brak podklucza o indeksie %d\n"
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:1981
msgid "user ID: \""
msgstr "Identyfikator u�ytkownika: "
-#: g10/keyedit.c:1978
+#: g10/keyedit.c:1984
#, c-format
msgid ""
"\"\n"
@@ -2640,34 +2651,34 @@ msgstr ""
"\"\n"
"podpisano Twoim kluczem %08lX w %s\n"
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1988
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N)"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2012
msgid "You have signed these user IDs:\n"
msgstr "Te identyfikatory u�ytkownik�w s� podpisane przez Ciebie:\n"
-#: g10/keyedit.c:2020 g10/keyedit.c:2055
+#: g10/keyedit.c:2026 g10/keyedit.c:2061
#, c-format
msgid " signed by %08lX at %s\n"
msgstr "podpisany przez %08lX w %s\n"
-#: g10/keyedit.c:2025
+#: g10/keyedit.c:2031
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr "uniewa�niony przez %08lX w %s\n"
-#: g10/keyedit.c:2045
+#: g10/keyedit.c:2051
msgid "You are about to revoke these signatures:\n"
msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:2069
msgid "Really create the revocation certificates? (y/N)"
msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N)"
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2098
msgid "no secret key\n"
msgstr "brak klucza tajnego\n"
@@ -2851,37 +2862,37 @@ msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
-#: g10/passphrase.c:277 g10/passphrase.c:319
+#: g10/passphrase.c:278 g10/passphrase.c:320
msgid "gpg-agent is not available in this session\n"
msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
-#: g10/passphrase.c:285
+#: g10/passphrase.c:286
msgid "can't set client pid for the agent\n"
msgstr ""
-#: g10/passphrase.c:293
+#: g10/passphrase.c:294
msgid "can't get server read FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:300
+#: g10/passphrase.c:301
msgid "can't get server write FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:325
+#: g10/passphrase.c:326
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "z�y format zmiennej GPG_AGENT_INFO\n"
-#: g10/hkp.c:174 g10/passphrase.c:344
+#: g10/hkp.c:174 g10/passphrase.c:345
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "nie mo�na po��czy� si� z %s: %s\n"
-#: g10/passphrase.c:415 g10/passphrase.c:677
+#: g10/passphrase.c:417 g10/passphrase.c:679
#, c-format
msgid " (main key ID %08lX)"
msgstr " (g��wny ID klucza %08lX)"
-#: g10/passphrase.c:425
+#: g10/passphrase.c:427
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -2892,32 +2903,32 @@ msgstr ""
"dla u�ytkownika: \"%.*s\"\n"
"Klucz o d�ugo�ci %u bit�w, typ %s, ID %08lX, stworzony %s%s\n"
-#: g10/passphrase.c:446
+#: g10/passphrase.c:448
msgid "Enter passphrase\n"
msgstr "Wyra�enie przej�ciowe\n"
-#: g10/passphrase.c:448
+#: g10/passphrase.c:450
msgid "Repeat passphrase\n"
msgstr "Powt�rzone wyra�enie przej�ciowe\n"
-#: g10/passphrase.c:483
+#: g10/passphrase.c:485
msgid "passphrase too long\n"
msgstr "wyra�enie zbyt d�ugie\n"
-#: g10/passphrase.c:495
+#: g10/passphrase.c:497
msgid "invalid response from agent\n"
msgstr "b��dna odpowied� agenta\n"
-#: g10/passphrase.c:504
+#: g10/passphrase.c:506
msgid "cancelled by user\n"
msgstr "anulowane przez u�ytkownika\n"
-#: g10/passphrase.c:507 g10/passphrase.c:580
+#: g10/passphrase.c:509 g10/passphrase.c:582
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "problem agenta: zwr�ci� 0x%lx\n"
-#: g10/passphrase.c:663
+#: g10/passphrase.c:665
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -2927,20 +2938,20 @@ msgstr ""
"Musisz poda� wyra�enie przej�ciowe (has�o) aby uaktywni� klucz tajny\n"
"dla u�ytkownika: \""
-#: g10/passphrase.c:672
+#: g10/passphrase.c:674
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "d�ugo�� %u bit�w, typ %s, klucz %08lX, stworzony %s"
-#: g10/passphrase.c:710
+#: g10/passphrase.c:712
msgid "can't query password in batchmode\n"
msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:716
msgid "Enter passphrase: "
msgstr "Wyra�enie przej�ciowe: "
-#: g10/passphrase.c:718
+#: g10/passphrase.c:720
msgid "Repeat passphrase: "
msgstr "Powt�rzone wyra�enie przej�ciowe: "
@@ -3167,7 +3178,7 @@ msgstr "%s: nie mo�na utworzy� blokady\n"
msgid "%s: can't make lock\n"
msgstr "%s: nie mo�na utworzy� blokady\n"
-#: g10/keyring.c:1376 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
+#: g10/keyring.c:1420 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: nie mo�na utworzy�: %s\n"
@@ -3304,22 +3315,32 @@ msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
-#: g10/trustdb.c:688
+#: g10/trustdb.c:470
+#, fuzzy
+msgid "no need for a trustdb check\n"
+msgstr "%s: to nie jest plik bazy zaufania\n"
+
+#: g10/trustdb.c:476 g10/trustdb.c:1458
+#, fuzzy, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "wstawienie wpisu zaufania nie powiod�o si�: %s\n"
+
+#: g10/trustdb.c:709
#, fuzzy
msgid "checking the trustdb\n"
msgstr "zmiana zaufania w�a�ciciela"
-#: g10/trustdb.c:839
+#: g10/trustdb.c:860
#, fuzzy, c-format
msgid "public key %08lX not found: %s\n"
msgstr "klucz publiczny nie odnaleziony"
-#: g10/trustdb.c:1304
+#: g10/trustdb.c:1338
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr ""
-#: g10/trustdb.c:1374
+#: g10/trustdb.c:1411
#, c-format
msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
msgstr ""
@@ -3738,60 +3759,60 @@ msgstr "Pomoc niedost�pna"
msgid "No help available for `%s'"
msgstr "Brak pomocy o '%s'"
-#: g10/keydb.c:170
+#: g10/keydb.c:175
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
-#: g10/keydb.c:179
+#: g10/keydb.c:184
#, c-format
msgid "changing permission of `%s' failed: %s\n"
msgstr ""
-#: g10/keydb.c:188
+#: g10/keydb.c:193
#, fuzzy, c-format
msgid "keyring `%s' created\n"
msgstr "%s: zbi�r kluczy utworzony\n"
-#: g10/keydb.c:530
+#: g10/keydb.c:586
#, fuzzy, c-format
-msgid "failed to rebuild all keyring caches: %s\n"
+msgid "failed to rebuild keyring cache: %s\n"
msgstr "%s: tworzenie tablicy skr�t�w nie powiod�o si�: %s\n"
-#: g10/keyring.c:1179
+#: g10/keyring.c:1220
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr "OSTRZE�ENIE: Istniej� dwa pliki z poufnymi informacjami.\n"
-#: g10/keyring.c:1181
+#: g10/keyring.c:1222
#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s pozosta� bez zmian\n"
-#: g10/keyring.c:1182
+#: g10/keyring.c:1223
#, c-format
msgid "%s is the new one\n"
msgstr "%s zosta� utworzony\n"
-#: g10/keyring.c:1183
+#: g10/keyring.c:1224
msgid "Please fix this possible security flaw\n"
msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
-#: g10/keyring.c:1281
+#: g10/keyring.c:1322
#, fuzzy, c-format
msgid "checking keyring `%s'\n"
msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
-#: g10/keyring.c:1312
+#: g10/keyring.c:1353
#, fuzzy, c-format
msgid "%lu keys so far checked (%lu signatures)\n"
msgstr "%lu kluczy przetworzonych do tej chwili\n"
-#: g10/keyring.c:1323
+#: g10/keyring.c:1364
#, fuzzy, c-format
msgid "%lu keys checked (%lu signatures)\n"
msgstr "lista kluczy i podpis�w"
-#: g10/keyring.c:1381
+#: g10/keyring.c:1425
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: zbi�r kluczy utworzony\n"
@@ -4388,9 +4409,6 @@ msgstr "%s: zbi�r kluczy utworzony\n"
#~ msgid "Oops: key is now in trustdb???\n"
#~ msgstr "Oops: klucz ju� jest w bazie zaufania???\n"
-#~ msgid "insert trust record failed: %s\n"
-#~ msgstr "wstawienie wpisu zaufania nie powiod�o si�: %s\n"
-
#~ msgid "Hmmm, public key lost?"
#~ msgstr "Hmmm, klucz publiczny utracony?"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7cd84112a..4196b77eb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"POT-Creation-Date: 2001-09-28 16:20+0200\n"
+"POT-Creation-Date: 2001-10-23 09:41+0200\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-20 23:46:36-0200\n"
"From: Thiago Jung Bauermann <[email protected]>\n"
@@ -46,7 +46,7 @@ msgid "nN"
msgstr "nN"
# INICIO MENU
-#: g10/keyedit.c:568 util/miscutil.c:326
+#: g10/keyedit.c:574 util/miscutil.c:326
msgid "quit"
msgstr "sair"
@@ -349,7 +349,7 @@ msgstr ""
"para que o sistema possa coletar mais entropia!\n"
"(S�o necess�rios mais %d bytes)\n"
-#: g10/g10.c:237
+#: g10/g10.c:238
msgid ""
"@Commands:\n"
" "
@@ -357,150 +357,150 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/g10.c:239
+#: g10/g10.c:240
msgid "|[file]|make a signature"
msgstr "|[arquivo]|fazer uma assinatura"
-#: g10/g10.c:240
+#: g10/g10.c:241
msgid "|[file]|make a clear text signature"
msgstr "|[arquivo]|fazer uma assinatura em texto puro"
-#: g10/g10.c:241
+#: g10/g10.c:242
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
-#: g10/g10.c:242
+#: g10/g10.c:243
msgid "encrypt data"
msgstr "criptografar dados"
-#: g10/g10.c:243
+#: g10/g10.c:244
msgid "encryption only with symmetric cipher"
msgstr ""
"criptografar apenas com criptografia\n"
"sim�trica"
-#: g10/g10.c:244
+#: g10/g10.c:245
msgid "store only"
msgstr "apenas armazenar"
-#: g10/g10.c:245
+#: g10/g10.c:246
msgid "decrypt data (default)"
msgstr "descriptografar dados (padr�o)"
-#: g10/g10.c:246
+#: g10/g10.c:247
msgid "verify a signature"
msgstr "verificar uma assinatura"
-#: g10/g10.c:248
+#: g10/g10.c:249
msgid "list keys"
msgstr "listar as chaves"
-#: g10/g10.c:250
+#: g10/g10.c:251
msgid "list keys and signatures"
msgstr "listar as chaves e as assinaturas"
-#: g10/g10.c:251
+#: g10/g10.c:252
msgid "check key signatures"
msgstr "verificar as assinaturas das chaves"
-#: g10/g10.c:252
+#: g10/g10.c:253
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impress�es digitais"
-#: g10/g10.c:253
+#: g10/g10.c:254
msgid "list secret keys"
msgstr "listar as chaves secretas"
-#: g10/g10.c:254
+#: g10/g10.c:255
msgid "generate a new key pair"
msgstr "gerar um novo par de chaves"
-#: g10/g10.c:255
+#: g10/g10.c:256
msgid "remove key from the public keyring"
msgstr "remover a chave do chaveiro p�blico"
-#: g10/g10.c:257
+#: g10/g10.c:258
msgid "remove key from the secret keyring"
msgstr "remover a chave do chaveiro secreto"
-#: g10/g10.c:258
+#: g10/g10.c:259
msgid "sign a key"
msgstr "assinar uma chave"
-#: g10/g10.c:259
+#: g10/g10.c:260
msgid "sign a key locally"
msgstr "assinar uma chave localmente"
-#: g10/g10.c:260
+#: g10/g10.c:261
msgid "sign or edit a key"
msgstr "assinar ou editar uma chave"
-#: g10/g10.c:261
+#: g10/g10.c:262
msgid "generate a revocation certificate"
msgstr "gerar um certificado de revoga��o"
-#: g10/g10.c:262
+#: g10/g10.c:263
msgid "export keys"
msgstr "exportar chaves"
-#: g10/g10.c:263
+#: g10/g10.c:264
msgid "export keys to a key server"
msgstr "exportar chaves para um servidor"
-#: g10/g10.c:264
+#: g10/g10.c:265
msgid "import keys from a key server"
msgstr "importar chaves de um servidor"
-#: g10/g10.c:266
+#: g10/g10.c:267
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "importar chaves de um servidor"
-#: g10/g10.c:270
+#: g10/g10.c:271
msgid "import/merge keys"
msgstr "importar/fundir chaves"
-#: g10/g10.c:272
+#: g10/g10.c:273
msgid "list only the sequence of packets"
msgstr "listar apenas as seq��ncias de pacotes"
# ownertrust ???
-#: g10/g10.c:274
+#: g10/g10.c:275
msgid "export the ownertrust values"
msgstr "exportar os valores de confian�a"
-#: g10/g10.c:276
+#: g10/g10.c:277
msgid "import ownertrust values"
msgstr "importar os valores de confian�a"
-#: g10/g10.c:278
+#: g10/g10.c:279
msgid "update the trust database"
msgstr "atualizar o banco de dados de confiabilidade"
-#: g10/g10.c:280
+#: g10/g10.c:281
#, fuzzy
msgid "unattended trust database update"
msgstr "atualizar o banco de dados de confiabilidade"
-#: g10/g10.c:281
+#: g10/g10.c:282
msgid "fix a corrupted trust database"
msgstr ""
"consertar um banco de dados de confiabilidade\n"
"danificado"
-#: g10/g10.c:282
+#: g10/g10.c:283
msgid "De-Armor a file or stdin"
msgstr "retirar a armadura de um arquivo ou de \"stdin\""
-#: g10/g10.c:284
+#: g10/g10.c:285
msgid "En-Armor a file or stdin"
msgstr "criar armadura para um arquivo ou \"stdin\""
-#: g10/g10.c:286
+#: g10/g10.c:287
msgid "|algo [files]|print message digests"
msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
-#: g10/g10.c:290
+#: g10/g10.c:291
msgid ""
"@\n"
"Options:\n"
@@ -510,186 +510,191 @@ msgstr ""
"Op��es:\n"
" "
-#: g10/g10.c:292
+#: g10/g10.c:293
msgid "create ascii armored output"
msgstr "criar sa�da com armadura ascii"
-#: g10/g10.c:294
+#: g10/g10.c:295
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|criptografar para NOME"
-#: g10/g10.c:297
+#: g10/g10.c:298
msgid "|NAME|use NAME as default recipient"
msgstr "|NOME|usar NOME como destinat�rio padr�o"
-#: g10/g10.c:299
+#: g10/g10.c:300
msgid "use the default key as default recipient"
msgstr "usar a chave padr�o como destinat�rio padr�o"
-#: g10/g10.c:303
+#: g10/g10.c:304
msgid "use this user-id to sign or decrypt"
msgstr ""
"usar este identificador de usu�rio para\n"
"assinar ou descriptografar"
-#: g10/g10.c:304
+#: g10/g10.c:305
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|estabelecer n�vel de compress�o N\n"
"(0 desabilita)"
-#: g10/g10.c:306
+#: g10/g10.c:307
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
-#: g10/g10.c:307
+#: g10/g10.c:308
msgid "use as output file"
msgstr "usar como arquivo de sa�da"
-#: g10/g10.c:308
+#: g10/g10.c:309
msgid "verbose"
msgstr "detalhado"
-#: g10/g10.c:309
+#: g10/g10.c:310
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
-#: g10/g10.c:310
+#: g10/g10.c:311
msgid "don't use the terminal at all"
msgstr "nunca usar o terminal"
-#: g10/g10.c:311
+#: g10/g10.c:312
msgid "force v3 signatures"
msgstr "for�ar assinaturas v3"
-#: g10/g10.c:312
+#: g10/g10.c:313
+#, fuzzy
+msgid "do not force v3 signatures"
+msgstr "for�ar assinaturas v3"
+
+#: g10/g10.c:314
msgid "always use a MDC for encryption"
msgstr "sempre usar um MDC para criptografar"
-#: g10/g10.c:313
+#: g10/g10.c:315
msgid "do not make any changes"
msgstr "n�o fazer altera��es"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:315
+#: g10/g10.c:317
msgid "use the gpg-agent"
msgstr ""
-#: g10/g10.c:316
+#: g10/g10.c:318
msgid "batch mode: never ask"
msgstr "modo n�o-interativo: nunca perguntar"
-#: g10/g10.c:317
+#: g10/g10.c:319
msgid "assume yes on most questions"
msgstr "assumir sim para a maioria das perguntas"
-#: g10/g10.c:318
+#: g10/g10.c:320
msgid "assume no on most questions"
msgstr "assumir n�o para a maioria das perguntas"
-#: g10/g10.c:319
+#: g10/g10.c:321
msgid "add this keyring to the list of keyrings"
msgstr "adicionar este chaveiro � lista de chaveiros"
-#: g10/g10.c:320
+#: g10/g10.c:322
msgid "add this secret keyring to the list"
msgstr "adicionar este chaveiro secreto � lista"
-#: g10/g10.c:321
+#: g10/g10.c:323
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usar NOME como chave secreta padr�o"
-#: g10/g10.c:322
+#: g10/g10.c:324
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|ENDERE�O|usar este servidor para buscar chaves"
-#: g10/g10.c:323
+#: g10/g10.c:325
msgid "|NAME|set terminal charset to NAME"
msgstr ""
"|NOME|definir mapa de caracteres do terminal como\n"
"NOME"
-#: g10/g10.c:324
+#: g10/g10.c:326
msgid "read options from file"
msgstr "ler op��es do arquivo"
-#: g10/g10.c:328
+#: g10/g10.c:330
msgid "|FD|write status info to this FD"
msgstr ""
"|DA|escrever informa��es de estado para o\n"
"descritor de arquivo DA"
-#: g10/g10.c:330
+#: g10/g10.c:332
#, fuzzy
msgid "|[file]|write status info to file"
msgstr ""
"|DA|escrever informa��es de estado para o\n"
"descritor de arquivo DA"
-#: g10/g10.c:336
+#: g10/g10.c:338
msgid "|KEYID|ultimately trust this key"
msgstr ""
-#: g10/g10.c:337
+#: g10/g10.c:339
msgid "|FILE|load extension module FILE"
msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
-#: g10/g10.c:338
+#: g10/g10.c:340
msgid "emulate the mode described in RFC1991"
msgstr "emular o modo descrito no RFC1991"
-#: g10/g10.c:339
+#: g10/g10.c:341
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr ""
"configurar todas as op��es de pacote,\n"
"criptografia e \"digest\" para comportamento\n"
"OpenPGP"
-#: g10/g10.c:340
+#: g10/g10.c:342
msgid "|N|use passphrase mode N"
msgstr "|N|usar frase secreta modo N"
-#: g10/g10.c:342
+#: g10/g10.c:344
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr ""
"|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
"para frases secretas"
-#: g10/g10.c:344
+#: g10/g10.c:346
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr ""
"|NOME|usar algoritmo de criptografia NOME para\n"
"frases secretas"
-#: g10/g10.c:345
+#: g10/g10.c:347
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usar algoritmo de criptografia NOME"
-#: g10/g10.c:346
+#: g10/g10.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
-#: g10/g10.c:347
+#: g10/g10.c:349
msgid "|N|use compress algorithm N"
msgstr "|N|usar algoritmo de compress�o N"
-#: g10/g10.c:348
+#: g10/g10.c:350
msgid "throw keyid field of encrypted packets"
msgstr ""
"eliminar o campo keyid dos pacotes\n"
"criptografados"
-#: g10/g10.c:349
+#: g10/g10.c:351
msgid "|NAME=VALUE|use this notation data"
msgstr "|NOME=VALOR|usar estes dados de nota��o"
-#: g10/g10.c:352
+#: g10/g10.c:354
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/g10.c:355
+#: g10/g10.c:357
msgid ""
"@\n"
"Examples:\n"
@@ -709,15 +714,15 @@ msgstr ""
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impress�es digitais\n"
-#: g10/g10.c:478
+#: g10/g10.c:480
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor comunique bugs para <[email protected]>.\n"
-#: g10/g10.c:482
+#: g10/g10.c:484
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
-#: g10/g10.c:485
+#: g10/g10.c:487
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -727,7 +732,7 @@ msgstr ""
"assina, verifica, criptografa ou descriptografa\n"
"a opera��o padr�o depende dos dados de entrada\n"
-#: g10/g10.c:496
+#: g10/g10.c:498
msgid ""
"\n"
"Supported algorithms:\n"
@@ -735,204 +740,204 @@ msgstr ""
"\n"
"Algoritmos suportados:\n"
-#: g10/g10.c:570
+#: g10/g10.c:572
msgid "usage: gpg [options] "
msgstr "uso: gpg [op��es] "
-#: g10/g10.c:627
+#: g10/g10.c:629
msgid "conflicting commands\n"
msgstr "comandos conflitantes\n"
-#: g10/g10.c:783
+#: g10/g10.c:785
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
-#: g10/g10.c:787
+#: g10/g10.c:789
#, c-format
msgid "option file `%s': %s\n"
msgstr "arquivo de op��es `%s': %s\n"
-#: g10/g10.c:794
+#: g10/g10.c:796
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo op��es de `%s'\n"
-#: g10/g10.c:1038
+#: g10/g10.c:1041
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/g10.c:1122
+#: g10/g10.c:1125
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um arquivo core!\n"
-#: g10/g10.c:1126 g10/g10.c:1135
+#: g10/g10.c:1129 g10/g10.c:1138
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s n�o � para uso normal!\n"
-#: g10/g10.c:1128
+#: g10/g10.c:1131
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n�o � permitido com %s!\n"
-#: g10/g10.c:1131
+#: g10/g10.c:1134
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n�o faz sentido com %s!\n"
-#: g10/g10.c:1151 g10/g10.c:1163
+#: g10/g10.c:1154 g10/g10.c:1166
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
-#: g10/g10.c:1157 g10/g10.c:1169
+#: g10/g10.c:1160 g10/g10.c:1172
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1176
msgid "the given policy URL is invalid\n"
msgstr "a URL de pol�tica dada � inv�lida\n"
-#: g10/g10.c:1176
+#: g10/g10.c:1179
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1181
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1183
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1185
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth deve estar na entre 1 e 255\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1188
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
-#: g10/g10.c:1189
+#: g10/g10.c:1192
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1196
#, fuzzy
msgid "invalid preferences\n"
msgstr "lista prefer�ncias"
-#: g10/g10.c:1276
+#: g10/g10.c:1279
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
-#: g10/g10.c:1282
+#: g10/g10.c:1285
msgid "--store [filename]"
msgstr "--store [nome_do_arquivo]"
-#: g10/g10.c:1289
+#: g10/g10.c:1292
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_arquivo]"
-#: g10/g10.c:1297
+#: g10/g10.c:1300
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_arquivo]"
-#: g10/g10.c:1310
+#: g10/g10.c:1313
msgid "--sign [filename]"
msgstr "--sign [nome_do_arquivo]"
-#: g10/g10.c:1323
+#: g10/g10.c:1326
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_arquivo]"
-#: g10/g10.c:1337
+#: g10/g10.c:1340
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [nome_do_arquivo]"
-#: g10/g10.c:1346
+#: g10/g10.c:1349
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_arquivo]"
-#: g10/g10.c:1364
+#: g10/g10.c:1367
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_arquivo]"
-#: g10/g10.c:1372
+#: g10/g10.c:1375
msgid "--sign-key user-id"
msgstr "--sign-key id-usu�rio"
-#: g10/g10.c:1380
+#: g10/g10.c:1383
msgid "--lsign-key user-id"
msgstr "--lsign-key id-usu�rio"
-#: g10/g10.c:1388
+#: g10/g10.c:1391
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-usu�rio [comandos]"
-#: g10/g10.c:1404
+#: g10/g10.c:1407
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key id-usu�rio"
-#: g10/g10.c:1407
+#: g10/g10.c:1410
msgid "--delete-key user-id"
msgstr "--delete-key id-usu�rio"
-#: g10/g10.c:1415
+#: g10/g10.c:1418
#, fuzzy
msgid "--delete-secret-and-public-key user-id"
msgstr "--delete-secret-and-public-key id-usu�rio"
-#: g10/encode.c:268 g10/g10.c:1452 g10/sign.c:632
+#: g10/encode.c:268 g10/g10.c:1455 g10/sign.c:632
#, c-format
msgid "can't open %s: %s\n"
msgstr "imposs�vel abrir %s: %s\n"
-#: g10/g10.c:1467
+#: g10/g10.c:1470
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
-#: g10/g10.c:1539
+#: g10/g10.c:1542
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
-#: g10/g10.c:1547
+#: g10/g10.c:1550
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
# "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/g10.c:1618
+#: g10/g10.c:1621
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de hash inv�lido `%s'\n"
-#: g10/g10.c:1704
+#: g10/g10.c:1707
msgid "[filename]"
msgstr "[nome_do_arquivo]"
-#: g10/g10.c:1708
+#: g10/g10.c:1711
msgid "Go ahead and type your message ...\n"
msgstr "V� em frente e digite sua mensagem ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1711 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1714 g10/verify.c:94 g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "imposs�vel abrir `%s'\n"
-#: g10/g10.c:1920
+#: g10/g10.c:1923
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"o primeiro caractere de um nome de nota��o deve ser uma letra ou um "
"sublinhado\n"
-#: g10/g10.c:1926
+#: g10/g10.c:1929
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -940,12 +945,12 @@ msgstr ""
"um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
"terminar com '='\n"
-#: g10/g10.c:1932
+#: g10/g10.c:1935
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
"pontos em um nome de nota��o devem estar cercados por outros caracteres\n"
-#: g10/g10.c:1940
+#: g10/g10.c:1943
msgid "a notation value must not use any control characters\n"
msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
@@ -1603,7 +1608,7 @@ msgstr ""
"Voc� precisa de uma frase secreta para proteger sua chave.\n"
"\n"
-#: g10/keyedit.c:456 g10/keygen.c:1171
+#: g10/keyedit.c:462 g10/keygen.c:1171
msgid "passphrase not correctly repeated; try again.\n"
msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
@@ -1741,27 +1746,27 @@ msgstr "lendo de `%s'\n"
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s criptografado para: %s\n"
-#: g10/delkey.c:69 g10/export.c:149
+#: g10/delkey.c:69 g10/export.c:148
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "usu�rio `%s' n�o encontrado: %s\n"
-#: g10/delkey.c:77 g10/export.c:159
+#: g10/delkey.c:77 g10/export.c:158
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: g10/export.c:167
+#: g10/export.c:166
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
-#: g10/export.c:178
+#: g10/export.c:177
#, fuzzy, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
-#: g10/export.c:234
+#: g10/export.c:233
msgid "WARNING: nothing exported\n"
msgstr "AVISO: nada exportado\n"
@@ -1771,17 +1776,17 @@ msgstr "entradas demais no cache pk - desativado\n"
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:183 g10/getkey.c:2188
+#: g10/getkey.c:183 g10/getkey.c:2192
#, fuzzy
msgid "[User id not found]"
msgstr "[usu�rio n�o encontrado]"
-#: g10/getkey.c:1911
+#: g10/getkey.c:1915
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
-#: g10/getkey.c:1952
+#: g10/getkey.c:1956
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
@@ -2113,17 +2118,17 @@ msgstr "%d IDs de usu�rios sem auto-assinaturas v�lidas detectados\n"
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:296
+#: g10/keyedit.c:302
#, c-format
msgid "Already signed by key %08lX\n"
msgstr "J� assinado pela chave %08lX\n"
-#: g10/keyedit.c:307
+#: g10/keyedit.c:313
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "Nada para assinar com a chave %08lX\n"
-#: g10/keyedit.c:316
+#: g10/keyedit.c:322
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2131,7 +2136,7 @@ msgstr ""
"Voc� tem certeza de que quer assinar esta chave com\n"
"sua chave: \""
-#: g10/keyedit.c:325
+#: g10/keyedit.c:331
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
@@ -2139,34 +2144,34 @@ msgstr ""
"A assinatura ser� marcada como n�o-export�vel.\n"
"\n"
-#: g10/keyedit.c:330
+#: g10/keyedit.c:336
msgid "Really sign? "
msgstr "Realmente assinar? "
-#: g10/keyedit.c:361 g10/keyedit.c:2104 g10/keyedit.c:2166 g10/sign.c:225
+#: g10/keyedit.c:367 g10/keyedit.c:2110 g10/keyedit.c:2172 g10/sign.c:225
#, c-format
msgid "signing failed: %s\n"
msgstr "assinatura falhou: %s\n"
-#: g10/keyedit.c:415
+#: g10/keyedit.c:421
msgid "This key is not protected.\n"
msgstr "Esta chave n�o � protegida.\n"
-#: g10/keyedit.c:419
+#: g10/keyedit.c:425
#, fuzzy
msgid "Secret parts of primary key are not available.\n"
msgstr "chave secreta n�o dispon�vel"
-#: g10/keyedit.c:423
+#: g10/keyedit.c:429
msgid "Key is protected.\n"
msgstr "A chave � protegida.\n"
-#: g10/keyedit.c:443
+#: g10/keyedit.c:449
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Imposs�vel editar esta chave: %s\n"
-#: g10/keyedit.c:448
+#: g10/keyedit.c:454
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2174,7 +2179,7 @@ msgstr ""
"Digite a nova frase para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:460
+#: g10/keyedit.c:466
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2182,468 +2187,474 @@ msgstr ""
"Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
"\n"
-#: g10/keyedit.c:463
+#: g10/keyedit.c:469
msgid "Do you really want to do this? "
msgstr "Voc� realmente quer fazer isso? "
-#: g10/keyedit.c:527
+#: g10/keyedit.c:533
msgid "moving a key signature to the correct place\n"
msgstr "movendo a assinatura da chave para o local correto\n"
-#: g10/keyedit.c:568
+#: g10/keyedit.c:574
msgid "quit this menu"
msgstr "sair deste menu"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:575
msgid "q"
msgstr "q"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save"
msgstr "save"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save and quit"
msgstr "gravar e sair"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "help"
msgstr "help"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "show this help"
msgstr "mostra esta ajuda"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "show fingerprint"
msgstr "mostra impress�o digital"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list"
msgstr "list"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list key and user IDs"
msgstr "lista chave e identificadores de usu�rios"
-#: g10/keyedit.c:575
+#: g10/keyedit.c:581
msgid "l"
msgstr "l"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "select user ID N"
msgstr "seleciona ID de usu�rio N"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "key"
msgstr "key"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "select secondary key N"
msgstr "seleciona chave secund�ria N"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "check"
msgstr "check"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "list signatures"
msgstr "lista assinaturas"
-#: g10/keyedit.c:579
+#: g10/keyedit.c:585
msgid "c"
msgstr "c"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign the key"
msgstr "assina a chave"
-#: g10/keyedit.c:581
+#: g10/keyedit.c:587
msgid "s"
msgstr "s"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "sign the key locally"
msgstr "assina a chave localmente"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:589
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "add a user ID"
msgstr "adiciona um novo ID de usu�rio"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "delete user ID"
msgstr "remove ID de usu�rio"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "add a secondary key"
msgstr "adiciona nova chave secund�ria"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delete a secondary key"
msgstr "remove uma chave secund�ria"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delete signatures"
msgstr "remove assinaturas"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "change the expire date"
msgstr "muda a data de validade"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "primary"
msgstr ""
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle between secret and public key listing"
msgstr "alterna entre listagem de chave secreta e p�blica"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:599
msgid "t"
msgstr "t"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:600
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:594 g10/keyedit.c:595
-msgid "list preferences"
+#: g10/keyedit.c:600
+#, fuzzy
+msgid "list preferences (expert)"
msgstr "lista prefer�ncias"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:601
#, fuzzy
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:601
+#, fuzzy
+msgid "list preferences (verbose)"
+msgstr "lista prefer�ncias"
+
+#: g10/keyedit.c:602
#, fuzzy
msgid "setpref"
msgstr "pref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:602
#, fuzzy
msgid "set preference list"
msgstr "lista prefer�ncias"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updpref"
msgstr "pref"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updated preferences"
msgstr "lista prefer�ncias"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "change the passphrase"
msgstr "muda a frase secreta"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "change the ownertrust"
msgstr "muda os valores de confian�a"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revoke signatures"
msgstr "revoga assinaturas"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revoke a secondary key"
msgstr "revoga uma chave secund�ria"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable a key"
msgstr "desativa uma chave"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable a key"
msgstr "ativa uma chave"
-#: g10/delkey.c:112 g10/keyedit.c:623
+#: g10/delkey.c:112 g10/keyedit.c:629
msgid "can't do that in batchmode\n"
msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
-#: g10/keyedit.c:658
+#: g10/keyedit.c:664
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: g10/keyedit.c:676
+#: g10/keyedit.c:682
msgid "Secret key is available.\n"
msgstr "Chave secreta dispon�vel.\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:712
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:737
+#: g10/keyedit.c:743
msgid "Need the secret key to do this.\n"
msgstr "A chave secreta � necess�ria para fazer isto.\n"
-#: g10/keyedit.c:741
+#: g10/keyedit.c:747
msgid "Please use the command \"toggle\" first.\n"
msgstr ""
-#: g10/keyedit.c:788
+#: g10/keyedit.c:794
msgid "Really sign all user IDs? "
msgstr "Realmente assinar todos os IDs de usu�rio? "
-#: g10/keyedit.c:789
+#: g10/keyedit.c:795
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
-#: g10/keyedit.c:821 g10/keyedit.c:842
+#: g10/keyedit.c:827 g10/keyedit.c:848
msgid "You must select at least one user ID.\n"
msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:829
msgid "You can't delete the last user ID!\n"
msgstr "Voc� n�o pode remover o �ltimo ID de usu�rio!\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:832
msgid "Really remove all selected user IDs? "
msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
-#: g10/keyedit.c:827
+#: g10/keyedit.c:833
msgid "Really remove this user ID? "
msgstr "Realmente remover este ID de usu�rio? "
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:871 g10/keyedit.c:893
msgid "You must select at least one key.\n"
msgstr "Voc� deve selecionar pelo menos uma chave.\n"
-#: g10/keyedit.c:869
+#: g10/keyedit.c:875
msgid "Do you really want to delete the selected keys? "
msgstr "Voc� realmente quer remover as chaves selecionadas? "
-#: g10/keyedit.c:870
+#: g10/keyedit.c:876
msgid "Do you really want to delete this key? "
msgstr "Voc� realmente quer remover esta chave? "
-#: g10/keyedit.c:891
+#: g10/keyedit.c:897
msgid "Do you really want to revoke the selected keys? "
msgstr "Voc� realmente quer revogar as chaves selecionadas? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:898
msgid "Do you really want to revoke this key? "
msgstr "Voc� realmente quer revogar esta chave? "
-#: g10/keyedit.c:956
+#: g10/keyedit.c:962
#, fuzzy
msgid "Really update the preferences for the selected user IDs? "
msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
#, fuzzy
msgid "Really update the preferences? "
msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
-#: g10/keyedit.c:992
+#: g10/keyedit.c:998
msgid "Save changes? "
msgstr "Salvar altera��es? "
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1001
msgid "Quit without saving? "
msgstr "Sair sem salvar? "
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1012
#, c-format
msgid "update failed: %s\n"
msgstr "atualiza��o falhou: %s\n"
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1019
#, c-format
msgid "update secret failed: %s\n"
msgstr "atualiza��o da chave secreta falhou: %s\n"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1026
msgid "Key not changed so no update needed.\n"
msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
# help ou ajuda ???
-#: g10/keyedit.c:1031
+#: g10/keyedit.c:1037
msgid "Invalid command (try \"help\")\n"
msgstr "Comando inv�lido (tente \"help\")\n"
-#: g10/keyedit.c:1139 g10/keyedit.c:1165
+#: g10/keyedit.c:1145 g10/keyedit.c:1171
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr ""
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1154
#, c-format
msgid " trust: %c/%c"
msgstr ""
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1158
msgid "This key has been disabled"
msgstr "Esta chave foi desativada"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1187
#, fuzzy, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! a subchave foi revogada: %s\n"
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1190
#, fuzzy
msgid "rev- faked revocation found\n"
msgstr "rev- revoga��es de chaves incorreta\n"
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1192
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr ""
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1408
msgid "Delete this good signature? (y/N/q)"
msgstr "Deletar esta assinatura v�lida? (s/N/q)"
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1412
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1416
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1422
msgid "Really delete this self-signature? (y/N)"
msgstr "Realmente remover esta auto-assinatura? (s/N)"
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d assinatura removida.\n"
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d assinaturas removidas.\n"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
msgid "Nothing deleted.\n"
msgstr "Nada removido.\n"
-#: g10/keyedit.c:1503
+#: g10/keyedit.c:1509
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor remova as sele��es das chaves secretas.\n"
-#: g10/keyedit.c:1509
+#: g10/keyedit.c:1515
msgid "Please select at most one secondary key.\n"
msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1519
msgid "Changing expiration time for a secondary key.\n"
msgstr "Modificando a data de validade para uma chave secund�ria.\n"
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1521
msgid "Changing expiration time for the primary key.\n"
msgstr "Modificando a data de validade para uma chave prim�ria.\n"
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1563
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1579
msgid "No corresponding signature in secret ring\n"
msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1662
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1837
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nenhum ID de usu�rio com �ndice %d\n"
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Nenhuma chave secund�ria com �ndice %d\n"
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:1981
msgid "user ID: \""
msgstr "ID de usu�rio: \""
-#: g10/keyedit.c:1978
+#: g10/keyedit.c:1984
#, c-format
msgid ""
"\"\n"
@@ -2652,34 +2663,34 @@ msgstr ""
"\"\n"
"assinado com sua chave %08lX em %s\n"
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1988
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2012
msgid "You have signed these user IDs:\n"
msgstr "Voc� assinou estes IDs de usu�rio:\n"
-#: g10/keyedit.c:2020 g10/keyedit.c:2055
+#: g10/keyedit.c:2026 g10/keyedit.c:2061
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " assinado por %08lX em %s\n"
-#: g10/keyedit.c:2025
+#: g10/keyedit.c:2031
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " revogado por %08lX em %s\n"
-#: g10/keyedit.c:2045
+#: g10/keyedit.c:2051
msgid "You are about to revoke these signatures:\n"
msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:2069
msgid "Really create the revocation certificates? (y/N)"
msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2098
msgid "no secret key\n"
msgstr "nenhuma chave secreta\n"
@@ -2863,37 +2874,37 @@ msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
-#: g10/passphrase.c:277 g10/passphrase.c:319
+#: g10/passphrase.c:278 g10/passphrase.c:320
msgid "gpg-agent is not available in this session\n"
msgstr ""
-#: g10/passphrase.c:285
+#: g10/passphrase.c:286
msgid "can't set client pid for the agent\n"
msgstr ""
-#: g10/passphrase.c:293
+#: g10/passphrase.c:294
msgid "can't get server read FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:300
+#: g10/passphrase.c:301
msgid "can't get server write FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:325
+#: g10/passphrase.c:326
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:174 g10/passphrase.c:344
+#: g10/hkp.c:174 g10/passphrase.c:345
#, fuzzy, c-format
msgid "can't connect to `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
-#: g10/passphrase.c:415 g10/passphrase.c:677
+#: g10/passphrase.c:417 g10/passphrase.c:679
#, c-format
msgid " (main key ID %08lX)"
msgstr " (ID principal da chave %08lX)"
-#: g10/passphrase.c:425
+#: g10/passphrase.c:427
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -2905,35 +2916,35 @@ msgstr ""
"usu�rio: \"%.*s\"\n"
"%u-bit %s chave, ID %08lX, criada %s%s\n"
-#: g10/passphrase.c:446
+#: g10/passphrase.c:448
#, fuzzy
msgid "Enter passphrase\n"
msgstr "Digite a frase secreta: "
-#: g10/passphrase.c:448
+#: g10/passphrase.c:450
#, fuzzy
msgid "Repeat passphrase\n"
msgstr "Repita a frase secreta: "
-#: g10/passphrase.c:483
+#: g10/passphrase.c:485
#, fuzzy
msgid "passphrase too long\n"
msgstr "linha muito longa\n"
-#: g10/passphrase.c:495
+#: g10/passphrase.c:497
msgid "invalid response from agent\n"
msgstr ""
-#: g10/passphrase.c:504
+#: g10/passphrase.c:506
msgid "cancelled by user\n"
msgstr ""
-#: g10/passphrase.c:507 g10/passphrase.c:580
+#: g10/passphrase.c:509 g10/passphrase.c:582
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr ""
-#: g10/passphrase.c:663
+#: g10/passphrase.c:665
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -2943,20 +2954,20 @@ msgstr ""
"Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
"usu�rio: \""
-#: g10/passphrase.c:672
+#: g10/passphrase.c:674
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
-#: g10/passphrase.c:710
+#: g10/passphrase.c:712
msgid "can't query password in batchmode\n"
msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:716
msgid "Enter passphrase: "
msgstr "Digite a frase secreta: "
-#: g10/passphrase.c:718
+#: g10/passphrase.c:720
msgid "Repeat passphrase: "
msgstr "Repita a frase secreta: "
@@ -3180,7 +3191,7 @@ msgstr "%s: imposs�vel criar trava\n"
msgid "%s: can't make lock\n"
msgstr "%s: imposs�vel criar trava\n"
-#: g10/keyring.c:1376 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
+#: g10/keyring.c:1420 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: imposs�vel criar: %s\n"
@@ -3318,22 +3329,32 @@ msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "banco de dados de confiabilidade: sincroniza��o falhou: %s\n"
-#: g10/trustdb.c:688
+#: g10/trustdb.c:470
+#, fuzzy
+msgid "no need for a trustdb check\n"
+msgstr "%s: n�o � um banco de dados de confiabilidade\n"
+
+#: g10/trustdb.c:476 g10/trustdb.c:1458
+#, fuzzy, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "inser��o de registro de confian�a falhou: %s\n"
+
+#: g10/trustdb.c:709
#, fuzzy
msgid "checking the trustdb\n"
msgstr "muda os valores de confian�a"
-#: g10/trustdb.c:839
+#: g10/trustdb.c:860
#, fuzzy, c-format
msgid "public key %08lX not found: %s\n"
msgstr "chave p�blica n�o encontrada"
-#: g10/trustdb.c:1304
+#: g10/trustdb.c:1338
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr ""
-#: g10/trustdb.c:1374
+#: g10/trustdb.c:1411
#, c-format
msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
msgstr ""
@@ -3737,60 +3758,60 @@ msgstr "Nenhuma ajuda dispon�vel"
msgid "No help available for `%s'"
msgstr "Nenhuma ajuda dispon�vel para `%s'"
-#: g10/keydb.c:170
+#: g10/keydb.c:175
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: g10/keydb.c:179
+#: g10/keydb.c:184
#, c-format
msgid "changing permission of `%s' failed: %s\n"
msgstr ""
-#: g10/keydb.c:188
+#: g10/keydb.c:193
#, fuzzy, c-format
msgid "keyring `%s' created\n"
msgstr "%s: chaveiro criado\n"
-#: g10/keydb.c:530
+#: g10/keydb.c:586
#, fuzzy, c-format
-msgid "failed to rebuild all keyring caches: %s\n"
+msgid "failed to rebuild keyring cache: %s\n"
msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
-#: g10/keyring.c:1179
+#: g10/keyring.c:1220
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr "AVISO: existem 2 arquivos com informa��es confidenciais.\n"
-#: g10/keyring.c:1181
+#: g10/keyring.c:1222
#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s � o n�o modificado\n"
-#: g10/keyring.c:1182
+#: g10/keyring.c:1223
#, c-format
msgid "%s is the new one\n"
msgstr "%s � o novo\n"
-#: g10/keyring.c:1183
+#: g10/keyring.c:1224
msgid "Please fix this possible security flaw\n"
msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
-#: g10/keyring.c:1281
+#: g10/keyring.c:1322
#, fuzzy, c-format
msgid "checking keyring `%s'\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: g10/keyring.c:1312
+#: g10/keyring.c:1353
#, fuzzy, c-format
msgid "%lu keys so far checked (%lu signatures)\n"
msgstr "%lu chaves processadas at� agora\n"
-#: g10/keyring.c:1323
+#: g10/keyring.c:1364
#, fuzzy, c-format
msgid "%lu keys checked (%lu signatures)\n"
msgstr "listar as chaves e as assinaturas"
-#: g10/keyring.c:1381
+#: g10/keyring.c:1425
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: chaveiro criado\n"
@@ -4261,9 +4282,6 @@ msgstr "%s: chaveiro criado\n"
#~ msgid "Oops: key is now in trustdb???\n"
#~ msgstr "Oops: agora a chave est� no banco de dados de confiabilidade???\n"
-#~ msgid "insert trust record failed: %s\n"
-#~ msgstr "inser��o de registro de confian�a falhou: %s\n"
-
#~ msgid "Hmmm, public key lost?"
#~ msgstr "Hmmm, chave p�blica perdida?"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 6560bd8a9..8658e1239 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2001-09-28 16:20+0200\n"
+"POT-Creation-Date: 2001-10-23 09:41+0200\n"
"PO-Revision-Date: 2001-04-08 16:28+00:00\n"
"Last-Translator: Pedro Morais <[email protected]>\n"
"Language-Team: pt <[email protected]>\n"
@@ -44,7 +44,7 @@ msgstr "n�o"
msgid "nN"
msgstr "nN"
-#: g10/keyedit.c:568 util/miscutil.c:326
+#: g10/keyedit.c:574 util/miscutil.c:326
msgid "quit"
msgstr "sair"
@@ -344,7 +344,7 @@ msgstr ""
"N�o h� bytes aleat�rios suficientes. Por favor, fa�a outro trabalho para\n"
"que o sistema possa recolher mais entropia! (S�o necess�rios mais %d bytes)\n"
-#: g10/g10.c:237
+#: g10/g10.c:238
msgid ""
"@Commands:\n"
" "
@@ -352,145 +352,145 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/g10.c:239
+#: g10/g10.c:240
msgid "|[file]|make a signature"
msgstr "|[ficheiro]|fazer uma assinatura"
-#: g10/g10.c:240
+#: g10/g10.c:241
msgid "|[file]|make a clear text signature"
msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
-#: g10/g10.c:241
+#: g10/g10.c:242
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
-#: g10/g10.c:242
+#: g10/g10.c:243
msgid "encrypt data"
msgstr "encriptar dados"
-#: g10/g10.c:243
+#: g10/g10.c:244
msgid "encryption only with symmetric cipher"
msgstr "encriptar apenas com cifra sim�trica"
-#: g10/g10.c:244
+#: g10/g10.c:245
msgid "store only"
msgstr "apenas armazenar"
-#: g10/g10.c:245
+#: g10/g10.c:246
msgid "decrypt data (default)"
msgstr "desencriptar dados (ac��o por omiss�o)"
-#: g10/g10.c:246
+#: g10/g10.c:247
msgid "verify a signature"
msgstr "verificar uma assinatura"
-#: g10/g10.c:248
+#: g10/g10.c:249
msgid "list keys"
msgstr "listar as chaves"
-#: g10/g10.c:250
+#: g10/g10.c:251
msgid "list keys and signatures"
msgstr "listar as chaves e as assinaturas"
-#: g10/g10.c:251
+#: g10/g10.c:252
msgid "check key signatures"
msgstr "verificar as assinaturas das chaves"
-#: g10/g10.c:252
+#: g10/g10.c:253
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impress�es digitais"
-#: g10/g10.c:253
+#: g10/g10.c:254
msgid "list secret keys"
msgstr "listar as chaves secretas"
-#: g10/g10.c:254
+#: g10/g10.c:255
msgid "generate a new key pair"
msgstr "gerar um novo par de chaves"
-#: g10/g10.c:255
+#: g10/g10.c:256
msgid "remove key from the public keyring"
msgstr "remover a chave do porta-chaves p�blico"
-#: g10/g10.c:257
+#: g10/g10.c:258
msgid "remove key from the secret keyring"
msgstr "remover a chave do porta-chaves secreto"
-#: g10/g10.c:258
+#: g10/g10.c:259
msgid "sign a key"
msgstr "assinar uma chave"
-#: g10/g10.c:259
+#: g10/g10.c:260
msgid "sign a key locally"
msgstr "assinar uma chave localmente"
-#: g10/g10.c:260
+#: g10/g10.c:261
msgid "sign or edit a key"
msgstr "assinar ou editar uma chave"
-#: g10/g10.c:261
+#: g10/g10.c:262
msgid "generate a revocation certificate"
msgstr "gerar um certificado de revoga��o"
-#: g10/g10.c:262
+#: g10/g10.c:263
msgid "export keys"
msgstr "exportar chaves"
-#: g10/g10.c:263
+#: g10/g10.c:264
msgid "export keys to a key server"
msgstr "exportar chaves para um servidor"
-#: g10/g10.c:264
+#: g10/g10.c:265
msgid "import keys from a key server"
msgstr "importar chaves de um servidor"
-#: g10/g10.c:266
+#: g10/g10.c:267
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "importar chaves de um servidor"
-#: g10/g10.c:270
+#: g10/g10.c:271
msgid "import/merge keys"
msgstr "importar/fundir chaves"
-#: g10/g10.c:272
+#: g10/g10.c:273
msgid "list only the sequence of packets"
msgstr "listar apenas as sequ�ncias de pacotes"
-#: g10/g10.c:274
+#: g10/g10.c:275
msgid "export the ownertrust values"
msgstr "exportar os valores de confian�a"
-#: g10/g10.c:276
+#: g10/g10.c:277
msgid "import ownertrust values"
msgstr "importar os valores de confian�a"
-#: g10/g10.c:278
+#: g10/g10.c:279
msgid "update the trust database"
msgstr "actualizar a base de dados de confian�a"
-#: g10/g10.c:280
+#: g10/g10.c:281
#, fuzzy
msgid "unattended trust database update"
msgstr "actualizar a base de dados de confian�a"
-#: g10/g10.c:281
+#: g10/g10.c:282
msgid "fix a corrupted trust database"
msgstr "consertar uma base de dados de confian�a"
-#: g10/g10.c:282
+#: g10/g10.c:283
msgid "De-Armor a file or stdin"
msgstr "retirar armadura de um ficheiro ou do \"stdin\""
-#: g10/g10.c:284
+#: g10/g10.c:285
msgid "En-Armor a file or stdin"
msgstr "criar armadura para um ficheiro ou \"stdin\""
-#: g10/g10.c:286
+#: g10/g10.c:287
msgid "|algo [files]|print message digests"
msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
-#: g10/g10.c:290
+#: g10/g10.c:291
msgid ""
"@\n"
"Options:\n"
@@ -500,181 +500,186 @@ msgstr ""
"Op��es:\n"
" "
-#: g10/g10.c:292
+#: g10/g10.c:293
msgid "create ascii armored output"
msgstr "criar sa�da com armadura ascii"
-#: g10/g10.c:294
+#: g10/g10.c:295
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|encriptar para NOME"
-#: g10/g10.c:297
+#: g10/g10.c:298
msgid "|NAME|use NAME as default recipient"
msgstr "|NOME|usar NOME como destinat�rio padr�o"
-#: g10/g10.c:299
+#: g10/g10.c:300
msgid "use the default key as default recipient"
msgstr "usar a chave padr�o como destinat�rio padr�o"
-#: g10/g10.c:303
+#: g10/g10.c:304
msgid "use this user-id to sign or decrypt"
msgstr ""
"usar este identificador de utilizador para\n"
"assinar ou desencriptar"
-#: g10/g10.c:304
+#: g10/g10.c:305
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|estabelecer n�vel de compress�o N\n"
"(0 desactiva)"
-#: g10/g10.c:306
+#: g10/g10.c:307
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
-#: g10/g10.c:307
+#: g10/g10.c:308
msgid "use as output file"
msgstr "usar como ficheiro de sa�da"
-#: g10/g10.c:308
+#: g10/g10.c:309
msgid "verbose"
msgstr "detalhado"
-#: g10/g10.c:309
+#: g10/g10.c:310
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
-#: g10/g10.c:310
+#: g10/g10.c:311
msgid "don't use the terminal at all"
msgstr "nunca usar o terminal"
-#: g10/g10.c:311
+#: g10/g10.c:312
msgid "force v3 signatures"
msgstr "for�ar assinaturas v3"
-#: g10/g10.c:312
+#: g10/g10.c:313
+#, fuzzy
+msgid "do not force v3 signatures"
+msgstr "for�ar assinaturas v3"
+
+#: g10/g10.c:314
msgid "always use a MDC for encryption"
msgstr "sempre usar um MDC para encriptar"
-#: g10/g10.c:313
+#: g10/g10.c:315
msgid "do not make any changes"
msgstr "n�o fazer altera��es"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:315
+#: g10/g10.c:317
msgid "use the gpg-agent"
msgstr "utilizar o gpg-agent"
-#: g10/g10.c:316
+#: g10/g10.c:318
msgid "batch mode: never ask"
msgstr "modo n�o-interactivo: nunca perguntar"
-#: g10/g10.c:317
+#: g10/g10.c:319
msgid "assume yes on most questions"
msgstr "assumir sim para a maioria das perguntas"
-#: g10/g10.c:318
+#: g10/g10.c:320
msgid "assume no on most questions"
msgstr "assumir n�o para a maioria das perguntas"
-#: g10/g10.c:319
+#: g10/g10.c:321
msgid "add this keyring to the list of keyrings"
msgstr ""
"adicionar este porta-chaves\n"
"� lista de porta-chaves"
-#: g10/g10.c:320
+#: g10/g10.c:322
msgid "add this secret keyring to the list"
msgstr "adicionar este porta-chaves secreto � lista"
-#: g10/g10.c:321
+#: g10/g10.c:323
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usar NOME como chave secreta por omiss�o"
-#: g10/g10.c:322
+#: g10/g10.c:324
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|ENDERE�O|usar este servidor para buscar chaves"
-#: g10/g10.c:323
+#: g10/g10.c:325
msgid "|NAME|set terminal charset to NAME"
msgstr ""
"|NOME|definir mapa de caracteres do terminal como\n"
"NOME"
-#: g10/g10.c:324
+#: g10/g10.c:326
msgid "read options from file"
msgstr "ler op��es do ficheiro"
-#: g10/g10.c:328
+#: g10/g10.c:330
msgid "|FD|write status info to this FD"
msgstr ""
"|DF|escrever informa��es de estado para o\n"
"descritor de ficheiro DF"
-#: g10/g10.c:330
+#: g10/g10.c:332
#, fuzzy
msgid "|[file]|write status info to file"
msgstr ""
"|DF|escrever informa��es de estado para o\n"
"descritor de ficheiro DF"
-#: g10/g10.c:336
+#: g10/g10.c:338
#, fuzzy
msgid "|KEYID|ultimately trust this key"
msgstr "|KEYID|confiar totalmente nesta chave"
-#: g10/g10.c:337
+#: g10/g10.c:339
msgid "|FILE|load extension module FILE"
msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
-#: g10/g10.c:338
+#: g10/g10.c:340
msgid "emulate the mode described in RFC1991"
msgstr "emular o modo descrito no RFC1991"
-#: g10/g10.c:339
+#: g10/g10.c:341
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr ""
"configurar todas as op��es de pacote,\n"
"criptografia e \"digest\" para comportamento\n"
"OpenPGP"
-#: g10/g10.c:340
+#: g10/g10.c:342
msgid "|N|use passphrase mode N"
msgstr "|N|usar mode de frase secreta N"
-#: g10/g10.c:342
+#: g10/g10.c:344
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr ""
"|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
"para frases secretas"
-#: g10/g10.c:344
+#: g10/g10.c:346
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr ""
"|NOME|usar algoritmo de criptografia NOME para\n"
"frases secretas"
-#: g10/g10.c:345
+#: g10/g10.c:347
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usar algoritmo de criptografia NOME"
-#: g10/g10.c:346
+#: g10/g10.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
-#: g10/g10.c:347
+#: g10/g10.c:349
msgid "|N|use compress algorithm N"
msgstr "|N|usar algoritmo de compress�o N"
-#: g10/g10.c:348
+#: g10/g10.c:350
msgid "throw keyid field of encrypted packets"
msgstr "eliminar campo keyid dos pacotes encriptados"
-#: g10/g10.c:349
+#: g10/g10.c:351
msgid "|NAME=VALUE|use this notation data"
msgstr "|NOME=VALOR|usar estes dados de nota��o"
-#: g10/g10.c:352
+#: g10/g10.c:354
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -682,7 +687,7 @@ msgstr ""
"@\n"
"(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
-#: g10/g10.c:355
+#: g10/g10.c:357
msgid ""
"@\n"
"Examples:\n"
@@ -702,15 +707,15 @@ msgstr ""
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impress�es digitais\n"
-#: g10/g10.c:478
+#: g10/g10.c:480
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor comunique bugs para <[email protected]>.\n"
-#: g10/g10.c:482
+#: g10/g10.c:484
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
-#: g10/g10.c:485
+#: g10/g10.c:487
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -720,7 +725,7 @@ msgstr ""
"assina, verifica, encripta ou desencripta\n"
"a opera��o por omiss�o depende dos dados de entrada\n"
-#: g10/g10.c:496
+#: g10/g10.c:498
msgid ""
"\n"
"Supported algorithms:\n"
@@ -728,202 +733,202 @@ msgstr ""
"\n"
"Algoritmos suportados:\n"
-#: g10/g10.c:570
+#: g10/g10.c:572
msgid "usage: gpg [options] "
msgstr "uso: gpg [op��es] "
-#: g10/g10.c:627
+#: g10/g10.c:629
msgid "conflicting commands\n"
msgstr "comandos em conflito\n"
-#: g10/g10.c:783
+#: g10/g10.c:785
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
-#: g10/g10.c:787
+#: g10/g10.c:789
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de op��es `%s': %s\n"
-#: g10/g10.c:794
+#: g10/g10.c:796
#, c-format
msgid "reading options from `%s'\n"
msgstr "a ler op��es de `%s'\n"
-#: g10/g10.c:1038
+#: g10/g10.c:1041
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/g10.c:1122
+#: g10/g10.c:1125
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um ficheiro core!\n"
-#: g10/g10.c:1126 g10/g10.c:1135
+#: g10/g10.c:1129 g10/g10.c:1138
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s n�o � para uso normal!\n"
-#: g10/g10.c:1128
+#: g10/g10.c:1131
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n�o � permitido com %s!\n"
-#: g10/g10.c:1131
+#: g10/g10.c:1134
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n�o faz sentido com %s!\n"
-#: g10/g10.c:1151 g10/g10.c:1163
+#: g10/g10.c:1154 g10/g10.c:1166
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado n�o � v�lido\n"
-#: g10/g10.c:1157 g10/g10.c:1169
+#: g10/g10.c:1160 g10/g10.c:1172
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1176
msgid "the given policy URL is invalid\n"
msgstr "a URL de pol�tica dada � inv�lida\n"
-#: g10/g10.c:1176
+#: g10/g10.c:1179
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1181
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1183
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1185
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth deve estar na entre 1 e 255\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1188
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
-#: g10/g10.c:1189
+#: g10/g10.c:1192
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1196
#, fuzzy
msgid "invalid preferences\n"
msgstr "lista prefer�ncias"
-#: g10/g10.c:1276
+#: g10/g10.c:1279
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
-#: g10/g10.c:1282
+#: g10/g10.c:1285
msgid "--store [filename]"
msgstr "--store [nome_do_ficheiro]"
-#: g10/g10.c:1289
+#: g10/g10.c:1292
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_ficheiro]"
-#: g10/g10.c:1297
+#: g10/g10.c:1300
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_ficheiro]"
-#: g10/g10.c:1310
+#: g10/g10.c:1313
msgid "--sign [filename]"
msgstr "--sign [nome_do_ficheiro]"
-#: g10/g10.c:1323
+#: g10/g10.c:1326
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
-#: g10/g10.c:1337
+#: g10/g10.c:1340
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [nome_do_ficheiro]"
-#: g10/g10.c:1346
+#: g10/g10.c:1349
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_ficheiro]"
-#: g10/g10.c:1364
+#: g10/g10.c:1367
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_ficheiro]"
-#: g10/g10.c:1372
+#: g10/g10.c:1375
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizador"
-#: g10/g10.c:1380
+#: g10/g10.c:1383
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizador"
-#: g10/g10.c:1388
+#: g10/g10.c:1391
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizador [comandos]"
-#: g10/g10.c:1404
+#: g10/g10.c:1407
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key id-utilizador"
-#: g10/g10.c:1407
+#: g10/g10.c:1410
msgid "--delete-key user-id"
msgstr "--delete-key id-utilizador"
-#: g10/g10.c:1415
+#: g10/g10.c:1418
msgid "--delete-secret-and-public-key user-id"
msgstr "--delete-secret-and-public-key id-utilizador"
-#: g10/encode.c:268 g10/g10.c:1452 g10/sign.c:632
+#: g10/encode.c:268 g10/g10.c:1455 g10/sign.c:632
#, c-format
msgid "can't open %s: %s\n"
msgstr "imposs�vel abrir %s: %s\n"
-#: g10/g10.c:1467
+#: g10/g10.c:1470
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
-#: g10/g10.c:1539
+#: g10/g10.c:1542
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
-#: g10/g10.c:1547
+#: g10/g10.c:1550
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
-#: g10/g10.c:1618
+#: g10/g10.c:1621
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de dispers�o inv�lido `%s'\n"
-#: g10/g10.c:1704
+#: g10/g10.c:1707
msgid "[filename]"
msgstr "[nome_do_ficheiro]"
-#: g10/g10.c:1708
+#: g10/g10.c:1711
msgid "Go ahead and type your message ...\n"
msgstr "Digite a sua mensagem ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1711 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1714 g10/verify.c:94 g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "imposs�vel abrir `%s'\n"
-#: g10/g10.c:1920
+#: g10/g10.c:1923
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"o primeiro caracter de um nome de nota��o deve ser uma letra ou um "
"sublinhado\n"
-#: g10/g10.c:1926
+#: g10/g10.c:1929
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -931,12 +936,12 @@ msgstr ""
"um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
"terminar com '='\n"
-#: g10/g10.c:1932
+#: g10/g10.c:1935
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
"pontos num nome de nota��o devem estar cercados por outros caracteres\n"
-#: g10/g10.c:1940
+#: g10/g10.c:1943
msgid "a notation value must not use any control characters\n"
msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
@@ -1590,7 +1595,7 @@ msgstr ""
"Voc� precisa de uma frase secreta para proteger a sua chave.\n"
"\n"
-#: g10/keyedit.c:456 g10/keygen.c:1171
+#: g10/keyedit.c:462 g10/keygen.c:1171
msgid "passphrase not correctly repeated; try again.\n"
msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez.\n"
@@ -1728,27 +1733,27 @@ msgstr "lendo de `%s'\n"
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s encriptado para: %s\n"
-#: g10/delkey.c:69 g10/export.c:149
+#: g10/delkey.c:69 g10/export.c:148
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "utilizador `%s' n�o encontrado: %s\n"
-#: g10/delkey.c:77 g10/export.c:159
+#: g10/delkey.c:77 g10/export.c:158
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: g10/export.c:167
+#: g10/export.c:166
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
-#: g10/export.c:178
+#: g10/export.c:177
#, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "chave %08lX: n�o est� protegida - ignorada\n"
-#: g10/export.c:234
+#: g10/export.c:233
msgid "WARNING: nothing exported\n"
msgstr "AVISO: nada exportado\n"
@@ -1758,16 +1763,16 @@ msgstr "entradas demais no cache pk - desactivado\n"
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:183 g10/getkey.c:2188
+#: g10/getkey.c:183 g10/getkey.c:2192
msgid "[User id not found]"
msgstr "[Utilizador n�o encontrado]"
-#: g10/getkey.c:1911
+#: g10/getkey.c:1915
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
-#: g10/getkey.c:1952
+#: g10/getkey.c:1956
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
@@ -2099,17 +2104,17 @@ msgstr "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:296
+#: g10/keyedit.c:302
#, c-format
msgid "Already signed by key %08lX\n"
msgstr "J� assinado pela chave %08lX\n"
-#: g10/keyedit.c:307
+#: g10/keyedit.c:313
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "Nada para assinar com a chave %08lX\n"
-#: g10/keyedit.c:316
+#: g10/keyedit.c:322
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2117,7 +2122,7 @@ msgstr ""
"Voc� tem certeza de que quer assinar esta chave com\n"
"a sua chave: \""
-#: g10/keyedit.c:325
+#: g10/keyedit.c:331
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
@@ -2125,33 +2130,33 @@ msgstr ""
"A assinatura ser� marcada como n�o-export�vel.\n"
"\n"
-#: g10/keyedit.c:330
+#: g10/keyedit.c:336
msgid "Really sign? "
msgstr "Realmente assinar? "
-#: g10/keyedit.c:361 g10/keyedit.c:2104 g10/keyedit.c:2166 g10/sign.c:225
+#: g10/keyedit.c:367 g10/keyedit.c:2110 g10/keyedit.c:2172 g10/sign.c:225
#, c-format
msgid "signing failed: %s\n"
msgstr "assinatura falhou: %s\n"
-#: g10/keyedit.c:415
+#: g10/keyedit.c:421
msgid "This key is not protected.\n"
msgstr "Esta chave n�o � protegida.\n"
-#: g10/keyedit.c:419
+#: g10/keyedit.c:425
msgid "Secret parts of primary key are not available.\n"
msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
-#: g10/keyedit.c:423
+#: g10/keyedit.c:429
msgid "Key is protected.\n"
msgstr "A chave � protegida.\n"
-#: g10/keyedit.c:443
+#: g10/keyedit.c:449
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Imposs�vel editar esta chave: %s\n"
-#: g10/keyedit.c:448
+#: g10/keyedit.c:454
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2159,7 +2164,7 @@ msgstr ""
"Digite a nova frase para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:460
+#: g10/keyedit.c:466
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2167,466 +2172,472 @@ msgstr ""
"Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
"\n"
-#: g10/keyedit.c:463
+#: g10/keyedit.c:469
msgid "Do you really want to do this? "
msgstr "Voc� quer realmente fazer isso? "
-#: g10/keyedit.c:527
+#: g10/keyedit.c:533
msgid "moving a key signature to the correct place\n"
msgstr "a mover a assinatura da chave para o local correcto\n"
-#: g10/keyedit.c:568
+#: g10/keyedit.c:574
msgid "quit this menu"
msgstr "sair deste menu"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:575
msgid "q"
msgstr "q"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save"
msgstr "save"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save and quit"
msgstr "gravar e sair"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "help"
msgstr "help"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "show this help"
msgstr "mostra esta ajuda"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "show fingerprint"
msgstr "mostra impress�o digital"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list"
msgstr "list"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list key and user IDs"
msgstr "lista chave e identificadores de utilizadores"
-#: g10/keyedit.c:575
+#: g10/keyedit.c:581
msgid "l"
msgstr "l"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "select user ID N"
msgstr "seleciona ID de utilizador N"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "key"
msgstr "key"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "select secondary key N"
msgstr "seleciona chave secund�ria N"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "check"
msgstr "check"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "list signatures"
msgstr "lista assinaturas"
-#: g10/keyedit.c:579
+#: g10/keyedit.c:585
msgid "c"
msgstr "c"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign the key"
msgstr "assina a chave"
-#: g10/keyedit.c:581
+#: g10/keyedit.c:587
msgid "s"
msgstr "s"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "sign the key locally"
msgstr "assina a chave localmente"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:589
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "add a user ID"
msgstr "adiciona um novo ID de utilizador"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "delete user ID"
msgstr "remove ID de utilizador"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "add a secondary key"
msgstr "adiciona nova chave secund�ria"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delete a secondary key"
msgstr "remove uma chave secund�ria"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delete signatures"
msgstr "remove assinaturas"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "change the expire date"
msgstr "muda a data de validade"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "primary"
msgstr ""
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle between secret and public key listing"
msgstr "alterna entre listagem de chave secreta e p�blica"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:599
msgid "t"
msgstr "t"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:600
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:594 g10/keyedit.c:595
-msgid "list preferences"
+#: g10/keyedit.c:600
+#, fuzzy
+msgid "list preferences (expert)"
msgstr "lista prefer�ncias"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:601
#, fuzzy
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:601
+#, fuzzy
+msgid "list preferences (verbose)"
+msgstr "lista prefer�ncias"
+
+#: g10/keyedit.c:602
#, fuzzy
msgid "setpref"
msgstr "pref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:602
#, fuzzy
msgid "set preference list"
msgstr "lista prefer�ncias"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updpref"
msgstr "pref"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updated preferences"
msgstr "lista prefer�ncias"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "change the passphrase"
msgstr "muda a frase secreta"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "change the ownertrust"
msgstr "muda os valores de confian�a"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revoke signatures"
msgstr "revoga assinaturas"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revoke a secondary key"
msgstr "revoga uma chave secund�ria"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable a key"
msgstr "desactiva uma chave"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable a key"
msgstr "activa uma chave"
-#: g10/delkey.c:112 g10/keyedit.c:623
+#: g10/delkey.c:112 g10/keyedit.c:629
msgid "can't do that in batchmode\n"
msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
-#: g10/keyedit.c:658
+#: g10/keyedit.c:664
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: g10/keyedit.c:676
+#: g10/keyedit.c:682
msgid "Secret key is available.\n"
msgstr "Chave secreta dispon�vel.\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:712
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:737
+#: g10/keyedit.c:743
msgid "Need the secret key to do this.\n"
msgstr "A chave secreta � necess�ria para fazer isto.\n"
-#: g10/keyedit.c:741
+#: g10/keyedit.c:747
msgid "Please use the command \"toggle\" first.\n"
msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
-#: g10/keyedit.c:788
+#: g10/keyedit.c:794
msgid "Really sign all user IDs? "
msgstr "Realmente assinar todos os IDs de utilizador? "
-#: g10/keyedit.c:789
+#: g10/keyedit.c:795
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
-#: g10/keyedit.c:821 g10/keyedit.c:842
+#: g10/keyedit.c:827 g10/keyedit.c:848
msgid "You must select at least one user ID.\n"
msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:829
msgid "You can't delete the last user ID!\n"
msgstr "Voc� n�o pode remover o �ltimo ID de utilizador!\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:832
msgid "Really remove all selected user IDs? "
msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
-#: g10/keyedit.c:827
+#: g10/keyedit.c:833
msgid "Really remove this user ID? "
msgstr "Realmente remover este ID de utilizador? "
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:871 g10/keyedit.c:893
msgid "You must select at least one key.\n"
msgstr "Voc� deve selecionar pelo menos uma chave.\n"
-#: g10/keyedit.c:869
+#: g10/keyedit.c:875
msgid "Do you really want to delete the selected keys? "
msgstr "Voc� quer realmente remover as chaves selecionadas? "
-#: g10/keyedit.c:870
+#: g10/keyedit.c:876
msgid "Do you really want to delete this key? "
msgstr "Voc� quer realmente remover esta chave? "
-#: g10/keyedit.c:891
+#: g10/keyedit.c:897
msgid "Do you really want to revoke the selected keys? "
msgstr "Voc� quer realmente revogar as chaves selecionadas? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:898
msgid "Do you really want to revoke this key? "
msgstr "Voc� quer realmente revogar esta chave? "
-#: g10/keyedit.c:956
+#: g10/keyedit.c:962
#, fuzzy
msgid "Really update the preferences for the selected user IDs? "
msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
#, fuzzy
msgid "Really update the preferences? "
msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
-#: g10/keyedit.c:992
+#: g10/keyedit.c:998
msgid "Save changes? "
msgstr "Gravar altera��es? "
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1001
msgid "Quit without saving? "
msgstr "Sair sem gravar? "
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1012
#, c-format
msgid "update failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1019
#, c-format
msgid "update secret failed: %s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1026
msgid "Key not changed so no update needed.\n"
msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
-#: g10/keyedit.c:1031
+#: g10/keyedit.c:1037
msgid "Invalid command (try \"help\")\n"
msgstr "Comando inv�lido (tente \"help\")\n"
-#: g10/keyedit.c:1139 g10/keyedit.c:1165
+#: g10/keyedit.c:1145 g10/keyedit.c:1171
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr "%s%c %4u%c/%08lX criada: %s expira: %s"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1154
#, c-format
msgid " trust: %c/%c"
msgstr " confian�a: %c/%c"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1158
msgid "This key has been disabled"
msgstr "Esta chave foi desactivada"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1187
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! subchave foi revogada: %s\n"
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1190
msgid "rev- faked revocation found\n"
msgstr "rev- revoga��o falsa encontrada\n"
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1192
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? problema ao verificar revoga��o: %s\n"
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1408
msgid "Delete this good signature? (y/N/q)"
msgstr "Apagar esta assinatura v�lida? (s/N/q)"
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1412
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1416
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1422
msgid "Really delete this self-signature? (y/N)"
msgstr "Realmente remover esta auto-assinatura? (s/N)"
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d assinatura removida.\n"
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d assinaturas removidas.\n"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
msgid "Nothing deleted.\n"
msgstr "Nada removido.\n"
-#: g10/keyedit.c:1503
+#: g10/keyedit.c:1509
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor remova as selec��es das chaves secretas.\n"
-#: g10/keyedit.c:1509
+#: g10/keyedit.c:1515
msgid "Please select at most one secondary key.\n"
msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1519
msgid "Changing expiration time for a secondary key.\n"
msgstr "A modificar a data de validade para uma chave secund�ria.\n"
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1521
msgid "Changing expiration time for the primary key.\n"
msgstr "Modificar a data de validade para uma chave prim�ria.\n"
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1563
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1579
msgid "No corresponding signature in secret ring\n"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1662
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1837
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Nenhuma chave secund�ria com �ndice %d\n"
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:1981
msgid "user ID: \""
msgstr "ID de utilizador: \""
-#: g10/keyedit.c:1978
+#: g10/keyedit.c:1984
#, c-format
msgid ""
"\"\n"
@@ -2635,34 +2646,34 @@ msgstr ""
"\"\n"
"assinado com sua chave %08lX em %s\n"
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1988
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2012
msgid "You have signed these user IDs:\n"
msgstr "Assinou estes identificadores de utilizadores:\n"
-#: g10/keyedit.c:2020 g10/keyedit.c:2055
+#: g10/keyedit.c:2026 g10/keyedit.c:2061
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " assinado por %08lX em %s\n"
-#: g10/keyedit.c:2025
+#: g10/keyedit.c:2031
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " revogado por %08lX em %s\n"
-#: g10/keyedit.c:2045
+#: g10/keyedit.c:2051
msgid "You are about to revoke these signatures:\n"
msgstr "Est� prestes a revogar estas assinaturas:\n"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:2069
msgid "Really create the revocation certificates? (y/N)"
msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2098
msgid "no secret key\n"
msgstr "nenhuma chave secreta\n"
@@ -2843,37 +2854,37 @@ msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
-#: g10/passphrase.c:277 g10/passphrase.c:319
+#: g10/passphrase.c:278 g10/passphrase.c:320
msgid "gpg-agent is not available in this session\n"
msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
-#: g10/passphrase.c:285
+#: g10/passphrase.c:286
msgid "can't set client pid for the agent\n"
msgstr ""
-#: g10/passphrase.c:293
+#: g10/passphrase.c:294
msgid "can't get server read FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:300
+#: g10/passphrase.c:301
msgid "can't get server write FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:325
+#: g10/passphrase.c:326
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
-#: g10/hkp.c:174 g10/passphrase.c:344
+#: g10/hkp.c:174 g10/passphrase.c:345
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "imposs�vel ligar a `%s': %s\n"
-#: g10/passphrase.c:415 g10/passphrase.c:677
+#: g10/passphrase.c:417 g10/passphrase.c:679
#, c-format
msgid " (main key ID %08lX)"
msgstr " (ID principal da chave %08lX)"
-#: g10/passphrase.c:425
+#: g10/passphrase.c:427
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -2886,32 +2897,32 @@ msgstr ""
"\"%.*s\"\n"
"chave %u bits %s, ID %08lx, criada %s%s\n"
-#: g10/passphrase.c:446
+#: g10/passphrase.c:448
msgid "Enter passphrase\n"
msgstr "Insira a frase secreta\n"
-#: g10/passphrase.c:448
+#: g10/passphrase.c:450
msgid "Repeat passphrase\n"
msgstr "Repita a frase secreta\n"
-#: g10/passphrase.c:483
+#: g10/passphrase.c:485
msgid "passphrase too long\n"
msgstr "frase secreta demasiado longa\n"
-#: g10/passphrase.c:495
+#: g10/passphrase.c:497
msgid "invalid response from agent\n"
msgstr "resposta do agente inv�lida\n"
-#: g10/passphrase.c:504
+#: g10/passphrase.c:506
msgid "cancelled by user\n"
msgstr "cancelado pelo utilizador\n"
-#: g10/passphrase.c:507 g10/passphrase.c:580
+#: g10/passphrase.c:509 g10/passphrase.c:582
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "problema com o agente: o agente returnou 0x%lx\n"
-#: g10/passphrase.c:663
+#: g10/passphrase.c:665
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -2921,20 +2932,20 @@ msgstr ""
"Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
"utilizador: \""
-#: g10/passphrase.c:672
+#: g10/passphrase.c:674
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
-#: g10/passphrase.c:710
+#: g10/passphrase.c:712
msgid "can't query password in batchmode\n"
msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:716
msgid "Enter passphrase: "
msgstr "Digite a frase secreta: "
-#: g10/passphrase.c:718
+#: g10/passphrase.c:720
msgid "Repeat passphrase: "
msgstr "Repita a frase secreta: "
@@ -3156,7 +3167,7 @@ msgstr "%s: imposs�vel criar tranca\n"
msgid "%s: can't make lock\n"
msgstr "%s: imposs�vel criar tranca\n"
-#: g10/keyring.c:1376 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
+#: g10/keyring.c:1420 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: imposs�vel criar: %s\n"
@@ -3295,22 +3306,32 @@ msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "base de dados de confian�a: sincroniza��o falhou: %s\n"
-#: g10/trustdb.c:688
+#: g10/trustdb.c:470
+#, fuzzy
+msgid "no need for a trustdb check\n"
+msgstr "%s: n�o � um base de dados de confian�a\n"
+
+#: g10/trustdb.c:476 g10/trustdb.c:1458
+#, fuzzy, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "base de dados de confian�a rec %lu: lseek falhou: %s\n"
+
+#: g10/trustdb.c:709
#, fuzzy
msgid "checking the trustdb\n"
msgstr "muda os valores de confian�a"
-#: g10/trustdb.c:839
+#: g10/trustdb.c:860
#, fuzzy, c-format
msgid "public key %08lX not found: %s\n"
msgstr "chave p�blica n�o encontrada"
-#: g10/trustdb.c:1304
+#: g10/trustdb.c:1338
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr ""
-#: g10/trustdb.c:1374
+#: g10/trustdb.c:1411
#, c-format
msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
msgstr ""
@@ -3724,60 +3745,60 @@ msgstr "Nenhuma ajuda dispon�vel"
msgid "No help available for `%s'"
msgstr "Nenhuma ajuda dispon�vel para `%s'"
-#: g10/keydb.c:170
+#: g10/keydb.c:175
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
-#: g10/keydb.c:179
+#: g10/keydb.c:184
#, c-format
msgid "changing permission of `%s' failed: %s\n"
msgstr ""
-#: g10/keydb.c:188
+#: g10/keydb.c:193
#, fuzzy, c-format
msgid "keyring `%s' created\n"
msgstr "%s: porta-chaves criado\n"
-#: g10/keydb.c:530
+#: g10/keydb.c:586
#, fuzzy, c-format
-msgid "failed to rebuild all keyring caches: %s\n"
+msgid "failed to rebuild keyring cache: %s\n"
msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
-#: g10/keyring.c:1179
+#: g10/keyring.c:1220
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr "AVISO: existem 2 ficheiros com informa��es confidenciais.\n"
-#: g10/keyring.c:1181
+#: g10/keyring.c:1222
#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s � o n�o modificado\n"
-#: g10/keyring.c:1182
+#: g10/keyring.c:1223
#, c-format
msgid "%s is the new one\n"
msgstr "%s � o novo\n"
-#: g10/keyring.c:1183
+#: g10/keyring.c:1224
msgid "Please fix this possible security flaw\n"
msgstr "Por favor conserte esta poss�vel falha de seguran�a\n"
-#: g10/keyring.c:1281
+#: g10/keyring.c:1322
#, fuzzy, c-format
msgid "checking keyring `%s'\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
-#: g10/keyring.c:1312
+#: g10/keyring.c:1353
#, fuzzy, c-format
msgid "%lu keys so far checked (%lu signatures)\n"
msgstr "%lu chaves processadas at� agora\n"
-#: g10/keyring.c:1323
+#: g10/keyring.c:1364
#, fuzzy, c-format
msgid "%lu keys checked (%lu signatures)\n"
msgstr "listar as chaves e as assinaturas"
-#: g10/keyring.c:1381
+#: g10/keyring.c:1425
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: porta-chaves criado\n"
diff --git a/po/sv.po b/po/sv.po
index ff1c0245d..42dbe01c2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2001-09-28 16:20+0200\n"
+"POT-Creation-Date: 2001-10-23 09:41+0200\n"
"PO-Revision-Date: 2000-04-23 16:43+02:00\n"
"Last-Translator: Daniel Resare <[email protected]>\n"
"Language-Team: Swedish <[email protected]>\n"
@@ -49,7 +49,7 @@ msgstr "nej"
msgid "nN"
msgstr "nN"
-#: g10/keyedit.c:568 util/miscutil.c:326
+#: g10/keyedit.c:574 util/miscutil.c:326
msgid "quit"
msgstr "avsluta"
@@ -357,7 +357,7 @@ msgstr ""
"en stund f�r att ge operativsystemet en chans att samla mer entropi!\n"
"(Beh�ver %d fler byte)\n"
-#: g10/g10.c:237
+#: g10/g10.c:238
msgid ""
"@Commands:\n"
" "
@@ -365,145 +365,145 @@ msgstr ""
"@Kommandon:\n"
" "
-#: g10/g10.c:239
+#: g10/g10.c:240
msgid "|[file]|make a signature"
msgstr "|[fil]|skapa en signatur"
-#: g10/g10.c:240
+#: g10/g10.c:241
msgid "|[file]|make a clear text signature"
msgstr "|[fil]|skapa en klartext-signatur"
-#: g10/g10.c:241
+#: g10/g10.c:242
msgid "make a detached signature"
msgstr "skapa en signatur i en separat fil"
-#: g10/g10.c:242
+#: g10/g10.c:243
msgid "encrypt data"
msgstr "kryptera data"
-#: g10/g10.c:243
+#: g10/g10.c:244
msgid "encryption only with symmetric cipher"
msgstr "endast kryptering med symmetriskt chiffer"
-#: g10/g10.c:244
+#: g10/g10.c:245
msgid "store only"
msgstr "endast lagring"
-#: g10/g10.c:245
+#: g10/g10.c:246
msgid "decrypt data (default)"
msgstr "dekryptera data (normall�ge)"
-#: g10/g10.c:246
+#: g10/g10.c:247
msgid "verify a signature"
msgstr "verifiera en signatur"
-#: g10/g10.c:248
+#: g10/g10.c:249
msgid "list keys"
msgstr "r�kna upp nycklar"
-#: g10/g10.c:250
+#: g10/g10.c:251
msgid "list keys and signatures"
msgstr "r�kna upp nycklar och signaturer"
-#: g10/g10.c:251
+#: g10/g10.c:252
msgid "check key signatures"
msgstr "verifiera nyckelsignaturer"
-#: g10/g10.c:252
+#: g10/g10.c:253
msgid "list keys and fingerprints"
msgstr "r�kna upp nycklar och fingeravtryck"
-#: g10/g10.c:253
+#: g10/g10.c:254
msgid "list secret keys"
msgstr "r�kna upp hemliga nycklar"
-#: g10/g10.c:254
+#: g10/g10.c:255
msgid "generate a new key pair"
msgstr "generera ett nytt nyckelpar"
-#: g10/g10.c:255
+#: g10/g10.c:256
msgid "remove key from the public keyring"
msgstr "ta bort en nyckel fr�n den publika nyckelringen"
-#: g10/g10.c:257
+#: g10/g10.c:258
msgid "remove key from the secret keyring"
msgstr "ta bort en nyckel fr�n den hemliga nyckelringen"
-#: g10/g10.c:258
+#: g10/g10.c:259
msgid "sign a key"
msgstr "signera en nyckel"
-#: g10/g10.c:259
+#: g10/g10.c:260
msgid "sign a key locally"
msgstr "signera en nyckel lokalt"
-#: g10/g10.c:260
+#: g10/g10.c:261
msgid "sign or edit a key"
msgstr "signera eller redigera en nyckel"
-#: g10/g10.c:261
+#: g10/g10.c:262
msgid "generate a revocation certificate"
msgstr "generera ett �terkallelesecertifikat"
-#: g10/g10.c:262
+#: g10/g10.c:263
msgid "export keys"
msgstr "exportera nycklar"
-#: g10/g10.c:263
+#: g10/g10.c:264
msgid "export keys to a key server"
msgstr "exportera nycklar till en nyckelserver"
-#: g10/g10.c:264
+#: g10/g10.c:265
msgid "import keys from a key server"
msgstr "importera nycklar fr�n en nyckelserver"
-#: g10/g10.c:266
+#: g10/g10.c:267
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "importera nycklar fr�n en nyckelserver"
-#: g10/g10.c:270
+#: g10/g10.c:271
msgid "import/merge keys"
msgstr "importera/sl� ihop nycklar"
-#: g10/g10.c:272
+#: g10/g10.c:273
msgid "list only the sequence of packets"
msgstr "skriv endast ut paketsekvensen"
-#: g10/g10.c:274
+#: g10/g10.c:275
msgid "export the ownertrust values"
msgstr "exportera de v�rden som representerar �gartillit"
-#: g10/g10.c:276
+#: g10/g10.c:277
msgid "import ownertrust values"
msgstr "importera v�rden som representerar �gartillit"
-#: g10/g10.c:278
+#: g10/g10.c:279
msgid "update the trust database"
msgstr "uppdatera tillitsdatabasen"
-#: g10/g10.c:280
+#: g10/g10.c:281
#, fuzzy
msgid "unattended trust database update"
msgstr "uppdatera tillitsdatabasen"
-#: g10/g10.c:281
+#: g10/g10.c:282
msgid "fix a corrupted trust database"
msgstr "reparera en korrupt tillitsdatabas"
-#: g10/g10.c:282
+#: g10/g10.c:283
msgid "De-Armor a file or stdin"
msgstr "Skala av en fil eller standard in"
-#: g10/g10.c:284
+#: g10/g10.c:285
msgid "En-Armor a file or stdin"
msgstr "Skapa ett skal f�r en fil eller standard in"
-#: g10/g10.c:286
+#: g10/g10.c:287
msgid "|algo [files]|print message digests"
msgstr "|algo [filer]|skriv ut kontrollsummor"
-#: g10/g10.c:290
+#: g10/g10.c:291
msgid ""
"@\n"
"Options:\n"
@@ -513,161 +513,166 @@ msgstr ""
"Flaggor:\n"
" "
-#: g10/g10.c:292
+#: g10/g10.c:293
msgid "create ascii armored output"
msgstr "skapa utdata med ett ascii-skal"
-#: g10/g10.c:294
+#: g10/g10.c:295
msgid "|NAME|encrypt for NAME"
msgstr "|NAMN|kryptera f�r NAMN"
-#: g10/g10.c:297
+#: g10/g10.c:298
msgid "|NAME|use NAME as default recipient"
msgstr "|NAMN|anv�nd NAMN som standardv�rdet f�r mottagare"
-#: g10/g10.c:299
+#: g10/g10.c:300
msgid "use the default key as default recipient"
msgstr "anv�nd standardnyckeln som standardmottagare"
-#: g10/g10.c:303
+#: g10/g10.c:304
msgid "use this user-id to sign or decrypt"
msgstr "anv�nd denna anv�ndaridentitet f�r att signera eller dekryptera"
-#: g10/g10.c:304
+#: g10/g10.c:305
msgid "|N|set compress level N (0 disables)"
msgstr "|N|s�tt kompressionsniv�n till N (0 f�r att sl� av kompression)"
-#: g10/g10.c:306
+#: g10/g10.c:307
msgid "use canonical text mode"
msgstr "anv�nd \"ursprunglig text\"-l�get"
-#: g10/g10.c:307
+#: g10/g10.c:308
msgid "use as output file"
msgstr "anv�nd som fil f�r utdata"
-#: g10/g10.c:308
+#: g10/g10.c:309
msgid "verbose"
msgstr "utf�rlig"
-#: g10/g10.c:309
+#: g10/g10.c:310
msgid "be somewhat more quiet"
msgstr "var n�got tystare"
-#: g10/g10.c:310
+#: g10/g10.c:311
msgid "don't use the terminal at all"
msgstr "anv�nd inte terminalen alls"
-#: g10/g10.c:311
+#: g10/g10.c:312
msgid "force v3 signatures"
msgstr "anv�nd v3-signaturer"
-#: g10/g10.c:312
+#: g10/g10.c:313
+#, fuzzy
+msgid "do not force v3 signatures"
+msgstr "anv�nd v3-signaturer"
+
+#: g10/g10.c:314
msgid "always use a MDC for encryption"
msgstr "anv�nd alltid en MDC f�r kryptering"
-#: g10/g10.c:313
+#: g10/g10.c:315
msgid "do not make any changes"
msgstr "g�r inga �ndringar"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:315
+#: g10/g10.c:317
msgid "use the gpg-agent"
msgstr ""
-#: g10/g10.c:316
+#: g10/g10.c:318
msgid "batch mode: never ask"
msgstr "batch-l�ge: fr�ga aldrig"
-#: g10/g10.c:317
+#: g10/g10.c:319
msgid "assume yes on most questions"
msgstr "anta att svaret �r ja p� de flesta fr�gor"
-#: g10/g10.c:318
+#: g10/g10.c:320
msgid "assume no on most questions"
msgstr "anta att svaret �r nej p� de flesta fr�gor"
-#: g10/g10.c:319
+#: g10/g10.c:321
msgid "add this keyring to the list of keyrings"
msgstr "l�gg till denna nyckelring till listan av nyckelringar"
-#: g10/g10.c:320
+#: g10/g10.c:322
msgid "add this secret keyring to the list"
msgstr "l�gg till denna hemliga nyckelring till listan"
-#: g10/g10.c:321
+#: g10/g10.c:323
msgid "|NAME|use NAME as default secret key"
msgstr "|NAMN|anv�nd NAMN som f�rvald hemlig nyckel"
-#: g10/g10.c:322
+#: g10/g10.c:324
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|V�RD|anv�nd denna nyckelserver f�r att sl� upp nycklar"
-#: g10/g10.c:323
+#: g10/g10.c:325
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAMN|s�tt teckentabellen f�r terminalen till NAMN"
-#: g10/g10.c:324
+#: g10/g10.c:326
msgid "read options from file"
msgstr "l�s flaggor fr�n fil"
-#: g10/g10.c:328
+#: g10/g10.c:330
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinformation till denna FD"
-#: g10/g10.c:330
+#: g10/g10.c:332
#, fuzzy
msgid "|[file]|write status info to file"
msgstr "|FD|skriv statusinformation till denna FD"
-#: g10/g10.c:336
+#: g10/g10.c:338
msgid "|KEYID|ultimately trust this key"
msgstr ""
-#: g10/g10.c:337
+#: g10/g10.c:339
msgid "|FILE|load extension module FILE"
msgstr "|FIL|ladda till�ggsmodul FIL"
-#: g10/g10.c:338
+#: g10/g10.c:340
msgid "emulate the mode described in RFC1991"
msgstr "imitera l�get som beskrivs i RFC1991"
-#: g10/g10.c:339
+#: g10/g10.c:341
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "st�ll om alla flaggor s� att gpg f�ljer OpenPGP-standarden"
-#: g10/g10.c:340
+#: g10/g10.c:342
msgid "|N|use passphrase mode N"
msgstr "|N|anv�nd l�senordsl�get N"
-#: g10/g10.c:342
+#: g10/g10.c:344
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN f�r l�senordsfraser"
-#: g10/g10.c:344
+#: g10/g10.c:346
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NAMN|anv�nd chifferalgoritmen NAMN f�r l�senordsfraser"
-#: g10/g10.c:345
+#: g10/g10.c:347
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAMN|anv�nd chifferalgoritmen NAMN"
-#: g10/g10.c:346
+#: g10/g10.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN"
-#: g10/g10.c:347
+#: g10/g10.c:349
msgid "|N|use compress algorithm N"
msgstr "|N|anv�nd komprimeringsalgoritmen N"
-#: g10/g10.c:348
+#: g10/g10.c:350
msgid "throw keyid field of encrypted packets"
msgstr "sl�ng bort nyckelidentitetsf�ltet fr�n krypterade paket"
-#: g10/g10.c:349
+#: g10/g10.c:351
msgid "|NAME=VALUE|use this notation data"
msgstr "|NAMN=V�RDE|anv�nd detta s�tt f�r att beskriva data"
-#: g10/g10.c:352
+#: g10/g10.c:354
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -675,7 +680,7 @@ msgstr ""
"@\n"
"(Se manualsidan f�r en komplett lista p� alla kommandon och flaggor)\n"
-#: g10/g10.c:355
+#: g10/g10.c:357
msgid ""
"@\n"
"Examples:\n"
@@ -695,17 +700,17 @@ msgstr ""
"--list-keys [namn] visa nycklar\n"
"--fingerprint [namn] visa fingeravtryck\n"
-#: g10/g10.c:478
+#: g10/g10.c:480
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Rapportera g�rna fel till <[email protected]>.\n"
"Rapportera g�rna fel eller synpunkter p� �vers�ttningen till <[email protected]>.\n"
-#: g10/g10.c:482
+#: g10/g10.c:484
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Anv�ndning: gpg [flaggor] [filer] (-h f�r hj�lp)"
-#: g10/g10.c:485
+#: g10/g10.c:487
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -715,7 +720,7 @@ msgstr ""
"signera, kontrollera, kryptera eller dekryptera\n"
"vilken operation som utf�rs beror p� programmets indata\n"
-#: g10/g10.c:496
+#: g10/g10.c:498
msgid ""
"\n"
"Supported algorithms:\n"
@@ -723,66 +728,66 @@ msgstr ""
"\n"
"St�dda algoritmer:\n"
-#: g10/g10.c:570
+#: g10/g10.c:572
msgid "usage: gpg [options] "
msgstr "anv�ndning: gpg [flaggor] "
-#: g10/g10.c:627
+#: g10/g10.c:629
msgid "conflicting commands\n"
msgstr "motstridiga kommandon\n"
-#: g10/g10.c:783
+#: g10/g10.c:785
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTERA: inst�llningsfilen \"%s\" saknas\n"
-#: g10/g10.c:787
+#: g10/g10.c:789
#, c-format
msgid "option file `%s': %s\n"
msgstr "inst�llningsfil \"%s\": %s\n"
-#: g10/g10.c:794
+#: g10/g10.c:796
#, c-format
msgid "reading options from `%s'\n"
msgstr "l�ser flaggor fr�n \"%s\"\n"
-#: g10/g10.c:1038
+#: g10/g10.c:1041
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s �r ingen giltig teckentabell\n"
-#: g10/g10.c:1122
+#: g10/g10.c:1125
msgid "WARNING: program may create a core file!\n"
msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
-#: g10/g10.c:1126 g10/g10.c:1135
+#: g10/g10.c:1129 g10/g10.c:1138
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTERA: %s �r inte f�r normal anv�ndning!\n"
-#: g10/g10.c:1128
+#: g10/g10.c:1131
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s �r inte till�ten tillsammans med %s!\n"
-#: g10/g10.c:1131
+#: g10/g10.c:1134
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "det �r ingen po�ng att anv�nda %s tillsammans med %s!\n"
-#: g10/g10.c:1151 g10/g10.c:1163
+#: g10/g10.c:1154 g10/g10.c:1166
msgid "selected cipher algorithm is invalid\n"
msgstr "den valda chifferalgoritmen �r ogiltig\n"
-#: g10/g10.c:1157 g10/g10.c:1169
+#: g10/g10.c:1160 g10/g10.c:1172
msgid "selected digest algorithm is invalid\n"
msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1176
msgid "the given policy URL is invalid\n"
msgstr "angiven URL �r ogiltig\n"
-#: g10/g10.c:1176
+#: g10/g10.c:1179
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
@@ -793,142 +798,142 @@ msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
# �r �nd� litet. Eventuellt borde meddelandena inte alls
# �vers�ttas f�r att g�ra eventuell fels�kning l�ttare
# f�r internationella fels�kare
-#: g10/g10.c:1178
+#: g10/g10.c:1181
msgid "completes-needed must be greater than 0\n"
msgstr "variabeln \"completes-needed\" m�ste ha ett v�rde som �r st�rre �n 0\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1183
msgid "marginals-needed must be greater than 1\n"
msgstr "variabeln \"marginals-needed\" m�ste vara st�rre �n 1\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1185
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "variabeln \"max-cert-depth\" m�ste ha ett v�rde mellan 1 och 255\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1188
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTERA: enkelt S2K-l�ge (0) rekommenderas inte\n"
-#: g10/g10.c:1189
+#: g10/g10.c:1192
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ogiltigt S2K-l�ge; m�ste vara 0, 1 eller 3\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1196
#, fuzzy
msgid "invalid preferences\n"
msgstr "skriv ut inst�llningar"
-#: g10/g10.c:1276
+#: g10/g10.c:1279
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
-#: g10/g10.c:1282
+#: g10/g10.c:1285
msgid "--store [filename]"
msgstr "--store [filnamn]"
-#: g10/g10.c:1289
+#: g10/g10.c:1292
msgid "--symmetric [filename]"
msgstr "--symmetric [filnamn]"
-#: g10/g10.c:1297
+#: g10/g10.c:1300
msgid "--encrypt [filename]"
msgstr "--encrypt [filnamn]"
-#: g10/g10.c:1310
+#: g10/g10.c:1313
msgid "--sign [filename]"
msgstr "--sign [filnamn]"
-#: g10/g10.c:1323
+#: g10/g10.c:1326
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnamn]"
-#: g10/g10.c:1337
+#: g10/g10.c:1340
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [filnamn]"
-#: g10/g10.c:1346
+#: g10/g10.c:1349
msgid "--clearsign [filename]"
msgstr "--clearsign [filnamn]"
-#: g10/g10.c:1364
+#: g10/g10.c:1367
msgid "--decrypt [filename]"
msgstr "--decrypt [filnamn]"
-#: g10/g10.c:1372
+#: g10/g10.c:1375
msgid "--sign-key user-id"
msgstr "--sign-key anv�ndaridentitet"
-#: g10/g10.c:1380
+#: g10/g10.c:1383
msgid "--lsign-key user-id"
msgstr "--lsign-key anv�ndaridentitet"
-#: g10/g10.c:1388
+#: g10/g10.c:1391
msgid "--edit-key user-id [commands]"
msgstr "--edit-key anv�ndaridentitet [kommandon]"
-#: g10/g10.c:1404
+#: g10/g10.c:1407
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key anv�ndaridentitet"
-#: g10/g10.c:1407
+#: g10/g10.c:1410
msgid "--delete-key user-id"
msgstr "--delete-key anv�ndaridentitet"
-#: g10/g10.c:1415
+#: g10/g10.c:1418
#, fuzzy
msgid "--delete-secret-and-public-key user-id"
msgstr "--delete-secret-and-public-key anv�ndaridentitet"
# Filnamn b�de med och utan fnuttar finns. lite ologiskt. Vill n�gon
# fixa en patch?
-#: g10/encode.c:268 g10/g10.c:1452 g10/sign.c:632
+#: g10/encode.c:268 g10/g10.c:1455 g10/sign.c:632
#, c-format
msgid "can't open %s: %s\n"
msgstr "kan inte �ppna %s: %s\n"
-#: g10/g10.c:1467
+#: g10/g10.c:1470
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [anv�ndaridentitet] [nyckelring]"
-#: g10/g10.c:1539
+#: g10/g10.c:1542
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "misslyckades med att ta bort skalet: %s\n"
-#: g10/g10.c:1547
+#: g10/g10.c:1550
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "misslyckades med att skapa skal: %s\n"
-#: g10/g10.c:1618
+#: g10/g10.c:1621
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "felaktig hash-algoritm \"%s\"\n"
-#: g10/g10.c:1704
+#: g10/g10.c:1707
msgid "[filename]"
msgstr "[filnamn]"
-#: g10/g10.c:1708
+#: g10/g10.c:1711
msgid "Go ahead and type your message ...\n"
msgstr "Skriv ditt meddelande h�r ...\n"
# se f�rra kommentaren
-#: g10/decrypt.c:59 g10/g10.c:1711 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1714 g10/verify.c:94 g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "kan inte �ppna \"%s\"\n"
-#: g10/g10.c:1920
+#: g10/g10.c:1923
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"det f�rsta tecknet i ett notationsnamn m�ste vara en bokstav eller\n"
"ett understrykningstecken (_)\n"
-#: g10/g10.c:1926
+#: g10/g10.c:1929
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -936,11 +941,11 @@ msgstr ""
"ett notationsnamn kan bara inneh�lla bokst�ver, siffror, punkter eller\n"
"understrykningstecken och sluta med ett likhetstecken\n"
-#: g10/g10.c:1932
+#: g10/g10.c:1935
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr "punkter i ett notationsnamn m�ste vara omgivna av andra tecken\n"
-#: g10/g10.c:1940
+#: g10/g10.c:1943
msgid "a notation value must not use any control characters\n"
msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
@@ -1602,7 +1607,7 @@ msgstr ""
"Du beh�ver en l�senordsfras f�r att skydda din hemliga nyckel\n"
"\n"
-#: g10/keyedit.c:456 g10/keygen.c:1171
+#: g10/keyedit.c:462 g10/keygen.c:1171
msgid "passphrase not correctly repeated; try again.\n"
msgstr "l�senordsfrasen upprepades ej korrekt; f�rs�k igen.\n"
@@ -1741,27 +1746,27 @@ msgstr "l�ser fr�n \"%s\"\n"
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s krypterad f�r: %s\n"
-#: g10/delkey.c:69 g10/export.c:149
+#: g10/delkey.c:69 g10/export.c:148
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "anv�ndaren \"%s\" hittades inte: %s\n"
-#: g10/delkey.c:77 g10/export.c:159
+#: g10/delkey.c:77 g10/export.c:158
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
msgstr "fel vid l�sning av \"%s\": %s\n"
-#: g10/export.c:167
+#: g10/export.c:166
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "nyckeln %08lX f�ljer inte standarden RFC2440 - �verhoppad\n"
-#: g10/export.c:178
+#: g10/export.c:177
#, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "nyckeln %08lX �r inte skyddad - �verhoppad\n"
-#: g10/export.c:234
+#: g10/export.c:233
msgid "WARNING: nothing exported\n"
msgstr "VARNING: exporterade ingenting\n"
@@ -1771,17 +1776,17 @@ msgstr "f�r m�nga poster i pk-cachen - inaktiverad\n"
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:183 g10/getkey.c:2188
+#: g10/getkey.c:183 g10/getkey.c:2192
#, fuzzy
msgid "[User id not found]"
msgstr "[hittade inte anv�ndaren]"
-#: g10/getkey.c:1911
+#: g10/getkey.c:1915
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "anv�nder sekund�ra nyckeln %08lX ist�llet f�r prim�rnyckeln %08lX\n"
-#: g10/getkey.c:1952
+#: g10/getkey.c:1956
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "nyckel %08lX: hemlig nyckel utan publik nyckel - hoppade �ver\n"
@@ -2114,17 +2119,17 @@ msgstr "%d anv�ndaridentiteter utan giltig sj�lvsignatur hittades\n"
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:296
+#: g10/keyedit.c:302
#, c-format
msgid "Already signed by key %08lX\n"
msgstr "Redan signerad av nyckeln %08lX\n"
-#: g10/keyedit.c:307
+#: g10/keyedit.c:313
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "Det finns inget att signera med nyckeln %08lX\n"
-#: g10/keyedit.c:316
+#: g10/keyedit.c:322
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2132,7 +2137,7 @@ msgstr ""
"�r du verkligen s�ker p� att du vill signera denna nyckel\n"
"med din nyckel: \""
-#: g10/keyedit.c:325
+#: g10/keyedit.c:331
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
@@ -2140,33 +2145,33 @@ msgstr ""
"Signaturen kommer att markeras som icke exporterbar.\n"
"\n"
-#: g10/keyedit.c:330
+#: g10/keyedit.c:336
msgid "Really sign? "
msgstr "Vill du verkligen signera? "
-#: g10/keyedit.c:361 g10/keyedit.c:2104 g10/keyedit.c:2166 g10/sign.c:225
+#: g10/keyedit.c:367 g10/keyedit.c:2110 g10/keyedit.c:2172 g10/sign.c:225
#, c-format
msgid "signing failed: %s\n"
msgstr "signeringen misslyckades: %s\n"
-#: g10/keyedit.c:415
+#: g10/keyedit.c:421
msgid "This key is not protected.\n"
msgstr "Denna nyckel �r inte skyddad.\n"
-#: g10/keyedit.c:419
+#: g10/keyedit.c:425
msgid "Secret parts of primary key are not available.\n"
msgstr "De hemliga delarna av den prim�ra nyckeln �r inte tillg�ngliga.\n"
-#: g10/keyedit.c:423
+#: g10/keyedit.c:429
msgid "Key is protected.\n"
msgstr "Nyckeln �r skyddad.\n"
-#: g10/keyedit.c:443
+#: g10/keyedit.c:449
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Kan inte redigera denna nyckel: %s\n"
-#: g10/keyedit.c:448
+#: g10/keyedit.c:454
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2174,7 +2179,7 @@ msgstr ""
"Skriv in den nya l�senordsfrasen f�r denna hemliga nyckel.\n"
"\n"
-#: g10/keyedit.c:460
+#: g10/keyedit.c:466
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2182,470 +2187,476 @@ msgstr ""
"Du vill inte ha n�gon l�senordsfras - detta �r sannolikt en d�lig id�!\n"
"\n"
-#: g10/keyedit.c:463
+#: g10/keyedit.c:469
msgid "Do you really want to do this? "
msgstr "Vill du verkligen g�ra detta? "
-#: g10/keyedit.c:527
+#: g10/keyedit.c:533
msgid "moving a key signature to the correct place\n"
msgstr "flyttar en nyckelsignatur till den r�tta platsen\n"
-#: g10/keyedit.c:568
+#: g10/keyedit.c:574
msgid "quit this menu"
msgstr "avsluta denna meny"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:575
msgid "q"
msgstr "q"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save"
msgstr "save"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save and quit"
msgstr "spara och avsluta"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "help"
msgstr "help"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "show this help"
msgstr "visa denna hj�lp"
# skall dessa �vers�ttas?
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "show fingerprint"
msgstr "visa fingeravtryck"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list"
msgstr "list"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list key and user IDs"
msgstr "r�kna upp nycklar och anv�ndaridentiteter"
-#: g10/keyedit.c:575
+#: g10/keyedit.c:581
msgid "l"
msgstr "l"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "select user ID N"
msgstr "v�lj anv�ndaridentitet N"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "key"
msgstr "key"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "select secondary key N"
msgstr "v�lj sekund�r nyckel N"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "check"
msgstr "check"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "list signatures"
msgstr "r�kna upp signaturer"
-#: g10/keyedit.c:579
+#: g10/keyedit.c:585
msgid "c"
msgstr "c"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign the key"
msgstr "signera nyckeln"
-#: g10/keyedit.c:581
+#: g10/keyedit.c:587
msgid "s"
msgstr "s"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "sign the key locally"
msgstr "signera nyckeln lokalt"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:589
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "add a user ID"
msgstr "l�gg till en anv�ndaridentitet"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "delete user ID"
msgstr "ta bort en anv�ndaridentitet"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "add a secondary key"
msgstr "l�gg till en sekund�r nyckel"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delete a secondary key"
msgstr "ta bort en sekund�r nyckel"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delete signatures"
msgstr "ta bort signaturer"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "change the expire date"
msgstr "�ndra utg�ngsdatum"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "primary"
msgstr ""
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle between secret and public key listing"
msgstr "hoppa mellan utskrift av hemliga och publika nycklar"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:599
msgid "t"
msgstr "t"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:600
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:594 g10/keyedit.c:595
-msgid "list preferences"
+#: g10/keyedit.c:600
+#, fuzzy
+msgid "list preferences (expert)"
msgstr "skriv ut inst�llningar"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:601
#, fuzzy
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:601
+#, fuzzy
+msgid "list preferences (verbose)"
+msgstr "skriv ut inst�llningar"
+
+#: g10/keyedit.c:602
#, fuzzy
msgid "setpref"
msgstr "pref"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:602
#, fuzzy
msgid "set preference list"
msgstr "skriv ut inst�llningar"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updpref"
msgstr "pref"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updated preferences"
msgstr "skriv ut inst�llningar"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "change the passphrase"
msgstr "�ndra l�senordsfrasen"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "trust"
msgstr "trust"
# originalet borde ha ett value
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "change the ownertrust"
msgstr "�ndra �gartillitsv�rdet"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revoke signatures"
msgstr "�terkalla signaturer"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revoke a secondary key"
msgstr "�terkalla en sekund�r nyckel"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable a key"
msgstr "deaktivera en nyckel"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable a key"
msgstr "aktivera en nyckel"
-#: g10/delkey.c:112 g10/keyedit.c:623
+#: g10/delkey.c:112 g10/keyedit.c:629
msgid "can't do that in batchmode\n"
msgstr "kan ej g�ra detta i batch-l�ge\n"
-#: g10/keyedit.c:658
+#: g10/keyedit.c:664
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "fel vid l�sning av \"%s\": %s\n"
-#: g10/keyedit.c:676
+#: g10/keyedit.c:682
msgid "Secret key is available.\n"
msgstr "Den hemliga nyckeln finns tillg�nglig.\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:712
msgid "Command> "
msgstr "Kommando> "
-#: g10/keyedit.c:737
+#: g10/keyedit.c:743
msgid "Need the secret key to do this.\n"
msgstr "Den hemliga nyckeln beh�vs f�r att g�ra detta.\n"
-#: g10/keyedit.c:741
+#: g10/keyedit.c:747
msgid "Please use the command \"toggle\" first.\n"
msgstr "Anv�nd kommandot \"toggle\" f�rst.\n"
-#: g10/keyedit.c:788
+#: g10/keyedit.c:794
msgid "Really sign all user IDs? "
msgstr "Vill du verkligen signera alla anv�ndaridentiteter? "
-#: g10/keyedit.c:789
+#: g10/keyedit.c:795
msgid "Hint: Select the user IDs to sign\n"
msgstr "Tips: V�lj det anv�ndarid du vill signera\n"
-#: g10/keyedit.c:821 g10/keyedit.c:842
+#: g10/keyedit.c:827 g10/keyedit.c:848
msgid "You must select at least one user ID.\n"
msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:829
msgid "You can't delete the last user ID!\n"
msgstr "Du kan inte ta bort den sista anv�ndaridentiteten!\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:832
msgid "Really remove all selected user IDs? "
msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
-#: g10/keyedit.c:827
+#: g10/keyedit.c:833
msgid "Really remove this user ID? "
msgstr "Vill du verkligen ta bort denna anv�ndaridentitet? "
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:871 g10/keyedit.c:893
msgid "You must select at least one key.\n"
msgstr "Du m�ste v�lja �tminstone en nyckel.\n"
-#: g10/keyedit.c:869
+#: g10/keyedit.c:875
msgid "Do you really want to delete the selected keys? "
msgstr "Vill du verkligen ta bort valda nycklar? "
-#: g10/keyedit.c:870
+#: g10/keyedit.c:876
msgid "Do you really want to delete this key? "
msgstr "Vill du verkligen ta bort denna nyckel? "
-#: g10/keyedit.c:891
+#: g10/keyedit.c:897
msgid "Do you really want to revoke the selected keys? "
msgstr "Vill du verkligen �terkalla de valda nycklarna? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:898
msgid "Do you really want to revoke this key? "
msgstr "Vill du verkligen �terkalla denna nyckel? "
-#: g10/keyedit.c:956
+#: g10/keyedit.c:962
#, fuzzy
msgid "Really update the preferences for the selected user IDs? "
msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
#, fuzzy
msgid "Really update the preferences? "
msgstr "Vill du verkligen skapa �terkallelsecertifikaten? (j/N)"
-#: g10/keyedit.c:992
+#: g10/keyedit.c:998
msgid "Save changes? "
msgstr "Spara �ndringarna? "
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1001
msgid "Quit without saving? "
msgstr "Avsluta utan att spara? "
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1012
#, c-format
msgid "update failed: %s\n"
msgstr "uppdateringen misslyckades: %s\n"
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1019
#, c-format
msgid "update secret failed: %s\n"
msgstr "misslyckades med att uppdatera hemligheten: %s\n"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1026
msgid "Key not changed so no update needed.\n"
msgstr "Nyckeln �r of�r�ndrad s� det beh�vs ingen uppdatering.\n"
-#: g10/keyedit.c:1031
+#: g10/keyedit.c:1037
msgid "Invalid command (try \"help\")\n"
msgstr "Ogiltigt kommando (f�rs�k med \"help\")\n"
-#: g10/keyedit.c:1139 g10/keyedit.c:1165
+#: g10/keyedit.c:1145 g10/keyedit.c:1171
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr ""
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1154
#, c-format
msgid " trust: %c/%c"
msgstr ""
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1158
msgid "This key has been disabled"
msgstr "Denna nyckel har deaktiverats"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1187
#, fuzzy, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! en undernyckel har �terkallats: %s\n"
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1190
#, fuzzy
msgid "rev- faked revocation found\n"
msgstr "rev- fel �terkallelser av nycklar\n"
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1192
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr ""
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1408
msgid "Delete this good signature? (y/N/q)"
msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1412
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1416
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Vill du radera denna ok�nda signatur? (j/N/a)"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1422
msgid "Really delete this self-signature? (y/N)"
msgstr "Vill du radera denna sj�lvsignatur? (j/N)"
# skulle lika g�rna kunna heta 1 signatur va?
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Raderade %d signatur.\n"
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Raderade %d signaturer.\n"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
msgid "Nothing deleted.\n"
msgstr "Ingenting raderat.\n"
-#: g10/keyedit.c:1503
+#: g10/keyedit.c:1509
msgid "Please remove selections from the secret keys.\n"
msgstr "Tag bort markeringar fr�n de hemliga nycklarna.\n"
-#: g10/keyedit.c:1509
+#: g10/keyedit.c:1515
msgid "Please select at most one secondary key.\n"
msgstr "V�lj som mest en sekund�r nyckel.\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1519
msgid "Changing expiration time for a secondary key.\n"
msgstr "�ndrar giltighetstid f�r en sekund�r nyckel.\n"
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1521
msgid "Changing expiration time for the primary key.\n"
msgstr "�ndrar giltighetstid f�r den prim�ra nyckeln.\n"
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1563
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Du kan inte �ndra giltighetsdatum f�r en v3-nyckel\n"
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1579
msgid "No corresponding signature in secret ring\n"
msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1662
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1837
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen anv�ndaridentitet med index %d\n"
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Ingen sekund�r nyckel med index %d\n"
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:1981
msgid "user ID: \""
msgstr "anv�ndaridentitet: \""
-#: g10/keyedit.c:1978
+#: g10/keyedit.c:1984
#, c-format
msgid ""
"\"\n"
@@ -2654,34 +2665,34 @@ msgstr ""
"\"\n"
"signerad med din nyckel %08lX %s\n"
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1988
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "Vill du skapa ett �terkallelsecertifikat f�r denna signatur? (j/N)"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2012
msgid "You have signed these user IDs:\n"
msgstr "Du har signerat f�ljande anv�ndaridentiteter:\n"
-#: g10/keyedit.c:2020 g10/keyedit.c:2055
+#: g10/keyedit.c:2026 g10/keyedit.c:2061
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " signerad av %08lX %s\n"
-#: g10/keyedit.c:2025
+#: g10/keyedit.c:2031
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " �terkallad av %08lX %s\n"
-#: g10/keyedit.c:2045
+#: g10/keyedit.c:2051
msgid "You are about to revoke these signatures:\n"
msgstr "Du st�r i begrepp att �terkalla dessa signaturer:\n"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:2069
msgid "Really create the revocation certificates? (y/N)"
msgstr "Vill du verkligen skapa �terkallelsecertifikaten? (j/N)"
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2098
msgid "no secret key\n"
msgstr "ingen hemlig nyckel\n"
@@ -2875,37 +2886,37 @@ msgstr "kan inte hantera algoritm %d f�r publik nyckelhantering\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
-#: g10/passphrase.c:277 g10/passphrase.c:319
+#: g10/passphrase.c:278 g10/passphrase.c:320
msgid "gpg-agent is not available in this session\n"
msgstr ""
-#: g10/passphrase.c:285
+#: g10/passphrase.c:286
msgid "can't set client pid for the agent\n"
msgstr ""
-#: g10/passphrase.c:293
+#: g10/passphrase.c:294
msgid "can't get server read FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:300
+#: g10/passphrase.c:301
msgid "can't get server write FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:325
+#: g10/passphrase.c:326
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:174 g10/passphrase.c:344
+#: g10/hkp.c:174 g10/passphrase.c:345
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "kan inte ansluta till \"%s\": %s\n"
-#: g10/passphrase.c:415 g10/passphrase.c:677
+#: g10/passphrase.c:417 g10/passphrase.c:679
#, c-format
msgid " (main key ID %08lX)"
msgstr " (huvudnyckelns identitet %08lX)"
-#: g10/passphrase.c:425
+#: g10/passphrase.c:427
#, fuzzy, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -2917,34 +2928,34 @@ msgstr ""
"anv�ndaren: \"%.*s\"\n"
"%u-bit %s key, ID %08lX, created %s%s\n"
-#: g10/passphrase.c:446
+#: g10/passphrase.c:448
#, fuzzy
msgid "Enter passphrase\n"
msgstr "Ange l�senordsfras: "
-#: g10/passphrase.c:448
+#: g10/passphrase.c:450
#, fuzzy
msgid "Repeat passphrase\n"
msgstr "Repetera l�senordsfrasen: "
-#: g10/passphrase.c:483
+#: g10/passphrase.c:485
msgid "passphrase too long\n"
msgstr ""
-#: g10/passphrase.c:495
+#: g10/passphrase.c:497
msgid "invalid response from agent\n"
msgstr ""
-#: g10/passphrase.c:504
+#: g10/passphrase.c:506
msgid "cancelled by user\n"
msgstr ""
-#: g10/passphrase.c:507 g10/passphrase.c:580
+#: g10/passphrase.c:509 g10/passphrase.c:582
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr ""
-#: g10/passphrase.c:663
+#: g10/passphrase.c:665
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -2954,20 +2965,20 @@ msgstr ""
"Du beh�ver en l�senordsfras f�r att l�sa upp den hemliga nyckeln f�r\n"
"anv�ndaren: \""
-#: g10/passphrase.c:672
+#: g10/passphrase.c:674
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "%u-bits %s-nyckel, ID %08lX, skapad %s"
-#: g10/passphrase.c:710
+#: g10/passphrase.c:712
msgid "can't query password in batchmode\n"
msgstr "kan inte fr�ga efter l�senord i batch-l�ge\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:716
msgid "Enter passphrase: "
msgstr "Ange l�senordsfras: "
-#: g10/passphrase.c:718
+#: g10/passphrase.c:720
msgid "Repeat passphrase: "
msgstr "Repetera l�senordsfrasen: "
@@ -3192,7 +3203,7 @@ msgstr "%s: kan inte skapa l�s\n"
msgid "%s: can't make lock\n"
msgstr "%s: kan inte skapa l�s\n"
-#: g10/keyring.c:1376 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
+#: g10/keyring.c:1420 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: kan inte skapa: %s\n"
@@ -3329,23 +3340,33 @@ msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
+#: g10/trustdb.c:470
+#, fuzzy
+msgid "no need for a trustdb check\n"
+msgstr "%s: ej en tillitsdatabasfil\n"
+
+#: g10/trustdb.c:476 g10/trustdb.c:1458
+#, fuzzy, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
+
# originalet borde ha ett value
-#: g10/trustdb.c:688
+#: g10/trustdb.c:709
#, fuzzy
msgid "checking the trustdb\n"
msgstr "�ndra �gartillitsv�rdet"
-#: g10/trustdb.c:839
+#: g10/trustdb.c:860
#, fuzzy, c-format
msgid "public key %08lX not found: %s\n"
msgstr "hittade inte publik nyckel"
-#: g10/trustdb.c:1304
+#: g10/trustdb.c:1338
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr ""
-#: g10/trustdb.c:1374
+#: g10/trustdb.c:1411
#, c-format
msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
msgstr ""
@@ -3773,61 +3794,61 @@ msgstr "Det finns ingen hj�lp tillg�nglig"
msgid "No help available for `%s'"
msgstr "Det finns ingen hj�lp tillg�nglig f�r \"%s\""
-#: g10/keydb.c:170
+#: g10/keydb.c:175
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
-#: g10/keydb.c:179
+#: g10/keydb.c:184
#, c-format
msgid "changing permission of `%s' failed: %s\n"
msgstr ""
-#: g10/keydb.c:188
+#: g10/keydb.c:193
#, fuzzy, c-format
msgid "keyring `%s' created\n"
msgstr "%s: nyckelring skapad\n"
-#: g10/keydb.c:530
+#: g10/keydb.c:586
#, fuzzy, c-format
-msgid "failed to rebuild all keyring caches: %s\n"
+msgid "failed to rebuild keyring cache: %s\n"
msgstr "%s: misslyckades med att skapa hash-tabell: %s\n"
# m�rkligt felmeddelande, kolla upp
-#: g10/keyring.c:1179
+#: g10/keyring.c:1220
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
-#: g10/keyring.c:1181
+#: g10/keyring.c:1222
#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s �r den of�r�ndrade\n"
-#: g10/keyring.c:1182
+#: g10/keyring.c:1223
#, c-format
msgid "%s is the new one\n"
msgstr "%s �r den nya\n"
-#: g10/keyring.c:1183
+#: g10/keyring.c:1224
msgid "Please fix this possible security flaw\n"
msgstr "L�s detta potentiella s�kerhetsproblem\n"
-#: g10/keyring.c:1281
+#: g10/keyring.c:1322
#, fuzzy, c-format
msgid "checking keyring `%s'\n"
msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
-#: g10/keyring.c:1312
+#: g10/keyring.c:1353
#, fuzzy, c-format
msgid "%lu keys so far checked (%lu signatures)\n"
msgstr "har behandlat %lu nycklar hittills\n"
-#: g10/keyring.c:1323
+#: g10/keyring.c:1364
#, fuzzy, c-format
msgid "%lu keys checked (%lu signatures)\n"
msgstr "r�kna upp nycklar och signaturer"
-#: g10/keyring.c:1381
+#: g10/keyring.c:1425
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: nyckelring skapad\n"
diff --git a/po/tr.po b/po/tr.po
index 95e30db1c..a06c96da8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.4h.po\n"
-"POT-Creation-Date: 2001-09-28 16:20+0200\n"
+"POT-Creation-Date: 2001-10-23 09:41+0200\n"
"PO-Revision-Date: 2001-05-24 06:42+300\n"
"Last-Translator: Nilg�n Belma Bug�ner <[email protected]>\n"
"Language-Team: Turkish <[email protected]>\n"
@@ -42,7 +42,7 @@ msgstr "hay�r"
msgid "nN"
msgstr "hH"
-#: g10/keyedit.c:568 util/miscutil.c:326
+#: g10/keyedit.c:574 util/miscutil.c:326
msgid "quit"
msgstr "��k��"
@@ -342,7 +342,7 @@ msgstr ""
"daha fazla rasgele bayt toplayabilmesi i�in i�letim sistemine\n"
"yard�mc� olun! (%d bayt daha gerekiyor)\n"
-#: g10/g10.c:237
+#: g10/g10.c:238
msgid ""
"@Commands:\n"
" "
@@ -350,145 +350,145 @@ msgstr ""
"@Komutlar:\n"
" "
-#: g10/g10.c:239
+#: g10/g10.c:240
msgid "|[file]|make a signature"
msgstr "|[dosya]|bir imza yapar"
-#: g10/g10.c:240
+#: g10/g10.c:241
msgid "|[file]|make a clear text signature"
msgstr "|[dosya]|a��k�a okunabilen bir imza yapar"
-#: g10/g10.c:241
+#: g10/g10.c:242
msgid "make a detached signature"
msgstr "ba��ms�z bir imza yapar"
-#: g10/g10.c:242
+#: g10/g10.c:243
msgid "encrypt data"
msgstr "veriyi �ifreler"
-#: g10/g10.c:243
+#: g10/g10.c:244
msgid "encryption only with symmetric cipher"
msgstr "sadece simetrik �ifre ile �ifreler"
-#: g10/g10.c:244
+#: g10/g10.c:245
msgid "store only"
msgstr "sadece saklar"
-#: g10/g10.c:245
+#: g10/g10.c:246
msgid "decrypt data (default)"
msgstr "veri �ifresini a�ar (�ntan�ml�)"
-#: g10/g10.c:246
+#: g10/g10.c:247
msgid "verify a signature"
msgstr "bir imzay� do�rular"
-#: g10/g10.c:248
+#: g10/g10.c:249
msgid "list keys"
msgstr "anahtarlar� listeler"
-#: g10/g10.c:250
+#: g10/g10.c:251
msgid "list keys and signatures"
msgstr "anahtarlar� ve imzalar� listeler"
-#: g10/g10.c:251
+#: g10/g10.c:252
msgid "check key signatures"
msgstr "anahtar imzalar�n� kontrol eder"
-#: g10/g10.c:252
+#: g10/g10.c:253
msgid "list keys and fingerprints"
msgstr "anahtarlar� ve parmak izlerini listeler"
-#: g10/g10.c:253
+#: g10/g10.c:254
msgid "list secret keys"
msgstr "gizli anahtarlar� listeler"
-#: g10/g10.c:254
+#: g10/g10.c:255
msgid "generate a new key pair"
msgstr "yeni bir anahtar �ifti �retir"
-#: g10/g10.c:255
+#: g10/g10.c:256
msgid "remove key from the public keyring"
msgstr "genel anahtar demetinden anahtar� kald�r�r"
-#: g10/g10.c:257
+#: g10/g10.c:258
msgid "remove key from the secret keyring"
msgstr "gizli anahtar demetinden anahtar� kald�r�r"
-#: g10/g10.c:258
+#: g10/g10.c:259
msgid "sign a key"
msgstr "bir anahtar� imzalar"
-#: g10/g10.c:259
+#: g10/g10.c:260
msgid "sign a key locally"
msgstr "bir anahtar� yerel olarak imzalar"
-#: g10/g10.c:260
+#: g10/g10.c:261
msgid "sign or edit a key"
msgstr "bir anahtar� d�zenler ve imzalar"
-#: g10/g10.c:261
+#: g10/g10.c:262
msgid "generate a revocation certificate"
msgstr "bir y�r�rl�kten kald�rma sertifikas� �retir"
-#: g10/g10.c:262
+#: g10/g10.c:263
msgid "export keys"
msgstr "anahtarlar� g�nderir"
-#: g10/g10.c:263
+#: g10/g10.c:264
msgid "export keys to a key server"
msgstr "anahtarlar� bir anahtar sunucusuna g�nderir"
-#: g10/g10.c:264
+#: g10/g10.c:265
msgid "import keys from a key server"
msgstr "anahtarlar� bir anahtar sunucusundan indirir"
-#: g10/g10.c:266
+#: g10/g10.c:267
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "anahtarlar� bir anahtar sunucusundan indirir"
-#: g10/g10.c:270
+#: g10/g10.c:271
msgid "import/merge keys"
msgstr "anahtarlar� indirir/kat��t�r�r"
-#: g10/g10.c:272
+#: g10/g10.c:273
msgid "list only the sequence of packets"
msgstr "sadece paketlerin silsilesini listeler"
-#: g10/g10.c:274
+#: g10/g10.c:275
msgid "export the ownertrust values"
msgstr "sahibining�vencesi de�erlerini g�nderir"
-#: g10/g10.c:276
+#: g10/g10.c:277
msgid "import ownertrust values"
msgstr "sahibining�vencesi de�erlerini indirir"
-#: g10/g10.c:278
+#: g10/g10.c:279
msgid "update the trust database"
msgstr "g�vence veritaban�n� g�nceller"
-#: g10/g10.c:280
+#: g10/g10.c:281
#, fuzzy
msgid "unattended trust database update"
msgstr "g�vence veritaban�n� g�nceller"
-#: g10/g10.c:281
+#: g10/g10.c:282
msgid "fix a corrupted trust database"
msgstr "bozulan g�vence veritaban�n� onar�r"
-#: g10/g10.c:282
+#: g10/g10.c:283
msgid "De-Armor a file or stdin"
msgstr "Bir dosya veya standart girdinin z�rh�n� kald�r�r"
-#: g10/g10.c:284
+#: g10/g10.c:285
msgid "En-Armor a file or stdin"
msgstr "Bir dosya veya standart girdiyi z�rhlar"
-#: g10/g10.c:286
+#: g10/g10.c:287
msgid "|algo [files]|print message digests"
msgstr "|algo [dosyalar]|ileti �z�mlemelerini g�sterir"
-#: g10/g10.c:290
+#: g10/g10.c:291
msgid ""
"@\n"
"Options:\n"
@@ -498,164 +498,169 @@ msgstr ""
"Se�enekler:\n"
" "
-#: g10/g10.c:292
+#: g10/g10.c:293
msgid "create ascii armored output"
msgstr "ascii z�rhl� ��kt� olu�turur"
-#: g10/g10.c:294
+#: g10/g10.c:295
msgid "|NAME|encrypt for NAME"
msgstr "|�S�M|�S�M i�in �ifreleme yapar"
-#: g10/g10.c:297
+#: g10/g10.c:298
msgid "|NAME|use NAME as default recipient"
msgstr "|�S�M|�ntan�ml� al�c� olarak �S�M kullan�l�r"
-#: g10/g10.c:299
+#: g10/g10.c:300
msgid "use the default key as default recipient"
msgstr "�ntan�ml� al�c� olarak �ntan�ml� anahtar kullan�l�r"
-#: g10/g10.c:303
+#: g10/g10.c:304
msgid "use this user-id to sign or decrypt"
msgstr "imzalamak ya da �ifre ��zmek i�in bu kullan�c� kimli�i kullan�l�r"
-#: g10/g10.c:304
+#: g10/g10.c:305
msgid "|N|set compress level N (0 disables)"
msgstr "|N|s�k��t�rma seviyesi N olarak ayarlan�r (0 ise s�k��t�rma yap�lmaz)"
-#: g10/g10.c:306
+#: g10/g10.c:307
msgid "use canonical text mode"
msgstr "kurall� metin kipini kullan�r"
-#: g10/g10.c:307
+#: g10/g10.c:308
msgid "use as output file"
msgstr "��kt� dosyas� olarak kullan�l�r"
-#: g10/g10.c:308
+#: g10/g10.c:309
msgid "verbose"
msgstr "�ok detayl�"
-#: g10/g10.c:309
+#: g10/g10.c:310
msgid "be somewhat more quiet"
msgstr "daha az detayl�"
-#: g10/g10.c:310
+#: g10/g10.c:311
msgid "don't use the terminal at all"
msgstr "terminali hi� kullanma"
-#: g10/g10.c:311
+#: g10/g10.c:312
msgid "force v3 signatures"
msgstr "v3 imzalar�na zorlar"
-#: g10/g10.c:312
+#: g10/g10.c:313
+#, fuzzy
+msgid "do not force v3 signatures"
+msgstr "v3 imzalar�na zorlar"
+
+#: g10/g10.c:314
msgid "always use a MDC for encryption"
msgstr "�ifreleme i�in daima bir MDC kullan�l�r"
-#: g10/g10.c:313
+#: g10/g10.c:315
msgid "do not make any changes"
msgstr "hi�bir de�i�iklik yapmaz"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:315
+#: g10/g10.c:317
msgid "use the gpg-agent"
msgstr "gpg-agent kullan"
-#: g10/g10.c:316
+#: g10/g10.c:318
msgid "batch mode: never ask"
msgstr "�nceden belirlenmi� i�lemler kipi: hi� sormaz"
-#: g10/g10.c:317
+#: g10/g10.c:319
msgid "assume yes on most questions"
msgstr "sorular�n �o�unda cevap evet farzedilir"
-#: g10/g10.c:318
+#: g10/g10.c:320
msgid "assume no on most questions"
msgstr "sorular�n �o�unda cevap hay�r farzedilir"
-#: g10/g10.c:319
+#: g10/g10.c:321
msgid "add this keyring to the list of keyrings"
msgstr "bu anahtar demetini anahtar demetleri listesine ekler"
-#: g10/g10.c:320
+#: g10/g10.c:322
msgid "add this secret keyring to the list"
msgstr "bu gizli anahtar demetini listeye ekler"
-#: g10/g10.c:321
+#: g10/g10.c:323
msgid "|NAME|use NAME as default secret key"
msgstr "|�S�M|�ntan�ml� gizli anahtar olarak �S�M kullan�l�r"
-#: g10/g10.c:322
+#: g10/g10.c:324
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|MAK�NA|anahtarlar� aramak i�in bu anahtar sunucusu kullan�l�r"
-#: g10/g10.c:323
+#: g10/g10.c:325
msgid "|NAME|set terminal charset to NAME"
msgstr "|�S�M|terminal karakter setini �S�M olarak ayarlar"
-#: g10/g10.c:324
+#: g10/g10.c:326
msgid "read options from file"
msgstr "se�enekleri dosyadan okur"
-#: g10/g10.c:328
+#: g10/g10.c:330
msgid "|FD|write status info to this FD"
msgstr "|FD|durum bilgisini bu FD'ye yazar"
-#: g10/g10.c:330
+#: g10/g10.c:332
#, fuzzy
msgid "|[file]|write status info to file"
msgstr "|FD|durum bilgisini bu FD'ye yazar"
-#: g10/g10.c:336
+#: g10/g10.c:338
#, fuzzy
msgid "|KEYID|ultimately trust this key"
msgstr "|ANAHTAR-K�ML�K|bu anahtar son derece g�vence alt�nda"
-#: g10/g10.c:337
+#: g10/g10.c:339
msgid "|FILE|load extension module FILE"
msgstr "|DOSYA|geni�letme mod�l� olarak DOSYA y�klenir"
-#: g10/g10.c:338
+#: g10/g10.c:340
msgid "emulate the mode described in RFC1991"
msgstr "RFC1991 de a��klanan kipi uygular"
-#: g10/g10.c:339
+#: g10/g10.c:341
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "t�m paket, �ifre ve �z�mleme se�eneklerini OpenPGP tarz�nda ayarlar"
-#: g10/g10.c:340
+#: g10/g10.c:342
msgid "|N|use passphrase mode N"
msgstr "|N|anahtar parolas� kipi olarak N kullan�l�r"
-#: g10/g10.c:342
+#: g10/g10.c:344
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr ""
"|�S�M|anahtar parolalar� i�in ileti �z�mleme algoritmas� olarak �S�M "
"kullan�l�r"
-#: g10/g10.c:344
+#: g10/g10.c:346
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|�S�M|anahtar parolalar� i�in �ifre algoritmas� olarak �S�M kullan�l�r"
-#: g10/g10.c:345
+#: g10/g10.c:347
msgid "|NAME|use cipher algorithm NAME"
msgstr "|�S�M|�ifre algoritmas� olarak �S�M kullan�l�r"
-#: g10/g10.c:346
+#: g10/g10.c:348
msgid "|NAME|use message digest algorithm NAME"
msgstr "|�S�M|�z�mleme algoritmas� olarak �S�M kullan�l�r"
-#: g10/g10.c:347
+#: g10/g10.c:349
msgid "|N|use compress algorithm N"
msgstr "|N|s�k��t�rma algoritmas� olarak N kullan�l�r"
-#: g10/g10.c:348
+#: g10/g10.c:350
msgid "throw keyid field of encrypted packets"
msgstr "�ifreli paketlerin anahtar-kimlik alanlar�n� atar"
-#: g10/g10.c:349
+#: g10/g10.c:351
msgid "|NAME=VALUE|use this notation data"
msgstr "|�S�M=DE�ER|veri bu nitelemeyle kullan�l�r"
-#: g10/g10.c:352
+#: g10/g10.c:354
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -663,7 +668,7 @@ msgstr ""
"@\n"
"(T�m komut ve se�eneklerin komple listesi i�in man sayfalar�na bak�n)\n"
-#: g10/g10.c:355
+#: g10/g10.c:357
msgid ""
"@\n"
"Examples:\n"
@@ -683,15 +688,15 @@ msgstr ""
" --list-keys [isimler] anahtarlar� listeler\n"
" --fingerprint [isimler] parmak izlerini g�sterir\n"
-#: g10/g10.c:478
+#: g10/g10.c:480
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Yaz�l�m hatalar�n� l�tfen <[email protected]> adresine bildirin.\n"
-#: g10/g10.c:482
+#: g10/g10.c:484
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Kullan�m�: gpg [se�enekler] [dosyalar] (yard�m i�in -h)"
-#: g10/g10.c:485
+#: g10/g10.c:487
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -701,7 +706,7 @@ msgstr ""
"imzalama, kontrol, �ifreleme veya ��zme\n"
"�ntan�ml� i�lem girilen veriye ba��ml�d�r\n"
-#: g10/g10.c:496
+#: g10/g10.c:498
msgid ""
"\n"
"Supported algorithms:\n"
@@ -709,200 +714,200 @@ msgstr ""
"\n"
"Desteklenen algoritmalar:\n"
-#: g10/g10.c:570
+#: g10/g10.c:572
msgid "usage: gpg [options] "
msgstr "kullan�m�: gpg [se�enekler] "
-#: g10/g10.c:627
+#: g10/g10.c:629
msgid "conflicting commands\n"
msgstr "�eli�en komutlar\n"
-#: g10/g10.c:783
+#: g10/g10.c:785
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "B�LG�: \"%s\" �ntan�ml� se�enek dosyas� yok\n"
-#: g10/g10.c:787
+#: g10/g10.c:789
#, c-format
msgid "option file `%s': %s\n"
msgstr "se�enek dosyas� \"%s\": %s\n"
-#: g10/g10.c:794
+#: g10/g10.c:796
#, c-format
msgid "reading options from `%s'\n"
msgstr "\"%s\"den se�enekler okunuyor\n"
-#: g10/g10.c:1038
+#: g10/g10.c:1041
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s ge�erli bir karakter seti de�il\n"
-#: g10/g10.c:1122
+#: g10/g10.c:1125
msgid "WARNING: program may create a core file!\n"
msgstr "UYARI: program bir \"core\" dosyas� olu�turabilir!\n"
-#: g10/g10.c:1126 g10/g10.c:1135
+#: g10/g10.c:1129 g10/g10.c:1138
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "B�LG�: %s normal kullan�m i�in de�il!\n"
-#: g10/g10.c:1128
+#: g10/g10.c:1131
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ile %s birlikte kullan�lmaz!\n"
-#: g10/g10.c:1131
+#: g10/g10.c:1134
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s, %s ile etkisiz olur!\n"
-#: g10/g10.c:1151 g10/g10.c:1163
+#: g10/g10.c:1154 g10/g10.c:1166
msgid "selected cipher algorithm is invalid\n"
msgstr "se�ilen �ifre algoritmas� ge�ersiz\n"
-#: g10/g10.c:1157 g10/g10.c:1169
+#: g10/g10.c:1160 g10/g10.c:1172
msgid "selected digest algorithm is invalid\n"
msgstr "se�ilen �z�mleme algoritmas� ge�ersiz\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1176
msgid "the given policy URL is invalid\n"
msgstr "verilmi� g�venlik URL(=web adresi) ge�ersiz\n"
-#: g10/g10.c:1176
+#: g10/g10.c:1179
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "s�k��t�rma algoritmas� %d..%d aral���nda olmal�\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1181
msgid "completes-needed must be greater than 0\n"
msgstr "\"completes-needed\" 0 dan b�y�k olmal�\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1183
msgid "marginals-needed must be greater than 1\n"
msgstr "\"marginals-needed\" 1 den b�y�k olmal�\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1185
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "\"max-cert-depth\" 1 ile 255 aras�nda olmal�\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1188
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "B�LG�: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
-#: g10/g10.c:1189
+#: g10/g10.c:1192
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "S2K kipi ge�ersiz; 0, 1 veya 3 olmal�\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1196
#, fuzzy
msgid "invalid preferences\n"
msgstr "�nayarlar� listeler"
-#: g10/g10.c:1276
+#: g10/g10.c:1279
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "\"TrustDB\" g�vence veritaban� ba�lang�� a�amas�nda ba�ar�s�z: %s\n"
-#: g10/g10.c:1282
+#: g10/g10.c:1285
msgid "--store [filename]"
msgstr "--store [dosyaismi]"
-#: g10/g10.c:1289
+#: g10/g10.c:1292
msgid "--symmetric [filename]"
msgstr "--symmetric [dosyaismi]"
-#: g10/g10.c:1297
+#: g10/g10.c:1300
msgid "--encrypt [filename]"
msgstr "--encrypt [dosyaismi]"
-#: g10/g10.c:1310
+#: g10/g10.c:1313
msgid "--sign [filename]"
msgstr "--sign [dosyaismi]"
-#: g10/g10.c:1323
+#: g10/g10.c:1326
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosyaismi]"
-#: g10/g10.c:1337
+#: g10/g10.c:1340
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [dosyaismi]"
-#: g10/g10.c:1346
+#: g10/g10.c:1349
msgid "--clearsign [filename]"
msgstr "--clearsign [dosyaismi]"
-#: g10/g10.c:1364
+#: g10/g10.c:1367
msgid "--decrypt [filename]"
msgstr "--decrypt [dosyaismi]"
-#: g10/g10.c:1372
+#: g10/g10.c:1375
msgid "--sign-key user-id"
msgstr "--sign-key kullan�c�-kimli�i"
-#: g10/g10.c:1380
+#: g10/g10.c:1383
msgid "--lsign-key user-id"
msgstr "--lsign-key kullan�c�-kimli�i"
-#: g10/g10.c:1388
+#: g10/g10.c:1391
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kullan�c�-kimli�i [komutlar]"
-#: g10/g10.c:1404
+#: g10/g10.c:1407
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key kullan�c�-kimli�i"
-#: g10/g10.c:1407
+#: g10/g10.c:1410
msgid "--delete-key user-id"
msgstr "--delete-key kullan�c�-kimli�i"
-#: g10/g10.c:1415
+#: g10/g10.c:1418
msgid "--delete-secret-and-public-key user-id"
msgstr "--delete-secret-and-public-key kullan�c�-kimli�i"
-#: g10/encode.c:268 g10/g10.c:1452 g10/sign.c:632
+#: g10/encode.c:268 g10/g10.c:1455 g10/sign.c:632
#, c-format
msgid "can't open %s: %s\n"
msgstr "%s a��lamad�: %s\n"
-#: g10/g10.c:1467
+#: g10/g10.c:1470
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [kullan�c�-kimli�i] [anahtar-demeti]"
-#: g10/g10.c:1539
+#: g10/g10.c:1542
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "z�rh�n kald�r�lmas� ba�ar�s�z: %s\n"
-#: g10/g10.c:1547
+#: g10/g10.c:1550
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "z�rhlama ba�ar�s�z: %s\n"
-#: g10/g10.c:1618
+#: g10/g10.c:1621
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "`%s' hash algoritmas� ge�ersiz\n"
-#: g10/g10.c:1704
+#: g10/g10.c:1707
msgid "[filename]"
msgstr "[dosyaismi]"
-#: g10/g10.c:1708
+#: g10/g10.c:1711
msgid "Go ahead and type your message ...\n"
msgstr "�letinizi yaz�n ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1711 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1714 g10/verify.c:94 g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "`%s' a��lamad�\n"
-#: g10/g10.c:1920
+#: g10/g10.c:1923
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr "bir niteleme isminin ilk karakteri bir harf ya da alt�izgi olmal�\n"
-#: g10/g10.c:1926
+#: g10/g10.c:1929
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -910,13 +915,13 @@ msgstr ""
"bir niteleme ismi sadece harfler, rakamlar, nokta ve alt�izgiler i�erebilir "
"ve bir '=' i�areti ile biter\n"
-#: g10/g10.c:1932
+#: g10/g10.c:1935
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
"bir niteleme isminde noktalar di�er karakterler taraf�ndan ku�at�lm�� "
"olmal�d�r\n"
-#: g10/g10.c:1940
+#: g10/g10.c:1943
msgid "a notation value must not use any control characters\n"
msgstr "bir niteleme de�erinde kontrol karakterleri kullan�lamaz\n"
@@ -1569,7 +1574,7 @@ msgstr ""
"Gizli anahtar�n�z� korumak i�in bir anahtar parolas�na gereksiniminiz var.\n"
"\n"
-#: g10/keyedit.c:456 g10/keygen.c:1171
+#: g10/keyedit.c:462 g10/keygen.c:1171
msgid "passphrase not correctly repeated; try again.\n"
msgstr "anahtar parolas� do�ru olarak tekrarlanmad�; tekrar deneyin.\n"
@@ -1709,27 +1714,27 @@ msgstr "`%s'den okunuyor\n"
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s %s i�in �ifrelendi\n"
-#: g10/delkey.c:69 g10/export.c:149
+#: g10/delkey.c:69 g10/export.c:148
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "kullan�c� \"%s\" bulunamad�: %s\n"
-#: g10/delkey.c:77 g10/export.c:159
+#: g10/delkey.c:77 g10/export.c:158
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
msgstr "\"%s\" okunurken hata: %s\n"
-#: g10/export.c:167
+#: g10/export.c:166
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "%08lX anahtar�: bir RFC2440 anahtar� de�il - atland�\n"
-#: g10/export.c:178
+#: g10/export.c:177
#, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "%08lX anahtar�: korunmam�� - atland�\n"
-#: g10/export.c:234
+#: g10/export.c:233
msgid "WARNING: nothing exported\n"
msgstr "UYARI: hi�bir �ey d��ar� aktar�lmad�\n"
@@ -1739,16 +1744,16 @@ msgstr "pk belle�inde �ok fazla girdi - iptal edildi\n"
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:183 g10/getkey.c:2188
+#: g10/getkey.c:183 g10/getkey.c:2192
msgid "[User id not found]"
msgstr "[Kullan�c� kimli�i bulunamad�]"
-#: g10/getkey.c:1911
+#: g10/getkey.c:1915
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "yard�mc� anahtar %08lX, as�l anahtar %08lX yerine kullan�l�yor\n"
-#: g10/getkey.c:1952
+#: g10/getkey.c:1956
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "%08lX anahtar�: genel anahtars�z gizli anahtar - atland�\n"
@@ -2083,17 +2088,17 @@ msgstr "%d �z-imzas� ge�ersiz kullan�c� kimli�i saptand�\n"
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:296
+#: g10/keyedit.c:302
#, c-format
msgid "Already signed by key %08lX\n"
msgstr "%08lX anahtar� taraf�ndan zaten imzalanm��\n"
-#: g10/keyedit.c:307
+#: g10/keyedit.c:313
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "%08lX anahtar� ile imzalanacak hi�bir �ey yok\n"
-#: g10/keyedit.c:316
+#: g10/keyedit.c:322
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2101,7 +2106,7 @@ msgstr ""
"Bu anahtar� kendi anahtar�n�zla imzalamak istedi�inize ger�ekten\n"
"emin misiniz?: \""
-#: g10/keyedit.c:325
+#: g10/keyedit.c:331
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
@@ -2109,33 +2114,33 @@ msgstr ""
"Bu imza g�nderilemez olarak i�aretlenmi� olacak\n"
"\n"
-#: g10/keyedit.c:330
+#: g10/keyedit.c:336
msgid "Really sign? "
msgstr "Ger�ekten imzalayacak m�s�n�z? "
-#: g10/keyedit.c:361 g10/keyedit.c:2104 g10/keyedit.c:2166 g10/sign.c:225
+#: g10/keyedit.c:367 g10/keyedit.c:2110 g10/keyedit.c:2172 g10/sign.c:225
#, c-format
msgid "signing failed: %s\n"
msgstr "imzalama ba�ar�s�z: %s\n"
-#: g10/keyedit.c:415
+#: g10/keyedit.c:421
msgid "This key is not protected.\n"
msgstr "Bu anahtar korunmam��.\n"
-#: g10/keyedit.c:419
+#: g10/keyedit.c:425
msgid "Secret parts of primary key are not available.\n"
msgstr "As�l anahtar�n gizli par�alar� kullan�lamaz.\n"
-#: g10/keyedit.c:423
+#: g10/keyedit.c:429
msgid "Key is protected.\n"
msgstr "Anahtar korunmu�.\n"
-#: g10/keyedit.c:443
+#: g10/keyedit.c:449
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Bu anahtar �zerinde d�zenleme yap�lamaz: %s\n"
-#: g10/keyedit.c:448
+#: g10/keyedit.c:454
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2143,7 +2148,7 @@ msgstr ""
"Bu gizli anahtar i�in yeni anahtar parolas� giriniz.\n"
"\n"
-#: g10/keyedit.c:460
+#: g10/keyedit.c:466
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2151,466 +2156,472 @@ msgstr ""
"Bu gizli anahtar i�in yeni anahtar parolas� giriniz.\n"
"\n"
-#: g10/keyedit.c:463
+#: g10/keyedit.c:469
msgid "Do you really want to do this? "
msgstr "Ger�ekten bunu yapmak istiyor musunuz? "
-#: g10/keyedit.c:527
+#: g10/keyedit.c:533
msgid "moving a key signature to the correct place\n"
msgstr "bir anahtar imzas�n� do�ru yere ta��yor\n"
-#: g10/keyedit.c:568
+#: g10/keyedit.c:574
msgid "quit this menu"
msgstr "bu men�den ��k"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:575
msgid "q"
msgstr "�"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save"
msgstr "kaydet"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:576
msgid "save and quit"
msgstr "kaydet ve ��k"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "help"
msgstr "yard�m"
-#: g10/keyedit.c:571
+#: g10/keyedit.c:577
msgid "show this help"
msgstr "bunu g�sterir "
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "fpr"
msgstr "piz"
-#: g10/keyedit.c:573
+#: g10/keyedit.c:579
msgid "show fingerprint"
msgstr "parmak izini g�ster"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list"
msgstr "listele"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:580
msgid "list key and user IDs"
msgstr "anahtar� ve kullan�c� kimli�ini g�ster"
-#: g10/keyedit.c:575
+#: g10/keyedit.c:581
msgid "l"
msgstr "l"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "uid"
msgstr "kullkim"
-#: g10/keyedit.c:576
+#: g10/keyedit.c:582
msgid "select user ID N"
msgstr "N kullan�c� kimli�ini se�er"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "key"
msgstr "anahtar"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:583
msgid "select secondary key N"
msgstr "N yard�mc� anahtar�n� se�er"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "check"
msgstr "kontrol"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:584
msgid "list signatures"
msgstr "imzalar� listele"
-#: g10/keyedit.c:579
+#: g10/keyedit.c:585
msgid "c"
msgstr "k"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign"
msgstr "imzala"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:586
msgid "sign the key"
msgstr "anahtar� imzalar"
-#: g10/keyedit.c:581
+#: g10/keyedit.c:587
msgid "s"
msgstr "i"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "lsign"
msgstr "yimza"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:588
msgid "sign the key locally"
msgstr "anahtar� yerel olarak imzala"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:589
msgid "debug"
msgstr "hata ay�klama"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "adduid"
msgstr "kullkimEkle"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:590
msgid "add a user ID"
msgstr "bir kullan�c� kimli�i ekler"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "deluid"
msgstr "kullkimSil"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:591
msgid "delete user ID"
msgstr "kullan�c� kimli�ini siler"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "addkey"
msgstr "anhEkle"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:592
msgid "add a secondary key"
msgstr "bir yard�mc� anahtar ekler"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delkey"
msgstr "anhSil"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:593
msgid "delete a secondary key"
msgstr "bir yard�mc� anahtar siler"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delsig"
msgstr "imzaSil"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:594
msgid "delete signatures"
msgstr "imzalar� siler"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "expire"
msgstr "sonkulltarih"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:595
msgid "change the expire date"
msgstr "son kullan�m tarihini de�i�tirir"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "primary"
msgstr ""
-#: g10/keyedit.c:590
+#: g10/keyedit.c:596
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle"
msgstr "se�mece"
-#: g10/keyedit.c:591
+#: g10/keyedit.c:597
msgid "toggle between secret and public key listing"
msgstr "genel ve gizli anahtar listeleri aras�nda yer de�i�tirir"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:599
msgid "t"
msgstr "b"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:600
msgid "pref"
msgstr "�nayar"
-#: g10/keyedit.c:594 g10/keyedit.c:595
-msgid "list preferences"
+#: g10/keyedit.c:600
+#, fuzzy
+msgid "list preferences (expert)"
msgstr "�nayarlar� listeler"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:601
msgid "showpref"
msgstr ""
-#: g10/keyedit.c:596
+#: g10/keyedit.c:601
+#, fuzzy
+msgid "list preferences (verbose)"
+msgstr "�nayarlar� listeler"
+
+#: g10/keyedit.c:602
#, fuzzy
msgid "setpref"
msgstr "�nayar"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:602
#, fuzzy
msgid "set preference list"
msgstr "�nayarlar� listeler"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updpref"
msgstr "�nayar"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:603
#, fuzzy
msgid "updated preferences"
msgstr "�nayarlar� listeler"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "passwd"
msgstr "aparola"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:604
msgid "change the passphrase"
msgstr "anahtar parolas�n� de�i�tirir"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "trust"
msgstr "g�vence"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:605
msgid "change the ownertrust"
msgstr "sahibining�vencesini de�i�tirir"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revsig"
msgstr "imzay�rkal"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:606
msgid "revoke signatures"
msgstr "imzalar� y�r�rl�kten kald�r�r"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revkey"
msgstr "y�rkalanh"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:607
msgid "revoke a secondary key"
msgstr "bir yard�mc� anahtar� y�r�rl�kten kald�r�r"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable"
msgstr "kald�r"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:608
msgid "disable a key"
msgstr "bir anahtar� kullan�mdan kald�r�r"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable"
msgstr "kullan"
-#: g10/keyedit.c:603
+#: g10/keyedit.c:609
msgid "enable a key"
msgstr "bir anahtar� kullan�ma sokar"
-#: g10/delkey.c:112 g10/keyedit.c:623
+#: g10/delkey.c:112 g10/keyedit.c:629
msgid "can't do that in batchmode\n"
msgstr "bu �nceden belirlenmi� i�lemler kipinde (in batchmode) yap�lamaz\n"
-#: g10/keyedit.c:658
+#: g10/keyedit.c:664
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "\"%s\" okunurken hata: %s\n"
-#: g10/keyedit.c:676
+#: g10/keyedit.c:682
msgid "Secret key is available.\n"
msgstr "Gizli anahtar mevcut.\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:712
msgid "Command> "
msgstr "Komut-> "
-#: g10/keyedit.c:737
+#: g10/keyedit.c:743
msgid "Need the secret key to do this.\n"
msgstr "Bunu yapmak i�in gizli anahtar gerekli.\n"
-#: g10/keyedit.c:741
+#: g10/keyedit.c:747
msgid "Please use the command \"toggle\" first.\n"
msgstr "l�tfen �nce \"se�mece\" komutunu kullan�n.\n"
-#: g10/keyedit.c:788
+#: g10/keyedit.c:794
msgid "Really sign all user IDs? "
msgstr "T�m kullan�c� kimlikleri ger�ekten imzalanacak m�? "
-#: g10/keyedit.c:789
+#: g10/keyedit.c:795
msgid "Hint: Select the user IDs to sign\n"
msgstr "�pucu: �mzalamak i�in bir kullan�c� kimli�i se�iniz\n"
-#: g10/keyedit.c:821 g10/keyedit.c:842
+#: g10/keyedit.c:827 g10/keyedit.c:848
msgid "You must select at least one user ID.\n"
msgstr "En az bir kullan�c� kimli�i se�melisiniz.\n"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:829
msgid "You can't delete the last user ID!\n"
msgstr "Son kullan�c� kimli�ini silemezsiniz!\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:832
msgid "Really remove all selected user IDs? "
msgstr "Se�ilen t�m kullan�c� kimlikleri ger�ekten silinecek mi? "
-#: g10/keyedit.c:827
+#: g10/keyedit.c:833
msgid "Really remove this user ID? "
msgstr "Bu kullan�c� kimli�i ger�ekten silinecek mi? "
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:871 g10/keyedit.c:893
msgid "You must select at least one key.\n"
msgstr "En az bir anahtar se�melisiniz.\n"
-#: g10/keyedit.c:869
+#: g10/keyedit.c:875
msgid "Do you really want to delete the selected keys? "
msgstr "Se�ilen anahtarlar� ger�ekten silmek istiyor musunuz? "
-#: g10/keyedit.c:870
+#: g10/keyedit.c:876
msgid "Do you really want to delete this key? "
msgstr "Bu anahtar� ger�ekten silmek istiyor musunuz? "
-#: g10/keyedit.c:891
+#: g10/keyedit.c:897
msgid "Do you really want to revoke the selected keys? "
msgstr "Se�ilen anahtarlar� ger�ekten y�r�rl�kten kald�rmak istiyor musunuz? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:898
msgid "Do you really want to revoke this key? "
msgstr "Bu anahtar� ger�ekten y�r�rl�kten kald�rmak istiyor musunuz? "
-#: g10/keyedit.c:956
+#: g10/keyedit.c:962
#, fuzzy
msgid "Really update the preferences for the selected user IDs? "
msgstr "Se�ilen t�m kullan�c� kimlikleri ger�ekten silinecek mi? "
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
#, fuzzy
msgid "Really update the preferences? "
msgstr ""
"Bu y�r�rl�kten kald�rma sertifikalar�n� ger�ekten olu�turacak m�s�n�z? (e/H)"
-#: g10/keyedit.c:992
+#: g10/keyedit.c:998
msgid "Save changes? "
msgstr "De�i�iklikler kaydedilecek mi? "
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1001
msgid "Quit without saving? "
msgstr "Kaydetmeden ��k�ls�n m�? "
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1012
#, c-format
msgid "update failed: %s\n"
msgstr "g�ncelleme ba�ar�s�z: %s\n"
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1019
#, c-format
msgid "update secret failed: %s\n"
msgstr "gizliyi g�ncelleme ba�ar�s�z: %s\n"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1026
msgid "Key not changed so no update needed.\n"
msgstr "G�ncelleme gere�i olmad���ndan anahtar de�i�medi.\n"
-#: g10/keyedit.c:1031
+#: g10/keyedit.c:1037
msgid "Invalid command (try \"help\")\n"
msgstr "Komut ge�ersiz (\"yard�m\" komutunu deneyin)\n"
-#: g10/keyedit.c:1139 g10/keyedit.c:1165
+#: g10/keyedit.c:1145 g10/keyedit.c:1171
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr "%s%c %4u%c/%08lX �retildi: %s son kullanma tarihi: %s"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1154
#, c-format
msgid " trust: %c/%c"
msgstr " g�vence: %c/%c"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1158
msgid "This key has been disabled"
msgstr "Bu anahtar kullan�mdan kald�r�lm��t�"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1187
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "y�rkal! yard�mc� anahtar y�r�rl�l�kten kald�r�lm��t�: %s\n"
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1190
msgid "rev- faked revocation found\n"
msgstr "y�rkal- sahte y�r�rl�kten kald�rma sertifikas� bulundu\n"
-#: g10/keyedit.c:1186
+#: g10/keyedit.c:1192
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "y�rkal? Y�r�rl�kten kald�rma denetlenirken problem: %s\n"
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1408
msgid "Delete this good signature? (y/N/q)"
msgstr "Bu do�ru imza silinsin mi? (e/H/�)"
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1412
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Bu ge�ersiz imza silinsin mi? (e/H/�)"
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1416
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Bu bilinmeyen imza silinsin mi? (e/H/�"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1422
msgid "Really delete this self-signature? (y/N)"
msgstr "Bu �z-imza ger�ekten silinecek mi? (e/H)"
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d imzas� silindi.\n"
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d adet imza silindi.\n"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
msgid "Nothing deleted.\n"
msgstr "Hi�bir �ey silinmedi.\n"
-#: g10/keyedit.c:1503
+#: g10/keyedit.c:1509
msgid "Please remove selections from the secret keys.\n"
msgstr "L�tfen gizli anahtarlardan se�ilenleri silin.\n"
-#: g10/keyedit.c:1509
+#: g10/keyedit.c:1515
msgid "Please select at most one secondary key.\n"
msgstr "L�tfen en fazla bir yard�mc� anahtar se�in.\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1519
msgid "Changing expiration time for a secondary key.\n"
msgstr "Bir yard�mc� anahtar i�in son kullanma tarihi de�i�tiriliyor.\n"
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1521
msgid "Changing expiration time for the primary key.\n"
msgstr "As�l anahtar i�in son kullanma tarihi de�i�tiriliyor.\n"
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1563
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Bir v3 anahtar�n�n son kullanma tarihini de�i�tiremezsiniz\n"
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1579
msgid "No corresponding signature in secret ring\n"
msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1662
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "En az bir kullan�c� kimli�i se�melisiniz.\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1837
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d endeksine sahip kullan�c� kimli�i yok\n"
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
#, c-format
msgid "No secondary key with index %d\n"
msgstr "%d endeksine sahip yard�mc� anahtar yok\n"
-#: g10/keyedit.c:1975
+#: g10/keyedit.c:1981
msgid "user ID: \""
msgstr "Kullan�c� kimli�i: \""
-#: g10/keyedit.c:1978
+#: g10/keyedit.c:1984
#, c-format
msgid ""
"\"\n"
@@ -2619,36 +2630,36 @@ msgstr ""
"\"\n"
" %08lX anahtar�n�zla %s de imzaland�\n"
-#: g10/keyedit.c:1982
+#: g10/keyedit.c:1988
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr ""
"Bu imza i�in bir y�r�rl�kten kald�rma sertifikas� olu�turulsun mu? (e/H)"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2012
msgid "You have signed these user IDs:\n"
msgstr "Bu kullan�c� kimliklerini imzalam��s�n�z:\n"
-#: g10/keyedit.c:2020 g10/keyedit.c:2055
+#: g10/keyedit.c:2026 g10/keyedit.c:2061
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " %08lX taraf�ndan %s de imzaland�\n"
-#: g10/keyedit.c:2025
+#: g10/keyedit.c:2031
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " %08lX taraf�ndan %s de y�r�rl�kten kald�r�ld�\n"
-#: g10/keyedit.c:2045
+#: g10/keyedit.c:2051
msgid "You are about to revoke these signatures:\n"
msgstr "Bu imzalar� y�r�rl�kten kald�rmak �zeresiniz\n"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:2069
msgid "Really create the revocation certificates? (y/N)"
msgstr ""
"Bu y�r�rl�kten kald�rma sertifikalar�n� ger�ekten olu�turacak m�s�n�z? (e/H)"
-#: g10/keyedit.c:2092
+#: g10/keyedit.c:2098
msgid "no secret key\n"
msgstr "gizli anahtar yok\n"
@@ -2832,37 +2843,37 @@ msgstr "%d genel anahtar algoritmas� kullan�lamad�\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d tipi alt paket kritik bit k�mesine sahip\n"
-#: g10/passphrase.c:277 g10/passphrase.c:319
+#: g10/passphrase.c:278 g10/passphrase.c:320
msgid "gpg-agent is not available in this session\n"
msgstr "gpg-agent bu oturumda kullan�lamaz\n"
-#: g10/passphrase.c:285
+#: g10/passphrase.c:286
msgid "can't set client pid for the agent\n"
msgstr ""
-#: g10/passphrase.c:293
+#: g10/passphrase.c:294
msgid "can't get server read FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:300
+#: g10/passphrase.c:301
msgid "can't get server write FD for the agent\n"
msgstr ""
-#: g10/passphrase.c:325
+#: g10/passphrase.c:326
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO �evre de�i�keni bozuk\n"
-#: g10/hkp.c:174 g10/passphrase.c:344
+#: g10/hkp.c:174 g10/passphrase.c:345
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "\"%s\" sunucusuna ba�lan�lamad�: %s\n"
-#: g10/passphrase.c:415 g10/passphrase.c:677
+#: g10/passphrase.c:417 g10/passphrase.c:679
#, c-format
msgid " (main key ID %08lX)"
msgstr " (as�l anahtar kimli�i %08lX)"
-#: g10/passphrase.c:425
+#: g10/passphrase.c:427
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -2873,32 +2884,32 @@ msgstr ""
"kullan�c�s�n�n gizli anahtar�n� a�acak bir anahtar parolas�na ihtiya� var.\n"
"%u-bit %s anahtar, kimlik %08lX, olu�turulan %s%s\n"
-#: g10/passphrase.c:446
+#: g10/passphrase.c:448
msgid "Enter passphrase\n"
msgstr "Anahtar parolas�n� girin\n"
-#: g10/passphrase.c:448
+#: g10/passphrase.c:450
msgid "Repeat passphrase\n"
msgstr "Parolay� tekrar yaz�n\n"
-#: g10/passphrase.c:483
+#: g10/passphrase.c:485
msgid "passphrase too long\n"
msgstr "Parola �ok uzun\n"
-#: g10/passphrase.c:495
+#: g10/passphrase.c:497
msgid "invalid response from agent\n"
msgstr "vekilin yan�t� ge�ersiz\n"
-#: g10/passphrase.c:504
+#: g10/passphrase.c:506
msgid "cancelled by user\n"
msgstr "kullan�c� taraf�ndan iptal edildi\n"
-#: g10/passphrase.c:507 g10/passphrase.c:580
+#: g10/passphrase.c:509 g10/passphrase.c:582
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "vekil ile sorun var: vekil 0x%lx ile sonu�land�\n"
-#: g10/passphrase.c:663
+#: g10/passphrase.c:665
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -2908,20 +2919,20 @@ msgstr ""
"Gizli anahtar�n kilidini a�mak i�in bir anahtar parolas�na ihtiyac�n�z var.\n"
"Anahtar�n sahibi: \""
-#: g10/passphrase.c:672
+#: g10/passphrase.c:674
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "%u-bit %s anahtar�, kimlik: %08lX, olu�turuldu %s"
-#: g10/passphrase.c:710
+#: g10/passphrase.c:712
msgid "can't query password in batchmode\n"
msgstr "�nceden tan�mlanm�� i�lemler kipinde (batchmode) parola sorgulanamaz\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:716
msgid "Enter passphrase: "
msgstr "Anahtar parolas�n� girin: "
-#: g10/passphrase.c:718
+#: g10/passphrase.c:720
msgid "Repeat passphrase: "
msgstr "Tekrar:"
@@ -3143,7 +3154,7 @@ msgstr "%s: kilit olu�turulamad�\n"
msgid "%s: can't make lock\n"
msgstr "%s: kilit olu�turulamad�\n"
-#: g10/keyring.c:1376 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
+#: g10/keyring.c:1420 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:479
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: olu�turulamad�: %s\n"
@@ -3279,22 +3290,32 @@ msgstr "g�vence veritaban� kayd� %lu, tip %d: yazma ba�ar�s�z: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "g�vence veritaban�: e�zamanlama ba�ar�s�z: %s\n"
-#: g10/trustdb.c:688
+#: g10/trustdb.c:470
+#, fuzzy
+msgid "no need for a trustdb check\n"
+msgstr "%s: bir g�vence veritaban� dosyas� de�il\n"
+
+#: g10/trustdb.c:476 g10/trustdb.c:1458
+#, fuzzy, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "g�vence veritaban� %lu kayd�: arama ba�ar�s�z: %s\n"
+
+#: g10/trustdb.c:709
#, fuzzy
msgid "checking the trustdb\n"
msgstr "sahibining�vencesini de�i�tirir"
-#: g10/trustdb.c:839
+#: g10/trustdb.c:860
#, fuzzy, c-format
msgid "public key %08lX not found: %s\n"
msgstr "genel anahtar bulunamad�"
-#: g10/trustdb.c:1304
+#: g10/trustdb.c:1338
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr ""
-#: g10/trustdb.c:1374
+#: g10/trustdb.c:1411
#, c-format
msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
msgstr ""
@@ -3709,60 +3730,60 @@ msgstr "yard�m mevcut de�il"
msgid "No help available for `%s'"
msgstr "\"%s\" i�in yard�m mevcut de�il"
-#: g10/keydb.c:170
+#: g10/keydb.c:175
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "\"%s\" anahtar demetini yazarken hata: %s\n"
-#: g10/keydb.c:179
+#: g10/keydb.c:184
#, c-format
msgid "changing permission of `%s' failed: %s\n"
msgstr ""
-#: g10/keydb.c:188
+#: g10/keydb.c:193
#, fuzzy, c-format
msgid "keyring `%s' created\n"
msgstr "%s: anahtar demeti olu�turuldu\n"
-#: g10/keydb.c:530
+#: g10/keydb.c:586
#, fuzzy, c-format
-msgid "failed to rebuild all keyring caches: %s\n"
+msgid "failed to rebuild keyring cache: %s\n"
msgstr "%s: hash tablosu olu�turma ba�ar�s�z: %s\n"
-#: g10/keyring.c:1179
+#: g10/keyring.c:1220
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr "UYARI: gizli bilgi i�eren 2 dosya mevcut.\n"
-#: g10/keyring.c:1181
+#: g10/keyring.c:1222
#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s de�i�meyen\n"
-#: g10/keyring.c:1182
+#: g10/keyring.c:1223
#, c-format
msgid "%s is the new one\n"
msgstr "%s yeni olan\n"
-#: g10/keyring.c:1183
+#: g10/keyring.c:1224
msgid "Please fix this possible security flaw\n"
msgstr "L�tfen bu g�venlik �atla��n� giderin\n"
-#: g10/keyring.c:1281
+#: g10/keyring.c:1322
#, fuzzy, c-format
msgid "checking keyring `%s'\n"
msgstr "\"%s\" anahtar demetini yazarken hata: %s\n"
-#: g10/keyring.c:1312
+#: g10/keyring.c:1353
#, fuzzy, c-format
msgid "%lu keys so far checked (%lu signatures)\n"
msgstr "�u ana kadar her�ey yolunda giderek %lu anahtar i�lenmi�\n"
-#: g10/keyring.c:1323
+#: g10/keyring.c:1364
#, fuzzy, c-format
msgid "%lu keys checked (%lu signatures)\n"
msgstr "anahtarlar� ve imzalar� listeler"
-#: g10/keyring.c:1381
+#: g10/keyring.c:1425
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: anahtar demeti olu�turuldu\n"
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 9a298f44e..0230fb5f2 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-22 Werner Koch <[email protected]>
+
+ * autogen.sh (aclocal_vers): Require automalke 1.5.
+
2001-08-21 Stefan Bellon <[email protected]>
* build-riscos [__riscos__]: New.
diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index 46744cd2e..215818965 100755
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -14,8 +14,8 @@
PGM=GnuPG
lib_config_files=""
autoconf_vers=2.52
-automake_vers=1.4
-aclocal_vers=1.4
+automake_vers=1.5
+aclocal_vers=1.5
DIE=no
diff --git a/scripts/config.guess b/scripts/config.guess
index 26048b63f..dff9e481b 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
-timestamp='2001-04-20'
+timestamp='2001-09-04'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -52,7 +52,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -72,7 +72,7 @@ while test $# -gt 0 ; do
echo "$usage"; exit 0 ;;
-- ) # Stop option processing
shift; break ;;
- - ) # Use stdin as input.
+ - ) # Use stdin as input.
break ;;
-* )
echo "$me: invalid option $1$help" >&2
@@ -95,27 +95,27 @@ trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated.
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int dummy(){}" > $dummy.c
- for c in cc gcc c89 ; do
- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
- if test $? = 0 ; then
- CC_FOR_BUILD="$c"; break
- fi
- done
- rm -f $dummy.c $dummy.o $dummy.rel
- if test x"$CC_FOR_BUILD" = x ; then
- CC_FOR_BUILD=no_compiler_found
- fi
- ;;
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,) echo "int dummy(){}" > $dummy.c ;
+ for c in cc gcc c89 ; do
+ ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
+ if test $? = 0 ; then
+ CC_FOR_BUILD="$c"; break ;
+ fi ;
+ done ;
+ rm -f $dummy.c $dummy.o $dummy.rel ;
+ if test x"$CC_FOR_BUILD" = x ; then
+ CC_FOR_BUILD=no_compiler_found ;
+ fi
+ ;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac
+esac'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# ([email protected] 8/24/94.)
+# ([email protected] 1994-08-24)
if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
- PATH=$PATH:/.attbin ; export PATH
+ PATH=$PATH:/.attbin ; export PATH
fi
UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
@@ -127,211 +127,218 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
- # Netbsd (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
- # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
- # switched to ELF, *-*-netbsd* would select the old
- # object file format. This provides both forward
- # compatibility and a consistent mechanism for selecting the
- # object file format.
- # Determine the machine/vendor (is the vendor relevant).
- case "${UNAME_MACHINE}" in
- amiga) machine=m68k-unknown ;;
- arm32) machine=arm-unknown ;;
- atari*) machine=m68k-atari ;;
- sun3*) machine=m68k-sun ;;
- mac68k) machine=m68k-apple ;;
- macppc) machine=powerpc-apple ;;
- hp3[0-9][05]) machine=m68k-hp ;;
- ibmrt|romp-ibm) machine=romp-ibm ;;
- *) machine=${UNAME_MACHINE}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
- case "${UNAME_MACHINE}" in
- i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
- os=netbsd
- else
- os=netbsdelf
- fi
- ;;
- *)
- os=netbsd
- ;;
- esac
- # The OS release
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
- # contains redundant information, the shorter form:
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
- exit 0 ;;
+ # Netbsd (nbsd) targets should (where applicable) match one or
+ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
+ # switched to ELF, *-*-netbsd* would select the old
+ # object file format. This provides both forward
+ # compatibility and a consistent mechanism for selecting the
+ # object file format.
+ # Determine the machine/vendor (is the vendor relevant).
+ case "${UNAME_MACHINE}" in
+ amiga) machine=m68k-unknown ;;
+ arm32) machine=arm-unknown ;;
+ atari*) machine=m68k-atari ;;
+ sun3*) machine=m68k-sun ;;
+ mac68k) machine=m68k-apple ;;
+ macppc) machine=powerpc-apple ;;
+ hp3[0-9][05]) machine=m68k-hp ;;
+ ibmrt|romp-ibm) machine=romp-ibm ;;
+ *) machine=${UNAME_MACHINE}-unknown ;;
+ esac
+ # The Operating System including object format, if it has switched
+ # to ELF recently, or will in the future.
+ case "${UNAME_MACHINE}" in
+ i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+ eval $set_cc_for_build
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep __ELF__ >/dev/null
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
+ os=netbsd
+ else
+ os=netbsdelf
+ fi
+ ;;
+ *)
+ os=netbsd
+ ;;
+ esac
+ # The OS release
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ # contains redundant information, the shorter form:
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+ exit 0 ;;
alpha:OSF1:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- fi
- # A Vn.n version is a released version.
- # A Tn.n version is a released field test version.
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
- cat <<EOF >$dummy.s
- .data
+ if test $UNAME_RELEASE = "V4.0"; then
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ fi
+ # A Vn.n version is a released version.
+ # A Tn.n version is a released field test version.
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+ cat <<EOF >$dummy.s
+ .data
\$Lformat:
- .byte 37,100,45,37,120,10,0 # "%d-%x\n"
+ .byte 37,100,45,37,120,10,0 # "%d-%x\n"
- .text
- .globl main
- .align 4
- .ent main
+ .text
+ .globl main
+ .align 4
+ .ent main
main:
- .frame \$30,16,\$26,0
- ldgp \$29,0(\$27)
- .prologue 1
- .long 0x47e03d80 # implver \$0
- lda \$2,-1
- .long 0x47e20c21 # amask \$2,\$1
- lda \$16,\$Lformat
- mov \$0,\$17
- not \$1,\$18
- jsr \$26,printf
- ldgp \$29,0(\$26)
- mov 0,\$16
- jsr \$26,exit
- .end main
+ .frame \$30,16,\$26,0
+ ldgp \$29,0(\$27)
+ .prologue 1
+ .long 0x47e03d80 # implver \$0
+ lda \$2,-1
+ .long 0x47e20c21 # amask \$2,\$1
+ lda \$16,\$Lformat
+ mov \$0,\$17
+ not \$1,\$18
+ jsr \$26,printf
+ ldgp \$29,0(\$26)
+ mov 0,\$16
+ jsr \$26,exit
+ .end main
EOF
- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
- if test "$?" = 0 ; then
- case `./$dummy` in
- 0-0)
- UNAME_MACHINE="alpha"
- ;;
- 1-0)
- UNAME_MACHINE="alphaev5"
- ;;
- 1-1)
- UNAME_MACHINE="alphaev56"
- ;;
- 1-101)
- UNAME_MACHINE="alphapca56"
- ;;
- 2-303)
- UNAME_MACHINE="alphaev6"
- ;;
- 2-307)
- UNAME_MACHINE="alphaev67"
- ;;
- esac
- fi
- rm -f $dummy.s $dummy
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrs
-tuvwxyz'`
- exit 0 ;;
+ eval $set_cc_for_build
+ $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+ if test "$?" = 0 ; then
+ case `./$dummy` in
+ 0-0)
+ UNAME_MACHINE="alpha"
+ ;;
+ 1-0)
+ UNAME_MACHINE="alphaev5"
+ ;;
+ 1-1)
+ UNAME_MACHINE="alphaev56"
+ ;;
+ 1-101)
+ UNAME_MACHINE="alphapca56"
+ ;;
+ 2-303)
+ UNAME_MACHINE="alphaev6"
+ ;;
+ 2-307)
+ UNAME_MACHINE="alphaev67"
+ ;;
+ 2-1307)
+ UNAME_MACHINE="alphaev68"
+ ;;
+ esac
+ fi
+ rm -f $dummy.s $dummy
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ exit 0 ;;
Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
- # of the specific Alpha model?
- echo alpha-pc-interix
- exit 0 ;;
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # Should we change UNAME_MACHINE based on the output of uname instead
+ # of the specific Alpha model?
+ echo alpha-pc-interix
+ exit 0 ;;
21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit 0 ;;
+ echo alpha-dec-winnt3.5
+ exit 0 ;;
Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4
- exit 0;;
+ echo m68k-unknown-sysv4
+ exit 0;;
amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
*:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
+ echo ${UNAME_MACHINE}-unknown-amigaos
+ exit 0 ;;
arc64:OpenBSD:*:*)
- echo mips64el-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ echo mips64el-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
hkmips:OpenBSD:*:*)
- echo mips-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ echo mips-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
pmax:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
sgi:OpenBSD:*:*)
- echo mips-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ echo mips-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
*:OS/390:*:*)
- echo i370-ibm-openedition
- exit 0 ;;
+ echo i370-ibm-openedition
+ exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
+ echo arm-acorn-riscix${UNAME_RELEASE}
+ exit 0;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- echo hppa1.1-hitachi-hiuxmpp
- exit 0;;
+ echo hppa1.1-hitachi-hiuxmpp
+ exit 0;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- # [email protected] (Earle F. Ake) contributed MIS and NILE.
- if test "`(/bin/universe) 2>/dev/null`" = att ; then
- echo pyramid-pyramid-sysv3
- else
- echo pyramid-pyramid-bsd
- fi
- exit 0 ;;
+ # [email protected] (Earle F. Ake) contributed MIS and NILE.
+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
+ echo pyramid-pyramid-sysv3
+ else
+ echo pyramid-pyramid-bsd
+ fi
+ exit 0 ;;
NILE*:*:*:dcosx)
- echo pyramid-pyramid-svr4
- exit 0 ;;
+ echo pyramid-pyramid-svr4
+ exit 0 ;;
sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
i86pc:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
- # SunOS6. Hard to guess exactly what SunOS6 will be like, but
- # it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ # According to config.sub, this is the proper way to canonicalize
+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
+ # it's likely to be more like Solaris than SunOS4.
+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
sun4*:SunOS:*:*)
- case "`/usr/bin/arch -k`" in
- Series*|S4*)
- UNAME_RELEASE=`uname -v`
- ;;
- esac
- # Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit 0 ;;
+ case "`/usr/bin/arch -k`" in
+ Series*|S4*)
+ UNAME_RELEASE=`uname -v`
+ ;;
+ esac
+ # Japanese Language versions have a version number like `4.1.3-JL'.
+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ exit 0 ;;
sun3*:SunOS:*:*)
- echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ exit 0 ;;
sun*:*:4.2BSD:*)
- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
- case "`/bin/arch`" in
- sun3)
- echo m68k-sun-sunos${UNAME_RELEASE}
- ;;
- sun4)
- echo sparc-sun-sunos${UNAME_RELEASE}
- ;;
- esac
- exit 0 ;;
+ UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ case "`/bin/arch`" in
+ sun3)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ ;;
+ sun4)
+ echo sparc-sun-sunos${UNAME_RELEASE}
+ ;;
+ esac
+ exit 0 ;;
aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
- exit 0 ;;
+ echo sparc-auspex-sunos${UNAME_RELEASE}
+ exit 0 ;;
+ sparc*:NetBSD:*)
+ echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
+ exit 0 ;;
atari*:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -342,13 +349,13 @@ tuvwxyz'`
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit 0 ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit 0 ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit 0 ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
echo m68k-milan-mint${UNAME_RELEASE}
exit 0 ;;
@@ -359,184 +366,186 @@ tuvwxyz'`
echo m68k-unknown-mint${UNAME_RELEASE}
exit 0 ;;
sun3*:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
+ echo powerpc-apple-machten${UNAME_RELEASE}
+ exit 0 ;;
RISC*:Mach:*:*)
- echo mips-dec-mach_bsd4.3
- exit 0 ;;
+ echo mips-dec-mach_bsd4.3
+ exit 0 ;;
RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ echo mips-dec-ultrix${UNAME_RELEASE}
+ exit 0 ;;
VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ echo vax-dec-ultrix${UNAME_RELEASE}
+ exit 0 ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix${UNAME_RELEASE}
- exit 0 ;;
+ echo clipper-intergraph-clix${UNAME_RELEASE}
+ exit 0 ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
- sed 's/^ //' << EOF >$dummy.c
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
#ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */
- int main (int argc, char *argv[]) {
+ int main (int argc, char *argv[]) {
#else
- int main (argc, argv) int argc; char *argv[]; {
+ int main (argc, argv) int argc; char *argv[]; {
#endif
- #if defined (host_mips) && defined (MIPSEB)
- #if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
- #endif
- #if defined (SYSTYPE_SVR4)
- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
- #endif
- #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
- #endif
- #endif
- exit (-1);
- }
+ #if defined (host_mips) && defined (MIPSEB)
+ #if defined (SYSTYPE_SYSV)
+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_SVR4)
+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ #endif
+ #endif
+ exit (-1);
+ }
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy \
- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
- echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
+ $CC_FOR_BUILD $dummy.c -o $dummy \
+ && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+ && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ echo mips-mips-riscos${UNAME_RELEASE}
+ exit 0 ;;
Motorola:PowerMAX_OS:*:*)
- echo powerpc-motorola-powermax
- exit 0 ;;
+ echo powerpc-motorola-powermax
+ exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
- echo powerpc-harris-powerunix
- exit 0 ;;
+ echo powerpc-harris-powerunix
+ exit 0 ;;
m88k:CX/UX:7*:*)
- echo m88k-harris-cxux7
- exit 0 ;;
+ echo m88k-harris-cxux7
+ exit 0 ;;
m88k:*:4*:R4*)
- echo m88k-motorola-sysv4
- exit 0 ;;
+ echo m88k-motorola-sysv4
+ exit 0 ;;
m88k:*:3*:R3*)
- echo m88k-motorola-sysv3
- exit 0 ;;
+ echo m88k-motorola-sysv3
+ exit 0 ;;
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
- [ ${TARGET_BINARY_INTERFACE}x = x ]
- then
- echo m88k-dg-dgux${UNAME_RELEASE}
- else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
- fi
- else
- echo i586-dg-dgux${UNAME_RELEASE}
- fi
- exit 0 ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
- exit 0 ;;
+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+ [ ${TARGET_BINARY_INTERFACE}x = x ]
+ then
+ echo m88k-dg-dgux${UNAME_RELEASE}
+ else
+ echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ fi
+ else
+ echo i586-dg-dgux${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ echo m88k-dolphin-sysv3
+ exit 0 ;;
M88*:*:R3*:*)
- # Delta 88k system running SVR3
- echo m88k-motorola-sysv3
- exit 0 ;;
+ # Delta 88k system running SVR3
+ echo m88k-motorola-sysv3
+ exit 0 ;;
XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- echo m88k-tektronix-sysv3
- exit 0 ;;
+ echo m88k-tektronix-sysv3
+ exit 0 ;;
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- echo m68k-tektronix-bsd
- exit 0 ;;
+ echo m68k-tektronix-bsd
+ exit 0 ;;
*:IRIX*:*:*)
- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit 0 ;;
+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ exit 0 ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
i*86:AIX:*:*)
- echo i386-ibm-aix
- exit 0 ;;
+ echo i386-ibm-aix
+ exit 0 ;;
ia64:AIX:*:*)
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
- else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit 0 ;;
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ exit 0 ;;
*:AIX:2:3)
- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- sed 's/^ //' << EOF >$dummy.c
- #include <sys/systemcfg.h>
+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <sys/systemcfg.h>
- main()
- {
- if (!__power_pc())
- exit(1);
- puts("powerpc-ibm-aix3.2.5");
- exit(0);
- }
+ main()
+ {
+ if (!__power_pc())
+ exit(1);
+ puts("powerpc-ibm-aix3.2.5");
+ exit(0);
+ }
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
- echo rs6000-ibm-aix3.2.5
- elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- echo rs6000-ibm-aix3.2.4
- else
- echo rs6000-ibm-aix3.2
- fi
- exit 0 ;;
+ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ echo rs6000-ibm-aix3.2.5
+ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ echo rs6000-ibm-aix3.2.4
+ else
+ echo rs6000-ibm-aix3.2
+ fi
+ exit 0 ;;
*:AIX:*:[45])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
- else
- IBM_ARCH=powerpc
- fi
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
- else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit 0 ;;
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+ else
+ IBM_ARCH=powerpc
+ fi
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ exit 0 ;;
*:AIX:*:*)
- echo rs6000-ibm-aix
- exit 0 ;;
+ echo rs6000-ibm-aix
+ exit 0 ;;
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- echo romp-ibm-bsd4.4
- exit 0 ;;
+ echo romp-ibm-bsd4.4
+ exit 0 ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit 0 ;; # report: romp-ibm BSD 4.3
+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+ exit 0 ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
- echo rs6000-bull-bosx
- exit 0 ;;
+ echo rs6000-bull-bosx
+ exit 0 ;;
DPX/2?00:B.O.S.:*:*)
- echo m68k-bull-sysv3
- exit 0 ;;
+ echo m68k-bull-sysv3
+ exit 0 ;;
9000/[34]??:4.3bsd:1.*:*)
- echo m68k-hp-bsd
- exit 0 ;;
+ echo m68k-hp-bsd
+ exit 0 ;;
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- echo m68k-hp-bsd4.4
- exit 0 ;;
+ echo m68k-hp-bsd4.4
+ exit 0 ;;
9000/[34678]??:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
- 9000/[678][0-9][0-9])
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ case "${UNAME_MACHINE}" in
+ 9000/31? ) HP_ARCH=m68000 ;;
+ 9000/[34]?? ) HP_ARCH=m68k ;;
+ 9000/[678][0-9][0-9])
case "${HPUX_REV}" in
11.[0-9][0-9])
if [ -x /usr/bin/getconf ]; then
@@ -554,6 +563,7 @@ EOF
fi ;;
esac
if [ "${HP_ARCH}" = "" ]; then
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#define _HPUX_SOURCE
@@ -568,616 +578,551 @@ EOF
long cpu = sysconf (_SC_CPU_VERSION);
switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- case CPU_PA_RISC2_0:
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
#if defined(_SC_KERNEL_BITS)
- switch (bits)
- {
- case 64: puts ("hppa2.0w"); break;
- case 32: puts ("hppa2.0n"); break;
- default: puts ("hppa2.0"); break;
- } break;
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
#else /* !defined(_SC_KERNEL_BITS) */
- puts ("hppa2.0"); break;
+ puts ("hppa2.0"); break;
#endif
- default: puts ("hppa1.0"); break;
- }
+ default: puts ("hppa1.0"); break;
+ }
exit (0);
}
EOF
- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
- rm -f $dummy.c $dummy
- fi ;;
- esac
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
+ (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+ if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+ rm -f $dummy.c $dummy
+ fi ;;
+ esac
+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ exit 0 ;;
ia64:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- echo ia64-hp-hpux${HPUX_REV}
- exit 0 ;;
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux${HPUX_REV}
+ exit 0 ;;
3050*:HI-UX:*:*)
- sed 's/^ //' << EOF >$dummy.c
- #include <unistd.h>
- int
- main ()
- {
- long cpu = sysconf (_SC_CPU_VERSION);
- /* The order matters, because CPU_IS_HP_MC68K erroneously returns
- true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
- results, however. */
- if (CPU_IS_PA_RISC (cpu))
- {
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
- case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
- default: puts ("hppa-hitachi-hiuxwe2"); break;
- }
- }
- else if (CPU_IS_HP_MC68K (cpu))
- puts ("m68k-hitachi-hiuxwe2");
- else puts ("unknown-hitachi-hiuxwe2");
- exit (0);
- }
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <unistd.h>
+ int
+ main ()
+ {
+ long cpu = sysconf (_SC_CPU_VERSION);
+ /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
+ results, however. */
+ if (CPU_IS_PA_RISC (cpu))
+ {
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+ default: puts ("hppa-hitachi-hiuxwe2"); break;
+ }
+ }
+ else if (CPU_IS_HP_MC68K (cpu))
+ puts ("m68k-hitachi-hiuxwe2");
+ else puts ("unknown-hitachi-hiuxwe2");
+ exit (0);
+ }
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
- echo unknown-hitachi-hiuxwe2
- exit 0 ;;
+ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ echo unknown-hitachi-hiuxwe2
+ exit 0 ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- echo hppa1.1-hp-bsd
- exit 0 ;;
+ echo hppa1.1-hp-bsd
+ exit 0 ;;
9000/8??:4.3bsd:*:*)
- echo hppa1.0-hp-bsd
- exit 0 ;;
- *9??*:MPE/iX:*:*)
- echo hppa1.0-hp-mpeix
- exit 0 ;;
+ echo hppa1.0-hp-bsd
+ exit 0 ;;
+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ echo hppa1.0-hp-mpeix
+ exit 0 ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- echo hppa1.1-hp-osf
- exit 0 ;;
+ echo hppa1.1-hp-osf
+ exit 0 ;;
hp8??:OSF1:*:*)
- echo hppa1.0-hp-osf
- exit 0 ;;
+ echo hppa1.0-hp-osf
+ exit 0 ;;
i*86:OSF1:*:*)
- if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
- else
- echo ${UNAME_MACHINE}-unknown-osf1
- fi
- exit 0 ;;
+ if [ -x /usr/sbin/sysversion ] ; then
+ echo ${UNAME_MACHINE}-unknown-osf1mk
+ else
+ echo ${UNAME_MACHINE}-unknown-osf1
+ fi
+ exit 0 ;;
parisc*:Lites*:*:*)
- echo hppa1.1-hp-lites
- exit 0 ;;
+ echo hppa1.1-hp-lites
+ exit 0 ;;
hppa*:OpenBSD:*:*)
- echo hppa-unknown-openbsd
- exit 0 ;;
+ echo hppa-unknown-openbsd
+ exit 0 ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- echo c1-convex-bsd
+ echo c1-convex-bsd
exit 0 ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
exit 0 ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- echo c34-convex-bsd
+ echo c34-convex-bsd
exit 0 ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- echo c38-convex-bsd
+ echo c38-convex-bsd
exit 0 ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- echo c4-convex-bsd
+ echo c4-convex-bsd
exit 0 ;;
CRAY*X-MP:*:*:*)
- echo xmp-cray-unicos
+ echo xmp-cray-unicos
exit 0 ;;
CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE}
- exit 0 ;;
+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
CRAY*[A-Z]90:*:*:*)
- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
- exit 0 ;;
+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
CRAY*T3D:*:*:*)
- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
CRAY*SV1:*:*:*)
- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
CRAY-2:*:*:*)
- echo cray2-cray-unicos
+ echo cray2-cray-unicos
exit 0 ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;;
hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ exit 0 ;;
sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ echo sparc-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
*:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
*:FreeBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit 0 ;;
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit 0 ;;
*:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- exit 0 ;;
+ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ exit 0 ;;
i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
- exit 0 ;;
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit 0 ;;
i*:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit 0 ;;
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit 0 ;;
i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit 0 ;;
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- # UNAME_MACHINE based on the output of uname instead of i386?
- echo i386-pc-interix
- exit 0 ;;
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ # UNAME_MACHINE based on the output of uname instead of i386?
+ echo i386-pc-interix
+ exit 0 ;;
i*:UWIN*:*)
- echo ${UNAME_MACHINE}-pc-uwin
- exit 0 ;;
+ echo ${UNAME_MACHINE}-pc-uwin
+ exit 0 ;;
p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
- exit 0 ;;
+ echo powerpcle-unknown-cygwin
+ exit 0 ;;
prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
*:GNU:*:*)
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ exit 0 ;;
i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
- exit 0 ;;
+ echo ${UNAME_MACHINE}-pc-minix
+ exit 0 ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux
- exit 0 ;;
+ echo ${UNAME_MACHINE}-unknown-linux
+ exit 0 ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
mips:Linux:*:*)
- cat >$dummy.c <<EOF
-#ifdef __cplusplus
-#include <stdio.h> /* for printf() prototype */
-int main (int argc, char *argv[]) {
-#else
-int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __MIPSEB__
- printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
- printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
- return 0;
-}
-EOF
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
- ;;
+ case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
+ big) echo mips-unknown-linux-gnu && exit 0 ;;
+ little) echo mipsel-unknown-linux-gnu && exit 0 ;;
+ esac
+ ;;
ppc:Linux:*:*)
- # Determine Lib Version
- cat >$dummy.c <<EOF
-#include <features.h>
-#if defined(__GLIBC__)
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
- int argc;
- char *argv[];
-{
-#if defined(__GLIBC__)
- printf("%s %s\n", __libc_version, __libc_release);
-#else
- printf("unknown\n");
-#endif
- return 0;
-}
-EOF
- LIBC=""
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
- if test "$?" = 0 ; then
- ./$dummy | grep 1\.99 > /dev/null
- if test "$?" = 0 ; then LIBC="libc1" ; fi
- fi
- rm -f $dummy.c $dummy
- echo powerpc-unknown-linux-gnu${LIBC}
- exit 0 ;;
+ echo powerpc-unknown-linux-gnu
+ exit 0 ;;
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+ exit 0 ;;
alpha:Linux:*:*)
- cat <<EOF >$dummy.s
- .data
- \$Lformat:
- .byte 37,100,45,37,120,10,0 # "%d-%x\n"
- .text
- .globl main
- .align 4
- .ent main
- main:
- .frame \$30,16,\$26,0
- ldgp \$29,0(\$27)
- .prologue 1
- .long 0x47e03d80 # implver \$0
- lda \$2,-1
- .long 0x47e20c21 # amask \$2,\$1
- lda \$16,\$Lformat
- mov \$0,\$17
- not \$1,\$18
- jsr \$26,printf
- ldgp \$29,0(\$26)
- mov 0,\$16
- jsr \$26,exit
- .end main
-EOF
- LIBC=""
- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
- if test "$?" = 0 ; then
- case `./$dummy` in
- 0-0) UNAME_MACHINE="alpha" ;;
- 1-0) UNAME_MACHINE="alphaev5" ;;
- 1-1) UNAME_MACHINE="alphaev56" ;;
- 1-101) UNAME_MACHINE="alphapca56" ;;
- 2-303) UNAME_MACHINE="alphaev6" ;;
- 2-307) UNAME_MACHINE="alphaev67" ;;
- esac
- objdump --private-headers $dummy | \
- grep ld.so.1 > /dev/null
- if test "$?" = 0 ; then
- LIBC="libc1"
- fi
- fi
- rm -f $dummy.s $dummy
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit 0 ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
esac
- exit 0 ;;
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit 0 ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit 0 ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
- exit 0 ;;
+ echo hppa64-unknown-linux-gnu
+ exit 0 ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
- exit 0 ;;
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit 0 ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
- exit 0 ;;
+ echo x86_64-unknown-linux-gnu
+ exit 0 ;;
i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
- # problems with other programs or directories called `ld' in the path.
- ld_supported_emulations=`cd /; ld --help 2>&1 \
- | sed -ne '/supported emulations:/!d
- s/[ ][ ]*/ /g
- s/.*supported emulations: *//
- s/ .*//
- p'`
- case "$ld_supported_emulations" in
- i*86linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0
- ;;
- elf_i*86)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
- i*86coff)
- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit 0
- ;;
- esac
- # Either a pre-BFD a.out linker (linux-gnuoldld)
- # or one that does not give us useful --help.
- # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
- # If ld does not provide *any* "supported emulations:"
- # that means it is gnuoldld.
- test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
- case "${UNAME_MACHINE}" in
- i*86)
- VENDOR=pc;
- ;;
- *)
- VENDOR=unknown;
- ;;
- esac
- # Determine whether the default compiler is a.out or elf
- cat >$dummy.c <<EOF
+ # The BFD linker knows what the default object file format is, so
+ # first see if it will tell us. cd to the root directory to prevent
+ # problems with other programs or directories called `ld' in the path.
+ ld_supported_targets=`cd /; ld --help 2>&1 \
+ | sed -ne '/supported targets:/!d
+ s/[ ][ ]*/ /g
+ s/.*supported targets: *//
+ s/ .*//
+ p'`
+ case "$ld_supported_targets" in
+ elf32-i386)
+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ ;;
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit 0 ;;
+ coff-i386)
+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ exit 0 ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ exit 0 ;;
+ esac
+ # Determine whether the default compiler is a.out or elf
+ eval $set_cc_for_build
+ cat >$dummy.c <<EOF
#include <features.h>
#ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */
- int main (int argc, char *argv[]) {
+ int main (int argc, char *argv[]) {
#else
- int main (argc, argv) int argc; char *argv[]; {
+ int main (argc, argv) int argc; char *argv[]; {
#endif
#ifdef __ELF__
# ifdef __GLIBC__
# if __GLIBC__ >= 2
- printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+ printf ("%s-pc-linux-gnu\n", argv[1]);
# else
- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+ printf ("%s-pc-linux-gnulibc1\n", argv[1]);
# endif
# else
- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+ printf ("%s-pc-linux-gnulibc1\n", argv[1]);
# endif
#else
- printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+ printf ("%s-pc-linux-gnuaout\n", argv[1]);
#endif
return 0;
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
- ;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
-# are messed up and put the nodename in both sysname and nodename.
+ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ ;;
i*86:DYNIX/ptx:4*:*)
- echo i386-sequent-sysv4
- exit 0 ;;
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+ # sysname and nodename.
+ echo i386-sequent-sysv4
+ exit 0 ;;
i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
# I am not positive that other SVR4 systems won't match this,
- # I just have to hope. -- rms.
+ # I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit 0 ;;
+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ exit 0 ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
- else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- fi
- exit 0 ;;
- i*86:*:5:7*)
- # Fixed at (any) Pentium or better
- UNAME_MACHINE=i586
- if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
- echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
- else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
- fi
- exit 0 ;;
+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ else
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ fi
+ exit 0 ;;
+ i*86:*:5:[78]*)
+ case `/bin/uname -X | grep "^Machine"` in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ esac
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ exit 0 ;;
i*86:*:3.2:*)
- if test -f /usr/options/cb.name; then
- UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
- elif /bin/uname -X 2>/dev/null >/dev/null ; then
- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
- && UNAME_MACHINE=i586
- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
- && UNAME_MACHINE=i686
- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
- && UNAME_MACHINE=i686
- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
- else
- echo ${UNAME_MACHINE}-pc-sysv32
- fi
- exit 0 ;;
+ if test -f /usr/options/cb.name; then
+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ elif /bin/uname -X 2>/dev/null >/dev/null ; then
+ UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+ && UNAME_MACHINE=i586
+ (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+ && UNAME_MACHINE=i686
+ (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+ && UNAME_MACHINE=i686
+ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ else
+ echo ${UNAME_MACHINE}-pc-sysv32
+ fi
+ exit 0 ;;
i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit 0 ;;
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ exit 0 ;;
pc:*:*:*)
- # Left here for compatibility:
+ # Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
- echo i386-pc-msdosdjgpp
+ echo i386-pc-msdosdjgpp
exit 0 ;;
Intel:Mach:3*:*)
- echo i386-pc-mach3
- exit 0 ;;
+ echo i386-pc-mach3
+ exit 0 ;;
paragon:*:*:*)
- echo i860-intel-osf1
- exit 0 ;;
+ echo i860-intel-osf1
+ exit 0 ;;
i860:*:4.*:*) # i860-SVR4
- if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
- fi
- exit 0 ;;
+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ else # Add other i860-SVR4 vendors below as they are discovered.
+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ fi
+ exit 0 ;;
mini*:CTIX:SYS*5:*)
- # "miniframe"
- echo m68010-convergent-sysv
- exit 0 ;;
+ # "miniframe"
+ echo m68010-convergent-sysv
+ exit 0 ;;
M68*:*:R3V[567]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+ test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
- OS_REL=''
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4.3${OS_REL} && exit 0
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+ OS_REL=''
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& echo i486-ncr-sysv4 && exit 0 ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
mc68030:UNIX_System_V:4.*:*)
- echo m68k-atari-sysv4
- exit 0 ;;
+ echo m68k-atari-sysv4
+ exit 0 ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ echo sparc-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
SM[BE]S:UNIX_SV:*:*)
- echo mips-dde-sysv${UNAME_RELEASE}
- exit 0 ;;
+ echo mips-dde-sysv${UNAME_RELEASE}
+ exit 0 ;;
RM*:ReliantUNIX-*:*:*)
- echo mips-sni-sysv4
- exit 0 ;;
+ echo mips-sni-sysv4
+ exit 0 ;;
RM*:SINIX-*:*:*)
- echo mips-sni-sysv4
- exit 0 ;;
+ echo mips-sni-sysv4
+ exit 0 ;;
*:SINIX-*:*:*)
- if uname -p 2>/dev/null >/dev/null ; then
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
- echo ${UNAME_MACHINE}-sni-sysv4
- else
- echo ns32k-sni-sysv
- fi
- exit 0 ;;
- PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ if uname -p 2>/dev/null >/dev/null ; then
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ echo ${UNAME_MACHINE}-sni-sysv4
+ else
+ echo ns32k-sni-sysv
+ fi
+ exit 0 ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
echo i586-unisys-sysv4
exit 0 ;;
*:UNIX_System_V:4*:FTX*)
- # From Gerald Hewes <[email protected]>.
- # How about differentiating between stratus architectures? -djm
- echo hppa1.1-stratus-sysv4
- exit 0 ;;
+ # From Gerald Hewes <[email protected]>.
+ # How about differentiating between stratus architectures? -djm
+ echo hppa1.1-stratus-sysv4
+ exit 0 ;;
*:*:*:FTX*)
- echo i860-stratus-sysv4
- exit 0 ;;
+ echo i860-stratus-sysv4
+ exit 0 ;;
+ *:VOS:*:*)
+ echo hppa1.1-stratus-vos
+ exit 0 ;;
mc68*:A/UX:*:*)
- echo m68k-apple-aux${UNAME_RELEASE}
- exit 0 ;;
+ echo m68k-apple-aux${UNAME_RELEASE}
+ exit 0 ;;
news*:NEWS-OS:6*:*)
- echo mips-sony-newsos6
- exit 0 ;;
+ echo mips-sony-newsos6
+ exit 0 ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
- else
- echo mips-unknown-sysv${UNAME_RELEASE}
- fi
- exit 0 ;;
- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
- echo powerpc-be-beos
- exit 0 ;;
- BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
- echo powerpc-apple-beos
- exit 0 ;;
- BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
- echo i586-pc-beos
- exit 0 ;;
+ if [ -d /usr/nec ]; then
+ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+ echo mips-unknown-sysv${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+ echo powerpc-be-beos
+ exit 0 ;;
+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
+ echo powerpc-apple-beos
+ exit 0 ;;
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+ exit 0 ;;
SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
SX-5:SUPER-UX:*:*)
- echo sx5-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ echo sx5-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
*:Rhapsody:*:*)
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
*:Darwin:*:*)
- echo `uname -p`-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
+ echo `uname -p`-apple-darwin${UNAME_RELEASE}
+ exit 0 ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
- if test "${UNAME_MACHINE}" = "x86pc"; then
- UNAME_MACHINE=pc
- fi
- echo `uname -p`-${UNAME_MACHINE}-nto-qnx
- exit 0 ;;
+ if test "${UNAME_MACHINE}" = "x86pc"; then
+ UNAME_MACHINE=pc
+ fi
+ echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+ exit 0 ;;
*:QNX:*:4*)
- echo i386-pc-qnx
- exit 0 ;;
+ echo i386-pc-qnx
+ exit 0 ;;
NSR-[KW]:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk${UNAME_RELEASE}
- exit 0 ;;
+ echo nsr-tandem-nsk${UNAME_RELEASE}
+ exit 0 ;;
*:NonStop-UX:*:*)
- echo mips-compaq-nonstopux
- exit 0 ;;
+ echo mips-compaq-nonstopux
+ exit 0 ;;
BS2000:POSIX*:*:*)
- echo bs2000-siemens-sysv
- exit 0 ;;
+ echo bs2000-siemens-sysv
+ exit 0 ;;
DS/*:UNIX_System_V:*:*)
- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit 0 ;;
+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+ exit 0 ;;
*:Plan9:*:*)
- # "uname -m" is not consistent, so use $cputype instead. 386
- # is converted to i386 for consistency with other x86
- # operating systems.
- if test "$cputype" = "386"; then
- UNAME_MACHINE=i386
- else
- UNAME_MACHINE="$cputype"
- fi
- echo ${UNAME_MACHINE}-unknown-plan9
- exit 0 ;;
+ # "uname -m" is not consistent, so use $cputype instead. 386
+ # is converted to i386 for consistency with other x86
+ # operating systems.
+ if test "$cputype" = "386"; then
+ UNAME_MACHINE=i386
+ else
+ UNAME_MACHINE="$cputype"
+ fi
+ echo ${UNAME_MACHINE}-unknown-plan9
+ exit 0 ;;
i*86:OS/2:*:*)
- # If we were able to find `uname', then EMX Unix compatibility
- # is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
- exit 0 ;;
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit 0 ;;
*:TOPS-10:*:*)
- echo pdp10-unknown-tops10
- exit 0 ;;
+ echo pdp10-unknown-tops10
+ exit 0 ;;
*:TENEX:*:*)
- echo pdp10-unknown-tenex
- exit 0 ;;
+ echo pdp10-unknown-tenex
+ exit 0 ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- echo pdp10-dec-tops20
- exit 0 ;;
+ echo pdp10-dec-tops20
+ exit 0 ;;
XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- echo pdp10-xkl-tops20
- exit 0 ;;
+ echo pdp10-xkl-tops20
+ exit 0 ;;
*:TOPS-20:*:*)
- echo pdp10-unknown-tops20
- exit 0 ;;
+ echo pdp10-unknown-tops20
+ exit 0 ;;
*:ITS:*:*)
- echo pdp10-unknown-its
- exit 0 ;;
+ echo pdp10-unknown-its
+ exit 0 ;;
+ i*86:XTS-300:*:STOP)
+ echo ${UNAME_MACHINE}-unknown-stop
+ exit 0 ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos
+ exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
@@ -1196,7 +1141,7 @@ main ()
#ifdef NEWSOS4
"4"
#else
- ""
+ ""
#endif
); exit (0);
#endif
@@ -1254,10 +1199,10 @@ main ()
uname(&un);
if (strncmp(un.version, "V2", 2) == 0) {
- printf ("i386-sequent-ptx2\n"); exit (0);
+ printf ("i386-sequent-ptx2\n"); exit (0);
}
if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
- printf ("i386-sequent-ptx1\n"); exit (0);
+ printf ("i386-sequent-ptx1\n"); exit (0);
}
printf ("i386-sequent-ptx\n"); exit (0);
@@ -1305,23 +1250,23 @@ if [ -x /usr/convex/getsysinfo ]
then
case `getsysinfo -f cpu_type` in
c1*)
- echo c1-convex-bsd
- exit 0 ;;
+ echo c1-convex-bsd
+ exit 0 ;;
c2*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit 0 ;;
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit 0 ;;
c34*)
- echo c34-convex-bsd
- exit 0 ;;
+ echo c34-convex-bsd
+ exit 0 ;;
c38*)
- echo c38-convex-bsd
- exit 0 ;;
+ echo c38-convex-bsd
+ exit 0 ;;
c4*)
- echo c4-convex-bsd
- exit 0 ;;
+ echo c4-convex-bsd
+ exit 0 ;;
esac
fi
@@ -1370,4 +1315,3 @@ exit 1
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:
-
diff --git a/scripts/config.sub b/scripts/config.sub
index 3666ecf1d..393f13d37 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
-timestamp='2001-04-20'
+timestamp='2001-09-07'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -46,9 +46,9 @@ timestamp='2001-04-20'
# The goal of this file is to map all the various variations of a given
# machine specification into a single specification in the form:
-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
# or in some cases, the newer four-part form:
-# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# It is wrong to echo any other type of specification.
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -89,7 +89,7 @@ while test $# -gt 0 ; do
echo "$usage"; exit 0 ;;
-- ) # Stop option processing
shift; break ;;
- - ) # Use stdin as input.
+ - ) # Use stdin as input.
break ;;
-* )
echo "$me: invalid option $1$help"
@@ -117,7 +117,7 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
+ nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -134,850 +134,894 @@ esac
### recognize some manufacturers as not being operating systems, so we
### can provide default operating systems below.
case $os in
- -sun*os*)
- # Prevent following clause from handling this invalid input.
- ;;
- -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
- -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
- -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis)
- os=
- basic_machine=$1
- ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
- ;;
- -scout)
- ;;
- -wrs)
- os=-vxworks
- basic_machine=$1
- ;;
- -hiux*)
- os=-hiuxwe2
- ;;
- -sco5)
- os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco4)
- os=-sco3.2v4
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco3.2.[4-9]*)
- os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco3.2v[4-9]*)
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco*)
- os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -udk*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -isc)
- os=-isc2.2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -clix*)
- basic_machine=clipper-intergraph
- ;;
- -isc*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -lynx*)
- os=-lynxos
- ;;
- -ptx*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
- ;;
- -windowsnt*)
- os=`echo $os | sed -e 's/windowsnt/winnt/'`
- ;;
- -psos*)
- os=-psos
- ;;
- -mint | -mint[0-9]*)
- basic_machine=m68k-atari
- os=-mint
- ;;
+ -sun*os*)
+ # Prevent following clause from handling this invalid input.
+ ;;
+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+ -apple | -axis)
+ os=
+ basic_machine=$1
+ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
+ os=
+ basic_machine=$1
+ ;;
+ -scout)
+ ;;
+ -wrs)
+ os=-vxworks
+ basic_machine=$1
+ ;;
+ -chorusos*)
+ os=-chorusos
+ basic_machine=$1
+ ;;
+ -chorusrdb)
+ os=-chorusrdb
+ basic_machine=$1
+ ;;
+ -hiux*)
+ os=-hiuxwe2
+ ;;
+ -sco5)
+ os=-sco3.2v5
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco4)
+ os=-sco3.2v4
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2.[4-9]*)
+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2v[4-9]*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco*)
+ os=-sco3.2v2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -udk*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -isc)
+ os=-isc2.2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -clix*)
+ basic_machine=clipper-intergraph
+ ;;
+ -isc*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -lynx*)
+ os=-lynxos
+ ;;
+ -ptx*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+ ;;
+ -windowsnt*)
+ os=`echo $os | sed -e 's/windowsnt/winnt/'`
+ ;;
+ -psos*)
+ os=-psos
+ ;;
+ -mint | -mint[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
esac
# Decode aliases for certain CPU-COMPANY combinations.
case $basic_machine in
- # Recognize the basic CPU types without company name.
- # Some are omitted here because they have special meanings below.
- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
- | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
- | pyramid | mn10200 | mn10300 | tron | a29k \
- | 580 | i960 | h8300 \
- | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
- | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
- | hppa64 \
- | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
- | alphaev6[78] \
- | we32k | ns16k | clipper | i370 | sh | sh[34] \
- | powerpc | powerpcle \
- | 1750a | dsp16xx | pdp10 | pdp11 \
- | mips16 | mips64 | mipsel | mips64el \
- | mips64orion | mips64orionel | mipstx39 | mipstx39el \
- | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
- | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
- | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
- | v850 | c4x \
- | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
- | pj | pjl | h8500)
- basic_machine=$basic_machine-unknown
- ;;
- m6811 | m68hc11 | m6812 | m68hc12)
- # Motorola 68HC11/12.
- basic_machine=$basic_machine-unknown
- os=-none
- ;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
- ;;
+ # Recognize the basic CPU types without company name.
+ # Some are omitted here because they have special meanings below.
+ 1750a | 580 \
+ | a29k \
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | c4x | clipper \
+ | d10v | d30v | dsp16xx \
+ | fr30 \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | m32r | m68000 | m68k | m88k | mcore \
+ | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+ | mips64vr4100 | mips64vr4100el | mips64vr4300 \
+ | mips64vr4300el | mips64vr5000 | mips64vr5000el \
+ | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+ | mipsisa32 \
+ | mn10200 | mn10300 \
+ | ns16k | ns32k \
+ | openrisc \
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
+ | s390 | s390x \
+ | sh | sh[34] | sh[34]eb | shbe | shle \
+ | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+ | stormy16 | strongarm \
+ | tahoe | thumb | tic80 | tron \
+ | v850 \
+ | we32k \
+ | x86 | xscale \
+ | z8k)
+ basic_machine=$basic_machine-unknown
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ ;;
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
- # (2) the word "unknown" tends to confuse beginning users.
- i*86 | x86_64)
- basic_machine=$basic_machine-pc
- ;;
- # Object if more than one company name word.
- *-*-*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
- ;;
- # Recognize the basic CPU types with company name.
- # FIXME: clean up the formatting here.
- vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
- | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
- | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
- | xmp-* | ymp-* \
- | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
- | hppa2.0n-* | hppa64-* \
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
- | alphaev6[78]-* \
- | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
- | clipper-* | orion-* \
- | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
- | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
- | mips16-* | mips64-* | mipsel-* \
- | mips64el-* | mips64orion-* | mips64orionel-* \
- | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
- | mipstx39-* | mipstx39el-* | mcore-* \
- | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
- | [cjt]90-* \
- | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
- | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
- | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
- ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
- 386bsd)
- basic_machine=i386-unknown
- os=-bsd
- ;;
- 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
- basic_machine=m68000-att
- ;;
- 3b*)
- basic_machine=we32k-att
- ;;
- a29khif)
- basic_machine=a29k-amd
- os=-udi
- ;;
- adobe68k)
- basic_machine=m68010-adobe
- os=-scout
- ;;
- alliant | fx80)
- basic_machine=fx80-alliant
- ;;
- altos | altos3068)
- basic_machine=m68k-altos
- ;;
- am29k)
- basic_machine=a29k-none
- os=-bsd
- ;;
- amdahl)
- basic_machine=580-amdahl
- os=-sysv
- ;;
- amiga | amiga-*)
- basic_machine=m68k-unknown
- ;;
- amigaos | amigados)
- basic_machine=m68k-unknown
- os=-amigaos
- ;;
- amigaunix | amix)
- basic_machine=m68k-unknown
- os=-sysv4
- ;;
- apollo68)
- basic_machine=m68k-apollo
- os=-sysv
- ;;
- apollo68bsd)
- basic_machine=m68k-apollo
- os=-bsd
- ;;
- aux)
- basic_machine=m68k-apple
- os=-aux
- ;;
- balance)
- basic_machine=ns32k-sequent
- os=-dynix
- ;;
- convex-c1)
- basic_machine=c1-convex
- os=-bsd
- ;;
- convex-c2)
- basic_machine=c2-convex
- os=-bsd
- ;;
- convex-c32)
- basic_machine=c32-convex
- os=-bsd
- ;;
- convex-c34)
- basic_machine=c34-convex
- os=-bsd
- ;;
- convex-c38)
- basic_machine=c38-convex
- os=-bsd
- ;;
- cray | ymp)
- basic_machine=ymp-cray
- os=-unicos
- ;;
- cray2)
- basic_machine=cray2-cray
- os=-unicos
- ;;
- [cjt]90)
- basic_machine=${basic_machine}-cray
- os=-unicos
- ;;
- crds | unos)
- basic_machine=m68k-crds
- ;;
- cris | cris-* | etrax*)
- basic_machine=cris-axis
- ;;
- da30 | da30-*)
- basic_machine=m68k-da30
- ;;
- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
- basic_machine=mips-dec
- ;;
- delta | 3300 | motorola-3300 | motorola-delta \
- | 3300-motorola | delta-motorola)
- basic_machine=m68k-motorola
- ;;
- delta88)
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
- dpx20 | dpx20-*)
- basic_machine=rs6000-bull
- os=-bosx
- ;;
- dpx2* | dpx2*-bull)
- basic_machine=m68k-bull
- os=-sysv3
- ;;
- ebmon29k)
- basic_machine=a29k-amd
- os=-ebmon
- ;;
- elxsi)
- basic_machine=elxsi-elxsi
- os=-bsd
- ;;
- encore | umax | mmax)
- basic_machine=ns32k-encore
- ;;
- es1800 | OSE68k | ose68k | ose | OSE)
- basic_machine=m68k-ericsson
- os=-ose
- ;;
- fx2800)
- basic_machine=i860-alliant
- ;;
- genix)
- basic_machine=ns32k-ns
- ;;
- gmicro)
- basic_machine=tron-gmicro
- os=-sysv
- ;;
- go32)
- basic_machine=i386-pc
- os=-go32
- ;;
- h3050r* | hiux*)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
- ;;
- h8300hms)
- basic_machine=h8300-hitachi
- os=-hms
- ;;
- h8300xray)
- basic_machine=h8300-hitachi
- os=-xray
- ;;
- h8500hms)
- basic_machine=h8500-hitachi
- os=-hms
- ;;
- harris)
- basic_machine=m88k-harris
- os=-sysv3
- ;;
- hp300-*)
- basic_machine=m68k-hp
- ;;
- hp300bsd)
- basic_machine=m68k-hp
- os=-bsd
- ;;
- hp300hpux)
- basic_machine=m68k-hp
- os=-hpux
- ;;
- hp3k9[0-9][0-9] | hp9[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hp9k2[0-9][0-9] | hp9k31[0-9])
- basic_machine=m68000-hp
- ;;
- hp9k3[2-9][0-9])
- basic_machine=m68k-hp
- ;;
- hp9k6[0-9][0-9] | hp6[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hp9k7[0-79][0-9] | hp7[0-79][0-9])
- basic_machine=hppa1.1-hp
- ;;
- hp9k78[0-9] | hp78[0-9])
- # FIXME: really hppa2.0-hp
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
- # FIXME: really hppa2.0-hp
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[0-9][13679] | hp8[0-9][13679])
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[0-9][0-9] | hp8[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hppa-next)
- os=-nextstep3
- ;;
- hppaosf)
- basic_machine=hppa1.1-hp
- os=-osf
- ;;
- hppro)
- basic_machine=hppa1.1-hp
- os=-proelf
- ;;
- i370-ibm* | ibm*)
- basic_machine=i370-ibm
- ;;
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+ # (2) the word "unknown" tends to confuse beginning users.
+ i*86 | x86_64)
+ basic_machine=$basic_machine-pc
+ ;;
+ # Object if more than one company name word.
+ *-*-*)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
+ # Recognize the basic CPU types with company name.
+ 580-* \
+ | a29k-* \
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ | alphapca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armv*-* \
+ | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c54x-* \
+ | clipper-* | cray2-* | cydra-* \
+ | d10v-* | d30v-* \
+ | elxsi-* \
+ | f30[01]-* | f700-* | fr30-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | m32r-* \
+ | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+ | m88110-* | m88k-* | mcore-* \
+ | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+ | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+ | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
+ | orion-* \
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+ | romp-* | rs6000-* \
+ | s390-* | s390x-* \
+ | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
+ | sparc-* | sparc64-* | sparc86x-* | sparclite-* \
+ | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
+ | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+ | v850-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
+ | ymp-* \
+ | z8k-*)
+ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+ 386bsd)
+ basic_machine=i386-unknown
+ os=-bsd
+ ;;
+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+ basic_machine=m68000-att
+ ;;
+ 3b*)
+ basic_machine=we32k-att
+ ;;
+ a29khif)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ adobe68k)
+ basic_machine=m68010-adobe
+ os=-scout
+ ;;
+ alliant | fx80)
+ basic_machine=fx80-alliant
+ ;;
+ altos | altos3068)
+ basic_machine=m68k-altos
+ ;;
+ am29k)
+ basic_machine=a29k-none
+ os=-bsd
+ ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
+ ;;
+ amiga | amiga-*)
+ basic_machine=m68k-unknown
+ ;;
+ amigaos | amigados)
+ basic_machine=m68k-unknown
+ os=-amigaos
+ ;;
+ amigaunix | amix)
+ basic_machine=m68k-unknown
+ os=-sysv4
+ ;;
+ apollo68)
+ basic_machine=m68k-apollo
+ os=-sysv
+ ;;
+ apollo68bsd)
+ basic_machine=m68k-apollo
+ os=-bsd
+ ;;
+ aux)
+ basic_machine=m68k-apple
+ os=-aux
+ ;;
+ balance)
+ basic_machine=ns32k-sequent
+ os=-dynix
+ ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=-bsd
+ ;;
+ convex-c2)
+ basic_machine=c2-convex
+ os=-bsd
+ ;;
+ convex-c32)
+ basic_machine=c32-convex
+ os=-bsd
+ ;;
+ convex-c34)
+ basic_machine=c34-convex
+ os=-bsd
+ ;;
+ convex-c38)
+ basic_machine=c38-convex
+ os=-bsd
+ ;;
+ cray | ymp)
+ basic_machine=ymp-cray
+ os=-unicos
+ ;;
+ cray2)
+ basic_machine=cray2-cray
+ os=-unicos
+ ;;
+ [cjt]90)
+ basic_machine=${basic_machine}-cray
+ os=-unicos
+ ;;
+ crds | unos)
+ basic_machine=m68k-crds
+ ;;
+ cris | cris-* | etrax*)
+ basic_machine=cris-axis
+ ;;
+ da30 | da30-*)
+ basic_machine=m68k-da30
+ ;;
+ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+ basic_machine=mips-dec
+ ;;
+ delta | 3300 | motorola-3300 | motorola-delta \
+ | 3300-motorola | delta-motorola)
+ basic_machine=m68k-motorola
+ ;;
+ delta88)
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
+ dpx20 | dpx20-*)
+ basic_machine=rs6000-bull
+ os=-bosx
+ ;;
+ dpx2* | dpx2*-bull)
+ basic_machine=m68k-bull
+ os=-sysv3
+ ;;
+ ebmon29k)
+ basic_machine=a29k-amd
+ os=-ebmon
+ ;;
+ elxsi)
+ basic_machine=elxsi-elxsi
+ os=-bsd
+ ;;
+ encore | umax | mmax)
+ basic_machine=ns32k-encore
+ ;;
+ es1800 | OSE68k | ose68k | ose | OSE)
+ basic_machine=m68k-ericsson
+ os=-ose
+ ;;
+ fx2800)
+ basic_machine=i860-alliant
+ ;;
+ genix)
+ basic_machine=ns32k-ns
+ ;;
+ gmicro)
+ basic_machine=tron-gmicro
+ os=-sysv
+ ;;
+ go32)
+ basic_machine=i386-pc
+ os=-go32
+ ;;
+ h3050r* | hiux*)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ h8300hms)
+ basic_machine=h8300-hitachi
+ os=-hms
+ ;;
+ h8300xray)
+ basic_machine=h8300-hitachi
+ os=-xray
+ ;;
+ h8500hms)
+ basic_machine=h8500-hitachi
+ os=-hms
+ ;;
+ harris)
+ basic_machine=m88k-harris
+ os=-sysv3
+ ;;
+ hp300-*)
+ basic_machine=m68k-hp
+ ;;
+ hp300bsd)
+ basic_machine=m68k-hp
+ os=-bsd
+ ;;
+ hp300hpux)
+ basic_machine=m68k-hp
+ os=-hpux
+ ;;
+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hp9k2[0-9][0-9] | hp9k31[0-9])
+ basic_machine=m68000-hp
+ ;;
+ hp9k3[2-9][0-9])
+ basic_machine=m68k-hp
+ ;;
+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k78[0-9] | hp78[0-9])
+ # FIXME: really hppa2.0-hp
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+ # FIXME: really hppa2.0-hp
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][13679] | hp8[0-9][13679])
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hppa-next)
+ os=-nextstep3
+ ;;
+ hppaosf)
+ basic_machine=hppa1.1-hp
+ os=-osf
+ ;;
+ hppro)
+ basic_machine=hppa1.1-hp
+ os=-proelf
+ ;;
+ i370-ibm* | ibm*)
+ basic_machine=i370-ibm
+ ;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
- i*86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv32
- ;;
- i*86v4*)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv4
- ;;
- i*86v)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv
- ;;
- i*86sol2)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-solaris2
- ;;
- i386mach)
- basic_machine=i386-mach
- os=-mach
- ;;
- i386-vsta | vsta)
- basic_machine=i386-unknown
- os=-vsta
- ;;
- iris | iris4d)
- basic_machine=mips-sgi
- case $os in
- -irix*)
- ;;
- *)
- os=-irix4
- ;;
- esac
- ;;
- isi68 | isi)
- basic_machine=m68k-isi
- os=-sysv
- ;;
- m88k-omron*)
- basic_machine=m88k-omron
- ;;
- magnum | m3230)
- basic_machine=mips-mips
- os=-sysv
- ;;
- merlin)
- basic_machine=ns32k-utek
- os=-sysv
- ;;
- mingw32)
- basic_machine=i386-pc
- os=-mingw32
- ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
- basic_machine=m68k-atari
- os=-mint
- ;;
- mipsel*-linux*)
- basic_machine=mipsel-unknown
- os=-linux-gnu
- ;;
- mips*-linux*)
- basic_machine=mips-unknown
- os=-linux-gnu
- ;;
- mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- ;;
- mips3*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- ;;
- mmix*)
- basic_machine=mmix-knuth
- os=-mmixware
- ;;
- monitor)
- basic_machine=m68k-rom68k
- os=-coff
- ;;
- msdos)
- basic_machine=i386-pc
- os=-msdos
- ;;
- mvs)
- basic_machine=i370-ibm
- os=-mvs
- ;;
- ncr3000)
- basic_machine=i486-ncr
- os=-sysv4
- ;;
- netbsd386)
- basic_machine=i386-unknown
- os=-netbsd
- ;;
- netwinder)
- basic_machine=armv4l-rebel
- os=-linux
- ;;
- news | news700 | news800 | news900)
- basic_machine=m68k-sony
- os=-newsos
- ;;
- news1000)
- basic_machine=m68030-sony
- os=-newsos
- ;;
- news-3600 | risc-news)
- basic_machine=mips-sony
- os=-newsos
- ;;
- necv70)
- basic_machine=v70-nec
- os=-sysv
- ;;
- next | m*-next )
- basic_machine=m68k-next
- case $os in
- -nextstep* )
- ;;
- -ns2*)
- os=-nextstep2
- ;;
- *)
- os=-nextstep3
- ;;
- esac
- ;;
- nh3000)
- basic_machine=m68k-harris
- os=-cxux
- ;;
- nh[45]000)
- basic_machine=m88k-harris
- os=-cxux
- ;;
- nindy960)
- basic_machine=i960-intel
- os=-nindy
- ;;
- mon960)
- basic_machine=i960-intel
- os=-mon960
- ;;
- nonstopux)
- basic_machine=mips-compaq
- os=-nonstopux
- ;;
- np1)
- basic_machine=np1-gould
- ;;
- nsr-tandem)
- basic_machine=nsr-tandem
- ;;
- op50n-* | op60c-*)
- basic_machine=hppa1.1-oki
- os=-proelf
- ;;
- OSE68000 | ose68000)
- basic_machine=m68000-ericsson
- os=-ose
- ;;
- os68k)
- basic_machine=m68k-none
- os=-os68k
- ;;
- pa-hitachi)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
- ;;
- paragon)
- basic_machine=i860-intel
- os=-osf
- ;;
- pbd)
- basic_machine=sparc-tti
- ;;
- pbb)
- basic_machine=m68k-tti
- ;;
+ i*86v32)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv32
+ ;;
+ i*86v4*)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv4
+ ;;
+ i*86v)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv
+ ;;
+ i*86sol2)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-solaris2
+ ;;
+ i386mach)
+ basic_machine=i386-mach
+ os=-mach
+ ;;
+ i386-vsta | vsta)
+ basic_machine=i386-unknown
+ os=-vsta
+ ;;
+ iris | iris4d)
+ basic_machine=mips-sgi
+ case $os in
+ -irix*)
+ ;;
+ *)
+ os=-irix4
+ ;;
+ esac
+ ;;
+ isi68 | isi)
+ basic_machine=m68k-isi
+ os=-sysv
+ ;;
+ m88k-omron*)
+ basic_machine=m88k-omron
+ ;;
+ magnum | m3230)
+ basic_machine=mips-mips
+ os=-sysv
+ ;;
+ merlin)
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+ ;;
+ miniframe)
+ basic_machine=m68000-convergent
+ ;;
+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
+ mipsel*-linux*)
+ basic_machine=mipsel-unknown
+ os=-linux-gnu
+ ;;
+ mips*-linux*)
+ basic_machine=mips-unknown
+ os=-linux-gnu
+ ;;
+ mips3*-*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ ;;
+ mips3*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ ;;
+ mmix*)
+ basic_machine=mmix-knuth
+ os=-mmixware
+ ;;
+ monitor)
+ basic_machine=m68k-rom68k
+ os=-coff
+ ;;
+ msdos)
+ basic_machine=i386-pc
+ os=-msdos
+ ;;
+ mvs)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+ ;;
+ netbsd386)
+ basic_machine=i386-unknown
+ os=-netbsd
+ ;;
+ netwinder)
+ basic_machine=armv4l-rebel
+ os=-linux
+ ;;
+ news | news700 | news800 | news900)
+ basic_machine=m68k-sony
+ os=-newsos
+ ;;
+ news1000)
+ basic_machine=m68030-sony
+ os=-newsos
+ ;;
+ news-3600 | risc-news)
+ basic_machine=mips-sony
+ os=-newsos
+ ;;
+ necv70)
+ basic_machine=v70-nec
+ os=-sysv
+ ;;
+ next | m*-next )
+ basic_machine=m68k-next
+ case $os in
+ -nextstep* )
+ ;;
+ -ns2*)
+ os=-nextstep2
+ ;;
+ *)
+ os=-nextstep3
+ ;;
+ esac
+ ;;
+ nh3000)
+ basic_machine=m68k-harris
+ os=-cxux
+ ;;
+ nh[45]000)
+ basic_machine=m88k-harris
+ os=-cxux
+ ;;
+ nindy960)
+ basic_machine=i960-intel
+ os=-nindy
+ ;;
+ mon960)
+ basic_machine=i960-intel
+ os=-mon960
+ ;;
+ nonstopux)
+ basic_machine=mips-compaq
+ os=-nonstopux
+ ;;
+ np1)
+ basic_machine=np1-gould
+ ;;
+ nsr-tandem)
+ basic_machine=nsr-tandem
+ ;;
+ op50n-* | op60c-*)
+ basic_machine=hppa1.1-oki
+ os=-proelf
+ ;;
+ OSE68000 | ose68000)
+ basic_machine=m68000-ericsson
+ os=-ose
+ ;;
+ os68k)
+ basic_machine=m68k-none
+ os=-os68k
+ ;;
+ pa-hitachi)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ paragon)
+ basic_machine=i860-intel
+ os=-osf
+ ;;
+ pbd)
+ basic_machine=sparc-tti
+ ;;
+ pbb)
+ basic_machine=m68k-tti
+ ;;
pc532 | pc532-*)
- basic_machine=ns32k-pc532
- ;;
- pentium | p5 | k5 | k6 | nexgen)
- basic_machine=i586-pc
- ;;
- pentiumpro | p6 | 6x86 | athlon)
- basic_machine=i686-pc
- ;;
- pentiumii | pentium2)
- basic_machine=i686-pc
- ;;
- pentium-* | p5-* | k5-* | k6-* | nexgen-*)
- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumii-* | pentium2-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pn)
- basic_machine=pn-gould
- ;;
- power) basic_machine=power-ibm
- ;;
- ppc) basic_machine=powerpc-unknown
- ;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
- basic_machine=powerpcle-unknown
- ;;
- ppcle-* | powerpclittle-*)
- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ps2)
- basic_machine=i386-ibm
- ;;
- pw32)
- basic_machine=i586-unknown
- os=-pw32
- ;;
- rom68k)
- basic_machine=m68k-rom68k
- os=-coff
- ;;
- rm[46]00)
- basic_machine=mips-siemens
- ;;
- rtpc | rtpc-*)
- basic_machine=romp-ibm
- ;;
- sa29200)
- basic_machine=a29k-amd
- os=-udi
- ;;
- sequent)
- basic_machine=i386-sequent
- ;;
- sh)
- basic_machine=sh-hitachi
- os=-hms
- ;;
- sparclite-wrs)
- basic_machine=sparclite-wrs
- os=-vxworks
- ;;
- sps7)
- basic_machine=m68k-bull
- os=-sysv2
- ;;
- spur)
- basic_machine=spur-unknown
- ;;
- st2000)
- basic_machine=m68k-tandem
- ;;
- stratus)
- basic_machine=i860-stratus
- os=-sysv4
- ;;
- sun2)
- basic_machine=m68000-sun
- ;;
- sun2os3)
- basic_machine=m68000-sun
- os=-sunos3
- ;;
- sun2os4)
- basic_machine=m68000-sun
- os=-sunos4
- ;;
- sun3os3)
- basic_machine=m68k-sun
- os=-sunos3
- ;;
- sun3os4)
- basic_machine=m68k-sun
- os=-sunos4
- ;;
- sun4os3)
- basic_machine=sparc-sun
- os=-sunos3
- ;;
- sun4os4)
- basic_machine=sparc-sun
- os=-sunos4
- ;;
- sun4sol2)
- basic_machine=sparc-sun
- os=-solaris2
- ;;
- sun3 | sun3-*)
- basic_machine=m68k-sun
- ;;
- sun4)
- basic_machine=sparc-sun
- ;;
- sun386 | sun386i | roadrunner)
- basic_machine=i386-sun
- ;;
- sv1)
- basic_machine=sv1-cray
- os=-unicos
- ;;
- symmetry)
- basic_machine=i386-sequent
- os=-dynix
- ;;
- t3e)
- basic_machine=t3e-cray
- os=-unicos
- ;;
- tic54x | c54x*)
- basic_machine=tic54x-unknown
- os=-coff
- ;;
- tx39)
- basic_machine=mipstx39-unknown
- ;;
- tx39el)
- basic_machine=mipstx39el-unknown
- ;;
- tower | tower-32)
- basic_machine=m68k-ncr
- ;;
- udi29k)
- basic_machine=a29k-amd
- os=-udi
- ;;
- ultra3)
- basic_machine=a29k-nyu
- os=-sym1
- ;;
- v810 | necv810)
- basic_machine=v810-nec
- os=-none
- ;;
- vaxv)
- basic_machine=vax-dec
- os=-sysv
- ;;
- vms)
- basic_machine=vax-dec
- os=-vms
- ;;
- vpp*|vx|vx-*)
+ basic_machine=ns32k-pc532
+ ;;
+ pentium | p5 | k5 | k6 | nexgen)
+ basic_machine=i586-pc
+ ;;
+ pentiumpro | p6 | 6x86 | athlon)
+ basic_machine=i686-pc
+ ;;
+ pentiumii | pentium2)
+ basic_machine=i686-pc
+ ;;
+ pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumii-* | pentium2-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pn)
+ basic_machine=pn-gould
+ ;;
+ power) basic_machine=power-ibm
+ ;;
+ ppc) basic_machine=powerpc-unknown
+ ;;
+ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppcle | powerpclittle | ppc-le | powerpc-little)
+ basic_machine=powerpcle-unknown
+ ;;
+ ppcle-* | powerpclittle-*)
+ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppc64) basic_machine=powerpc64-unknown
+ ;;
+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ basic_machine=powerpc64le-unknown
+ ;;
+ ppc64le-* | powerpc64little-*)
+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ps2)
+ basic_machine=i386-ibm
+ ;;
+ pw32)
+ basic_machine=i586-unknown
+ os=-pw32
+ ;;
+ rom68k)
+ basic_machine=m68k-rom68k
+ os=-coff
+ ;;
+ rm[46]00)
+ basic_machine=mips-siemens
+ ;;
+ rtpc | rtpc-*)
+ basic_machine=romp-ibm
+ ;;
+ sa29200)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ sequent)
+ basic_machine=i386-sequent
+ ;;
+ sh)
+ basic_machine=sh-hitachi
+ os=-hms
+ ;;
+ sparclite-wrs)
+ basic_machine=sparclite-wrs
+ os=-vxworks
+ ;;
+ sps7)
+ basic_machine=m68k-bull
+ os=-sysv2
+ ;;
+ spur)
+ basic_machine=spur-unknown
+ ;;
+ st2000)
+ basic_machine=m68k-tandem
+ ;;
+ stratus)
+ basic_machine=i860-stratus
+ os=-sysv4
+ ;;
+ sun2)
+ basic_machine=m68000-sun
+ ;;
+ sun2os3)
+ basic_machine=m68000-sun
+ os=-sunos3
+ ;;
+ sun2os4)
+ basic_machine=m68000-sun
+ os=-sunos4
+ ;;
+ sun3os3)
+ basic_machine=m68k-sun
+ os=-sunos3
+ ;;
+ sun3os4)
+ basic_machine=m68k-sun
+ os=-sunos4
+ ;;
+ sun4os3)
+ basic_machine=sparc-sun
+ os=-sunos3
+ ;;
+ sun4os4)
+ basic_machine=sparc-sun
+ os=-sunos4
+ ;;
+ sun4sol2)
+ basic_machine=sparc-sun
+ os=-solaris2
+ ;;
+ sun3 | sun3-*)
+ basic_machine=m68k-sun
+ ;;
+ sun4)
+ basic_machine=sparc-sun
+ ;;
+ sun386 | sun386i | roadrunner)
+ basic_machine=i386-sun
+ ;;
+ sv1)
+ basic_machine=sv1-cray
+ os=-unicos
+ ;;
+ symmetry)
+ basic_machine=i386-sequent
+ os=-dynix
+ ;;
+ t3e)
+ basic_machine=t3e-cray
+ os=-unicos
+ ;;
+ tic54x | c54x*)
+ basic_machine=tic54x-unknown
+ os=-coff
+ ;;
+ tx39)
+ basic_machine=mipstx39-unknown
+ ;;
+ tx39el)
+ basic_machine=mipstx39el-unknown
+ ;;
+ tower | tower-32)
+ basic_machine=m68k-ncr
+ ;;
+ udi29k)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ ultra3)
+ basic_machine=a29k-nyu
+ os=-sym1
+ ;;
+ v810 | necv810)
+ basic_machine=v810-nec
+ os=-none
+ ;;
+ vaxv)
+ basic_machine=vax-dec
+ os=-sysv
+ ;;
+ vms)
+ basic_machine=vax-dec
+ os=-vms
+ ;;
+ vpp*|vx|vx-*)
basic_machine=f301-fujitsu
;;
- vxworks960)
- basic_machine=i960-wrs
- os=-vxworks
- ;;
- vxworks68)
- basic_machine=m68k-wrs
- os=-vxworks
- ;;
- vxworks29k)
- basic_machine=a29k-wrs
- os=-vxworks
- ;;
- w65*)
- basic_machine=w65-wdc
- os=-none
- ;;
- w89k-*)
- basic_machine=hppa1.1-winbond
- os=-proelf
- ;;
- xmp)
- basic_machine=xmp-cray
- os=-unicos
- ;;
+ vxworks960)
+ basic_machine=i960-wrs
+ os=-vxworks
+ ;;
+ vxworks68)
+ basic_machine=m68k-wrs
+ os=-vxworks
+ ;;
+ vxworks29k)
+ basic_machine=a29k-wrs
+ os=-vxworks
+ ;;
+ w65*)
+ basic_machine=w65-wdc
+ os=-none
+ ;;
+ w89k-*)
+ basic_machine=hppa1.1-winbond
+ os=-proelf
+ ;;
+ windows32)
+ basic_machine=i386-pc
+ os=-windows32-msvcrt
+ ;;
+ xmp)
+ basic_machine=xmp-cray
+ os=-unicos
+ ;;
xps | xps100)
- basic_machine=xps100-honeywell
- ;;
- z8k-*-coff)
- basic_machine=z8k-unknown
- os=-sim
- ;;
- none)
- basic_machine=none-none
- os=-none
- ;;
+ basic_machine=xps100-honeywell
+ ;;
+ z8k-*-coff)
+ basic_machine=z8k-unknown
+ os=-sim
+ ;;
+ none)
+ basic_machine=none-none
+ os=-none
+ ;;
# Here we handle the default manufacturer of certain CPU types. It is in
# some cases the only manufacturer, in others, it is the most popular.
- w89k)
- basic_machine=hppa1.1-winbond
- ;;
- op50n)
- basic_machine=hppa1.1-oki
- ;;
- op60c)
- basic_machine=hppa1.1-oki
- ;;
- mips)
- if [ x$os = x-linux-gnu ]; then
- basic_machine=mips-unknown
- else
- basic_machine=mips-mips
- fi
- ;;
- romp)
- basic_machine=romp-ibm
- ;;
- rs6000)
- basic_machine=rs6000-ibm
- ;;
- vax)
- basic_machine=vax-dec
- ;;
- pdp10)
- # there are many clones, so DEC is not a safe bet
- basic_machine=pdp10-unknown
- ;;
- pdp11)
- basic_machine=pdp11-dec
- ;;
- we32k)
- basic_machine=we32k-att
- ;;
- sh3 | sh4)
- basic_machine=sh-unknown
- ;;
- sparc | sparcv9 | sparcv9b)
- basic_machine=sparc-sun
- ;;
+ w89k)
+ basic_machine=hppa1.1-winbond
+ ;;
+ op50n)
+ basic_machine=hppa1.1-oki
+ ;;
+ op60c)
+ basic_machine=hppa1.1-oki
+ ;;
+ mips)
+ if [ x$os = x-linux-gnu ]; then
+ basic_machine=mips-unknown
+ else
+ basic_machine=mips-mips
+ fi
+ ;;
+ romp)
+ basic_machine=romp-ibm
+ ;;
+ rs6000)
+ basic_machine=rs6000-ibm
+ ;;
+ vax)
+ basic_machine=vax-dec
+ ;;
+ pdp10)
+ # there are many clones, so DEC is not a safe bet
+ basic_machine=pdp10-unknown
+ ;;
+ pdp11)
+ basic_machine=pdp11-dec
+ ;;
+ we32k)
+ basic_machine=we32k-att
+ ;;
+ sh3 | sh4 | sh3eb | sh4eb)
+ basic_machine=sh-unknown
+ ;;
+ sparc | sparcv9 | sparcv9b)
+ basic_machine=sparc-sun
+ ;;
cydra)
- basic_machine=cydra-cydrome
- ;;
- orion)
- basic_machine=orion-highlevel
- ;;
- orion105)
- basic_machine=clipper-highlevel
- ;;
- mac | mpw | mac-mpw)
- basic_machine=m68k-apple
- ;;
- pmac | pmac-mpw)
- basic_machine=powerpc-apple
- ;;
- c4x*)
- basic_machine=c4x-none
- os=-coff
- ;;
- *-unknown)
- # Make sure to match an already-canonicalized machine name.
- ;;
- *)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
- ;;
+ basic_machine=cydra-cydrome
+ ;;
+ orion)
+ basic_machine=orion-highlevel
+ ;;
+ orion105)
+ basic_machine=clipper-highlevel
+ ;;
+ mac | mpw | mac-mpw)
+ basic_machine=m68k-apple
+ ;;
+ pmac | pmac-mpw)
+ basic_machine=powerpc-apple
+ ;;
+ c4x*)
+ basic_machine=c4x-none
+ os=-coff
+ ;;
+ *-unknown)
+ # Make sure to match an already-canonicalized machine name.
+ ;;
+ *)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
esac
# Here we canonicalize certain aliases for manufacturers.
case $basic_machine in
- *-digital*)
- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
- ;;
- *-commodore*)
- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
- ;;
- *)
- ;;
+ *-digital*)
+ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+ ;;
+ *-commodore*)
+ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+ ;;
+ *)
+ ;;
esac
# Decode manufacturer-specific aliases for certain operating systems.
@@ -987,150 +1031,152 @@ then
case $os in
# First match some system type aliases
# that might get confused with valid system types.
- # -solaris* is a basic system type, with this one exception.
- -solaris1 | -solaris1.*)
- os=`echo $os | sed -e 's|solaris1|sunos4|'`
- ;;
- -solaris)
- os=-solaris2
- ;;
- -svr4*)
- os=-sysv4
- ;;
- -unixware*)
- os=-sysv4.2uw
- ;;
- -gnu/linux*)
- os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
- ;;
- # First accept the basic system types.
- # The portable systems comes first.
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
- case $basic_machine in
- x86-* | i*86-*)
- ;;
- *)
- os=-nto$os
- ;;
- esac
- ;;
- -nto*)
- os=-nto-qnx
- ;;
- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
- | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- ;;
- -mac*)
- os=`echo $os | sed -e 's|mac|macos|'`
- ;;
- -linux*)
- os=`echo $os | sed -e 's|linux|linux-gnu|'`
- ;;
- -sunos5*)
- os=`echo $os | sed -e 's|sunos5|solaris2|'`
- ;;
- -sunos6*)
- os=`echo $os | sed -e 's|sunos6|solaris3|'`
- ;;
- -opened*)
- os=-openedition
- ;;
- -wince*)
- os=-wince
- ;;
- -osfrose*)
- os=-osfrose
- ;;
- -osf*)
- os=-osf
- ;;
- -utek*)
- os=-bsd
- ;;
- -dynix*)
- os=-bsd
- ;;
- -acis*)
- os=-aos
- ;;
- -386bsd)
- os=-bsd
- ;;
- -ctix* | -uts*)
- os=-sysv
- ;;
- -ns2 )
- os=-nextstep2
- ;;
- -nsk*)
- os=-nsk
- ;;
- # Preserve the version number of sinix5.
- -sinix5.*)
- os=`echo $os | sed -e 's|sinix|sysv|'`
- ;;
- -sinix*)
- os=-sysv4
- ;;
- -triton*)
- os=-sysv3
- ;;
- -oss*)
- os=-sysv3
- ;;
- -svr4)
- os=-sysv4
- ;;
- -svr3)
- os=-sysv3
- ;;
- -sysvr4)
- os=-sysv4
- ;;
- # This must come after -sysvr4.
- -sysv*)
- ;;
- -ose*)
- os=-ose
- ;;
- -es1800*)
- os=-ose
- ;;
- -xenix)
- os=-xenix
- ;;
+ # -solaris* is a basic system type, with this one exception.
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+ -solaris)
+ os=-solaris2
+ ;;
+ -svr4*)
+ os=-sysv4
+ ;;
+ -unixware*)
+ os=-sysv4.2uw
+ ;;
+ -gnu/linux*)
+ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+ ;;
+ # First accept the basic system types.
+ # The portable systems comes first.
+ # Each alternative MUST END IN A *, to match a version number.
+ # -sysv* is not here because it comes later, after sysvr4.
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ | -aos* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ | -os2* | -vos*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+ case $basic_machine in
+ x86-* | i*86-*)
+ ;;
+ *)
+ os=-nto$os
+ ;;
+ esac
+ ;;
+ -nto*)
+ os=-nto-qnx
+ ;;
+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ ;;
+ -mac*)
+ os=`echo $os | sed -e 's|mac|macos|'`
+ ;;
+ -linux*)
+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ ;;
+ -sunos5*)
+ os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ ;;
+ -sunos6*)
+ os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ ;;
+ -opened*)
+ os=-openedition
+ ;;
+ -wince*)
+ os=-wince
+ ;;
+ -osfrose*)
+ os=-osfrose
+ ;;
+ -osf*)
+ os=-osf
+ ;;
+ -utek*)
+ os=-bsd
+ ;;
+ -dynix*)
+ os=-bsd
+ ;;
+ -acis*)
+ os=-aos
+ ;;
+ -386bsd)
+ os=-bsd
+ ;;
+ -ctix* | -uts*)
+ os=-sysv
+ ;;
+ -ns2 )
+ os=-nextstep2
+ ;;
+ -nsk*)
+ os=-nsk
+ ;;
+ # Preserve the version number of sinix5.
+ -sinix5.*)
+ os=`echo $os | sed -e 's|sinix|sysv|'`
+ ;;
+ -sinix*)
+ os=-sysv4
+ ;;
+ -triton*)
+ os=-sysv3
+ ;;
+ -oss*)
+ os=-sysv3
+ ;;
+ -svr4)
+ os=-sysv4
+ ;;
+ -svr3)
+ os=-sysv3
+ ;;
+ -sysvr4)
+ os=-sysv4
+ ;;
+ # This must come after -sysvr4.
+ -sysv*)
+ ;;
+ -ose*)
+ os=-ose
+ ;;
+ -es1800*)
+ os=-ose
+ ;;
+ -xenix)
+ os=-xenix
+ ;;
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- os=-mint
- ;;
- -none)
- ;;
- *)
- # Get rid of the `-' at the beginning of $os.
- os=`echo $os | sed 's/[^-]*-//'`
- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
- exit 1
- ;;
+ os=-mint
+ ;;
+ -none)
+ ;;
+ *)
+ # Get rid of the `-' at the beginning of $os.
+ os=`echo $os | sed 's/[^-]*-//'`
+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+ exit 1
+ ;;
esac
else
@@ -1145,144 +1191,144 @@ else
# system, and we'll never get to this point.
case $basic_machine in
- *-acorn)
- os=-riscix1.2
- ;;
- arm*-rebel)
- os=-linux
- ;;
- arm*-semi)
- os=-aout
- ;;
- pdp10-*)
- os=-tops20
- ;;
+ *-acorn)
+ os=-riscix1.2
+ ;;
+ arm*-rebel)
+ os=-linux
+ ;;
+ arm*-semi)
+ os=-aout
+ ;;
+ pdp10-*)
+ os=-tops20
+ ;;
pdp11-*)
- os=-none
- ;;
- *-dec | vax-*)
- os=-ultrix4.2
- ;;
- m68*-apollo)
- os=-domain
- ;;
- i386-sun)
- os=-sunos4.0.2
- ;;
- m68000-sun)
- os=-sunos3
- # This also exists in the configure program, but was not the
- # default.
- # os=-sunos4
- ;;
- m68*-cisco)
- os=-aout
- ;;
- mips*-cisco)
- os=-elf
- ;;
- mips*-*)
- os=-elf
- ;;
- *-tti) # must be before sparc entry or we get the wrong os.
- os=-sysv3
- ;;
- sparc-* | *-sun)
- os=-sunos4.1.1
- ;;
- *-be)
- os=-beos
- ;;
- *-ibm)
- os=-aix
- ;;
- *-wec)
- os=-proelf
- ;;
- *-winbond)
- os=-proelf
- ;;
- *-oki)
- os=-proelf
- ;;
- *-hp)
- os=-hpux
- ;;
- *-hitachi)
- os=-hiux
- ;;
- i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
- os=-sysv
- ;;
- *-cbm)
- os=-amigaos
- ;;
- *-dg)
- os=-dgux
- ;;
- *-dolphin)
- os=-sysv3
- ;;
- m68k-ccur)
- os=-rtu
- ;;
- m88k-omron*)
- os=-luna
- ;;
- *-next )
- os=-nextstep
- ;;
- *-sequent)
- os=-ptx
- ;;
- *-crds)
- os=-unos
- ;;
- *-ns)
- os=-genix
- ;;
- i370-*)
- os=-mvs
- ;;
- *-next)
- os=-nextstep3
- ;;
+ os=-none
+ ;;
+ *-dec | vax-*)
+ os=-ultrix4.2
+ ;;
+ m68*-apollo)
+ os=-domain
+ ;;
+ i386-sun)
+ os=-sunos4.0.2
+ ;;
+ m68000-sun)
+ os=-sunos3
+ # This also exists in the configure program, but was not the
+ # default.
+ # os=-sunos4
+ ;;
+ m68*-cisco)
+ os=-aout
+ ;;
+ mips*-cisco)
+ os=-elf
+ ;;
+ mips*-*)
+ os=-elf
+ ;;
+ *-tti) # must be before sparc entry or we get the wrong os.
+ os=-sysv3
+ ;;
+ sparc-* | *-sun)
+ os=-sunos4.1.1
+ ;;
+ *-be)
+ os=-beos
+ ;;
+ *-ibm)
+ os=-aix
+ ;;
+ *-wec)
+ os=-proelf
+ ;;
+ *-winbond)
+ os=-proelf
+ ;;
+ *-oki)
+ os=-proelf
+ ;;
+ *-hp)
+ os=-hpux
+ ;;
+ *-hitachi)
+ os=-hiux
+ ;;
+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+ os=-sysv
+ ;;
+ *-cbm)
+ os=-amigaos
+ ;;
+ *-dg)
+ os=-dgux
+ ;;
+ *-dolphin)
+ os=-sysv3
+ ;;
+ m68k-ccur)
+ os=-rtu
+ ;;
+ m88k-omron*)
+ os=-luna
+ ;;
+ *-next )
+ os=-nextstep
+ ;;
+ *-sequent)
+ os=-ptx
+ ;;
+ *-crds)
+ os=-unos
+ ;;
+ *-ns)
+ os=-genix
+ ;;
+ i370-*)
+ os=-mvs
+ ;;
+ *-next)
+ os=-nextstep3
+ ;;
*-gould)
- os=-sysv
- ;;
+ os=-sysv
+ ;;
*-highlevel)
- os=-bsd
- ;;
- *-encore)
- os=-bsd
- ;;
+ os=-bsd
+ ;;
+ *-encore)
+ os=-bsd
+ ;;
*-sgi)
- os=-irix
- ;;
+ os=-irix
+ ;;
*-siemens)
- os=-sysv4
- ;;
- *-masscomp)
- os=-rtu
- ;;
- f30[01]-fujitsu | f700-fujitsu)
- os=-uxpv
- ;;
- *-rom68k)
- os=-coff
- ;;
- *-*bug)
- os=-coff
- ;;
- *-apple)
- os=-macos
- ;;
- *-atari*)
- os=-mint
- ;;
- *)
- os=-none
- ;;
+ os=-sysv4
+ ;;
+ *-masscomp)
+ os=-rtu
+ ;;
+ f30[01]-fujitsu | f700-fujitsu)
+ os=-uxpv
+ ;;
+ *-rom68k)
+ os=-coff
+ ;;
+ *-*bug)
+ os=-coff
+ ;;
+ *-apple)
+ os=-macos
+ ;;
+ *-atari*)
+ os=-mint
+ ;;
+ *)
+ os=-none
+ ;;
esac
fi
@@ -1290,65 +1336,68 @@ fi
# manufacturer. We pick the logical manufacturer.
vendor=unknown
case $basic_machine in
- *-unknown)
- case $os in
- -riscix*)
- vendor=acorn
- ;;
- -sunos*)
- vendor=sun
- ;;
- -aix*)
- vendor=ibm
- ;;
- -beos*)
- vendor=be
- ;;
- -hpux*)
- vendor=hp
- ;;
- -mpeix*)
- vendor=hp
- ;;
- -hiux*)
- vendor=hitachi
- ;;
- -unos*)
- vendor=crds
- ;;
- -dgux*)
- vendor=dg
- ;;
- -luna*)
- vendor=omron
- ;;
- -genix*)
- vendor=ns
- ;;
- -mvs* | -opened*)
- vendor=ibm
- ;;
- -ptx*)
- vendor=sequent
- ;;
- -vxsim* | -vxworks*)
- vendor=wrs
- ;;
- -aux*)
- vendor=apple
- ;;
- -hms*)
- vendor=hitachi
- ;;
- -mpw* | -macos*)
- vendor=apple
- ;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- vendor=atari
- ;;
- esac
- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
- ;;
+ *-unknown)
+ case $os in
+ -riscix*)
+ vendor=acorn
+ ;;
+ -sunos*)
+ vendor=sun
+ ;;
+ -aix*)
+ vendor=ibm
+ ;;
+ -beos*)
+ vendor=be
+ ;;
+ -hpux*)
+ vendor=hp
+ ;;
+ -mpeix*)
+ vendor=hp
+ ;;
+ -hiux*)
+ vendor=hitachi
+ ;;
+ -unos*)
+ vendor=crds
+ ;;
+ -dgux*)
+ vendor=dg
+ ;;
+ -luna*)
+ vendor=omron
+ ;;
+ -genix*)
+ vendor=ns
+ ;;
+ -mvs* | -opened*)
+ vendor=ibm
+ ;;
+ -ptx*)
+ vendor=sequent
+ ;;
+ -vxsim* | -vxworks*)
+ vendor=wrs
+ ;;
+ -aux*)
+ vendor=apple
+ ;;
+ -hms*)
+ vendor=hitachi
+ ;;
+ -mpw* | -macos*)
+ vendor=apple
+ ;;
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ vendor=atari
+ ;;
+ -vos*)
+ vendor=stratus
+ ;;
+ esac
+ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ ;;
esac
echo $basic_machine$os
@@ -1360,4 +1409,3 @@ exit 0
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
# End:
-
diff --git a/scripts/install-sh b/scripts/install-sh
index ebc66913e..e9de23842 100755
--- a/scripts/install-sh
+++ b/scripts/install-sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
#
# install - install a program, script, or datafile
# This comes from X11R5 (mit/util/scripts/install.sh).
@@ -118,6 +118,7 @@ if [ x"$dir_arg" != x ]; then
if [ -d $dst ]; then
instcmd=:
+ chmodcmd=""
else
instcmd=mkdir
fi
diff --git a/scripts/missing b/scripts/missing
index a6abd0698..0a7fb5a2a 100755
--- a/scripts/missing
+++ b/scripts/missing
@@ -1,7 +1,7 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-# Franc,ois Pinard <[email protected]>, 1996.
+# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <[email protected]>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,11 +18,37 @@
# 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.
+
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+ configure_ac=configure.ac
+else
+ configure_ac=configure.in
+fi
+
+case "$1" in
+--run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
case "$1" in
-h|--h|--he|--hel|--help)
@@ -35,19 +61,24 @@ error status if there is no known handling for PROGRAM.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
automake touch all \`Makefile.in' files
- bison touch file \`y.tab.c'
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
+ lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
- yacc touch file \`y.tab.c'"
+ tar try tar, gnutar, gtar, then tar without non-portable flags
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing - GNU libit 0.0"
+ echo "missing 0.3 - GNU automake"
;;
-*)
@@ -59,7 +90,7 @@ Supported PROGRAM values:
aclocal)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acinclude.m4' or \`configure.in'. You might want
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
@@ -68,7 +99,7 @@ WARNING: \`$1' is missing on your system. You should only need it if
autoconf)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`configure.in'. You might want to install the
+ you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
@@ -77,21 +108,31 @@ WARNING: \`$1' is missing on your system. You should only need it if
autoheader)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acconfig.h' or \`configure.in'. You might want
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
- touch config.h.in
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+ case "$f" in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+ esac
+ done
+ touch $touch_files
;;
automake)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print \
- | sed 's/^\(.*\).am$/touch \1.in/' \
- | sh
+ find . -type f -name Makefile.am -print |
+ sed 's/\.am$/.in/' |
+ while read f; do touch "$f"; done
;;
bison|yacc)
@@ -100,10 +141,79 @@ WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
- touch y.tab.c
+ rm -f y.tab.c y.tab.h
+ if [ $# -ne 1 ]; then
+ eval LASTARG="\${$#}"
+ case "$LASTARG" in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+ if [ -f "$SRCFILE" ]; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+ if [ -f "$SRCFILE" ]; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+ if [ ! -f y.tab.h ]; then
+ echo >y.tab.h
+ fi
+ if [ ! -f y.tab.c ]; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+
+ lex|flex)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified a \`.l' file. You may need the \`Flex' package
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+ if [ $# -ne 1 ]; then
+ eval LASTARG="\${$#}"
+ case "$LASTARG" in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+ if [ -f "$SRCFILE" ]; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+ if [ ! -f lex.yy.c ]; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+
+ help2man)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit 1
+ fi
;;
makeinfo)
+ if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+ # We have makeinfo, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -119,6 +229,45 @@ WARNING: \`$1' is missing on your system. You should only need it if
touch $file
;;
+ tar)
+ shift
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ fi
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+ # messages.
+ if (gnutar --version > /dev/null 2>&1); then
+ gnutar ${1+"$@"} && exit 0
+ fi
+ if (gtar --version > /dev/null 2>&1); then
+ gtar ${1+"$@"} && exit 0
+ fi
+ firstarg="$1"
+ if shift; then
+ case "$firstarg" in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" ${1+"$@"} && exit 0
+ ;;
+ esac
+ case "$firstarg" in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" ${1+"$@"} && exit 0
+ ;;
+ esac
+ fi
+
+ echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+ You may want to install GNU tar or Free paxutils, or check the
+ command line arguments."
+ exit 1
+ ;;
+
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and you do not seem to have it handy on your
diff --git a/scripts/mkinstalldirs b/scripts/mkinstalldirs
index 70f6e5802..6b3b5fc5d 100755
--- a/scripts/mkinstalldirs
+++ b/scripts/mkinstalldirs
@@ -7,26 +7,6 @@
# $Id$
errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
- case "${1}" in
- -h | --help | --h* ) # -h for help
- echo "${usage}" 1>&2; exit 0 ;;
- -m ) # -m PERM arg
- shift
- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
- dirmode="${1}"
- shift ;;
- -- ) shift; break ;; # stop option processing
- -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option
- * ) break ;; # first non-opt arg
- esac
-done
for file
do
@@ -48,17 +28,6 @@ do
if test ! -d "$pathcomp"; then
errstatus=$lasterr
- else
- if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
-
- lasterr=""
- chmod $dirmode "$pathcomp" || lasterr=$?
-
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
fi
fi
@@ -68,7 +37,4 @@ done
exit $errstatus
-# Local Variables:
-# mode:shell-script
-# sh-indentation:3
-# End:
+# mkinstalldirs ends here