aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2001-04-28 18:53:00 +0000
committerWerner Koch <[email protected]>2001-04-28 18:53:00 +0000
commitcc08ba73d4270e18bb8fce066dfdcb62a21761ad (patch)
tree0aa62757ec5d520251a8efd18552dc67e17a7449
parentlast hour fixes. (diff)
downloadgnupg-cc08ba73d4270e18bb8fce066dfdcb62a21761ad.tar.gz
gnupg-cc08ba73d4270e18bb8fce066dfdcb62a21761ad.zip
Updated copyright notices and other doc fixes.
-rw-r--r--ChangeLog4
-rw-r--r--INSTALL4
-rw-r--r--NEWS73
-rw-r--r--cipher/bithelp.h2
-rw-r--r--cipher/blowfish.c10
-rw-r--r--cipher/blowfish.h2
-rw-r--r--cipher/cast5.c2
-rw-r--r--cipher/cast5.h2
-rw-r--r--cipher/cipher.c2
-rw-r--r--cipher/des.c15
-rw-r--r--cipher/des.h2
-rw-r--r--cipher/dsa.c4
-rw-r--r--cipher/dsa.h4
-rw-r--r--cipher/dynload.c2
-rw-r--r--cipher/dynload.h4
-rw-r--r--cipher/elgamal.c2
-rw-r--r--cipher/elgamal.h2
-rw-r--r--cipher/g10c.c2
-rw-r--r--cipher/md.c2
-rw-r--r--cipher/md5.c11
-rw-r--r--cipher/primegen.c2
-rw-r--r--cipher/pubkey.c2
-rw-r--r--cipher/rand-internal.h2
-rw-r--r--cipher/random.c2
-rw-r--r--cipher/random.h2
-rw-r--r--cipher/rijndael.c2
-rw-r--r--cipher/rmd.h2
-rw-r--r--cipher/rmd160.c2
-rw-r--r--cipher/rmd160test.c4
-rw-r--r--cipher/rndegd.c2
-rw-r--r--cipher/rndlinux.c2
-rw-r--r--cipher/rndw32.c2
-rw-r--r--cipher/rsa.c2
-rw-r--r--cipher/rsa.h2
-rw-r--r--cipher/sha1.c2
-rw-r--r--cipher/smallprime.c2
-rw-r--r--cipher/tiger.c2
-rw-r--r--doc/gpg.sgml21
-rw-r--r--doc/gpgv.sgml2
-rw-r--r--g10/ChangeLog2
-rw-r--r--include/cipher.h2
-rw-r--r--include/errors.h2
-rw-r--r--include/host2net.h2
-rw-r--r--include/http.h2
-rw-r--r--include/i18n.h2
-rw-r--r--include/iobuf.h2
-rw-r--r--include/memory.h2
-rw-r--r--include/mpi.h3
-rw-r--r--include/ttyio.h2
-rw-r--r--include/types.h2
-rw-r--r--include/util.h2
-rw-r--r--mpi/alpha/mpih-add1.S10
-rw-r--r--mpi/alpha/mpih-lshift.S13
-rw-r--r--mpi/alpha/mpih-mul1.S3
-rw-r--r--mpi/alpha/mpih-mul2.S3
-rw-r--r--mpi/alpha/mpih-mul3.S3
-rw-r--r--mpi/alpha/mpih-rshift.S4
-rw-r--r--mpi/alpha/mpih-sub1.S3
-rw-r--r--mpi/alpha/udiv-qrnnd.S10
-rw-r--r--mpi/hppa/mpih-add1.S4
-rw-r--r--mpi/hppa/mpih-lshift.S5
-rw-r--r--mpi/hppa/mpih-rshift.S5
-rw-r--r--mpi/hppa/mpih-sub1.S5
-rw-r--r--mpi/hppa/udiv-qrnnd.S10
-rw-r--r--mpi/hppa1.1/mpih-mul1.S5
-rw-r--r--mpi/hppa1.1/mpih-mul2.S5
-rw-r--r--mpi/hppa1.1/mpih-mul3.S5
-rw-r--r--mpi/hppa1.1/udiv-qrnnd.S4
-rw-r--r--mpi/i386/mpih-add1.S4
-rw-r--r--mpi/i386/mpih-lshift.S4
-rw-r--r--mpi/i386/mpih-mul1.S4
-rw-r--r--mpi/i386/mpih-mul2.S5
-rw-r--r--mpi/i386/mpih-mul3.S5
-rw-r--r--mpi/i386/mpih-rshift.S5
-rw-r--r--mpi/i386/mpih-sub1.S5
-rw-r--r--mpi/i386/syntax.h48
-rw-r--r--mpi/i586/mpih-add1.S3
-rw-r--r--mpi/i586/mpih-lshift.S5
-rw-r--r--mpi/i586/mpih-mul1.S4
-rw-r--r--mpi/i586/mpih-mul2.S5
-rw-r--r--mpi/i586/mpih-mul3.S5
-rw-r--r--mpi/i586/mpih-rshift.S5
-rw-r--r--mpi/i586/mpih-sub1.S5
-rw-r--r--mpi/m68k/mc68020/mpih-mul1.S49
-rw-r--r--mpi/m68k/mc68020/mpih-mul2.S49
-rw-r--r--mpi/m68k/mc68020/mpih-mul3.S48
-rw-r--r--mpi/m68k/mpih-add1.S49
-rw-r--r--mpi/m68k/mpih-lshift.S47
-rw-r--r--mpi/m68k/mpih-rshift.S47
-rw-r--r--mpi/m68k/mpih-sub1.S50
-rw-r--r--mpi/m68k/syntax.h46
-rw-r--r--mpi/mips3/mpih-add1.S4
-rw-r--r--mpi/mips3/mpih-lshift.S4
-rw-r--r--mpi/mips3/mpih-mul1.S4
-rw-r--r--mpi/mips3/mpih-mul2.S4
-rw-r--r--mpi/mips3/mpih-mul3.S4
-rw-r--r--mpi/mips3/mpih-rshift.S4
-rw-r--r--mpi/mips3/mpih-sub1.S4
-rw-r--r--mpi/mpi-div.c2
-rw-r--r--mpi/mpi-inline.h2
-rw-r--r--mpi/mpi-internal.h2
-rw-r--r--mpi/mpi-mul.c2
-rw-r--r--mpi/mpi-pow.c2
-rw-r--r--mpi/mpih-cmp.c2
-rw-r--r--mpi/mpih-div.c2
-rw-r--r--mpi/pa7100/mpih-lshift.S5
-rw-r--r--mpi/pa7100/mpih-rshift.S5
-rw-r--r--mpi/power/mpih-add1.S3
-rw-r--r--mpi/power/mpih-lshift.S3
-rw-r--r--mpi/power/mpih-mul1.S5
-rw-r--r--mpi/power/mpih-mul2.S3
-rw-r--r--mpi/power/mpih-mul3.S3
-rw-r--r--mpi/power/mpih-rshift.S3
-rw-r--r--mpi/power/mpih-sub1.S3
-rw-r--r--mpi/powerpc32/mpih-add1.S3
-rw-r--r--mpi/powerpc32/mpih-lshift.S3
-rw-r--r--mpi/powerpc32/mpih-mul1.S3
-rw-r--r--mpi/powerpc32/mpih-mul2.S3
-rw-r--r--mpi/powerpc32/mpih-mul3.S3
-rw-r--r--mpi/powerpc32/mpih-rshift.S3
-rw-r--r--mpi/powerpc32/mpih-sub1.S3
-rw-r--r--mpi/sparc32/mpih-add1.S3
-rw-r--r--mpi/sparc32/mpih-lshift.S3
-rw-r--r--mpi/sparc32/mpih-rshift.S3
-rw-r--r--mpi/sparc32/udiv.S51
-rw-r--r--mpi/sparc32v8/mpih-mul1.S50
-rw-r--r--mpi/sparc32v8/mpih-mul2.S50
-rw-r--r--mpi/sparc32v8/mpih-mul3.S53
-rw-r--r--mpi/supersparc/udiv.S52
-rw-r--r--po/da.po175
-rw-r--r--po/de.po171
-rw-r--r--po/eo.po1211
-rw-r--r--po/es_ES.po174
-rw-r--r--po/et.po171
-rw-r--r--po/fr.po223
-rw-r--r--po/id.po175
-rw-r--r--po/it.po198
-rw-r--r--po/ja.po173
-rw-r--r--po/nl.po175
-rw-r--r--po/pl.po171
-rw-r--r--po/pt_BR.po175
-rw-r--r--po/pt_PT.po171
-rw-r--r--po/ru.po174
-rw-r--r--po/sv.po175
-rw-r--r--po/tr.po171
-rwxr-xr-xscripts/autogen.sh10
-rwxr-xr-xscripts/mk-w32-dist13
-rwxr-xr-xscripts/mkdiff9
-rw-r--r--tools/ChangeLog4
-rw-r--r--tools/bftest.c2
-rw-r--r--tools/clean-sat.c9
-rw-r--r--tools/crlf.c9
-rwxr-xr-xtools/lspgpot8
-rwxr-xr-xtools/mail-signed-keys9
-rw-r--r--tools/mk-tdata.c10
-rw-r--r--tools/mpicalc.c2
-rwxr-xr-xtools/ring-a-party9
-rw-r--r--tools/shmtest.c9
-rw-r--r--util/dotlock.c2
-rw-r--r--util/errors.c2
-rw-r--r--util/fileutil.c2
-rw-r--r--util/g10u.c2
-rw-r--r--util/http.c2
-rw-r--r--util/logger.c2
-rw-r--r--util/memory.c21
-rw-r--r--util/miscutil.c2
-rw-r--r--util/secmem.c2
-rw-r--r--util/simple-gettext.c5
-rw-r--r--util/strgutil.c2
-rw-r--r--util/ttyio.c2
-rw-r--r--util/w32reg.c2
171 files changed, 2881 insertions, 2343 deletions
diff --git a/ChangeLog b/ChangeLog
index 40a29d74c..2ada4b584 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-28 Werner Koch <[email protected]>
+
+ Updated all copyright notices.
+
2001-04-27 Werner Koch <[email protected]>
* README: Removed a few outdated paragraphs.
diff --git a/INSTALL b/INSTALL
index 26fb9c46e..8492447e5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -153,6 +153,10 @@ We will use capabilities in the future.
The ~/.gnupg directory will be created if it does not exist. Your first
action should be to create a key pair: "gpg --gen-key".
+Due to limitations in the automake system, the Info format versions of
+the man pages are not installed. You have to convert the Texinfo
+files by hand (use makeinfo) and copy them to the appropriate place.
+
Creating a RPM package
diff --git a/NEWS b/NEWS
index e1ba6ab2a..3192021eb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,48 +1,55 @@
-
- * WARNING: The semantics of --verify have changed to address a problem
- with detached signature detection. --verify now ignores signed material
- given on stdin unless this is requested by using a "-" as the name for
- the file with the signed material.
-
- ! Please check all your detached signature handling applications !
- ! and make sure that they don't pipe the signed material to stdin !
- ! without using a filename and "-" on the the command line. !
-
- * Corrected hash calculation for some inputs greater than 512M - it
- was just wrong, so you might notice bad signature in some very
- big files. It may be wise to keep an old copy of GnuPG around.
+Noteworthy changes in version 1.0.5 (2001-04-??)
+------------------------------------------------
+
+ * WARNING: The semantics of --verify have changed to address a
+ problem with detached signature detection. --verify now ignores
+ signed material given on stdin unless this is requested by using
+ a "-" as the name for the file with the signed material. Please
+ check all your detached signature handling applications and make
+ sure that they don't pipe the signed material to stdin without
+ using a filename together with "-" on the the command line.
+
+ * WARNING: Corrected hash calculation for input data larger than
+ 512M - it was just wrong, so you might notice bad signature in
+ some very big files. It may be wise to keep an old copy of
+ GnuPG around.
* Secret keys are no longer imported unless you use the new option
--allow-secret-key-import. This is a kludge and future versions will
handle it in another way.
- * There is now the notation of a primary user ID. For example, it is
- printed with a signature verifaction as the first user ID; revoked user
- IDs are not printed there anymore. In general the primary user ID is
- the one with the latest self-signature.
-
- * The verification status of self-signatures are now cached. To increase
- the speed of key list operations for existing keys you can do the
- following in your GnuPG homedir (~/.gnupg):
- $ cp pubring.gpg pubring.gpg.save
- $ gpg --export-all >x
- $ rm pubring.gpg
- $ gpg --import x
- Only v4 keys (i.e not the old RSA keys) benefit from this caching.
+ * New command "showpref" in the --edit-key menu to show an easier
+ to understand preference listing.
- * Support for the gpg-agent from gpg 1.1 and other changes needed by
- gpgme.
+ * There is now the notation of a primary user ID. For example, it
+ is printed with a signature verification as the first user ID;
+ revoked user IDs are not printed there anymore. In general the
+ primary user ID is the one with the latest self-signature.
- * Better LFS support.
+ * New --charset=utf-8 to bypass all internal conversions.
- * New option --ignore-crc-error
+ * Large File Support (LFS) is now working.
+
+ * New options: --ignore-crc-error, --no-sig-create-check,
+ --no-sig-cache, --fixed_list_mode, --no-expensive-trust-checks,
+ --enable-special-filenames and --use-agent. See man page.
+
+ * New command --pipemode, which can be used to run gpg as a
+ co-process. Currently only the verification of detached
+ signatures are working. See doc/DETAILS.
* Keyserver support for the W32 version.
- * New --charset=utf-8 to bypass all internal translations.
+ * A lot of bug fixes, rewritten key selection code so that GnuPG
+ can better cope with multiple sub keys, expire dates and so.
+ The drawback is that it is slower.
- * New command "showpref" in the --edit-key menu to show an easier
- to understand preference listing.
+ * The verification status of self-signatures are now cached. To
+ increase the speed of key list operations for existing keys you
+ can do the following in your GnuPG homedir (~/.gnupg):
+ $ cp pubring.gpg pubring.gpg.save && $ gpg --export-all >x && \
+ rm pubring.gpg && gpg --import x
+ Only v4 keys (i.e not the old RSA keys) benefit from this caching.
* New translations: Estonian, Turkish.
diff --git a/cipher/bithelp.h b/cipher/bithelp.h
index 188db168a..6832b2a04 100644
--- a/cipher/bithelp.h
+++ b/cipher/bithelp.h
@@ -1,5 +1,5 @@
/* bithelp.h - Some bit manipulation helpers
- * Copyright (C) 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/blowfish.c b/cipher/blowfish.c
index 0bf497e33..c19d8f341 100644
--- a/cipher/blowfish.c
+++ b/cipher/blowfish.c
@@ -1,9 +1,5 @@
/* blowfish.c - Blowfish encryption
- * Copyright (C) 1998 Free Software Foundation, Inc.
- *
- * For a description of the algorithm, see:
- * Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996.
- * ISBN 0-471-11709-9. Pages 336 ff.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -20,6 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * For a description of the algorithm, see:
+ * Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996.
+ * ISBN 0-471-11709-9. Pages 336 ff.
*/
/* Test values:
diff --git a/cipher/blowfish.h b/cipher/blowfish.h
index bed034c73..f6aaaf67e 100644
--- a/cipher/blowfish.h
+++ b/cipher/blowfish.h
@@ -1,5 +1,5 @@
/* blowfish.h
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/cast5.c b/cipher/cast5.c
index 8f9658362..c99b47e13 100644
--- a/cipher/cast5.c
+++ b/cipher/cast5.c
@@ -1,5 +1,5 @@
/* cast5.c - CAST5 cipher (RFC2144)
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/cast5.h b/cipher/cast5.h
index 798eaa23f..2d14d4368 100644
--- a/cipher/cast5.h
+++ b/cipher/cast5.h
@@ -1,5 +1,5 @@
/* cast5.h
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/cipher.c b/cipher/cipher.c
index bbaddd116..a68679a73 100644
--- a/cipher/cipher.c
+++ b/cipher/cipher.c
@@ -1,5 +1,5 @@
/* cipher.c - cipher dispatcher
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/des.c b/cipher/des.c
index ce436d847..90fd8199e 100644
--- a/cipher/des.c
+++ b/cipher/des.c
@@ -1,12 +1,5 @@
/* des.c - DES and Triple-DES encryption/decryption Algorithm
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
- *
- * Please see below for more legal information!
- *
- * According to the definition of DES in FIPS PUB 46-2 from December 1993.
- * For a description of triple encryption, see:
- * Bruce Schneier: Applied Cryptography. Second Edition.
- * John Wiley & Sons, 1996. ISBN 0-471-12845-7. Pages 358 ff.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -23,6 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ *
+ * According to the definition of DES in FIPS PUB 46-2 from December 1993.
+ * For a description of triple encryption, see:
+ * Bruce Schneier: Applied Cryptography. Second Edition.
+ * John Wiley & Sons, 1996. ISBN 0-471-12845-7. Pages 358 ff.
*/
diff --git a/cipher/des.h b/cipher/des.h
index f68560686..ee6830c3f 100644
--- a/cipher/des.h
+++ b/cipher/des.h
@@ -1,5 +1,5 @@
/* des.h
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/dsa.c b/cipher/dsa.c
index 7ef410a08..65fe55a54 100644
--- a/cipher/dsa.c
+++ b/cipher/dsa.c
@@ -1,5 +1,5 @@
-/* dsa.c - DSA signature scheme
- * Copyright (C) 1998 Free Software Foundation, Inc.
+/* dsa.c - DSA signature algorithm
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/dsa.h b/cipher/dsa.h
index 1456d65b6..6cd762b3a 100644
--- a/cipher/dsa.h
+++ b/cipher/dsa.h
@@ -1,5 +1,5 @@
-/* dsa.h - DSA signature scheme
- * Copyright (C) 1998 Free Software Foundation, Inc.
+/* dsa.h - DSA signature algorithm
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/dynload.c b/cipher/dynload.c
index 01992942a..291e2429c 100644
--- a/cipher/dynload.c
+++ b/cipher/dynload.c
@@ -1,5 +1,5 @@
/* dynload.c - load cipher extensions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/dynload.h b/cipher/dynload.h
index af8940712..a769923aa 100644
--- a/cipher/dynload.h
+++ b/cipher/dynload.h
@@ -1,5 +1,5 @@
-/* dynload.5
- * Copyright (C) 1998 Free Software Foundation, Inc.
+/* dynload.h
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/elgamal.c b/cipher/elgamal.c
index 9276631df..b4563cd58 100644
--- a/cipher/elgamal.c
+++ b/cipher/elgamal.c
@@ -1,5 +1,5 @@
/* elgamal.c - ElGamal Public Key encryption
- * Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 2000, 2001 Free Software Foundation, Inc.
*
* For a description of the algorithm, see:
* Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996.
diff --git a/cipher/elgamal.h b/cipher/elgamal.h
index f104c2a52..c438e1ab9 100644
--- a/cipher/elgamal.h
+++ b/cipher/elgamal.h
@@ -1,5 +1,5 @@
/* elgamal.h
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/g10c.c b/cipher/g10c.c
index de6a09c96..feee08d80 100644
--- a/cipher/g10c.c
+++ b/cipher/g10c.c
@@ -1,5 +1,5 @@
/* g10c.c - Wrapper for cipher functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/md.c b/cipher/md.c
index 9313fc068..032eeccdf 100644
--- a/cipher/md.c
+++ b/cipher/md.c
@@ -1,5 +1,5 @@
/* md.c - message digest dispatcher
- * Copyright (C) 1998,1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/md5.c b/cipher/md5.c
index cf8861d10..78bf28832 100644
--- a/cipher/md5.c
+++ b/cipher/md5.c
@@ -1,8 +1,6 @@
/* md5.c - MD5 Message-Digest Algorithm
- * Copyright (C) 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
- *
- * according to the definition of MD5 in RFC 1321 from April 1992.
- * NOTE: This is *not* the same file as the one from glibc.
+ * Copyright (C) 1995, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -17,9 +15,12 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * According to the definition of MD5 in RFC 1321 from April 1992.
+ * NOTE: This is *not* the same file as the one from glibc.
*/
/* Written by Ulrich Drepper <[email protected]>, 1995. */
-/* heavily modified for GnuPG by <[email protected]> */
+/* Heavily modified for GnuPG by <[email protected]> */
/* Test values:
* "" D4 1D 8C D9 8F 00 B2 04 E9 80 09 98 EC F8 42 7E
diff --git a/cipher/primegen.c b/cipher/primegen.c
index 7eaf6641f..96048a398 100644
--- a/cipher/primegen.c
+++ b/cipher/primegen.c
@@ -1,5 +1,5 @@
/* primegen.c - prime number generator
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/pubkey.c b/cipher/pubkey.c
index ce78895fd..7e320856e 100644
--- a/cipher/pubkey.c
+++ b/cipher/pubkey.c
@@ -1,5 +1,5 @@
/* pubkey.c - pubkey dispatcher
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/rand-internal.h b/cipher/rand-internal.h
index 290f034f9..69f96b3dc 100644
--- a/cipher/rand-internal.h
+++ b/cipher/rand-internal.h
@@ -1,5 +1,5 @@
/* rand-internal.h - header to glue the random functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/random.c b/cipher/random.c
index 03a54e580..e93a0bdd7 100644
--- a/cipher/random.c
+++ b/cipher/random.c
@@ -1,5 +1,5 @@
/* random.c - random number generator
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/random.h b/cipher/random.h
index cf80bd98d..f4ba918bd 100644
--- a/cipher/random.h
+++ b/cipher/random.h
@@ -1,5 +1,5 @@
/* random.h - random functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/rijndael.c b/cipher/rijndael.c
index 3eac290c1..50079cb75 100644
--- a/cipher/rijndael.c
+++ b/cipher/rijndael.c
@@ -1,5 +1,5 @@
/* Rijndael (AES) for GnuPG
- * Copyright (C) 2000 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/rmd.h b/cipher/rmd.h
index cd5c453a3..917e04a26 100644
--- a/cipher/rmd.h
+++ b/cipher/rmd.h
@@ -1,5 +1,5 @@
/* rmd.h - RIPE-MD hash functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/rmd160.c b/cipher/rmd160.c
index 9f5ab852c..1fd0b98f9 100644
--- a/cipher/rmd160.c
+++ b/cipher/rmd160.c
@@ -1,5 +1,5 @@
/* rmd160.c - RIPE-MD160
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/rmd160test.c b/cipher/rmd160test.c
index f0acd2ad6..14afb435b 100644
--- a/cipher/rmd160test.c
+++ b/cipher/rmd160test.c
@@ -1,5 +1,5 @@
-/* rmd160test.c - ripe md 160 test program
- * Copyright (C) 1998 Free Software Foundation, Inc.
+/* rmd160test.c - ripe md160 test program
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/rndegd.c b/cipher/rndegd.c
index 666681ee2..7579ba80e 100644
--- a/cipher/rndegd.c
+++ b/cipher/rndegd.c
@@ -1,5 +1,5 @@
/* rndegd.c - interface to the EGD
- * Copyright (C) 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/rndlinux.c b/cipher/rndlinux.c
index 4ac8bb310..5f2ccf241 100644
--- a/cipher/rndlinux.c
+++ b/cipher/rndlinux.c
@@ -1,5 +1,5 @@
/* rndlinux.c - raw random number for OSes with /dev/random
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/rndw32.c b/cipher/rndw32.c
index e951fdf6e..d4d7d22e4 100644
--- a/cipher/rndw32.c
+++ b/cipher/rndw32.c
@@ -1,5 +1,5 @@
/* rndw32.c - W32 entropy gatherer
- * Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright Peter Gutmann, Matt Thomlinson and Blake Coverett 1996-1999
*
* This file is part of GnuPG.
diff --git a/cipher/rsa.c b/cipher/rsa.c
index 2daa0547f..e8d404732 100644
--- a/cipher/rsa.c
+++ b/cipher/rsa.c
@@ -1,6 +1,6 @@
/* rsa.c - RSA function
* Copyright (C) 1997, 1998, 1999 by Werner Koch (dd9jn)
- * Copyright (C) 2000 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/rsa.h b/cipher/rsa.h
index 8b60ecbb0..350a373ec 100644
--- a/cipher/rsa.h
+++ b/cipher/rsa.h
@@ -1,6 +1,6 @@
/* rsa.h
* Copyright (C) 1997,1998 by Werner Koch (dd9jn)
- * Copyright (C) 2000 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/sha1.c b/cipher/sha1.c
index 0f8f17ce2..f5dd59d91 100644
--- a/cipher/sha1.c
+++ b/cipher/sha1.c
@@ -1,5 +1,5 @@
/* sha1.c - SHA1 hash function
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* Please see below for more legal information!
*
diff --git a/cipher/smallprime.c b/cipher/smallprime.c
index 8187aa768..941f4ce9a 100644
--- a/cipher/smallprime.c
+++ b/cipher/smallprime.c
@@ -1,5 +1,5 @@
/* smallprime.c - List of small primes
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/cipher/tiger.c b/cipher/tiger.c
index 76fcbbdac..4da0f64e4 100644
--- a/cipher/tiger.c
+++ b/cipher/tiger.c
@@ -1,5 +1,5 @@
/* tiger.c - The TIGER hash function
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index b5e9c2f2a..d36849751 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1,5 +1,5 @@
<!-- gpg.sgml - the man page for GnuPG
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of GnuPG.
@@ -1190,6 +1190,14 @@ together with --status-fd. See the file doc/DETAILS in the source
distribution for details on how to use it.
</para></listitem></varlistentry>
+<varlistentry>
+<term>--use-agent</term>
+<listitem><para>
+Try to use the GnuPG-Agent. Please note that this agent is still under
+development. With this option, GnuPG first tries to connect to the
+agent before it asks for a passphrase.
+</para></listitem></varlistentry>
+
<varlistentry>
<term>--rfc1991</term>
@@ -1470,10 +1478,15 @@ handy in case where an encrypted message contains a bogus key ID.
<term>--enable-special-filenames</term>
<listitem><para>
This options enables a mode in which filenames of the form
-<filename>-&amp;n</>, where n is a non-negative decimal number,
+<filename>-&#38;n</>, where n is a non-negative decimal number,
refer to the file descriptor n and not to a file with that name.
</para></listitem></varlistentry>
+<varlistentry>
+<term>--no-expensive-trust-checks</term>
+<listitem><para>
+Experimental use only.
+</para></listitem></varlistentry>
</variablelist>
</refsect1>
@@ -1525,14 +1538,14 @@ key IDs (which are really rare for the long key IDs).
</varlistentry>
<varlistentry>
-<term>=Heinrich Heine &lt;[email protected]&gt;</term>
+<term>=Heinrich Heine &#60;[email protected]&#62;</term>
<listitem><para>
Using an exact to match string. The equal sign indicates this.
</para></listitem>
</varlistentry>
<varlistentry>
-<term>&lt;[email protected]&gt;</term>
+<term>&#60;[email protected]&#62;</term>
<listitem><para>
Using the email address part which must match exactly. The left angle bracket
indicates this email address mode.
diff --git a/doc/gpgv.sgml b/doc/gpgv.sgml
index 8debaa329..757c8fe7c 100644
--- a/doc/gpgv.sgml
+++ b/doc/gpgv.sgml
@@ -1,5 +1,5 @@
<!-- gpgv.sgml - the man page for GnuPG
- Copyright (C) 2000 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001 Free Software Foundation, Inc.
This file is part of GnuPG.
diff --git a/g10/ChangeLog b/g10/ChangeLog
index f32db206c..0be49aec0 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -188,7 +188,7 @@
2001-03-13 Werner Koch <[email protected]>
- * main.c, options.h: New option fixed_list_mode.
+ * main.c, options.h: New option --fixed_list_mode.
* keylist.c (list_keyblock_colon): use it here.
* getkey.c (merge_keys_and_selfsig): Divert merging of public keys
diff --git a/include/cipher.h b/include/cipher.h
index 8299e0438..8e7c26669 100644
--- a/include/cipher.h
+++ b/include/cipher.h
@@ -1,5 +1,5 @@
/* cipher.h
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/include/errors.h b/include/errors.h
index f7a9fc570..d9edebd24 100644
--- a/include/errors.h
+++ b/include/errors.h
@@ -1,5 +1,5 @@
/* errors.h - erro code
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/include/host2net.h b/include/host2net.h
index 4c14d64ce..0f12a8e1d 100644
--- a/include/host2net.h
+++ b/include/host2net.h
@@ -1,5 +1,5 @@
/* host2net.h - Some macros
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/include/http.h b/include/http.h
index 3d13f8266..c41f719d1 100644
--- a/include/http.h
+++ b/include/http.h
@@ -1,5 +1,5 @@
/* http.h - HTTP protocol handler
- * Copyright (C) 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/include/i18n.h b/include/i18n.h
index 5caf86e92..efae5f2d9 100644
--- a/include/i18n.h
+++ b/include/i18n.h
@@ -1,5 +1,5 @@
/* i18n.h
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/include/iobuf.h b/include/iobuf.h
index 5e02a3ae0..595186f6e 100644
--- a/include/iobuf.h
+++ b/include/iobuf.h
@@ -1,5 +1,5 @@
/* iobuf.h - I/O buffer
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/include/memory.h b/include/memory.h
index 84b7337c6..76acd8732 100644
--- a/include/memory.h
+++ b/include/memory.h
@@ -1,5 +1,5 @@
/* memory.h - memory allocation
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/include/mpi.h b/include/mpi.h
index 50e088b20..27723d1b7 100644
--- a/include/mpi.h
+++ b/include/mpi.h
@@ -1,5 +1,6 @@
/* mpi.h - Multi Precision Integers
- * Copyright (C) 1994, 1996, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/include/ttyio.h b/include/ttyio.h
index 3864e2440..7341b323b 100644
--- a/include/ttyio.h
+++ b/include/ttyio.h
@@ -1,5 +1,5 @@
/* ttyio.h
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/include/types.h b/include/types.h
index a91e89a50..dbd711c94 100644
--- a/include/types.h
+++ b/include/types.h
@@ -1,5 +1,5 @@
/* types.h - some common typedefs
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/include/util.h b/include/util.h
index 60b0c1736..f89dade7c 100644
--- a/include/util.h
+++ b/include/util.h
@@ -1,5 +1,5 @@
/* util.h
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/alpha/mpih-add1.S b/mpi/alpha/mpih-add1.S
index dc3bcfbb8..de0d248ac 100644
--- a/mpi/alpha/mpih-add1.S
+++ b/mpi/alpha/mpih-add1.S
@@ -1,17 +1,15 @@
/* alpha add_n -- Add two limb vectors of the same length > 0 and store
* sum in a third limb vector.
+ * Copyright (C) 1995, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
- * Copyright (C) 1995 Free Software Foundation, Inc.
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * This file is part of GnuPG.
*
- * This file is part of GNUPG.
- *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/mpi/alpha/mpih-lshift.S b/mpi/alpha/mpih-lshift.S
index 9688588fa..a24fbd82b 100644
--- a/mpi/alpha/mpih-lshift.S
+++ b/mpi/alpha/mpih-lshift.S
@@ -1,15 +1,16 @@
-/* alpha lshift
- * Copyright (C) 1994, 1995 Free Software Foundation, Inc.
- * Copyright (C) 1998 Free Software Foundation, Inc.
+/* alpha - left shift
+ * Copyright (C) 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
- * This file is part of GNUPG.
*
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/mpi/alpha/mpih-mul1.S b/mpi/alpha/mpih-mul1.S
index 5b24d98d1..38cbbdfc3 100644
--- a/mpi/alpha/mpih-mul1.S
+++ b/mpi/alpha/mpih-mul1.S
@@ -1,7 +1,8 @@
/* Alpha 21064 mpih-mul1.S -- Multiply a limb vector with a limb and store
* the result in a second limb vector.
*
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/alpha/mpih-mul2.S b/mpi/alpha/mpih-mul2.S
index 0c8d361c3..bd0f2444c 100644
--- a/mpi/alpha/mpih-mul2.S
+++ b/mpi/alpha/mpih-mul2.S
@@ -1,7 +1,8 @@
/* Alpha 21064 addmul_1 -- Multiply a limb vector with a limb and add
* the result to a second limb vector.
*
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/alpha/mpih-mul3.S b/mpi/alpha/mpih-mul3.S
index bdf16b57b..764f5c787 100644
--- a/mpi/alpha/mpih-mul3.S
+++ b/mpi/alpha/mpih-mul3.S
@@ -1,6 +1,7 @@
/* Alpha 21064 submul_1 -- Multiply a limb vector with a limb and
* subtract the result from a second limb vector.
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/alpha/mpih-rshift.S b/mpi/alpha/mpih-rshift.S
index e93315ae2..e15542de5 100644
--- a/mpi/alpha/mpih-rshift.S
+++ b/mpi/alpha/mpih-rshift.S
@@ -1,6 +1,6 @@
/* alpha rshift
- * Copyright (C) 1994, 1995 Free Software Foundation, Inc.
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/alpha/mpih-sub1.S b/mpi/alpha/mpih-sub1.S
index bf614309b..32363885e 100644
--- a/mpi/alpha/mpih-sub1.S
+++ b/mpi/alpha/mpih-sub1.S
@@ -1,6 +1,7 @@
/* Alpha sub_n -- Subtract two limb vectors of the same length > 0 and
* store difference in a third limb vector.
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/alpha/udiv-qrnnd.S b/mpi/alpha/udiv-qrnnd.S
index 487991cd8..70ed09df4 100644
--- a/mpi/alpha/udiv-qrnnd.S
+++ b/mpi/alpha/udiv-qrnnd.S
@@ -1,16 +1,16 @@
/* Alpha 21064 __udiv_qrnnd
*
- * Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
- * Copyright (c) 1997 by Werner Koch (dd9jn)
+ * Copyright (C) 1992, 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
- * This file is part of G10.
+ * This file is part of GnuPG.
*
- * G10 is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * G10 is distributed in the hope that it will be useful,
+ * GnuPG is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/mpi/hppa/mpih-add1.S b/mpi/hppa/mpih-add1.S
index e01c2eed0..ea8624e85 100644
--- a/mpi/hppa/mpih-add1.S
+++ b/mpi/hppa/mpih-add1.S
@@ -1,8 +1,8 @@
/* hppa add_n -- Add two limb vectors of the same length > 0 and store
* sum in a third limb vector.
*
- * Copyright (C) 1992, 1994 Free Software Foundation, Inc.
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1998, 1999,
+ * 2000, 2001 Fee Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/hppa/mpih-lshift.S b/mpi/hppa/mpih-lshift.S
index ada09f595..dbb3bede3 100644
--- a/mpi/hppa/mpih-lshift.S
+++ b/mpi/hppa/mpih-lshift.S
@@ -1,6 +1,7 @@
/* hppa lshift
-*
- * Copyright (C) 1992, 1994, 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/hppa/mpih-rshift.S b/mpi/hppa/mpih-rshift.S
index 0299d2e27..2095a0f01 100644
--- a/mpi/hppa/mpih-rshift.S
+++ b/mpi/hppa/mpih-rshift.S
@@ -1,6 +1,7 @@
/* hppa rshift
-*
- * Copyright (C) 1992, 1994, 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/hppa/mpih-sub1.S b/mpi/hppa/mpih-sub1.S
index 8672e3145..0147ca562 100644
--- a/mpi/hppa/mpih-sub1.S
+++ b/mpi/hppa/mpih-sub1.S
@@ -1,7 +1,8 @@
/* hppa sub_n -- Sub two limb vectors of the same length > 0 and store
* sum in a third limb vector.
- * Copyright (C) 1992, 1994 Free Software Foundation, Inc.
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/hppa/udiv-qrnnd.S b/mpi/hppa/udiv-qrnnd.S
index 849238349..34fdf98c5 100644
--- a/mpi/hppa/udiv-qrnnd.S
+++ b/mpi/hppa/udiv-qrnnd.S
@@ -1,17 +1,17 @@
/* HP-PA __udiv_qrnnd division support, used from longlong.h.
* This version runs fast on pre-PA7000 CPUs.
*
- * Copyright (C) 1993, 1994 Free Software Foundation, Inc.
- * Copyright (c) 1997 by Werner Koch (dd9jn)
+ * Copyright (C) 1993, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
- * This file is part of G10.
+ * This file is part of GnuPG.
*
- * G10 is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * G10 is distributed in the hope that it will be useful,
+ * GnuPG is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
diff --git a/mpi/hppa1.1/mpih-mul1.S b/mpi/hppa1.1/mpih-mul1.S
index 1f7377473..940c0a5a9 100644
--- a/mpi/hppa1.1/mpih-mul1.S
+++ b/mpi/hppa1.1/mpih-mul1.S
@@ -1,7 +1,8 @@
/* hppa1.1 mul_1 -- Multiply a limb vector with a limb and store
* the result in a second limb vector.
- * Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1993, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/hppa1.1/mpih-mul2.S b/mpi/hppa1.1/mpih-mul2.S
index 89c025952..7c480b9f2 100644
--- a/mpi/hppa1.1/mpih-mul2.S
+++ b/mpi/hppa1.1/mpih-mul2.S
@@ -1,7 +1,8 @@
/* hppa1.1 addmul_1 -- Multiply a limb vector with a limb and add
* the result to a second limb vector.
- * Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1993, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/hppa1.1/mpih-mul3.S b/mpi/hppa1.1/mpih-mul3.S
index 80868a3ef..2f9b4b824 100644
--- a/mpi/hppa1.1/mpih-mul3.S
+++ b/mpi/hppa1.1/mpih-mul3.S
@@ -1,7 +1,8 @@
/* hppa1.1 submul_1 -- Multiply a limb vector with a limb and add
* the result to a second limb vector.
- * Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1993, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/hppa1.1/udiv-qrnnd.S b/mpi/hppa1.1/udiv-qrnnd.S
index b48eee49a..331e16193 100644
--- a/mpi/hppa1.1/udiv-qrnnd.S
+++ b/mpi/hppa1.1/udiv-qrnnd.S
@@ -1,8 +1,8 @@
/* HP-PA __udiv_qrnnd division support, used from longlong.h.
* This version runs fast on PA 7000 and later.
*
- * Copyright (C) 1993, 1994 Free Software Foundation, Inc.
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1993, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/i386/mpih-add1.S b/mpi/i386/mpih-add1.S
index b7517cf01..dbf65c84e 100644
--- a/mpi/i386/mpih-add1.S
+++ b/mpi/i386/mpih-add1.S
@@ -1,8 +1,8 @@
/* i80386 add_n -- Add two limb vectors of the same length > 0 and store
* sum in a third limb vector.
*
- * Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/i386/mpih-lshift.S b/mpi/i386/mpih-lshift.S
index a84f6b1f9..97e922e35 100644
--- a/mpi/i386/mpih-lshift.S
+++ b/mpi/i386/mpih-lshift.S
@@ -1,6 +1,6 @@
/* i80386 lshift
- * Copyright (C) 1998 Free Software Foundation, Inc.
- * Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/i386/mpih-mul1.S b/mpi/i386/mpih-mul1.S
index 106796431..559b52469 100644
--- a/mpi/i386/mpih-mul1.S
+++ b/mpi/i386/mpih-mul1.S
@@ -1,7 +1,7 @@
/* i80386 mul_1 -- Multiply a limb vector with a limb and store
* the result in a second limb vector.
- * Copyright (C) 1998 Free Software Foundation, Inc.
- * Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/i386/mpih-mul2.S b/mpi/i386/mpih-mul2.S
index 8b124bda7..57aafaa50 100644
--- a/mpi/i386/mpih-mul2.S
+++ b/mpi/i386/mpih-mul2.S
@@ -1,7 +1,8 @@
/* i80386 addmul_1 -- Multiply a limb vector with a limb and add
* the result to a second limb vector.
- * Copyright (C) 1998 Free Software Foundation, Inc.
- * Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/i386/mpih-mul3.S b/mpi/i386/mpih-mul3.S
index 5f3655611..66bc29230 100644
--- a/mpi/i386/mpih-mul3.S
+++ b/mpi/i386/mpih-mul3.S
@@ -1,7 +1,8 @@
/* i80386 submul_1 -- Multiply a limb vector with a limb and add
* the result to a second limb vector.
- * Copyright (C) 1998 Free Software Foundation, Inc.
- * Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/i386/mpih-rshift.S b/mpi/i386/mpih-rshift.S
index 3dd9caf7e..beb8fc829 100644
--- a/mpi/i386/mpih-rshift.S
+++ b/mpi/i386/mpih-rshift.S
@@ -1,6 +1,7 @@
/* i80386 rshift
- * Copyright (C) 1998 Free Software Foundation, Inc.
- * Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/i386/mpih-sub1.S b/mpi/i386/mpih-sub1.S
index fe1cdeeeb..28208a1a5 100644
--- a/mpi/i386/mpih-sub1.S
+++ b/mpi/i386/mpih-sub1.S
@@ -1,7 +1,8 @@
/* i80386 sub_n -- Sub two limb vectors of the same length > 0 and store
* sum in a third limb vector.
- * Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/i386/syntax.h b/mpi/i386/syntax.h
index 33bd29479..0797de29b 100644
--- a/mpi/i386/syntax.h
+++ b/mpi/i386/syntax.h
@@ -1,24 +1,30 @@
-/* asm.h -- Definitions for x86 syntax variations.
-
-Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP Library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
-
+/* syntax.h -- Definitions for x86 syntax variations.
+ *
+ * Copyright (C) 1992, 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
+ *
+ * GNUPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GNUPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ * Actually it's the same code with only minor changes in the
+ * way the data is stored; this is to support the abstraction
+ * of an optional secure memory allocation which may be used
+ * to avoid revealing of sensitive data due to paging etc.
+ * The GNU MP Library itself is published under the LGPL;
+ * however I decided to publish this code under the plain GPL.
+ */
#undef ALIGN
diff --git a/mpi/i586/mpih-add1.S b/mpi/i586/mpih-add1.S
index a52c16464..5e95adecd 100644
--- a/mpi/i586/mpih-add1.S
+++ b/mpi/i586/mpih-add1.S
@@ -1,7 +1,8 @@
/* i80586 add_n -- Add two limb vectors of the same length > 0 and store
* sum in a third limb vector.
*
- * Copyright (C) 1992, 1994, 1995, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1995, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/i586/mpih-lshift.S b/mpi/i586/mpih-lshift.S
index 9e0cb0297..0e2ad3dda 100644
--- a/mpi/i586/mpih-lshift.S
+++ b/mpi/i586/mpih-lshift.S
@@ -1,6 +1,7 @@
/* i80586 lshift
- * Copyright (C) 1998 Free Software Foundation, Inc.
- * Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/i586/mpih-mul1.S b/mpi/i586/mpih-mul1.S
index b338b1a8b..662caacc5 100644
--- a/mpi/i586/mpih-mul1.S
+++ b/mpi/i586/mpih-mul1.S
@@ -1,6 +1,8 @@
/* i80586 mul_1 -- Multiply a limb vector with a limb and store
* the result in a second limb vector.
- * Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/i586/mpih-mul2.S b/mpi/i586/mpih-mul2.S
index df22a4282..f42441e26 100644
--- a/mpi/i586/mpih-mul2.S
+++ b/mpi/i586/mpih-mul2.S
@@ -1,7 +1,8 @@
/* i80586 addmul_1 -- Multiply a limb vector with a limb and add
* the result to a second limb vector.
- * Copyright (C) 1998 Free Software Foundation, Inc.
- * Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/i586/mpih-mul3.S b/mpi/i586/mpih-mul3.S
index 014e33cb1..0f17c53ec 100644
--- a/mpi/i586/mpih-mul3.S
+++ b/mpi/i586/mpih-mul3.S
@@ -1,7 +1,8 @@
/* i80586 submul_1 -- Multiply a limb vector with a limb and add
* the result to a second limb vector.
- * Copyright (C) 1998 Free Software Foundation, Inc.
- * Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/i586/mpih-rshift.S b/mpi/i586/mpih-rshift.S
index aec26e64d..085f7380b 100644
--- a/mpi/i586/mpih-rshift.S
+++ b/mpi/i586/mpih-rshift.S
@@ -1,6 +1,7 @@
/* i80586 rshift
- * Copyright (C) 1998 Free Software Foundation, Inc.
- * Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/i586/mpih-sub1.S b/mpi/i586/mpih-sub1.S
index 2ed704e89..1e935702d 100644
--- a/mpi/i586/mpih-sub1.S
+++ b/mpi/i586/mpih-sub1.S
@@ -1,7 +1,8 @@
/* i80586 sub_n -- Sub two limb vectors of the same length > 0 and store
* sum in a third limb vector.
- * Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/m68k/mc68020/mpih-mul1.S b/mpi/m68k/mc68020/mpih-mul1.S
index 16a52a229..5dc178569 100644
--- a/mpi/m68k/mc68020/mpih-mul1.S
+++ b/mpi/m68k/mc68020/mpih-mul1.S
@@ -1,24 +1,33 @@
/* mc68020 __mpn_mul_1 -- Multiply a limb vector with a limb and store
- the result in a second limb vector.
-
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP Library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
+ * the result in a second limb vector.
+ *
+ * Copyright (C) 1992, 1994, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ * Actually it's the same code with only minor changes in the
+ * way the data is stored; this is to support the abstraction
+ * of an optional secure memory allocation which may be used
+ * to avoid revealing of sensitive data due to paging etc.
+ * The GNU MP Library itself is published under the LGPL;
+ * however I decided to publish this code under the plain GPL.
+ */
diff --git a/mpi/m68k/mc68020/mpih-mul2.S b/mpi/m68k/mc68020/mpih-mul2.S
index 8cbbc5480..1d33c9aa7 100644
--- a/mpi/m68k/mc68020/mpih-mul2.S
+++ b/mpi/m68k/mc68020/mpih-mul2.S
@@ -1,24 +1,33 @@
/* mc68020 __mpn_addmul_1 -- Multiply a limb vector with a limb and add
- the result to a second limb vector.
-
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP Library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
+ * the result to a second limb vector.
+ *
+ * Copyright (C) 1992, 1994, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ * Actually it's the same code with only minor changes in the
+ * way the data is stored; this is to support the abstraction
+ * of an optional secure memory allocation which may be used
+ * to avoid revealing of sensitive data due to paging etc.
+ * The GNU MP Library itself is published under the LGPL;
+ * however I decided to publish this code under the plain GPL.
+ */
#include "sysdep.h"
diff --git a/mpi/m68k/mc68020/mpih-mul3.S b/mpi/m68k/mc68020/mpih-mul3.S
index 8e28ce456..bda9b6c98 100644
--- a/mpi/m68k/mc68020/mpih-mul3.S
+++ b/mpi/m68k/mc68020/mpih-mul3.S
@@ -1,24 +1,34 @@
/* mc68020 __mpn_submul_1 -- Multiply a limb vector with a limb and subtract
- the result from a second limb vector.
-
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP Library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-License for more details.
+ * the result from a second limb vector.
+ *
+ * Copyright (C) 1992, 1994, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ * Actually it's the same code with only minor changes in the
+ * way the data is stored; this is to support the abstraction
+ * of an optional secure memory allocation which may be used
+ * to avoid revealing of sensitive data due to paging etc.
+ * The GNU MP Library itself is published under the LGPL;
+ * however I decided to publish this code under the plain GPL.
+ */
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
diff --git a/mpi/m68k/mpih-add1.S b/mpi/m68k/mpih-add1.S
index b3812c787..3874c9fc1 100644
--- a/mpi/m68k/mpih-add1.S
+++ b/mpi/m68k/mpih-add1.S
@@ -1,24 +1,33 @@
/* mc68020 __mpn_add_n -- Add two limb vectors of the same length > 0 and store
- sum in a third limb vector.
-
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP Library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
+ * sum in a third limb vector.
+ *
+ * Copyright (C) 1992, 1994,1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ * Actually it's the same code with only minor changes in the
+ * way the data is stored; this is to support the abstraction
+ * of an optional secure memory allocation which may be used
+ * to avoid revealing of sensitive data due to paging etc.
+ * The GNU MP Library itself is published under the LGPL;
+ * however I decided to publish this code under the plain GPL.
+ */
#include "sysdep.h"
diff --git a/mpi/m68k/mpih-lshift.S b/mpi/m68k/mpih-lshift.S
index af305c847..9f6e3e582 100644
--- a/mpi/m68k/mpih-lshift.S
+++ b/mpi/m68k/mpih-lshift.S
@@ -1,24 +1,33 @@
/* mc68020 lshift -- Shift left a low-level natural-number integer.
+ *
+ * Copyright (C) 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ * Actually it's the same code with only minor changes in the
+ * way the data is stored; this is to support the abstraction
+ * of an optional secure memory allocation which may be used
+ * to avoid revealing of sensitive data due to paging etc.
+ * The GNU MP Library itself is published under the LGPL;
+ * however I decided to publish this code under the plain GPL.
+ */
-Copyright (C) 1996, 1998 Free Software Foundation, Inc.
-
-This file is part of GNUPG.
-
-GNUPG is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-GNUPG is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA.
-*/
#include "sysdep.h"
#include "asm-syntax.h"
diff --git a/mpi/m68k/mpih-rshift.S b/mpi/m68k/mpih-rshift.S
index 5670888c9..f892f742c 100644
--- a/mpi/m68k/mpih-rshift.S
+++ b/mpi/m68k/mpih-rshift.S
@@ -1,24 +1,33 @@
/* mc68020 rshift -- Shift right a low-level natural-number integer.
+ *
+ * Copyright (C) 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ * Actually it's the same code with only minor changes in the
+ * way the data is stored; this is to support the abstraction
+ * of an optional secure memory allocation which may be used
+ * to avoid revealing of sensitive data due to paging etc.
+ * The GNU MP Library itself is published under the LGPL;
+ * however I decided to publish this code under the plain GPL.
+ */
-Copyright (C) 1996, 1998 Free Software Foundation, Inc.
-
-This file is part of GNUPG.
-
-GNUPG is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-GNUPG is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA.
-*/
#include "sysdep.h"
#include "asm-syntax.h"
diff --git a/mpi/m68k/mpih-sub1.S b/mpi/m68k/mpih-sub1.S
index 8d8ef0b41..ad58ba87d 100644
--- a/mpi/m68k/mpih-sub1.S
+++ b/mpi/m68k/mpih-sub1.S
@@ -1,25 +1,33 @@
/* mc68020 __mpn_sub_n -- Subtract two limb vectors of the same length > 0 and
- store difference in a third limb vector.
-
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP Library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
-
+ * store difference in a third limb vector.
+ *
+ * Copyright (C) 1992, 1994, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ * Actually it's the same code with only minor changes in the
+ * way the data is stored; this is to support the abstraction
+ * of an optional secure memory allocation which may be used
+ * to avoid revealing of sensitive data due to paging etc.
+ * The GNU MP Library itself is published under the LGPL;
+ * however I decided to publish this code under the plain GPL.
+ */
#include "sysdep.h"
#include "asm-syntax.h"
diff --git a/mpi/m68k/syntax.h b/mpi/m68k/syntax.h
index 9d6f3522b..9e03d74b4 100644
--- a/mpi/m68k/syntax.h
+++ b/mpi/m68k/syntax.h
@@ -1,23 +1,33 @@
/* asm.h -- Definitions for 68k syntax variations.
+ *
+ * Copyright (C) 1992, 1994, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ * Actually it's the same code with only minor changes in the
+ * way the data is stored; this is to support the abstraction
+ * of an optional secure memory allocation which may be used
+ * to avoid revealing of sensitive data due to paging etc.
+ * The GNU MP Library itself is published under the LGPL;
+ * however I decided to publish this code under the plain GPL.
+ */
-Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-The GNU MP Library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
#undef ALIGN
diff --git a/mpi/mips3/mpih-add1.S b/mpi/mips3/mpih-add1.S
index 7ac5f38bd..336b07bbb 100644
--- a/mpi/mips3/mpih-add1.S
+++ b/mpi/mips3/mpih-add1.S
@@ -1,6 +1,8 @@
/* mips3 add_n -- Add two limb vectors of the same length > 0 and store
* sum in a third limb vector.
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/mips3/mpih-lshift.S b/mpi/mips3/mpih-lshift.S
index 37e9a5e1b..32f62cd20 100644
--- a/mpi/mips3/mpih-lshift.S
+++ b/mpi/mips3/mpih-lshift.S
@@ -1,5 +1,7 @@
/* mips3 lshift
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/mips3/mpih-mul1.S b/mpi/mips3/mpih-mul1.S
index d55d4260c..8a12f4110 100644
--- a/mpi/mips3/mpih-mul1.S
+++ b/mpi/mips3/mpih-mul1.S
@@ -1,6 +1,8 @@
/* mips3 mpih-mul1.S -- Multiply a limb vector with a limb and store
* the result in a second limb vector.
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/mips3/mpih-mul2.S b/mpi/mips3/mpih-mul2.S
index 0312884a2..bc256fa09 100644
--- a/mpi/mips3/mpih-mul2.S
+++ b/mpi/mips3/mpih-mul2.S
@@ -1,6 +1,8 @@
/* MIPS3 addmul_1 -- Multiply a limb vector with a single limb and
* add the product to a second limb vector.
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/mips3/mpih-mul3.S b/mpi/mips3/mpih-mul3.S
index bcb40edbf..84d3f9a8e 100644
--- a/mpi/mips3/mpih-mul3.S
+++ b/mpi/mips3/mpih-mul3.S
@@ -1,6 +1,8 @@
/* MIPS3 submul_1 -- Multiply a limb vector with a single limb and
* subtract the product from a second limb vector.
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/mips3/mpih-rshift.S b/mpi/mips3/mpih-rshift.S
index 7bc084500..b208c55b9 100644
--- a/mpi/mips3/mpih-rshift.S
+++ b/mpi/mips3/mpih-rshift.S
@@ -1,5 +1,7 @@
/* mips3 rshift
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/mips3/mpih-sub1.S b/mpi/mips3/mpih-sub1.S
index 4bc3ad295..2df6339b6 100644
--- a/mpi/mips3/mpih-sub1.S
+++ b/mpi/mips3/mpih-sub1.S
@@ -1,6 +1,8 @@
/* mips3 sub_n -- Subtract two limb vectors of the same length > 0 and
* store difference in a third limb vector.
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/mpi-div.c b/mpi/mpi-div.c
index 926527644..a86df2daf 100644
--- a/mpi/mpi-div.c
+++ b/mpi/mpi-div.c
@@ -1,6 +1,6 @@
/* mpi-div.c - MPI functions
- * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/mpi-inline.h b/mpi/mpi-inline.h
index 3866f106b..f19ce0233 100644
--- a/mpi/mpi-inline.h
+++ b/mpi/mpi-inline.h
@@ -1,6 +1,6 @@
/* mpi-inline.h - Internal to the Multi Precision Integers
- * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/mpi-internal.h b/mpi/mpi-internal.h
index 02169c2fc..3b8b89205 100644
--- a/mpi/mpi-internal.h
+++ b/mpi/mpi-internal.h
@@ -1,6 +1,6 @@
/* mpi-internal.h - Internal to the Multi Precision Integers
- * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/mpi-mul.c b/mpi/mpi-mul.c
index d94aca48d..661ad11c2 100644
--- a/mpi/mpi-mul.c
+++ b/mpi/mpi-mul.c
@@ -1,6 +1,6 @@
/* mpi-mul.c - MPI functions
- * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/mpi-pow.c b/mpi/mpi-pow.c
index 82617fbde..94e74f7ce 100644
--- a/mpi/mpi-pow.c
+++ b/mpi/mpi-pow.c
@@ -1,6 +1,6 @@
/* mpi-pow.c - MPI functions
- * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright (C) 1994, 1996, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/mpih-cmp.c b/mpi/mpih-cmp.c
index 143f87a85..03d41557c 100644
--- a/mpi/mpih-cmp.c
+++ b/mpi/mpih-cmp.c
@@ -1,6 +1,6 @@
/* mpihelp-sub.c - MPI helper functions
- * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/mpih-div.c b/mpi/mpih-div.c
index 9205b51bc..a9ddfc43c 100644
--- a/mpi/mpih-div.c
+++ b/mpi/mpih-div.c
@@ -1,6 +1,6 @@
/* mpihelp-div.c - MPI helper functions
- * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/pa7100/mpih-lshift.S b/mpi/pa7100/mpih-lshift.S
index e17e1b705..d71afcbae 100644
--- a/mpi/pa7100/mpih-lshift.S
+++ b/mpi/pa7100/mpih-lshift.S
@@ -1,7 +1,8 @@
/* hppa lshift
* optimized for the PA7100, where is runs at 3.25 cycles/limb
- * Copyright (C) 1992, 1994 Free Software Foundation, Inc.
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/pa7100/mpih-rshift.S b/mpi/pa7100/mpih-rshift.S
index b409de042..bedde4248 100644
--- a/mpi/pa7100/mpih-rshift.S
+++ b/mpi/pa7100/mpih-rshift.S
@@ -1,7 +1,8 @@
/* hppa rshift
* optimized for the PA7100, where is runs at 3.25 cycles/limb
- * Copyright (C) 1992, 1994 Free Software Foundation, Inc.
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ *
+ * Copyright (C) 1992, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/power/mpih-add1.S b/mpi/power/mpih-add1.S
index ad27f3d81..f9ccf5bcd 100644
--- a/mpi/power/mpih-add1.S
+++ b/mpi/power/mpih-add1.S
@@ -1,6 +1,7 @@
/* IBM POWER add_n -- Add two limb vectors of equal, non-zero length.
*
- * Copyright (C) 1992, 1994, 1995, 1996, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/power/mpih-lshift.S b/mpi/power/mpih-lshift.S
index 5c53a0ae6..d29b899b2 100644
--- a/mpi/power/mpih-lshift.S
+++ b/mpi/power/mpih-lshift.S
@@ -1,6 +1,7 @@
/* IBM POWER lshift
*
- * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/power/mpih-mul1.S b/mpi/power/mpih-mul1.S
index 3b71b5aa9..5c0f6f039 100644
--- a/mpi/power/mpih-mul1.S
+++ b/mpi/power/mpih-mul1.S
@@ -1,7 +1,8 @@
/* IBM POWER mul_1 -- Multiply a limb vector with a limb and store
- * the result in a second limb vector.
+ * the result in a second limb vector.
*
- * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/power/mpih-mul2.S b/mpi/power/mpih-mul2.S
index 19ddee86d..f2a8b87fc 100644
--- a/mpi/power/mpih-mul2.S
+++ b/mpi/power/mpih-mul2.S
@@ -1,7 +1,8 @@
/* IBM POWER addmul_1 -- Multiply a limb vector with a limb and add
* the result to a second limb vector.
*
- * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/power/mpih-mul3.S b/mpi/power/mpih-mul3.S
index e875e88ea..cdd317c0d 100644
--- a/mpi/power/mpih-mul3.S
+++ b/mpi/power/mpih-mul3.S
@@ -1,7 +1,8 @@
/* IBM POWER submul_1 -- Multiply a limb vector with a limb and subtract
* the result from a second limb vector.
*
- * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/power/mpih-rshift.S b/mpi/power/mpih-rshift.S
index e29645072..30ba83922 100644
--- a/mpi/power/mpih-rshift.S
+++ b/mpi/power/mpih-rshift.S
@@ -1,6 +1,7 @@
/* IBM POWER rshift
*
- * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/power/mpih-sub1.S b/mpi/power/mpih-sub1.S
index a3605533e..9f18ac829 100644
--- a/mpi/power/mpih-sub1.S
+++ b/mpi/power/mpih-sub1.S
@@ -1,6 +1,7 @@
/* IBM POWER sub_n -- Subtract two limb vectors of equal, non-zero length.
*
- * Copyright (C) 1992, 1994, 1995, 1996, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1995, 1996, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/powerpc32/mpih-add1.S b/mpi/powerpc32/mpih-add1.S
index a26de52a9..6f8d68331 100644
--- a/mpi/powerpc32/mpih-add1.S
+++ b/mpi/powerpc32/mpih-add1.S
@@ -1,6 +1,7 @@
/* PowerPC-32 add_n -- Add two limb vectors of equal, non-zero length.
*
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/powerpc32/mpih-lshift.S b/mpi/powerpc32/mpih-lshift.S
index 683f799b1..8189f914e 100644
--- a/mpi/powerpc32/mpih-lshift.S
+++ b/mpi/powerpc32/mpih-lshift.S
@@ -1,6 +1,7 @@
/* PowerPC-32 lshift
*
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/powerpc32/mpih-mul1.S b/mpi/powerpc32/mpih-mul1.S
index 24193adb3..32361bf59 100644
--- a/mpi/powerpc32/mpih-mul1.S
+++ b/mpi/powerpc32/mpih-mul1.S
@@ -1,7 +1,8 @@
/* PowerPC-32 mul_1 -- Multiply a limb vector with a limb and store
* the result in a second limb vector.
*
- * Copyright (C) 1993, 1994, 1995, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1993, 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/powerpc32/mpih-mul2.S b/mpi/powerpc32/mpih-mul2.S
index 185fed90e..eb1591d2e 100644
--- a/mpi/powerpc32/mpih-mul2.S
+++ b/mpi/powerpc32/mpih-mul2.S
@@ -1,7 +1,8 @@
/* PowerPC-32 addmul_1 -- Multiply a limb vector with a limb and add
* the result to a second limb vector.
*
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/powerpc32/mpih-mul3.S b/mpi/powerpc32/mpih-mul3.S
index e6b7cf5c2..ca58936c4 100644
--- a/mpi/powerpc32/mpih-mul3.S
+++ b/mpi/powerpc32/mpih-mul3.S
@@ -1,7 +1,8 @@
/* PowerPC-32 submul_1 -- Multiply a limb vector with a limb and subtract
* the result from a second limb vector.
*
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/powerpc32/mpih-rshift.S b/mpi/powerpc32/mpih-rshift.S
index 78732b9ed..468b722cb 100644
--- a/mpi/powerpc32/mpih-rshift.S
+++ b/mpi/powerpc32/mpih-rshift.S
@@ -1,6 +1,7 @@
/* PowerPC-32 rshift
*
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/powerpc32/mpih-sub1.S b/mpi/powerpc32/mpih-sub1.S
index cb87cc703..f0ae1a283 100644
--- a/mpi/powerpc32/mpih-sub1.S
+++ b/mpi/powerpc32/mpih-sub1.S
@@ -1,7 +1,8 @@
/* PowerPC-32 sub_n -- Subtract two limb vectors of the same length > 0
* and store difference in a third limb vector.
*
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/sparc32/mpih-add1.S b/mpi/sparc32/mpih-add1.S
index b90d9d60f..da6c83338 100644
--- a/mpi/sparc32/mpih-add1.S
+++ b/mpi/sparc32/mpih-add1.S
@@ -1,7 +1,8 @@
/* SPARC _add_n -- Add two limb vectors of the same length > 0 and store
* sum in a third limb vector.
*
- * Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/sparc32/mpih-lshift.S b/mpi/sparc32/mpih-lshift.S
index 5348a157a..114b58d4b 100644
--- a/mpi/sparc32/mpih-lshift.S
+++ b/mpi/sparc32/mpih-lshift.S
@@ -1,6 +1,7 @@
/* sparc lshift
*
- * Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/sparc32/mpih-rshift.S b/mpi/sparc32/mpih-rshift.S
index e74675d13..ebb947d3d 100644
--- a/mpi/sparc32/mpih-rshift.S
+++ b/mpi/sparc32/mpih-rshift.S
@@ -1,6 +1,7 @@
/* sparc rshift
*
- * Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG.
*
diff --git a/mpi/sparc32/udiv.S b/mpi/sparc32/udiv.S
index 3e2376cfc..af3389286 100644
--- a/mpi/sparc32/udiv.S
+++ b/mpi/sparc32/udiv.S
@@ -1,24 +1,33 @@
-! SPARC v7 __udiv_qrnnd division support, used from longlong.h.
-! This is for v7 CPUs without a floating-point unit.
-
-! Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc.
-
-! This file is part of the GNU MP Library.
-
-! The GNU MP Library is free software; you can redistribute it and/or modify
-! it under the terms of the GNU Library General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or (at your
-! option) any later version.
-
-! The GNU MP Library is distributed in the hope that it will be useful, but
-! WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-! or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-! License for more details.
-
-! You should have received a copy of the GNU Library General Public License
-! along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-! MA 02111-1307, USA.
+/* SPARC v7 __udiv_qrnnd division support, used from longlong.h.
+ * This is for v7 CPUs without a floating-point unit.
+ *
+ * Copyright (C) 1993, 1994, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ * Actually it's the same code with only minor changes in the
+ * way the data is stored; this is to support the abstraction
+ * of an optional secure memory allocation which may be used
+ * to avoid revealing of sensitive data due to paging etc.
+ * The GNU MP Library itself is published under the LGPL;
+ * however I decided to publish this code under the plain GPL.
+ */
! INPUT PARAMETERS
diff --git a/mpi/sparc32v8/mpih-mul1.S b/mpi/sparc32v8/mpih-mul1.S
index 8bc1db57a..3648f8b41 100644
--- a/mpi/sparc32v8/mpih-mul1.S
+++ b/mpi/sparc32v8/mpih-mul1.S
@@ -1,24 +1,34 @@
-! SPARC v8 __mpn_mul_1 -- Multiply a limb vector with a single limb and
-! store the product in a second limb vector.
+/* SPARC v8 __mpn_mul_1 -- Multiply a limb vector with a single limb and
+ * store the product in a second limb vector.
+ *
+ * Copyright (C) 1992, 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ * Actually it's the same code with only minor changes in the
+ * way the data is stored; this is to support the abstraction
+ * of an optional secure memory allocation which may be used
+ * to avoid revealing of sensitive data due to paging etc.
+ * The GNU MP Library itself is published under the LGPL;
+ * however I decided to publish this code under the plain GPL.
+ */
-! Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
-
-! This file is part of the GNU MP Library.
-
-! The GNU MP Library is free software; you can redistribute it and/or modify
-! it under the terms of the GNU Library General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or (at your
-! option) any later version.
-
-! The GNU MP Library is distributed in the hope that it will be useful, but
-! WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-! or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-! License for more details.
-
-! You should have received a copy of the GNU Library General Public License
-! along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-! MA 02111-1307, USA.
! INPUT PARAMETERS
diff --git a/mpi/sparc32v8/mpih-mul2.S b/mpi/sparc32v8/mpih-mul2.S
index 9055f89e8..f34af6a6d 100644
--- a/mpi/sparc32v8/mpih-mul2.S
+++ b/mpi/sparc32v8/mpih-mul2.S
@@ -1,24 +1,34 @@
-! SPARC v8 __mpn_addmul_1 -- Multiply a limb vector with a limb and
-! add the result to a second limb vector.
+/* SPARC v8 __mpn_addmul_1 -- Multiply a limb vector with a limb and
+ * add the result to a second limb vector.
+ *
+ * Copyright (C) 1992, 1993, 1994, 1995, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ * Actually it's the same code with only minor changes in the
+ * way the data is stored; this is to support the abstraction
+ * of an optional secure memory allocation which may be used
+ * to avoid revealing of sensitive data due to paging etc.
+ * The GNU MP Library itself is published under the LGPL;
+ * however I decided to publish this code under the plain GPL.
+ */
-! Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-
-! This file is part of the GNU MP Library.
-
-! The GNU MP Library is free software; you can redistribute it and/or modify
-! it under the terms of the GNU Library General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or (at your
-! option) any later version.
-
-! The GNU MP Library is distributed in the hope that it will be useful, but
-! WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-! or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-! License for more details.
-
-! You should have received a copy of the GNU Library General Public License
-! along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-! MA 02111-1307, USA.
! INPUT PARAMETERS
diff --git a/mpi/sparc32v8/mpih-mul3.S b/mpi/sparc32v8/mpih-mul3.S
index efd83de41..e498888d1 100644
--- a/mpi/sparc32v8/mpih-mul3.S
+++ b/mpi/sparc32v8/mpih-mul3.S
@@ -1,26 +1,35 @@
-! SPARC v8 __mpn_submul_1 -- Multiply a limb vector with a limb and
-! subtract the result from a second limb vector.
-
-! Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
-
-! This file is part of the GNU MP Library.
-
-! The GNU MP Library is free software; you can redistribute it and/or modify
-! it under the terms of the GNU Library General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or (at your
-! option) any later version.
-
-! The GNU MP Library is distributed in the hope that it will be useful, but
-! WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-! or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-! License for more details.
-
-! You should have received a copy of the GNU Library General Public License
-! along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-! MA 02111-1307, USA.
-
+/* SPARC v8 __mpn_submul_1 -- Multiply a limb vector with a limb and
+ * subtract the result from a second limb vector.
+ *
+ * Copyright (C) 1992, 1993, 1994, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ * Actually it's the same code with only minor changes in the
+ * way the data is stored; this is to support the abstraction
+ * of an optional secure memory allocation which may be used
+ * to avoid revealing of sensitive data due to paging etc.
+ * The GNU MP Library itself is published under the LGPL;
+ * however I decided to publish this code under the plain GPL.
+ */
+
! INPUT PARAMETERS
! res_ptr o0
! s1_ptr o1
diff --git a/mpi/supersparc/udiv.S b/mpi/supersparc/udiv.S
index 07d904c70..6ad18ecaf 100644
--- a/mpi/supersparc/udiv.S
+++ b/mpi/supersparc/udiv.S
@@ -1,25 +1,35 @@
-! SuperSPARC __udiv_qrnnd division support, used from longlong.h.
-! This is for SuperSPARC only, to compensate for its semi-functional
-! udiv instruction.
+/* SuperSPARC __udiv_qrnnd division support, used from longlong.h.
+ * This is for SuperSPARC only, to compensate for its
+ * semi-functional udiv instruction.
+ *
+ * Copyright (C) 1993, 1994, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * Note: This code is heavily based on the GNU MP Library.
+ * Actually it's the same code with only minor changes in the
+ * way the data is stored; this is to support the abstraction
+ * of an optional secure memory allocation which may be used
+ * to avoid revealing of sensitive data due to paging etc.
+ * The GNU MP Library itself is published under the LGPL;
+ * however I decided to publish this code under the plain GPL.
+ */
-! Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc.
-
-! This file is part of the GNU MP Library.
-
-! The GNU MP Library is free software; you can redistribute it and/or modify
-! it under the terms of the GNU Library General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or (at your
-! option) any later version.
-
-! The GNU MP Library is distributed in the hope that it will be useful, but
-! WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-! or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-! License for more details.
-
-! You should have received a copy of the GNU Library General Public License
-! along with the GNU MP Library; see the file COPYING.LIB. If not, write to
-! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-! MA 02111-1307, USA.
! INPUT PARAMETERS
diff --git a/po/da.po b/po/da.po
index 0211d8631..9a2783dd1 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-04-19 12:04+0200\n"
+"POT-Creation-Date: 2001-04-28 19:57+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"
@@ -981,7 +981,7 @@ msgstr "quoted printable-tegn i panser - m�ske pga. en fejlbeh�ftet MTA\n"
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1190 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
msgid " Fingerprint:"
msgstr " Fingeraftryk:"
@@ -1621,25 +1621,27 @@ msgstr "ADVARSEL: intet blev eksporteret\n"
msgid "too many entries in pk cache - disabled\n"
msgstr ""
-#: g10/getkey.c:449
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+#, fuzzy
+msgid "[User id not found]"
+msgstr "%s: bruger ikke fundet\n"
+
+#: g10/getkey.c:453
msgid "too many entries in unk cache - disabled\n"
msgstr ""
-#: g10/getkey.c:2203
+#: g10/getkey.c:2207
#, 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:2245 g10/trustdb.c:577
+#: g10/getkey.c:2249 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr ""
-#: g10/getkey.c:2532
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: bruger ikke fundet\n"
-
#: g10/import.c:184
#, c-format
msgid "skipping block of type %d\n"
@@ -2000,7 +2002,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Vil du gerne signere? "
-#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:157
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
#, c-format
msgid "signing failed: %s\n"
msgstr "signering fejlede: %s\n"
@@ -2203,287 +2205,292 @@ msgstr "s"
msgid "pref"
msgstr "pr�f"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:606 g10/keyedit.c:607
msgid "list preferences"
msgstr "vis pr�ferencer"
#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pr�f"
+
+#: g10/keyedit.c:608
msgid "passwd"
msgstr "kodeord"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
msgid "change the passphrase"
msgstr "�ndr kodes�tningen"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "trust"
msgstr "betro"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "change the ownertrust"
msgstr ""
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revsig"
msgstr ""
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revoke signatures"
msgstr ""
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revkey"
msgstr ""
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revoke a secondary key"
msgstr ""
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable"
msgstr "sl�fra"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable a key"
msgstr "sl� n�gle fra"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable"
msgstr "sl�til"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable a key"
msgstr "sl� n�gle til"
-#: g10/delkey.c:110 g10/keyedit.c:632
+#: g10/delkey.c:110 g10/keyedit.c:633
msgid "can't do that in batchmode\n"
msgstr ""
#. check that they match
#. fixme: check that they both match
-#: g10/keyedit.c:670
+#: g10/keyedit.c:671
msgid "Secret key is available.\n"
msgstr ""
-#: g10/keyedit.c:699
+#: g10/keyedit.c:700
msgid "Command> "
msgstr ""
-#: g10/keyedit.c:729
+#: g10/keyedit.c:730
msgid "Need the secret key to do this.\n"
msgstr ""
-#: g10/keyedit.c:733
+#: g10/keyedit.c:734
msgid "Please use the command \"toggle\" first.\n"
msgstr ""
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
msgid "Really sign all user IDs? "
msgstr ""
-#: g10/keyedit.c:781
+#: g10/keyedit.c:782
msgid "Hint: Select the user IDs to sign\n"
msgstr ""
-#: g10/keyedit.c:813 g10/keyedit.c:995
+#: g10/keyedit.c:814 g10/keyedit.c:1000
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr ""
-#: g10/keyedit.c:824 g10/keyedit.c:845
+#: g10/keyedit.c:825 g10/keyedit.c:846
msgid "You must select at least one user ID.\n"
msgstr ""
-#: g10/keyedit.c:826
+#: g10/keyedit.c:827
msgid "You can't delete the last user ID!\n"
msgstr ""
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
msgid "Really remove all selected user IDs? "
msgstr ""
-#: g10/keyedit.c:830
+#: g10/keyedit.c:831
msgid "Really remove this user ID? "
msgstr ""
-#: g10/keyedit.c:866 g10/keyedit.c:888
+#: g10/keyedit.c:867 g10/keyedit.c:889
msgid "You must select at least one key.\n"
msgstr ""
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
msgid "Do you really want to delete the selected keys? "
msgstr ""
-#: g10/keyedit.c:871
+#: g10/keyedit.c:872
msgid "Do you really want to delete this key? "
msgstr ""
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
msgid "Do you really want to revoke the selected keys? "
msgstr ""
-#: g10/keyedit.c:893
+#: g10/keyedit.c:894
msgid "Do you really want to revoke this key? "
msgstr ""
-#: g10/keyedit.c:959
+#: g10/keyedit.c:964
msgid "Save changes? "
msgstr "Gem �ndringer? "
-#: g10/keyedit.c:962
+#: g10/keyedit.c:967
msgid "Quit without saving? "
msgstr "Afslut uden at gemme? "
-#: g10/keyedit.c:973
+#: g10/keyedit.c:978
#, c-format
msgid "update failed: %s\n"
msgstr ""
-#: g10/keyedit.c:980
+#: g10/keyedit.c:985
#, c-format
msgid "update secret failed: %s\n"
msgstr ""
-#: g10/keyedit.c:987
+#: g10/keyedit.c:992
msgid "Key not changed so no update needed.\n"
msgstr ""
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1007
msgid "Invalid command (try \"help\")\n"
msgstr ""
-#: g10/keyedit.c:1082 g10/keyedit.c:1108
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr ""
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1140
#, c-format
msgid " trust: %c/%c"
msgstr ""
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1144
msgid "This key has been disabled"
msgstr ""
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1173
#, fuzzy, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1176
#, fuzzy
msgid "rev- faked revocation found\n"
msgstr " nye n�gletilbagekald: %lu\n"
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1178
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr ""
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1420
msgid "Delete this good signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1424
msgid "Delete this invalid signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1428
msgid "Delete this unknown signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1434
msgid "Really delete this self-signature? (y/N)"
msgstr ""
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1448
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Slettede %d signatur.\n"
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1449
#, c-format
msgid "Deleted %d signatures.\n"
msgstr ""
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1452
msgid "Nothing deleted.\n"
msgstr ""
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1521
msgid "Please remove selections from the secret keys.\n"
msgstr ""
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1527
msgid "Please select at most one secondary key.\n"
msgstr ""
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1531
msgid "Changing expiration time for a secondary key.\n"
msgstr ""
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1533
msgid "Changing expiration time for the primary key.\n"
msgstr ""
-#: g10/keyedit.c:1522
+#: g10/keyedit.c:1575
msgid "You can't change the expiration date of a v3 key\n"
msgstr ""
-#: g10/keyedit.c:1538
+#: g10/keyedit.c:1591
msgid "No corresponding signature in secret ring\n"
msgstr ""
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1652
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen bruger-id med indeks %d\n"
-#: g10/keyedit.c:1645
+#: g10/keyedit.c:1698
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Ingen sekund�r n�gle med indeks %d\n"
-#: g10/keyedit.c:1743
+#: g10/keyedit.c:1796
msgid "user ID: \""
msgstr "bruger-id: \""
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:1799
#, c-format
msgid ""
"\"\n"
"signed with your key %08lX at %s\n"
msgstr ""
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1803
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr ""
#. FIXME: detect duplicates here
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1827
msgid "You have signed these user IDs:\n"
msgstr ""
-#: g10/keyedit.c:1788 g10/keyedit.c:1823
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
#, c-format
msgid " signed by %08lX at %s\n"
msgstr ""
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1846
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr ""
-#: g10/keyedit.c:1813
+#: g10/keyedit.c:1866
msgid "You are about to revoke these signatures:\n"
msgstr ""
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1884
msgid "Really create the revocation certificates? (y/N)"
msgstr ""
-#: g10/keyedit.c:1860
+#: g10/keyedit.c:1913
msgid "no secret key\n"
msgstr ""
@@ -2616,7 +2623,7 @@ msgid "Experimental algorithms should not be used!\n"
msgstr ""
#: g10/misc.c:238
-msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
#: g10/parse-packet.c:119
@@ -2637,7 +2644,7 @@ msgstr ""
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:147 g10/passphrase.c:248
+#: g10/hkp.c:167 g10/passphrase.c:248
#, fuzzy, c-format
msgid "can't connect to `%s': %s\n"
msgstr "kan ikke �bne '%s': %s\n"
@@ -2764,31 +2771,31 @@ msgstr ""
msgid "requesting key %08lX from %s ...\n"
msgstr ""
-#: g10/hkp.c:72
+#: g10/hkp.c:83
#, fuzzy, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "import�r n�gler fra en n�gleserver"
-#: g10/hkp.c:91 g10/hkp.c:125
+#: g10/hkp.c:102 g10/hkp.c:136
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/hkp.c:99
+#: g10/hkp.c:110
#, fuzzy, c-format
msgid "%s: not a valid key ID\n"
msgstr "%s er ikke et gyldigt tegns�t\n"
-#: g10/hkp.c:171
+#: g10/hkp.c:191
#, fuzzy, c-format
msgid "error sending to `%s': %s\n"
msgstr "fejl ved l�sning af '%s': %s\n"
-#: g10/hkp.c:183
+#: g10/hkp.c:203
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr ""
-#: g10/hkp.c:186
+#: g10/hkp.c:206
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr ""
diff --git a/po/de.po b/po/de.po
index 8ddcc311d..76e36c743 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-04-19 12:04+0200\n"
+"POT-Creation-Date: 2001-04-28 19:57+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"
@@ -992,7 +992,7 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1190 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
msgid " Fingerprint:"
msgstr " Fingerabdruck:"
@@ -1708,27 +1708,29 @@ msgstr "WARNUNG: Nichts exportiert\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "zu viele Eintr�ge im pk-Lager - abgeschaltet\n"
-#: g10/getkey.c:449
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[User-ID nicht gefunden]"
+
+#: g10/getkey.c:453
msgid "too many entries in unk cache - disabled\n"
msgstr "zu viele Eintr�ge im unk-Lager - abgeschaltet\n"
-#: g10/getkey.c:2203
+#: g10/getkey.c:2207
#, 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:2245 g10/trustdb.c:577
+#: g10/getkey.c:2249 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr ""
"Schl�ssel %08lX: geheimer Schl�ssel, aber ohne �ffentlichen Schl�ssel - "
"�bersprungen\n"
-#: g10/getkey.c:2532
-msgid "[User id not found]"
-msgstr "[User-ID nicht gefunden]"
-
#: g10/import.c:184
#, c-format
msgid "skipping block of type %d\n"
@@ -2101,7 +2103,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Wirklich unterschreiben? "
-#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:157
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
#, c-format
msgid "signing failed: %s\n"
msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -2307,252 +2309,257 @@ msgstr "t"
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:606 g10/keyedit.c:607
msgid "list preferences"
msgstr "Liste der Voreinstellungen"
#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
msgid "change the passphrase"
msgstr "Das Mantra �ndern"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "change the ownertrust"
msgstr "Den \"Owner trust\" �ndern"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revoke signatures"
msgstr "Signaturen widerrufen"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revoke a secondary key"
msgstr "Einen Zweitschl�ssel widerrufen"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable a key"
msgstr "Schl�ssel abschalten"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable a key"
msgstr "Schl�ssel anschalten"
-#: g10/delkey.c:110 g10/keyedit.c:632
+#: g10/delkey.c:110 g10/keyedit.c:633
msgid "can't do that in batchmode\n"
msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
#. check that they match
#. fixme: check that they both match
-#: g10/keyedit.c:670
+#: g10/keyedit.c:671
msgid "Secret key is available.\n"
msgstr "Geheimer Schl�ssel ist vorhanden.\n"
-#: g10/keyedit.c:699
+#: g10/keyedit.c:700
msgid "Command> "
msgstr "Befehl> "
-#: g10/keyedit.c:729
+#: g10/keyedit.c:730
msgid "Need the secret key to do this.\n"
msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
-#: g10/keyedit.c:733
+#: g10/keyedit.c:734
msgid "Please use the command \"toggle\" first.\n"
msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
msgid "Really sign all user IDs? "
msgstr "Wirklich alle User-IDs beglaubigen? "
-#: g10/keyedit.c:781
+#: g10/keyedit.c:782
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:813 g10/keyedit.c:995
+#: g10/keyedit.c:814 g10/keyedit.c:1000
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "�nderung der \"Trust-DB\" fehlgeschlagen: %s\n"
-#: g10/keyedit.c:824 g10/keyedit.c:845
+#: g10/keyedit.c:825 g10/keyedit.c:846
msgid "You must select at least one user ID.\n"
msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:827
msgid "You can't delete the last user ID!\n"
msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
msgid "Really remove all selected user IDs? "
msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
-#: g10/keyedit.c:830
+#: g10/keyedit.c:831
msgid "Really remove this user ID? "
msgstr "Diese User-ID wirklich entfernen? "
-#: g10/keyedit.c:866 g10/keyedit.c:888
+#: g10/keyedit.c:867 g10/keyedit.c:889
msgid "You must select at least one key.\n"
msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
msgid "Do you really want to delete the selected keys? "
msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
-#: g10/keyedit.c:871
+#: g10/keyedit.c:872
msgid "Do you really want to delete this key? "
msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
msgid "Do you really want to revoke the selected keys? "
msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
-#: g10/keyedit.c:893
+#: g10/keyedit.c:894
msgid "Do you really want to revoke this key? "
msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
-#: g10/keyedit.c:959
+#: g10/keyedit.c:964
msgid "Save changes? "
msgstr "�nderungen speichern? "
-#: g10/keyedit.c:962
+#: g10/keyedit.c:967
msgid "Quit without saving? "
msgstr "Beenden ohne zu speichern? "
-#: g10/keyedit.c:973
+#: g10/keyedit.c:978
#, c-format
msgid "update failed: %s\n"
msgstr "�nderung fehlgeschlagen: %s\n"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:985
#, c-format
msgid "update secret failed: %s\n"
msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
-#: g10/keyedit.c:987
+#: g10/keyedit.c:992
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:1002
+#: g10/keyedit.c:1007
msgid "Invalid command (try \"help\")\n"
msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
-#: g10/keyedit.c:1082 g10/keyedit.c:1108
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
#, 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:1091
+#: g10/keyedit.c:1140
#, c-format
msgid " trust: %c/%c"
msgstr " Vertrauen: %c/%c"
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1144
msgid "This key has been disabled"
msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1173
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! Unterschl�ssel wurde widerrufen: %s\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1176
msgid "rev- faked revocation found\n"
msgstr "rev- gef�lschter Schl�sselwiderruf entdeckt\n"
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1178
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? Schwierigkeiten bei der Widerruf-�berpr�fung: %s\n"
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1420
msgid "Delete this good signature? (y/N/q)"
msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1424
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1428
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1434
msgid "Really delete this self-signature? (y/N)"
msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1448
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d Beglaubigungen entfernt.\n"
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1449
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d Beglaubigungen entfernt.\n"
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1452
msgid "Nothing deleted.\n"
msgstr "Nichts entfernt.\n"
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1521
msgid "Please remove selections from the secret keys.\n"
msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1527
msgid "Please select at most one secondary key.\n"
msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1531
msgid "Changing expiration time for a secondary key.\n"
msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1533
msgid "Changing expiration time for the primary key.\n"
msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
-#: g10/keyedit.c:1522
+#: g10/keyedit.c:1575
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:1538
+#: g10/keyedit.c:1591
msgid "No corresponding signature in secret ring\n"
msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1652
#, c-format
msgid "No user ID with index %d\n"
msgstr "Keine User-ID mit Index %d\n"
-#: g10/keyedit.c:1645
+#: g10/keyedit.c:1698
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Kein Zweitschl�ssel mit Index %d\n"
-#: g10/keyedit.c:1743
+#: g10/keyedit.c:1796
msgid "user ID: \""
msgstr "User-ID: \""
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:1799
#, c-format
msgid ""
"\"\n"
@@ -2561,34 +2568,34 @@ msgstr ""
"\"\n"
"unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1803
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:1774
+#: g10/keyedit.c:1827
msgid "You have signed these user IDs:\n"
msgstr "Sie haben folgende User-IDs beglaubigt:\n"
-#: g10/keyedit.c:1788 g10/keyedit.c:1823
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " beglaubigt durch %08lX um %s\n"
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1846
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " widerrufen durch %08lX um %s\n"
-#: g10/keyedit.c:1813
+#: g10/keyedit.c:1866
msgid "You are about to revoke these signatures:\n"
msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1884
msgid "Really create the revocation certificates? (y/N)"
msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
-#: g10/keyedit.c:1860
+#: g10/keyedit.c:1913
msgid "no secret key\n"
msgstr "Kein geheimer Schl�ssel\n"
@@ -2745,7 +2752,7 @@ msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
-#: g10/hkp.c:147 g10/passphrase.c:248
+#: g10/hkp.c:167 g10/passphrase.c:248
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
@@ -2877,31 +2884,31 @@ msgstr "Hinweis: geheimer Schl�ssel %08lX verf�llt am %s\n"
msgid "requesting key %08lX from %s ...\n"
msgstr "Schl�ssel %08lX von %s wird angefordert ...\n"
-#: g10/hkp.c:72
+#: g10/hkp.c:83
#, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "Schl�ssel ist beim Schl�sselserver nicht erh�ltlich: %s\n"
-#: g10/hkp.c:91 g10/hkp.c:125
+#: g10/hkp.c:102 g10/hkp.c:136
msgid "no keyserver known (use option --keyserver)\n"
msgstr "Kein Schl�sselserver bekannt (Option --keyserver verwenden)\n"
-#: g10/hkp.c:99
+#: g10/hkp.c:110
#, c-format
msgid "%s: not a valid key ID\n"
msgstr "%s: Dies ist keine g�ltige Schl�ssel-ID\n"
-#: g10/hkp.c:171
+#: g10/hkp.c:191
#, c-format
msgid "error sending to `%s': %s\n"
msgstr "Fehler beim Senden an `%s': %s\n"
-#: g10/hkp.c:183
+#: g10/hkp.c:203
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr "Senden an `%s' erfolgreich (status=%u)\n"
-#: g10/hkp.c:186
+#: g10/hkp.c:206
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr "Senden an `%s' erfolglos (status=%u)\n"
diff --git a/po/eo.po b/po/eo.po
index 8b2883ea6..1769f3489 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: 2000-10-16 19:22+0200\n"
+"POT-Creation-Date: 2001-04-28 19:57+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"
@@ -17,35 +17,35 @@ msgstr ""
msgid "Warning: using insecure memory!\n"
msgstr "Averto: uzas malsekuran memoron!\n"
-#: util/secmem.c:295
+#: util/secmem.c:299
msgid "operation is not possible without initialized secure memory\n"
msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
-#: util/secmem.c:296
+#: util/secmem.c:300
msgid "(you may have used the wrong program for this task)\n"
msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
msgid "yes"
msgstr "jes"
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
msgid "yY"
msgstr "jJ"
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
msgid "no"
msgstr "ne"
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
msgid "nN"
msgstr "nN"
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
msgid "quit"
msgstr "fini"
-#: util/miscutil.c:311
+#: util/miscutil.c:321
msgid "qQ"
msgstr "fF"
@@ -245,6 +245,17 @@ msgstr "ne �ifrita"
msgid "not processed"
msgstr "ne traktita"
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "malbona publika �losilo"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "malbona sekreta �losilo"
+
#: util/logger.c:224
#, c-format
msgid "... this is a bug (%s:%d:%s)\n"
@@ -255,63 +266,63 @@ msgstr "... �i tio estas cimo (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "vi trovis cimon ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
#, c-format
msgid "can't open `%s': %s\n"
msgstr "ne povas malfermi '%s': %s\n"
-#: cipher/random.c:315
+#: cipher/random.c:324
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "ne povas stat-i '%s': %s\n"
-#: cipher/random.c:320
+#: cipher/random.c:329
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "'%s' ne estas normala dosiero - ignorita\n"
-#: cipher/random.c:325
+#: cipher/random.c:334
msgid "note: random_seed file is empty\n"
msgstr "noto: dosiero random_seed estas malplena\n"
-#: cipher/random.c:331
+#: cipher/random.c:340
msgid "warning: invalid size of random_seed file - not used\n"
msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
-#: cipher/random.c:339
+#: cipher/random.c:348
#, c-format
msgid "can't read `%s': %s\n"
msgstr "ne povas legi '%s': %s\n"
-#: cipher/random.c:377
+#: cipher/random.c:386
msgid "note: random_seed file not updated\n"
msgstr "noto: dosiero random_seed ne aktualigita\n"
-#: cipher/random.c:397
+#: cipher/random.c:406
#, c-format
msgid "can't create `%s': %s\n"
msgstr "ne povas krei '%s': %s\n"
-#: cipher/random.c:404
+#: cipher/random.c:413
#, c-format
msgid "can't write `%s': %s\n"
msgstr "ne povas skribi '%s': %s\n"
-#: cipher/random.c:407
+#: cipher/random.c:416
#, c-format
msgid "can't close `%s': %s\n"
msgstr "ne povas fermi '%s': %s\n"
-#: cipher/random.c:418
+#: cipher/random.c:427
#, c-format
msgid "too many random bits requested; the limit is %d\n"
msgstr "tro da stokastaj bitoj petitaj; la limo estas %d\n"
-#: cipher/random.c:650
+#: cipher/random.c:659
msgid "WARNING: using insecure random number generator!!\n"
msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
-#: cipher/random.c:651
+#: cipher/random.c:660
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@ -336,7 +347,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:206
+#: g10/g10.c:216
msgid ""
"@Commands:\n"
" "
@@ -344,139 +355,139 @@ msgstr ""
"@Komandoj:\n"
" "
-#: g10/g10.c:208
+#: g10/g10.c:218
msgid "|[file]|make a signature"
msgstr "|[dosiero]|fari subskribon"
-#: g10/g10.c:209
+#: g10/g10.c:219
msgid "|[file]|make a clear text signature"
msgstr "|[dosiero]|fari klartekstan subskribon"
-#: g10/g10.c:210
+#: g10/g10.c:220
msgid "make a detached signature"
msgstr "fari apartan subskribon"
-#: g10/g10.c:211
+#: g10/g10.c:221
msgid "encrypt data"
msgstr "�ifri datenojn"
-#: g10/g10.c:212
+#: g10/g10.c:222
msgid "encryption only with symmetric cipher"
msgstr "�ifri nur kun simetria �ifro"
-#: g10/g10.c:213
+#: g10/g10.c:223
msgid "store only"
msgstr "nur skribi"
-#: g10/g10.c:214
+#: g10/g10.c:224
msgid "decrypt data (default)"
msgstr "mal�ifri datenojn (implicita elekto)"
-#: g10/g10.c:215
+#: g10/g10.c:225
msgid "verify a signature"
msgstr "kontroli subskribon"
-#: g10/g10.c:217
+#: g10/g10.c:227
msgid "list keys"
msgstr "listigi �losilojn"
-#: g10/g10.c:219
+#: g10/g10.c:229
msgid "list keys and signatures"
msgstr "listigi �losilojn kaj subskribojn"
-#: g10/g10.c:220
+#: g10/g10.c:230
msgid "check key signatures"
msgstr "kontroli �losilsubskribojn"
-#: g10/g10.c:221
+#: g10/g10.c:231
msgid "list keys and fingerprints"
msgstr "listigi �losilojn kaj fingro�purojn"
-#: g10/g10.c:222
+#: g10/g10.c:232
msgid "list secret keys"
msgstr "listigi sekretajn �losilojn"
-#: g10/g10.c:223
+#: g10/g10.c:233
msgid "generate a new key pair"
msgstr "krei novan �losilparon"
-#: g10/g10.c:224
+#: g10/g10.c:234
msgid "remove key from the public keyring"
msgstr "forigi �losilon de la publika �losilaro"
-#: g10/g10.c:226
+#: g10/g10.c:236
msgid "remove key from the secret keyring"
msgstr "forigi �losilon de la sekreta �losilaro"
-#: g10/g10.c:227
+#: g10/g10.c:237
msgid "sign a key"
msgstr "subskribi �losilon"
-#: g10/g10.c:228
+#: g10/g10.c:238
msgid "sign a key locally"
msgstr "subskribi �losilon loke"
-#: g10/g10.c:229
+#: g10/g10.c:239
msgid "sign or edit a key"
msgstr "subskribi a� redakti �losilon"
-#: g10/g10.c:230
+#: g10/g10.c:240
msgid "generate a revocation certificate"
msgstr "krei revokatestilon"
-#: g10/g10.c:231
+#: g10/g10.c:241
msgid "export keys"
msgstr "eksporti �losilojn"
-#: g10/g10.c:232
+#: g10/g10.c:242
msgid "export keys to a key server"
msgstr "eksporti �losilojn al �losilservilo"
-#: g10/g10.c:233
+#: g10/g10.c:243
msgid "import keys from a key server"
msgstr "importi �losilojn de �losilservilo"
-#: g10/g10.c:237
+#: g10/g10.c:247
msgid "import/merge keys"
msgstr "importi/kunfandi �losilojn"
-#: g10/g10.c:239
+#: g10/g10.c:249
msgid "list only the sequence of packets"
msgstr "listigi nur la sinsekvon de paketoj"
-#: g10/g10.c:241
+#: g10/g10.c:251
msgid "export the ownertrust values"
msgstr "eksporti la posedantofido-valorojn"
-#: g10/g10.c:243
+#: g10/g10.c:253
msgid "import ownertrust values"
msgstr "importi posedantofido-valorojn"
-#: g10/g10.c:245
+#: g10/g10.c:255
msgid "update the trust database"
msgstr "aktualigi la fido-datenaron"
-#: g10/g10.c:247
+#: g10/g10.c:257
msgid "|[NAMES]|check the trust database"
msgstr "|[NOMOJ]|kontroli la fido-datenaron"
-#: g10/g10.c:248
+#: g10/g10.c:258
msgid "fix a corrupted trust database"
msgstr "ripari fu�itan fido-datenaron"
-#: g10/g10.c:249
+#: g10/g10.c:259
msgid "De-Armor a file or stdin"
msgstr "elkirasigi dosieron a� la normalan enigon"
-#: g10/g10.c:251
+#: g10/g10.c:261
msgid "En-Armor a file or stdin"
msgstr "enkirasigi dosieron a� la normalan enigon"
-#: g10/g10.c:253
+#: g10/g10.c:263
msgid "|algo [files]|print message digests"
msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
-#: g10/g10.c:257
+#: g10/g10.c:267
msgid ""
"@\n"
"Options:\n"
@@ -486,152 +497,156 @@ msgstr ""
"Opcioj:\n"
" "
-#: g10/g10.c:259
+#: g10/g10.c:269
msgid "create ascii armored output"
msgstr "krei eligon en askia kiraso"
-#: g10/g10.c:261
+#: g10/g10.c:271
msgid "|NAME|encrypt for NAME"
msgstr "|NOMO|�ifri por NOMO"
-#: g10/g10.c:264
+#: g10/g10.c:274
msgid "|NAME|use NAME as default recipient"
msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
-#: g10/g10.c:266
+#: g10/g10.c:276
msgid "use the default key as default recipient"
msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
-#: g10/g10.c:270
+#: g10/g10.c:280
msgid "use this user-id to sign or decrypt"
msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
-#: g10/g10.c:271
+#: g10/g10.c:281
msgid "|N|set compress level N (0 disables)"
msgstr "|N|difini densig-nivelon N (0=nenia)"
-#: g10/g10.c:273
+#: g10/g10.c:283
msgid "use canonical text mode"
msgstr "uzi tekstan re�imon"
-#: g10/g10.c:274
+#: g10/g10.c:284
msgid "use as output file"
msgstr "uzi dosieron por eligo"
-#: g10/g10.c:275
+#: g10/g10.c:285
msgid "verbose"
msgstr "detala eligo"
-#: g10/g10.c:276
+#: g10/g10.c:286
msgid "be somewhat more quiet"
msgstr "iom malpli da informoj"
-#: g10/g10.c:277
+#: g10/g10.c:287
msgid "don't use the terminal at all"
msgstr "tute ne uzi la terminalon"
-#: g10/g10.c:278
+#: g10/g10.c:288
msgid "force v3 signatures"
msgstr "devigi v3-subskribojn"
-#: g10/g10.c:279
+#: g10/g10.c:289
msgid "always use a MDC for encryption"
msgstr "�iam uzi sigelon (MDC) por �ifrado"
-#: g10/g10.c:280
+#: g10/g10.c:290
msgid "do not make any changes"
msgstr "fari neniajn �an�ojn"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:282
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr ""
+
+#: g10/g10.c:293
msgid "batch mode: never ask"
msgstr "neinteraga re�imo: neniam demandi"
-#: g10/g10.c:283
+#: g10/g10.c:294
msgid "assume yes on most questions"
msgstr "supozi \"jes\" �e la plej multaj demandoj"
-#: g10/g10.c:284
+#: g10/g10.c:295
msgid "assume no on most questions"
msgstr "supozi \"ne\" �e la plej multaj demandoj"
-#: g10/g10.c:285
+#: g10/g10.c:296
msgid "add this keyring to the list of keyrings"
msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
-#: g10/g10.c:286
+#: g10/g10.c:297
msgid "add this secret keyring to the list"
msgstr "aldoni �i tiun sekretan �losilaron al la listo"
-#: g10/g10.c:287
+#: g10/g10.c:298
msgid "|NAME|use NAME as default secret key"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
-#: g10/g10.c:288
+#: g10/g10.c:299
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
-#: g10/g10.c:289
+#: g10/g10.c:300
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
-#: g10/g10.c:290
+#: g10/g10.c:301
msgid "read options from file"
msgstr "legi la opciojn el dosiero"
-#: g10/g10.c:294
+#: g10/g10.c:305
msgid "|FD|write status info to this FD"
msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
-#: g10/g10.c:299
+#: g10/g10.c:310
msgid "|KEYID|ulimately trust this key"
msgstr "|KEYID|fidi �i tiun �losilon absolute"
-#: g10/g10.c:300
+#: g10/g10.c:311
msgid "|FILE|load extension module FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
-#: g10/g10.c:301
+#: g10/g10.c:312
msgid "emulate the mode described in RFC1991"
msgstr "imiti la re�imon priskribitan en RFC 1991"
-#: g10/g10.c:302
+#: g10/g10.c:313
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:303
+#: g10/g10.c:314
msgid "|N|use passphrase mode N"
msgstr "|N|uzi pasfraz-re�imon N"
-#: g10/g10.c:305
+#: g10/g10.c:316
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
-#: g10/g10.c:307
+#: g10/g10.c:318
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
-#: g10/g10.c:308
+#: g10/g10.c:319
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOMO|uzi �ifrad-metodon NOMO"
-#: g10/g10.c:309
+#: g10/g10.c:320
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOMO|uzi kompendi-metodon NOMO"
-#: g10/g10.c:310
+#: g10/g10.c:321
msgid "|N|use compress algorithm N"
msgstr "|N|uzi densig-metodon N"
-#: g10/g10.c:311
+#: g10/g10.c:322
msgid "throw keyid field of encrypted packets"
msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
-#: g10/g10.c:312
+#: g10/g10.c:323
msgid "|NAME=VALUE|use this notation data"
msgstr "|NOMO=VALORO|uzi �i tiun notacian datenon"
-#: g10/g10.c:315
+#: g10/g10.c:326
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -639,7 +654,7 @@ msgstr ""
"@\n"
"(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
-#: g10/g10.c:318
+#: g10/g10.c:329
msgid ""
"@\n"
"Examples:\n"
@@ -659,15 +674,15 @@ msgstr ""
" --list-keys [nomoj] montri �losilojn\n"
" --fingerprint [nomoj] montri fingro�purojn\n"
-#: g10/g10.c:418
+#: g10/g10.c:438
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
-#: g10/g10.c:422
+#: g10/g10.c:442
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-#: g10/g10.c:425
+#: g10/g10.c:445
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -677,7 +692,7 @@ msgstr ""
"subskribi, kontroli, �ifri a� mal�ifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
-#: g10/g10.c:432
+#: g10/g10.c:452
msgid ""
"\n"
"Supported algorithms:\n"
@@ -685,186 +700,191 @@ msgstr ""
"\n"
"Realigitaj metodoj:\n"
-#: g10/g10.c:511
+#: g10/g10.c:531
msgid "usage: gpg [options] "
msgstr "uzado: gpg [opcioj] "
-#: g10/g10.c:564
+#: g10/g10.c:584
msgid "conflicting commands\n"
msgstr "malkongruaj komandoj\n"
-#: g10/g10.c:704
+#: g10/g10.c:734
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
-#: g10/g10.c:708
+#: g10/g10.c:738
#, c-format
msgid "option file `%s': %s\n"
msgstr "opcio-dosiero '%s': %s\n"
-#: g10/g10.c:715
+#: g10/g10.c:745
#, c-format
msgid "reading options from `%s'\n"
msgstr "legas opciojn el '%s'\n"
-#: g10/g10.c:905
+#: g10/g10.c:950
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s ne estas valida signaro\n"
-#: g10/g10.c:970
+#: g10/g10.c:1024
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTO: programo povas krei core-dosieron!\n"
-#: g10/g10.c:974 g10/g10.c:983
+#: g10/g10.c:1028 g10/g10.c:1037
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTO: %s ne estas por normala uzado!\n"
-#: g10/g10.c:976
+#: g10/g10.c:1030
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ne eblas kun %s!\n"
-#: g10/g10.c:979
+#: g10/g10.c:1033
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ne havas sencon kun %s!\n"
-#: g10/g10.c:998 g10/g10.c:1010
+#: g10/g10.c:1053 g10/g10.c:1065
msgid "selected cipher algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
-#: g10/g10.c:1004 g10/g10.c:1016
+#: g10/g10.c:1059 g10/g10.c:1071
msgid "selected digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
-#: g10/g10.c:1020
+#: g10/g10.c:1075
msgid "the given policy URL is invalid\n"
msgstr "la donita gvidlinia URL ne validas\n"
-#: g10/g10.c:1023
+#: g10/g10.c:1078
#, 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:1025
+#: g10/g10.c:1080
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed devas esti pli granda ol 0\n"
-#: g10/g10.c:1027
+#: g10/g10.c:1082
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed devas esti pli granda ol 1\n"
-#: g10/g10.c:1029
+#: g10/g10.c:1084
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:1032
+#: g10/g10.c:1087
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
-#: g10/g10.c:1036
+#: g10/g10.c:1091
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:1121
+#: g10/g10.c:1176
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
-#: g10/g10.c:1127
+#: g10/g10.c:1182
msgid "--store [filename]"
msgstr "--store [dosiero]"
-#: g10/g10.c:1134
+#: g10/g10.c:1189
msgid "--symmetric [filename]"
msgstr "--symmetric [dosiero]"
-#: g10/g10.c:1142
+#: g10/g10.c:1197
msgid "--encrypt [filename]"
msgstr "--encrypt [dosiero]"
-#: g10/g10.c:1155
+#: g10/g10.c:1210
msgid "--sign [filename]"
msgstr "--sign [dosiero]"
-#: g10/g10.c:1168
+#: g10/g10.c:1223
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
-#: g10/g10.c:1182
+#: g10/g10.c:1237
msgid "--clearsign [filename]"
msgstr "--clearsign [dosiero]"
-#: g10/g10.c:1199
+#: g10/g10.c:1254
msgid "--decrypt [filename]"
msgstr "--decrypt [dosiero]"
-#: g10/g10.c:1207
+#: g10/g10.c:1262
msgid "--sign-key user-id"
msgstr "--sign-key uzantidentigilo"
-#: g10/g10.c:1215
+#: g10/g10.c:1270
msgid "--lsign-key user-id"
msgstr "--lsign-key uzantidentigilo"
-#: g10/g10.c:1223
+#: g10/g10.c:1278
msgid "--edit-key user-id [commands]"
msgstr "--edit-key uzantidentigilo [komandoj]"
-#: g10/g10.c:1239
+#: g10/g10.c:1294
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key uzantidentigilo"
-#: g10/g10.c:1242
+#: g10/g10.c:1297
msgid "--delete-key user-id"
msgstr "--delete-key uzantidentigilo"
-#: g10/encode.c:265 g10/g10.c:1279 g10/sign.c:393
+#: g10/g10.c:1305
+#, fuzzy
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-key uzantidentigilo"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
#, c-format
msgid "can't open %s: %s\n"
msgstr "ne povas malfermi %s: %s\n"
-#: g10/g10.c:1294
+#: g10/g10.c:1357
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
-#: g10/g10.c:1360
+#: g10/g10.c:1423
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "elkirasigo malsukcesis: %s\n"
-#: g10/g10.c:1368
+#: g10/g10.c:1431
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
-#: g10/g10.c:1439
+#: g10/g10.c:1502
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
-#: g10/g10.c:1520
+#: g10/g10.c:1589
msgid "[filename]"
msgstr "[dosiero]"
-#: g10/g10.c:1524
+#: g10/g10.c:1593
msgid "Go ahead and type your message ...\n"
msgstr "Ektajpu vian mesa�on ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1527 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1596 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:1737
+#: g10/g10.c:1805
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:1743
+#: g10/g10.c:1811
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -872,87 +892,87 @@ msgstr ""
"notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
"kaj fini per '='\n"
-#: g10/g10.c:1749
+#: g10/g10.c:1817
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:1757
+#: g10/g10.c:1825
msgid "a notation value must not use any control characters\n"
msgstr "notacia valoro ne povas enhavi stirsignojn\n"
-#: g10/armor.c:302
+#: g10/armor.c:306
#, c-format
msgid "armor: %s\n"
msgstr "kiraso: %s\n"
-#: g10/armor.c:331
+#: g10/armor.c:335
msgid "invalid armor header: "
msgstr "nevalida kiraso�apo: "
-#: g10/armor.c:338
+#: g10/armor.c:342
msgid "armor header: "
msgstr "kiraso�apo: "
-#: g10/armor.c:349
+#: g10/armor.c:353
msgid "invalid clearsig header\n"
msgstr "nevalida �apo de klarteksta subskribo\n"
-#: g10/armor.c:401
+#: g10/armor.c:405
msgid "nested clear text signatures\n"
msgstr "ingitaj klartekstaj subskriboj\n"
-#: g10/armor.c:525
+#: g10/armor.c:529
msgid "invalid dash escaped line: "
msgstr "nevalida strek-eskapita linio: "
-#: g10/armor.c:537
+#: g10/armor.c:541
msgid "unexpected armor:"
msgstr "neatendita kiraso:"
-#: g10/armor.c:654
+#: g10/armor.c:667 g10/armor.c:1235
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "nevalida signo %02x en bazo 64 ignorita\n"
-#: g10/armor.c:697
+#: g10/armor.c:710
msgid "premature eof (no CRC)\n"
msgstr "tro frua dosierfino (nenia CRC)\n"
-#: g10/armor.c:731
+#: g10/armor.c:744
msgid "premature eof (in CRC)\n"
msgstr "tro frua dosierfino (en CRC)\n"
-#: g10/armor.c:735
+#: g10/armor.c:748
msgid "malformed CRC\n"
msgstr "misformita CRC\n"
-#: g10/armor.c:739
+#: g10/armor.c:752 g10/armor.c:1272
#, c-format
msgid "CRC error; %06lx - %06lx\n"
msgstr "CRC-eraro; %06lx - %06lx\n"
-#: g10/armor.c:756
+#: g10/armor.c:772
msgid "premature eof (in Trailer)\n"
msgstr "tro frua dosierfino (en vosto)\n"
-#: g10/armor.c:760
+#: g10/armor.c:776
msgid "error in trailer line\n"
msgstr "eraro en vostolinio\n"
-#: g10/armor.c:906
+#: g10/armor.c:922
msgid "For info see http://www.gnupg.org"
msgstr "Por informoj vidu http://www.gnupg.org"
-#: g10/armor.c:1027
+#: g10/armor.c:1050
msgid "no valid OpenPGP data found.\n"
msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
-#: g10/armor.c:1032
+#: g10/armor.c:1055
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
-#: g10/armor.c:1036
+#: g10/armor.c:1059
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -961,7 +981,7 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
msgid " Fingerprint:"
msgstr " Fingrospuro:"
@@ -1189,17 +1209,17 @@ msgstr ""
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorita: %s\n"
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ignorita: publika �losilo jam �eestas\n"
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
msgid ""
"You did not specify a user ID. (you may use \"-r\")\n"
"\n"
@@ -1207,42 +1227,42 @@ msgstr ""
"Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
"\n"
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
msgid "Enter the user ID: "
msgstr "Donu la uzantidentigilon: "
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
msgid "No such user ID.\n"
msgstr "Uzantidentigilo ne ekzistas.\n"
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
msgid "skipped: public key already set as default recipient\n"
msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
msgid "Public key is disabled.\n"
msgstr "Publika �losilo estas mal�altita.\n"
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
msgid "skipped: public key already set with --encrypt-to\n"
msgstr "ignorita: publika �losilo jam difinita per --encrypt-to\n"
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
#, c-format
msgid "unknown default recipient `%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
#, c-format
msgid "%s: error checking key: %s\n"
msgstr "%s: eraro dum kontrolo de �losilo: %s\n"
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
msgid "no valid addressees\n"
msgstr "mankas validaj adresitoj\n"
@@ -1250,62 +1270,66 @@ msgstr "mankas validaj adresitoj\n"
msgid "writing self signature\n"
msgstr "skribas mem-subskribon\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:217
msgid "writing key binding signature\n"
msgstr "skribas �losilbindan subskribon\n"
-#: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "�losilgrando nevalida; uzas %u bitojn\n"
-#: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "�losilgrando rondigita �is %u bitoj\n"
-#: g10/keygen.c:540
+#: g10/keygen.c:549
msgid "Please select what kind of key you want:\n"
msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
-#: g10/keygen.c:542
+#: g10/keygen.c:551
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n"
-#: g10/keygen.c:543
+#: g10/keygen.c:552
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (nur subskribi)\n"
-#: g10/keygen.c:545
+#: g10/keygen.c:554
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (nur �ifri)\n"
-#: g10/keygen.c:546
+#: g10/keygen.c:555
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (subskribi kaj �ifri)\n"
-#: g10/keygen.c:548
+#: g10/keygen.c:557
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (subskribi kaj �ifri)\n"
-#: g10/keygen.c:552
+#: g10/keygen.c:561
msgid "Your selection? "
msgstr "Via elekto? "
-#: g10/keygen.c:563 g10/keygen.c:571
+#: g10/keygen.c:572
msgid "Do you really want to create a sign and encrypt key? "
msgstr "�u vi vere volas krei subskriban kaj �ifran �losilon? "
-#: g10/keygen.c:585
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr ""
+
+#: g10/keygen.c:594
msgid "Invalid selection.\n"
msgstr "Nevalida elekto.\n"
-#: g10/keygen.c:597
+#: g10/keygen.c:606
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1318,19 +1342,19 @@ msgstr ""
" implicita �losilgrando estas 1024 bitoj\n"
" plej granda rekomendata �losilgrando estas 2048 bitoj\n"
-#: g10/keygen.c:604
+#: g10/keygen.c:613
msgid "What keysize do you want? (1024) "
msgstr "Kiun �losilgrandon vi deziras? (1024) "
-#: g10/keygen.c:609
+#: g10/keygen.c:618
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA permesas �losilgrandon nur inter 512 kaj 1024\n"
-#: g10/keygen.c:611
+#: g10/keygen.c:620
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "�losilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
-#: g10/keygen.c:613
+#: g10/keygen.c:622
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "�losilgrando tro malgranda; 1024 estas plej eta valoro por RSA.\n"
@@ -1342,12 +1366,12 @@ msgstr "�losilgrando tro malgranda; 1024 estas plej eta valoro por RSA.\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:624
+#: g10/keygen.c:633
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "�losilgrando tro granda; %d estas plej granda permesata valoro.\n"
-#: g10/keygen.c:629
+#: g10/keygen.c:638
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1355,11 +1379,11 @@ msgstr ""
"�losilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n"
"�ar la komputado da�ras TRE longe!\n"
-#: g10/keygen.c:632
+#: g10/keygen.c:641
msgid "Are you sure that you want this keysize? "
msgstr "�u vi estas certa, ke vi deziras �i tiun �losilgrandon? "
-#: g10/keygen.c:633
+#: g10/keygen.c:642
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1367,21 +1391,21 @@ msgstr ""
"Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre "
"facile kaptebla!\n"
-#: g10/keygen.c:641
+#: g10/keygen.c:650
msgid "Do you really need such a large keysize? "
msgstr "�u vi vere bezonas tiom grandan �losilgrandon? "
-#: g10/keygen.c:647
+#: g10/keygen.c:656
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Petita �losilgrando estas %u bitoj\n"
-#: g10/keygen.c:650 g10/keygen.c:654
+#: g10/keygen.c:659 g10/keygen.c:663
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rondigita �is %u bitoj\n"
-#: g10/keygen.c:702
+#: g10/keygen.c:711
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1397,25 +1421,25 @@ msgstr ""
" <n>m = �losilo eksvalidi�os post n monatoj\n"
" <n>y = �losilo eksvalidi�os post n jaroj\n"
-#: g10/keygen.c:717
+#: g10/keygen.c:726
msgid "Key is valid for? (0) "
msgstr "�losilo validu ...? (0) "
-#: g10/keygen.c:722
+#: g10/keygen.c:731
msgid "invalid value\n"
msgstr "nevalida valoro\n"
-#: g10/keygen.c:727
+#: g10/keygen.c:736
msgid "Key does not expire at all\n"
msgstr "�losilo neniam eksvalidi�os\n"
#. print the date when the key expires
-#: g10/keygen.c:733
+#: g10/keygen.c:742
#, c-format
msgid "Key expires at %s\n"
msgstr "�losilo eksvalidi�os je %s\n"
-#: g10/keygen.c:736
+#: g10/keygen.c:745
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1423,11 +1447,11 @@ msgstr ""
"Via sistemo ne povas montri datojn post 2038.\n"
"Tamen, �i estos �uste traktata �is 2106.\n"
-#: g10/keygen.c:741
+#: g10/keygen.c:750
msgid "Is this correct (y/n)? "
msgstr "�u tio estas �usta (j/n)? "
-#: g10/keygen.c:784
+#: g10/keygen.c:793
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1442,44 +1466,44 @@ msgstr ""
" \"Heinrich Heine (la poeto) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:796
+#: g10/keygen.c:805
msgid "Real name: "
msgstr "Vera nomo: "
-#: g10/keygen.c:804
+#: g10/keygen.c:813
msgid "Invalid character in name\n"
msgstr "Nevalida signo en nomo\n"
-#: g10/keygen.c:806
+#: g10/keygen.c:815
msgid "Name may not start with a digit\n"
msgstr "Nomo ne povas komenci�i per cifero\n"
-#: g10/keygen.c:808
+#: g10/keygen.c:817
msgid "Name must be at least 5 characters long\n"
msgstr "Nomo devas havi almena� 5 signojn\n"
-#: g10/keygen.c:816
+#: g10/keygen.c:825
msgid "Email address: "
msgstr "Retadreso: "
-#: g10/keygen.c:827
+#: g10/keygen.c:836
msgid "Not a valid email address\n"
msgstr "Nevalida retadreso\n"
-#: g10/keygen.c:835
+#: g10/keygen.c:844
msgid "Comment: "
msgstr "Komento: "
-#: g10/keygen.c:841
+#: g10/keygen.c:850
msgid "Invalid character in comment\n"
msgstr "Nevalida signo en komento\n"
-#: g10/keygen.c:864
+#: g10/keygen.c:873
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Vi uzas la signaron '%s'.\n"
-#: g10/keygen.c:870
+#: g10/keygen.c:879
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1490,27 +1514,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:874
+#: g10/keygen.c:883
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
-#: g10/keygen.c:879
+#: g10/keygen.c:888
msgid "NnCcEeOoQq"
msgstr "NnKkAaBbFf"
-#: g10/keygen.c:889
+#: g10/keygen.c:898
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (F)ini? "
-#: g10/keygen.c:890
+#: g10/keygen.c:899
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (B)one/(F)ini? "
-#: g10/keygen.c:909
+#: g10/keygen.c:918
msgid "Please correct the error first\n"
msgstr "Bonvolu korekti la eraron unue\n"
-#: g10/keygen.c:947
+#: g10/keygen.c:956
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1518,11 +1542,11 @@ msgstr ""
"Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
"\n"
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:964
msgid "passphrase not correctly repeated; try again.\n"
msgstr "la pasfrazo ne estis �uste ripetita; provu denove.\n"
-#: g10/keygen.c:961
+#: g10/keygen.c:970
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -1534,7 +1558,7 @@ msgstr ""
"uzante �i tiun programon kun la opcio \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:982
+#: g10/keygen.c:991
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1546,29 +1570,29 @@ msgstr ""
"kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
"akiri sufi�e da entropio.\n"
-#: g10/keygen.c:1431
+#: g10/keygen.c:1440
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA-�losilparo havos 1024 bitojn.\n"
-#: g10/keygen.c:1474
+#: g10/keygen.c:1483
msgid "Key generation canceled.\n"
msgstr "Kreado de �losiloj nuligita.\n"
-#: g10/keygen.c:1571
+#: g10/keygen.c:1581
#, c-format
msgid "writing public key to `%s'\n"
msgstr "skribas publikan �losilon al '%s'\n"
-#: g10/keygen.c:1572
+#: g10/keygen.c:1582
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "skribas sekretan �losilon al '%s'\n"
-#: g10/keygen.c:1668
+#: g10/keygen.c:1679
msgid "public and secret key created and signed.\n"
msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
-#: g10/keygen.c:1673
+#: g10/keygen.c:1684
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1576,12 +1600,12 @@ msgstr ""
"Notu, ke �i tiu �losilo ne estas uzebla por �ifrado. Vi eble volos\n"
"uzi la komandon \"--edit-key\" por krei flankan �losilon por tiu celo.\n"
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1701 g10/keygen.c:1807
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1589,7 +1613,7 @@ msgstr ""
"�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
"horlo�eraro)\n"
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1597,11 +1621,11 @@ msgstr ""
"�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
"horlo�eraro)\n"
-#: g10/keygen.c:1769
+#: g10/keygen.c:1783
msgid "Really create? "
msgstr "�u vere krei? "
-#: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
#: g10/tdbio.c:515
#, c-format
msgid "%s: can't open: %s\n"
@@ -1612,17 +1636,17 @@ msgstr "%s: ne povas malfermi: %s\n"
msgid "error creating passphrase: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
#, c-format
msgid "%s: WARNING: empty file\n"
msgstr "%s: AVERTO: malplena dosiero\n"
-#: g10/encode.c:271
+#: g10/encode.c:274
#, c-format
msgid "reading from `%s'\n"
msgstr "legas el '%s'\n"
-#: g10/encode.c:492
+#: g10/encode.c:497
#, c-format
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s-�ifrita por: %s\n"
@@ -1647,280 +1671,280 @@ msgstr "�losilo %08lX: ne estas RFC-2440-�losilo - ignorita\n"
msgid "key %08lX: not protected - skipped\n"
msgstr "�losilo %08lX: ne protektita - ignorita\n"
-#: g10/export.c:232
+#: g10/export.c:236
msgid "WARNING: nothing exported\n"
msgstr "AVERTO: nenio estis eksportita\n"
-#: g10/getkey.c:211
+#: g10/getkey.c:214
msgid "too many entries in pk cache - disabled\n"
msgstr "tro da registroj en pk-staplo - mal�altas\n"
-#: g10/getkey.c:350
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[Uzantidentigilo ne trovita]"
+
+#: g10/getkey.c:453
msgid "too many entries in unk cache - disabled\n"
msgstr "tro da registroj en unk-staplo - mal�altas\n"
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "RSA-�losilo ne estas uzebla kun �i tiu versio\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Mankas �losilo por uzantidentigilo\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Mankas uzantidentigilo por �losilo\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2207
#, 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:2050
-msgid "[User id not found]"
-msgstr "[Uzantidentigilo ne trovita]"
+#: g10/getkey.c:2249 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
-#: g10/import.c:182
+#: g10/import.c:184
#, c-format
msgid "skipping block of type %d\n"
msgstr "ignoras blokon de speco %d\n"
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
#, c-format
msgid "%lu keys so far processed\n"
msgstr "%lu �losiloj jam traktitaj\n"
-#: g10/import.c:194
+#: g10/import.c:196
#, c-format
msgid "error reading `%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: g10/import.c:204
+#: g10/import.c:206
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Nombro traktita entute: %lu\n"
-#: g10/import.c:206
+#: g10/import.c:208
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignoritaj novaj �losiloj: %lu\n"
-#: g10/import.c:209
+#: g10/import.c:211
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sen uzantidentigilo: %lu\n"
-#: g10/import.c:211
+#: g10/import.c:213
#, c-format
msgid " imported: %lu"
msgstr " importitaj: %lu"
-#: g10/import.c:217
+#: g10/import.c:219
#, c-format
msgid " unchanged: %lu\n"
msgstr " ne�an�itaj: %lu\n"
-#: g10/import.c:219
+#: g10/import.c:221
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novaj uzantidentigiloj: %lu\n"
-#: g10/import.c:221
+#: g10/import.c:223
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novaj sub�losiloj: %lu\n"
-#: g10/import.c:223
+#: g10/import.c:225
#, c-format
msgid " new signatures: %lu\n"
msgstr " novaj subskriboj: %lu\n"
-#: g10/import.c:225
+#: g10/import.c:227
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novaj �losilrevokoj: %lu\n"
-#: g10/import.c:227
+#: g10/import.c:229
#, c-format
msgid " secret keys read: %lu\n"
msgstr " sekretaj �losiloj legitaj: %lu\n"
-#: g10/import.c:229
+#: g10/import.c:231
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "sekretaj �losiloj importitaj: %lu\n"
-#: g10/import.c:231
+#: g10/import.c:233
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:408 g10/import.c:617
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
-#: g10/import.c:405
+#: g10/import.c:422
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
-#: g10/import.c:407
+#: g10/import.c:424
msgid "this may be caused by a missing self-signature\n"
msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:435 g10/import.c:684
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
-#: g10/import.c:423
+#: g10/import.c:440
#, c-format
msgid "key %08lX: new key - skipped\n"
msgstr "�losilo %08lX: nova �losilo - ignorita\n"
-#: g10/import.c:431
+#: g10/import.c:448
msgid "no default public keyring\n"
msgstr "mankas implicita publika �losilaro\n"
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
#, c-format
msgid "writing to `%s'\n"
msgstr "skribas al '%s'\n"
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
#, c-format
msgid "can't lock keyring `%s': %s\n"
msgstr "ne povas �losi la �losilaron '%s': %s\n"
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "eraro dum skribado de �losilaro '%s': %s\n"
-#: g10/import.c:446
+#: g10/import.c:463
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "�losilo %08lX: publika �losilo importita\n"
-#: g10/import.c:463
+#: g10/import.c:480
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "�losilo %08lX: diferencas de nia kopio\n"
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:489 g10/import.c:692
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:495 g10/import.c:698
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
-#: g10/import.c:505
+#: g10/import.c:522
#, c-format
msgid "key %08lX: 1 new user ID\n"
msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
-#: g10/import.c:508
+#: g10/import.c:525
#, c-format
msgid "key %08lX: %d new user IDs\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
-#: g10/import.c:511
+#: g10/import.c:528
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "�losilo %08lX: 1 nova subskribo\n"
-#: g10/import.c:514
+#: g10/import.c:531
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
-#: g10/import.c:517
+#: g10/import.c:534
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "�losilo %08lX: 1 nova sub�losilo\n"
-#: g10/import.c:520
+#: g10/import.c:537
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
-#: g10/import.c:530
+#: g10/import.c:547
#, c-format
msgid "key %08lX: not changed\n"
msgstr "�losilo %08lX: ne �an�ita\n"
-#: g10/import.c:613
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:640
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "�losilo %08lX: sekreta �losilo importita\n"
#. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:644
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
-#: g10/import.c:622
+#: g10/import.c:649
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
-#: g10/import.c:651
+#: g10/import.c:678
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
-#: g10/import.c:682
+#: g10/import.c:709
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
-#: g10/import.c:714
+#: g10/import.c:741
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "�losilo %08lX: revokatestilo importita\n"
-#: g10/import.c:756
+#: g10/import.c:783
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:790 g10/import.c:814
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
-#: g10/import.c:764
+#: g10/import.c:791
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "�losilo %08lX: nevalida mem-subskribo\n"
-#: g10/import.c:779
+#: g10/import.c:806
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
-#: g10/import.c:788
+#: g10/import.c:815
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
-#: g10/import.c:815
+#: g10/import.c:842
#, c-format
msgid "key %08lX: accepted non self-signed user ID '"
msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
-#: g10/import.c:844
+#: g10/import.c:871
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "�losilo %08lX: ignoris uzantidentigilon '"
-#: g10/import.c:867
+#: g10/import.c:894
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "�losilo %08lX: ignoris sub�losilon\n"
@@ -1929,98 +1953,98 @@ msgstr "�losilo %08lX: ignoris sub�losilon\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:892
+#: g10/import.c:919
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
-#: g10/import.c:901
+#: g10/import.c:928
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
-#: g10/import.c:909
+#: g10/import.c:936
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
-#: g10/import.c:1009
+#: g10/import.c:1036
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
-#: g10/import.c:1060
+#: g10/import.c:1088
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "�losilo %08lX: revokatestilo aldonita\n"
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1202 g10/import.c:1255
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "�losilo %08lX: nia kopio ne havas mem-subskribon\n"
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
#, c-format
msgid "%s: user not found\n"
msgstr "%s: uzanto ne trovita\n"
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
msgid "[revocation]"
msgstr "[revoko]"
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
msgid "[self-signature]"
msgstr "[mem-subskribo]"
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
msgid "1 bad signature\n"
msgstr "1 malbona subskribo\n"
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
#, c-format
msgid "%d bad signatures\n"
msgstr "%d malbonaj subskriboj\n"
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
msgid "1 signature not checked due to a missing key\n"
msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d subskriboj ne kontrolitaj pro manko de �losiloj\n"
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
msgid "1 signature not checked due to an error\n"
msgstr "1 subskribo ne kontrolita pro eraro\n"
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
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:316
+#: g10/keyedit.c:317
#, c-format
msgid "Already signed by key %08lX\n"
msgstr "Jam subskribita per �losilo %08lX\n"
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "Nenio por subskribi per �losilo %08lX\n"
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2028,7 +2052,7 @@ msgstr ""
"�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
"per via �losilo: \""
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
@@ -2036,33 +2060,33 @@ msgstr ""
"La subskribo estos markita kiel neeksportebla.\n"
"\n"
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
msgid "Really sign? "
msgstr "�u vere subskribi? "
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
#, c-format
msgid "signing failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
msgid "This key is not protected.\n"
msgstr "�i tiu �losilo ne estas protektita.\n"
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
msgid "Secret parts of primary key are not available.\n"
msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
msgid "Key is protected.\n"
msgstr "�losilo estas protektita.\n"
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Ne povas redakti �i tiun �losilon: %s\n"
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2070,7 +2094,7 @@ msgstr ""
"Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
"\n"
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2078,420 +2102,425 @@ msgstr ""
"Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
"\n"
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
msgid "Do you really want to do this? "
msgstr "�u vi vere volas fari tion? "
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
msgid "moving a key signature to the correct place\n"
msgstr "movas �losilsubskribon al la �usta loko\n"
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
msgid "quit this menu"
msgstr "forlasi �i tiun menuon"
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
msgid "q"
msgstr "f"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
msgid "save"
msgstr "skribi"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
msgid "save and quit"
msgstr "skribi kaj fini"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
msgid "help"
msgstr "helpo"
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
msgid "show this help"
msgstr "montri �i tiun helpon"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
msgid "fpr"
msgstr "fsp"
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
msgid "show fingerprint"
msgstr "montri fingrospuron"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
msgid "list"
msgstr "listo"
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
msgid "list key and user IDs"
msgstr "listigi �losilojn kaj uzantidentigilojn"
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
msgid "l"
msgstr "l"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
msgid "select user ID N"
msgstr "elekti uzantidentigilon N"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
msgid "key"
msgstr "�losilo"
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
msgid "select secondary key N"
msgstr "elekti flankan �losilon N"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
msgid "check"
msgstr "kontroli"
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
msgid "list signatures"
msgstr "listigi subskribojn"
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
msgid "c"
msgstr "k"
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
msgid "sign"
msgstr "subskribi"
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
msgid "sign the key"
msgstr "subskribi la �losilon"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
msgid "s"
msgstr "s"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
msgid "lsign"
msgstr "lsub"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
msgid "sign the key locally"
msgstr "subskribi la �losilon loke"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
msgid "debug"
msgstr "spuri"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
msgid "adduid"
msgstr "aluid"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
msgid "add a user ID"
msgstr "aldoni uzantidentigilon"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
msgid "deluid"
msgstr "foruid"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
msgid "delete user ID"
msgstr "forvi�i uzantidentigilon"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
msgid "addkey"
msgstr "al"
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
msgid "add a secondary key"
msgstr "aldoni flankan �losilon"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
msgid "delkey"
msgstr "for"
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
msgid "delete a secondary key"
msgstr "forvi�i flankan �losilon"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
msgid "delsig"
msgstr "forsig"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
msgid "delete signatures"
msgstr "forvi�i subskribojn"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
msgid "expire"
msgstr "eksval"
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
msgid "change the expire date"
msgstr "�an�i la daton de eksvalidi�o"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
msgid "toggle"
msgstr "alia"
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
msgid "toggle between secret and public key listing"
msgstr "de sekreta a� publika listo iri al la alia"
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
msgid "t"
msgstr "a"
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606 g10/keyedit.c:607
msgid "list preferences"
msgstr "listigi preferojn"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
msgid "passwd"
msgstr "pasf"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:608
msgid "change the passphrase"
msgstr "�an�i la pasfrazon"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
msgid "trust"
msgstr "fido"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:609
msgid "change the ownertrust"
msgstr "�an�i la posedantofidon"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:610
msgid "revoke signatures"
msgstr "revoki subskribojn"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
msgid "revkey"
msgstr "rev"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:611
msgid "revoke a secondary key"
msgstr "revoki flankan �losilon"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
msgid "disable"
msgstr "el"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:612
msgid "disable a key"
msgstr "mal�alti �losilon"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
msgid "enable"
msgstr "en"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:613
msgid "enable a key"
msgstr "�alti �losilon"
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:633
msgid "can't do that in batchmode\n"
msgstr "ne povas fari tion en neinteraga re�imo\n"
#. check that they match
#. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:671
msgid "Secret key is available.\n"
msgstr "Sekreta �losilo estas havebla.\n"
-#: g10/keyedit.c:698
+#: g10/keyedit.c:700
msgid "Command> "
msgstr "Komando> "
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
msgid "Need the secret key to do this.\n"
msgstr "Bezonas la sekretan �losilon por fari tion.\n"
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
msgid "Please use the command \"toggle\" first.\n"
msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
-#: g10/keyedit.c:779
+#: g10/keyedit.c:781
msgid "Really sign all user IDs? "
msgstr "�u vere subskribi �iujn uzantidentigilojn? "
-#: g10/keyedit.c:780
+#: g10/keyedit.c:782
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:814 g10/keyedit.c:1000
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:825 g10/keyedit.c:846
msgid "You must select at least one user ID.\n"
msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
-#: g10/keyedit.c:825
+#: g10/keyedit.c:827
msgid "You can't delete the last user ID!\n"
msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
-#: g10/keyedit.c:828
+#: g10/keyedit.c:830
msgid "Really remove all selected user IDs? "
msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
-#: g10/keyedit.c:829
+#: g10/keyedit.c:831
msgid "Really remove this user ID? "
msgstr "�u vere forigi �i tiun uzantidentigilon? "
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:867 g10/keyedit.c:889
msgid "You must select at least one key.\n"
msgstr "Vi devas elekti almena� unu �losilon.\n"
-#: g10/keyedit.c:869
+#: g10/keyedit.c:871
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:872
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:893
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:894
msgid "Do you really want to revoke this key? "
msgstr "�u vi vere volas revoki �i tiun �losilon? "
-#: g10/keyedit.c:958
+#: g10/keyedit.c:964
msgid "Save changes? "
msgstr "�u skribi �an�ojn? "
-#: g10/keyedit.c:961
+#: g10/keyedit.c:967
msgid "Quit without saving? "
msgstr "�u fini sen skribi �an�ojn? "
-#: g10/keyedit.c:972
+#: g10/keyedit.c:978
#, c-format
msgid "update failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
-#: g10/keyedit.c:979
+#: g10/keyedit.c:985
#, c-format
msgid "update secret failed: %s\n"
msgstr "aktualigo de sekreto malsukcesis: %s\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:992
msgid "Key not changed so no update needed.\n"
msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1007
msgid "Invalid command (try \"help\")\n"
msgstr "Nevalida komando (provu per \"helpo\")\n"
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
#, 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:1090
+#: g10/keyedit.c:1140
#, c-format
msgid " trust: %c/%c"
msgstr " fido: %c/%c"
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1144
msgid "This key has been disabled"
msgstr "�i tiu �losilo estas mal�altita"
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1173
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! sub�losilo estas revokita: %s\n"
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1176
msgid "rev- faked revocation found\n"
msgstr "rev- falsita revoko trovita\n"
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1178
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? problemo en kontrolo de revoko: %s\n"
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1420
msgid "Delete this good signature? (y/N/q)"
msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1424
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1428
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1434
msgid "Really delete this self-signature? (y/N)"
msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1448
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Forvi�is %d subskribon.\n"
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1449
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Forvi�is %d subskribojn.\n"
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1452
msgid "Nothing deleted.\n"
msgstr "Nenio estis forvi�ita.\n"
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1521
msgid "Please remove selections from the secret keys.\n"
msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1527
msgid "Please select at most one secondary key.\n"
msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1531
msgid "Changing expiration time for a secondary key.\n"
msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1533
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:1521
+#: g10/keyedit.c:1575
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:1537
+#: g10/keyedit.c:1591
msgid "No corresponding signature in secret ring\n"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1652
#, c-format
msgid "No user ID with index %d\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1698
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Mankas flanka �losilo kun indekso %d\n"
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1796
msgid "user ID: \""
msgstr "uzantidentigilo: \""
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1799
#, c-format
msgid ""
"\"\n"
@@ -2500,168 +2529,168 @@ msgstr ""
"\"\n"
"subskribita per via �losilo %08lX je %s\n"
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1803
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:1773
+#: g10/keyedit.c:1827
msgid "You have signed these user IDs:\n"
msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " subskribita per %08lX je %s\n"
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1846
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " revokita de %08lX je %s\n"
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1866
msgid "You are about to revoke these signatures:\n"
msgstr "Vi revokos la sekvajn subskribojn:\n"
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1884
msgid "Really create the revocation certificates? (y/N)"
msgstr "�u vere krei la revokatestilojn? (j/N)"
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1913
msgid "no secret key\n"
msgstr "mankas sekreta �losilo\n"
-#: g10/keylist.c:158
-msgid "invalid"
-msgstr "nevalida"
-
-#: g10/keylist.c:178
-msgid "revoked"
-msgstr "revokita"
-
#. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:790
+#: g10/keylist.c:279 g10/mainproc.c:851
#, c-format
msgid " [expires: %s]"
msgstr " [eksvalidi�os: %s]"
-#: g10/mainproc.c:240
+#: g10/mainproc.c:269
#, c-format
msgid "public key is %08lX\n"
msgstr "publika �losilo estas %08lX\n"
-#: g10/mainproc.c:284
+#: g10/mainproc.c:314
msgid "public key encrypted data: good DEK\n"
msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
-#: g10/mainproc.c:326
+#: g10/mainproc.c:366
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "�ifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
-#: g10/mainproc.c:336
+#: g10/mainproc.c:376
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "�ifrita per %s-�losilo, %08lX\n"
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "mankas sekreta �losilo por mal�ifrado\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:390
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
-#: g10/mainproc.c:388
+#: g10/mainproc.c:430
msgid "decryption okay\n"
msgstr "mal�ifrado sukcesis\n"
-#: g10/mainproc.c:393
+#: g10/mainproc.c:435
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
-#: g10/mainproc.c:398
+#: g10/mainproc.c:440
#, c-format
msgid "decryption failed: %s\n"
msgstr "mal�ifrado malsukcesis: %s\n"
-#: g10/mainproc.c:417
+#: g10/mainproc.c:459
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
-#: g10/mainproc.c:419
+#: g10/mainproc.c:461
#, c-format
msgid "original file name='%.*s'\n"
msgstr "originala dosiernomo='%.*s'\n"
-#: g10/mainproc.c:574
+#: g10/mainproc.c:632
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:719 g10/mainproc.c:728
msgid "WARNING: invalid notation data found\n"
msgstr "AVERTO: nevalida notacia dateno trovita\n"
-#: g10/mainproc.c:673
+#: g10/mainproc.c:731
msgid "Notation: "
msgstr "Notacio: "
-#: g10/mainproc.c:680
+#: g10/mainproc.c:740
msgid "Policy: "
msgstr "Gvidlinio: "
-#: g10/mainproc.c:1121
+#: g10/mainproc.c:1193
msgid "signature verification suppressed\n"
msgstr "kontrolo de subskribo estas mal�altita\n"
-#: g10/mainproc.c:1158
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#, fuzzy
+msgid "can't handle these multiple signatures\n"
+msgstr "ingitaj klartekstaj subskriboj\n"
+
+#: g10/mainproc.c:1256
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
#. just in case that we have no userid
-#: g10/mainproc.c:1184 g10/mainproc.c:1195
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
msgid "BAD signature from \""
msgstr "MALBONA subskribo de \""
-#: g10/mainproc.c:1185 g10/mainproc.c:1196
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
msgid "Good signature from \""
msgstr "Bona subskribo de \""
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1308
msgid " aka \""
msgstr " alinome \""
-#: g10/mainproc.c:1243
+#: g10/mainproc.c:1358
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Ne povas kontroli subskribon: %s\n"
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "fari apartan subskribon"
+
+#: g10/mainproc.c:1454
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "memstara subskribo de klaso 0x%02x\n"
-#: g10/mainproc.c:1369
+#: g10/mainproc.c:1511
msgid "old style (PGP 2.x) signature\n"
msgstr "malnovstila subskribo (PGP 2.x)\n"
-#: g10/mainproc.c:1374
+#: g10/mainproc.c:1518
msgid "invalid root packet detected in proc_tree()\n"
msgstr "nevalida radikpaketo trovita en proc_tree()\n"
-#: g10/misc.c:97
+#: g10/misc.c:98
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
-#: g10/misc.c:207
+#: g10/misc.c:208
msgid "Experimental algorithms should not be used!\n"
msgstr "Eksperimentaj metodoj ne estu uzataj!\n"
-#: g10/misc.c:234
-msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:238
+#, fuzzy
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr "�i tiu �ifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
#: g10/parse-packet.c:119
@@ -2669,12 +2698,68 @@ msgstr "�i tiu �ifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
msgid "can't handle public key algorithm %d\n"
msgstr "ne povas trakti publik�losilan metodon %d\n"
-#: g10/parse-packet.c:991
+#: g10/parse-packet.c:1010
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
-#: g10/passphrase.c:159
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
+
+#: g10/hkp.c:167 g10/passphrase.c:248
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "ne povas konekti�i al '%s': %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (�ef�losilo %08lX)"
+
+#: g10/passphrase.c:323
+#, fuzzy, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"\n"
+"Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
+"por la uzanto: \""
+
+#: g10/passphrase.c:344
+#, fuzzy
+msgid "Enter passphrase\n"
+msgstr "Donu pasfrazon: "
+
+#: g10/passphrase.c:346
+#, fuzzy
+msgid "Repeat passphrase\n"
+msgstr "Ripetu pasfrazon: "
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr ""
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr ""
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr ""
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr ""
+
+#: g10/passphrase.c:562
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -2684,25 +2769,20 @@ msgstr ""
"Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
"por la uzanto: \""
-#: g10/passphrase.c:168
+#: g10/passphrase.c:571
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
-#: g10/passphrase.c:173
-#, c-format
-msgid " (main key ID %08lX)"
-msgstr " (�ef�losilo %08lX)"
-
-#: g10/passphrase.c:190
+#: g10/passphrase.c:609
msgid "can't query password in batchmode\n"
msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
-#: g10/passphrase.c:194
+#: g10/passphrase.c:613
msgid "Enter passphrase: "
msgstr "Donu pasfrazon: "
-#: g10/passphrase.c:198
+#: g10/passphrase.c:617
msgid "Repeat passphrase: "
msgstr "Ripetu pasfrazon: "
@@ -2710,19 +2790,24 @@ msgstr "Ripetu pasfrazon: "
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n"
-#: g10/plaintext.c:324
+#: g10/plaintext.c:332
msgid "Detached signature.\n"
msgstr "Aparta subskribo.\n"
-#: g10/plaintext.c:328
+#: g10/plaintext.c:336
msgid "Please enter name of data file: "
msgstr "Bonvolu doni la nomon de la dosiero: "
-#: g10/plaintext.c:349
+#: g10/plaintext.c:357
msgid "reading stdin ...\n"
msgstr "legas la normalan enigon ...\n"
-#: g10/plaintext.c:392
+#: g10/plaintext.c:391
+#, fuzzy
+msgid "no signed data\n"
+msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
+
+#: g10/plaintext.c:399
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
@@ -2755,41 +2840,36 @@ msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
msgid "NOTE: secret key %08lX expired at %s\n"
msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
-#: g10/hkp.c:72
+#: g10/hkp.c:59
#, c-format
msgid "requesting key %08lX from %s ...\n"
msgstr "petas la �losilon %08lX de %s ...\n"
-#: g10/hkp.c:85
+#: g10/hkp.c:83
#, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "ne povas akiri �losilon de �losilservilo: %s\n"
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:102 g10/hkp.c:136
msgid "no keyserver known (use option --keyserver)\n"
msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
-#: g10/hkp.c:117
+#: g10/hkp.c:110
#, c-format
msgid "%s: not a valid key ID\n"
msgstr "%s: ne valida �losilidentigilo\n"
-#: g10/hkp.c:170
-#, c-format
-msgid "can't connect to `%s': %s\n"
-msgstr "ne povas konekti�i al '%s': %s\n"
-
-#: g10/hkp.c:194
+#: g10/hkp.c:191
#, c-format
msgid "error sending to `%s': %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
-#: g10/hkp.c:206
+#: g10/hkp.c:203
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr "sukceso dum sendo al '%s' (statuso=%u)\n"
-#: g10/hkp.c:209
+#: g10/hkp.c:206
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr "malsukceso dum sendo al '%s': statuso=%u\n"
@@ -2833,30 +2913,35 @@ msgstr "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
msgid "public key is %lu seconds newer than the signature\n"
msgstr "la publika �losilo estas %lu sekundojn pli nova ol la subskribo\n"
-#: g10/sig-check.c:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
msgstr "NOTO: subskribo-�losilo eksvalidi�is je %s\n"
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
msgid "assuming bad signature due to an unknown critical bit\n"
msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
-#: g10/sign.c:140
+#: g10/sign.c:152
+#, fuzzy, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "Ne povas kontroli subskribon: %s\n"
+
+#: g10/sign.c:161
#, c-format
msgid "%s signature from: %s\n"
msgstr "%s-subskribo de: %s\n"
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:307 g10/sign.c:630
#, c-format
msgid "can't create %s: %s\n"
msgstr "ne povas krei %s: %s\n"
-#: g10/sign.c:388
+#: g10/sign.c:405
msgid "signing:"
msgstr "subskribas:"
-#: g10/sign.c:431
+#: g10/sign.c:448
#, c-format
msgid "WARNING: `%s' is an empty file\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
@@ -2895,7 +2980,7 @@ msgstr "%s: ne povas aliri: %s\n"
msgid "%s: directory does not exist!\n"
msgstr "%s: dosierujo ne ekzistas!\n"
-#: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: ne povas krei: %s\n"
@@ -3075,11 +3160,6 @@ msgstr "�losilo %08lX: mankas publika �losilo por fidata �losilo - ignorita\n"
msgid "NOTE: secret key %08lX is NOT protected.\n"
msgstr "NOTO: sekreta �losilo %08lX NE estas protektita.\n"
-#: g10/trustdb.c:577
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
-
#: g10/trustdb.c:584
#, c-format
msgid "key %08lX: secret and public key don't match\n"
@@ -3288,7 +3368,7 @@ msgstr "malsukcesis meti '%s' en fido-datenaron: %s\n"
msgid "WARNING: can't yet handle long pref records\n"
msgstr "AVERTO: ne povas trakti longajn preferoregistrojn\n"
-#: g10/verify.c:82
+#: g10/verify.c:108
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@ -3298,7 +3378,7 @@ msgstr ""
"Bonvolu memori, ke la subskribodosiero (.sig a� .asc)\n"
"devas esti la unua dosiero donita en la komandlinio.\n"
-#: g10/verify.c:147
+#: g10/verify.c:173
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "enigata linio %u tro longa, a� mankas linifino\n"
@@ -3308,41 +3388,51 @@ msgstr "enigata linio %u tro longa, a� mankas linifino\n"
msgid "%s: can't create keyring: %s\n"
msgstr "%s: ne povas krei �losilaron: %s\n"
-#: g10/ringedit.c:319 g10/ringedit.c:1374
+#: g10/ringedit.c:319 g10/ringedit.c:1376
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: �losilaro kreita\n"
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1557
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1558
#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s estas la ne�an�ita\n"
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1559
#, c-format
msgid "%s is the new one\n"
msgstr "%s estas la nova\n"
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1560
msgid "Please fix this possible security flaw\n"
msgstr "Bonvolu ripari �i tiun eblan sekurecproblemon\n"
-#: g10/skclist.c:88 g10/skclist.c:125
+#: g10/skclist.c:110 g10/skclist.c:166
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"�losilo ne estas markita kiel malsekura - ne povas uzi �in kun falsa "
"stokastilo!\n"
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "ignoris '%s': %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
#, c-format
msgid "skipped `%s': %s\n"
msgstr "ignoris '%s': %s\n"
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: ignorita: publika �losilo jam �eestas\n"
+
+#: g10/skclist.c:160
#, c-format
msgid ""
"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3370,31 +3460,31 @@ msgstr "%s: nekonata sufikso\n"
msgid "Enter new filename"
msgstr "Donu novan dosiernomon"
-#: g10/openfile.c:182
+#: g10/openfile.c:184
msgid "writing to stdout\n"
msgstr "skribas al la normala eligo\n"
-#: g10/openfile.c:261
+#: g10/openfile.c:273
#, c-format
msgid "assuming signed data in `%s'\n"
msgstr "supozas subskribitajn datenojn en '%s'\n"
-#: g10/openfile.c:311
+#: g10/openfile.c:323
#, c-format
msgid "%s: new options file created\n"
msgstr "%s: nova opcio-dosiero kreita\n"
-#: g10/openfile.c:338
+#: g10/openfile.c:350
#, c-format
msgid "%s: can't create directory: %s\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
-#: g10/openfile.c:341
+#: g10/openfile.c:353
#, c-format
msgid "%s: directory created\n"
msgstr "%s: dosierujo kreita\n"
-#: g10/openfile.c:343
+#: g10/openfile.c:355
msgid "you have to start GnuPG again, so it can read the new options file\n"
msgstr ""
"vi devas restartigi GnuPG, por ke �i povu legi la novan opcio-dosieron\n"
@@ -3415,6 +3505,11 @@ msgid ""
msgstr ""
"AVERTO: mesa�o estis �ifrita per malforta �losilo en la simetria �ifro.\n"
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
+
#: g10/seskey.c:52
msgid "weak key created - retrying\n"
msgstr "malforta �losilo kreita - provas denove\n"
@@ -3425,14 +3520,6 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"ne povas eviti malfortajn �losilojn por simetria �ifro; provis %d fojojn!\n"
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "mankas sekreta �losilo por �i tiu publika �losilo!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
-
#: g10/delkey.c:114
msgid "can't do that in batchmode without \"--yes\"\n"
msgstr "ne povas fari tion en neinteraga re�imo sen \"--yes\"\n"
@@ -3445,6 +3532,14 @@ msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
msgid "This is a secret key! - really delete? "
msgstr "Tio estas sekreta �losilo! �u vere forvi�i �in? "
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "mankas sekreta �losilo por �i tiu publika �losilo!\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
+
#: g10/helptext.c:47
msgid ""
"It's up to you to assign a value here; this value will never be exported\n"
@@ -3703,3 +3798,21 @@ msgstr "Nenia helpo disponata"
#, c-format
msgid "No help available for `%s'"
msgstr "Nenia helpo disponata por '%s'"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "RSA-�losilo ne estas uzebla kun �i tiu versio\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Mankas �losilo por uzantidentigilo\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Mankas uzantidentigilo por �losilo\n"
+
+#~ msgid "invalid"
+#~ msgstr "nevalida"
+
+#~ msgid "revoked"
+#~ msgstr "revokita"
+
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "mankas sekreta �losilo por mal�ifrado\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index c4d3009f5..da4824b26 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-04-19 12:04+0200\n"
+"POT-Creation-Date: 2001-04-28 19:57+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"
@@ -998,7 +998,7 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1190 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
msgid " Fingerprint:"
msgstr " Huella dactilar:"
@@ -1706,25 +1706,27 @@ msgstr "ATENCI�N: no se ha exportado nada\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "demasiados registros en la cache pk - anulada\n"
-#: g10/getkey.c:449
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+#, fuzzy
+msgid "[User id not found]"
+msgstr "%s: usuario no encontrado\n"
+
+#: g10/getkey.c:453
msgid "too many entries in unk cache - disabled\n"
msgstr "demasiados registros en la cache unk - anulada\n"
-#: g10/getkey.c:2203
+#: g10/getkey.c:2207
#, 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:2245 g10/trustdb.c:577
+#: g10/getkey.c:2249 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "clave %08lX: clave secreta sin clave p�blica - ignorada\n"
-#: g10/getkey.c:2532
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: usuario no encontrado\n"
-
#: g10/import.c:184
#, c-format
msgid "skipping block of type %d\n"
@@ -2092,7 +2094,7 @@ msgstr ""
msgid "Really sign? "
msgstr "�Firmar de verdad? "
-#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:157
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallida: %s\n"
@@ -2299,253 +2301,257 @@ msgstr ""
msgid "pref"
msgstr ""
-#: g10/keyedit.c:606
+#: g10/keyedit.c:606 g10/keyedit.c:607
msgid "list preferences"
msgstr "muestra preferencias"
#: g10/keyedit.c:607
+msgid "showpref"
+msgstr ""
+
+#: g10/keyedit.c:608
msgid "passwd"
msgstr ""
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
msgid "change the passphrase"
msgstr "cambia la contrase�a"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "trust"
msgstr ""
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "change the ownertrust"
msgstr "cambia valores de confianza"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revsig"
msgstr ""
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revoke signatures"
msgstr "revoca firmas"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revkey"
msgstr ""
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revoke a secondary key"
msgstr "revoca una clave secundaria"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable"
msgstr ""
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable a key"
msgstr "deshabilita una clave"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable"
msgstr ""
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable a key"
msgstr "habilita una clave"
-#: g10/delkey.c:110 g10/keyedit.c:632
+#: g10/delkey.c:110 g10/keyedit.c:633
msgid "can't do that in batchmode\n"
msgstr "imposible hacer esto en modo de proceso por lotes\n"
#. check that they match
#. fixme: check that they both match
-#: g10/keyedit.c:670
+#: g10/keyedit.c:671
msgid "Secret key is available.\n"
msgstr "Clave secreta disponible.\n"
-#: g10/keyedit.c:699
+#: g10/keyedit.c:700
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:729
+#: g10/keyedit.c:730
msgid "Need the secret key to do this.\n"
msgstr "Se necesita la clave secreta para hacer esto.\n"
-#: g10/keyedit.c:733
+#: g10/keyedit.c:734
msgid "Please use the command \"toggle\" first.\n"
msgstr ""
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
msgid "Really sign all user IDs? "
msgstr "�Firmar realmente todos los identificativos de usuario? "
-#: g10/keyedit.c:781
+#: g10/keyedit.c:782
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugerencia: seleccione los identificativos de usuario a firmar\n"
-#: g10/keyedit.c:813 g10/keyedit.c:995
+#: g10/keyedit.c:814 g10/keyedit.c:1000
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "actualizaci�n de confianza fallida: %s\n"
-#: g10/keyedit.c:824 g10/keyedit.c:845
+#: g10/keyedit.c:825 g10/keyedit.c:846
msgid "You must select at least one user ID.\n"
msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:827
msgid "You can't delete the last user ID!\n"
msgstr "�No puede borrar el �ltimo identificativo de usuario!\n"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
msgid "Really remove all selected user IDs? "
msgstr "�Borrar realmente todos los identificativos seleccionados? "
-#: g10/keyedit.c:830
+#: g10/keyedit.c:831
msgid "Really remove this user ID? "
msgstr "�Borrar realmente este identificativo? "
-#: g10/keyedit.c:866 g10/keyedit.c:888
+#: g10/keyedit.c:867 g10/keyedit.c:889
msgid "You must select at least one key.\n"
msgstr "Debe seleccionar por lo menos una clave.\n"
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
msgid "Do you really want to delete the selected keys? "
msgstr "�Borrar realmente las claves seleccionadas? "
-#: g10/keyedit.c:871
+#: g10/keyedit.c:872
msgid "Do you really want to delete this key? "
msgstr "�Borrar realmente esta clave? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
msgid "Do you really want to revoke the selected keys? "
msgstr "�Revocar realmente las claves seleccionadas? "
-#: g10/keyedit.c:893
+#: g10/keyedit.c:894
msgid "Do you really want to revoke this key? "
msgstr "�Revocar realmente esta clave? "
-#: g10/keyedit.c:959
+#: g10/keyedit.c:964
msgid "Save changes? "
msgstr "�Grabar cambios? "
-#: g10/keyedit.c:962
+#: g10/keyedit.c:967
msgid "Quit without saving? "
msgstr "�Salir sin grabar? "
-#: g10/keyedit.c:973
+#: g10/keyedit.c:978
#, c-format
msgid "update failed: %s\n"
msgstr "actualizaci�n fallida: %s\n"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:985
#, c-format
msgid "update secret failed: %s\n"
msgstr "actualizaci�n de la clave secreta fallida: %s\n"
-#: g10/keyedit.c:987
+#: g10/keyedit.c:992
msgid "Key not changed so no update needed.\n"
msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1007
msgid "Invalid command (try \"help\")\n"
msgstr "Comando no v�lido (pruebe \"help\")\n"
-#: g10/keyedit.c:1082 g10/keyedit.c:1108
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr ""
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1140
#, c-format
msgid " trust: %c/%c"
msgstr ""
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1144
msgid "This key has been disabled"
msgstr "Esta clave est� deshabilitada"
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1173
#, fuzzy, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "clave %08lX: �esta subclave ha sido revocada!\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1176
#, fuzzy
msgid "rev- faked revocation found\n"
msgstr " nuevas revocaciones: %lu\n"
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1178
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr ""
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1420
msgid "Delete this good signature? (y/N/q)"
msgstr "�Borrar esta firma correcta? (s/N/q)"
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1424
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�Borrar esta firma no v�lida? (s/N/q)"
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1428
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�Borrar esta firma desconocida? (s/N/q)"
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1434
msgid "Really delete this self-signature? (y/N)"
msgstr "�Borrar realmente esta autofirma? (s/N)"
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1448
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d firmas borradas.\n"
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1449
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d firmas borradas\n"
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1452
msgid "Nothing deleted.\n"
msgstr "No se borr� nada\n"
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1521
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor, quite la selecci�n de las claves secretas.\n"
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1527
msgid "Please select at most one secondary key.\n"
msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1531
msgid "Changing expiration time for a secondary key.\n"
msgstr "Cambiando caducidad de clave secundaria.\n"
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1533
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambiando caducidad de clave primaria.\n"
-#: g10/keyedit.c:1522
+#: g10/keyedit.c:1575
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:1538
+#: g10/keyedit.c:1591
msgid "No corresponding signature in secret ring\n"
msgstr "No hay firma correspondiente en anillo secreto\n"
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1652
#, 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:1645
+#: g10/keyedit.c:1698
#, c-format
msgid "No secondary key with index %d\n"
msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
-#: g10/keyedit.c:1743
+#: g10/keyedit.c:1796
msgid "user ID: \""
msgstr "ID de usuario: \""
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:1799
#, c-format
msgid ""
"\"\n"
@@ -2554,34 +2560,34 @@ msgstr ""
"\"\n"
"firmada con su clave %08lX el %s\n"
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1803
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:1774
+#: g10/keyedit.c:1827
msgid "You have signed these user IDs:\n"
msgstr "Ha firmado los siguientes IDs de usuario:\n"
-#: g10/keyedit.c:1788 g10/keyedit.c:1823
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " firmada por %08lX el %s\n"
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1846
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " revocada por %08lX el %s\n"
-#: g10/keyedit.c:1813
+#: g10/keyedit.c:1866
msgid "You are about to revoke these signatures:\n"
msgstr "Va Vd. a revocar las siguientes firmas:\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1884
msgid "Really create the revocation certificates? (y/N)"
msgstr "�Crear los certificados de revocaci�n realmente? (s/N)"
-#: g10/keyedit.c:1860
+#: g10/keyedit.c:1913
msgid "no secret key\n"
msgstr "no hay clave secreta\n"
@@ -2715,7 +2721,7 @@ msgstr "�No se deber�an usar algoritmos experimentales!\n"
#: g10/misc.c:238
#, fuzzy
-msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"este algoritmo de cifrado est� en desuso, considere el uso de uno m�s "
"est�ndar.\n"
@@ -2738,7 +2744,7 @@ msgstr ""
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:147 g10/passphrase.c:248
+#: g10/hkp.c:167 g10/passphrase.c:248
#, fuzzy, c-format
msgid "can't connect to `%s': %s\n"
msgstr "no puede abrirse `%s': %s\n"
@@ -2874,31 +2880,31 @@ msgstr "NOTA: clave de la firma caducada el %s\n"
msgid "requesting key %08lX from %s ...\n"
msgstr ""
-#: g10/hkp.c:72
+#: g10/hkp.c:83
#, fuzzy, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "no puede escribirse en el anillo: %s\n"
-#: g10/hkp.c:91 g10/hkp.c:125
+#: g10/hkp.c:102 g10/hkp.c:136
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/hkp.c:99
+#: g10/hkp.c:110
#, fuzzy, c-format
msgid "%s: not a valid key ID\n"
msgstr "'%s' no es un identificativo largo de clave v�lido\n"
-#: g10/hkp.c:171
+#: g10/hkp.c:191
#, fuzzy, c-format
msgid "error sending to `%s': %s\n"
msgstr "error leyendo `%s': %s\n"
-#: g10/hkp.c:183
+#: g10/hkp.c:203
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr ""
-#: g10/hkp.c:186
+#: g10/hkp.c:206
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr ""
diff --git a/po/et.po b/po/et.po
index e0660a6a9..f09999e46 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-04-19 12:04+0200\n"
+"POT-Creation-Date: 2001-04-28 19:57+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"
@@ -981,7 +981,7 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1190 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
msgid " Fingerprint:"
msgstr " S�rmej�lg:"
@@ -1674,24 +1674,26 @@ msgstr "HOIATUS: midagi ei eksporditud\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
-#: g10/getkey.c:449
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[Kasutaja id ei leitud]"
+
+#: g10/getkey.c:453
msgid "too many entries in unk cache - disabled\n"
msgstr "unk puhvris on liiga palju elemente - blokeerin\n"
-#: g10/getkey.c:2203
+#: g10/getkey.c:2207
#, 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:2245 g10/trustdb.c:577
+#: g10/getkey.c:2249 g10/trustdb.c:577
#, 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"
-#: g10/getkey.c:2532
-msgid "[User id not found]"
-msgstr "[Kasutaja id ei leitud]"
-
#: g10/import.c:184
#, c-format
msgid "skipping block of type %d\n"
@@ -2057,7 +2059,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Allkirjastan t�esti? "
-#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:157
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
#, c-format
msgid "signing failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
@@ -2263,252 +2265,257 @@ msgstr "t"
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:606 g10/keyedit.c:607
msgid "list preferences"
msgstr "n�ita eelistusi"
#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
msgid "change the passphrase"
msgstr "muuda parooli"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "change the ownertrust"
msgstr "muuda omaniku usaldust"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revoke signatures"
msgstr "t�hista allkirjad"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revoke a secondary key"
msgstr "t�hista sekundaarne v�ti"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable a key"
msgstr "blokeeri v�ti"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable a key"
msgstr "luba v�ti"
-#: g10/delkey.c:110 g10/keyedit.c:632
+#: g10/delkey.c:110 g10/keyedit.c:633
msgid "can't do that in batchmode\n"
msgstr "seda ei saa teha pakettmoodis\n"
#. check that they match
#. fixme: check that they both match
-#: g10/keyedit.c:670
+#: g10/keyedit.c:671
msgid "Secret key is available.\n"
msgstr "Salajane v�ti on kasutatav.\n"
-#: g10/keyedit.c:699
+#: g10/keyedit.c:700
msgid "Command> "
msgstr "K�sklus> "
-#: g10/keyedit.c:729
+#: g10/keyedit.c:730
msgid "Need the secret key to do this.\n"
msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
-#: g10/keyedit.c:733
+#: g10/keyedit.c:734
msgid "Please use the command \"toggle\" first.\n"
msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
msgid "Really sign all user IDs? "
msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
-#: g10/keyedit.c:781
+#: g10/keyedit.c:782
msgid "Hint: Select the user IDs to sign\n"
msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
-#: g10/keyedit.c:813 g10/keyedit.c:995
+#: g10/keyedit.c:814 g10/keyedit.c:1000
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "trustdb uuendamine eba�nnestus: %s\n"
-#: g10/keyedit.c:824 g10/keyedit.c:845
+#: g10/keyedit.c:825 g10/keyedit.c:846
msgid "You must select at least one user ID.\n"
msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:827
msgid "You can't delete the last user ID!\n"
msgstr "Viimast kasutaja ID ei saa kustutada!\n"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
msgid "Really remove all selected user IDs? "
msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
-#: g10/keyedit.c:830
+#: g10/keyedit.c:831
msgid "Really remove this user ID? "
msgstr "Kas eemaldan t�esti selle kasutaja ID? "
-#: g10/keyedit.c:866 g10/keyedit.c:888
+#: g10/keyedit.c:867 g10/keyedit.c:889
msgid "You must select at least one key.\n"
msgstr "Te peata valima v�hemalt �he v�tme.\n"
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
msgid "Do you really want to delete the selected keys? "
msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
-#: g10/keyedit.c:871
+#: g10/keyedit.c:872
msgid "Do you really want to delete this key? "
msgstr "Kas te t�esti soovite seda v�tit kustutada? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
msgid "Do you really want to revoke the selected keys? "
msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
-#: g10/keyedit.c:893
+#: g10/keyedit.c:894
msgid "Do you really want to revoke this key? "
msgstr "Kas te t�esti soovite seda v�tit t�histada? "
-#: g10/keyedit.c:959
+#: g10/keyedit.c:964
msgid "Save changes? "
msgstr "Salvestan muutused? "
-#: g10/keyedit.c:962
+#: g10/keyedit.c:967
msgid "Quit without saving? "
msgstr "V�ljun salvestamata? "
-#: g10/keyedit.c:973
+#: g10/keyedit.c:978
#, c-format
msgid "update failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:985
#, c-format
msgid "update secret failed: %s\n"
msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
-#: g10/keyedit.c:987
+#: g10/keyedit.c:992
msgid "Key not changed so no update needed.\n"
msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1007
msgid "Invalid command (try \"help\")\n"
msgstr "Vigane k�sklus (proovige \"help\")\n"
-#: g10/keyedit.c:1082 g10/keyedit.c:1108
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
#, 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:1091
+#: g10/keyedit.c:1140
#, c-format
msgid " trust: %c/%c"
msgstr " usaldus: %c/%c"
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1144
msgid "This key has been disabled"
msgstr "See v�ti on blokeeritud"
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1173
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! alamv�ti on t�histatud: %s\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1176
msgid "rev- faked revocation found\n"
msgstr "rev- leitud v�ltsitud t�histamine\n"
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1178
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1420
msgid "Delete this good signature? (y/N/q)"
msgstr "Kustutan selle hea allkirja? (j/E/v)"
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1424
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Kustutan selle vigase allkirja? (j/E/v)"
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1428
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1434
msgid "Really delete this self-signature? (y/N)"
msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1448
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Kustutatud %d allkiri.\n"
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1449
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Kustutatud %d allkirja.\n"
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1452
msgid "Nothing deleted.\n"
msgstr "Midagi ei kustutatud.\n"
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1521
msgid "Please remove selections from the secret keys.\n"
msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1527
msgid "Please select at most one secondary key.\n"
msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1531
msgid "Changing expiration time for a secondary key.\n"
msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1533
msgid "Changing expiration time for the primary key.\n"
msgstr "Muudan primaarse v�tme aegumise aega.\n"
-#: g10/keyedit.c:1522
+#: g10/keyedit.c:1575
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:1538
+#: g10/keyedit.c:1591
msgid "No corresponding signature in secret ring\n"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1652
#, c-format
msgid "No user ID with index %d\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
-#: g10/keyedit.c:1645
+#: g10/keyedit.c:1698
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Sekundaarne v�ti numbriga %d puudub\n"
-#: g10/keyedit.c:1743
+#: g10/keyedit.c:1796
msgid "user ID: \""
msgstr "kasutaja ID: \""
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:1799
#, c-format
msgid ""
"\"\n"
@@ -2517,34 +2524,34 @@ msgstr ""
"\"\n"
"allkirjastatud teie v�tmega %08lX %s\n"
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1803
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:1774
+#: g10/keyedit.c:1827
msgid "You have signed these user IDs:\n"
msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
-#: g10/keyedit.c:1788 g10/keyedit.c:1823
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " allkirjastanud %08lX %s\n"
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1846
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " t�histanud %08lX %s\n"
-#: g10/keyedit.c:1813
+#: g10/keyedit.c:1866
msgid "You are about to revoke these signatures:\n"
msgstr "Te asute t�histama j�rgmisi allkirju:\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1884
msgid "Really create the revocation certificates? (y/N)"
msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E)"
-#: g10/keyedit.c:1860
+#: g10/keyedit.c:1913
msgid "no secret key\n"
msgstr "salajast v�tit pole\n"
@@ -2700,7 +2707,7 @@ msgstr ""
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:147 g10/passphrase.c:248
+#: g10/hkp.c:167 g10/passphrase.c:248
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
@@ -2834,31 +2841,31 @@ msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
msgid "requesting key %08lX from %s ...\n"
msgstr "k�sin v�tit %08lX serverist %s ...\n"
-#: g10/hkp.c:72
+#: g10/hkp.c:83
#, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "v�tmeserverist ei saa v�tit: %s\n"
-#: g10/hkp.c:91 g10/hkp.c:125
+#: g10/hkp.c:102 g10/hkp.c:136
msgid "no keyserver known (use option --keyserver)\n"
msgstr "v�tmeserver puudub (kasutage v�tit --keyserver)\n"
-#: g10/hkp.c:99
+#: g10/hkp.c:110
#, c-format
msgid "%s: not a valid key ID\n"
msgstr "%s: ei ole kehtiv v�tme ID\n"
-#: g10/hkp.c:171
+#: g10/hkp.c:191
#, c-format
msgid "error sending to `%s': %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
-#: g10/hkp.c:183
+#: g10/hkp.c:203
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr "teate saatmine serverile `%s' �nnestus (olek=%u)\n"
-#: g10/hkp.c:186
+#: g10/hkp.c:206
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr "teate saatmine serverile `%s' eba�nnestus: olek=%u\n"
diff --git a/po/fr.po b/po/fr.po
index e59056f97..3f1b26fc7 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-04-19 12:04+0200\n"
+"POT-Creation-Date: 2001-04-28 19:57+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"
@@ -329,7 +329,8 @@ msgstr ""
#: cipher/random.c:659
msgid "WARNING: using insecure random number generator!!\n"
-msgstr "ATTENTION: utilisation d'un g�n�rateur de nombres al�atoires peu s�r !!\n"
+msgstr ""
+"ATTENTION: utilisation d'un g�n�rateur de nombres al�atoires peu s�r !!\n"
#: cipher/random.c:660
msgid ""
@@ -902,11 +903,14 @@ msgid ""
"with an '='\n"
msgstr ""
"le nom d'une notation ne doit comporter que des lettres, des chiffres,\n"
-"des points ou des traits de soulignement et doit se terminer par un signe �gal\n"
+"des points ou des traits de soulignement et doit se terminer par un signe "
+"�gal\n"
#: g10/g10.c:1817
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"
+msgstr ""
+"les points dans le nom d'une notation doivent �tre entour�s d'autes "
+"caract�res\n"
#: g10/g10.c:1825
msgid "a notation value must not use any control characters\n"
@@ -993,7 +997,7 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1190 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
msgid " Fingerprint:"
msgstr " Empreinte:"
@@ -1055,8 +1059,10 @@ msgid ""
" 4 = I trust fully\n"
" s = please show me more information\n"
msgstr ""
-"� quel point avez-vous confiance en cet utilisateur pour v�rifier correctement\n"
-"les cl�s des autres utilisateurs (vous pouvez v�rifier son passeport, v�rifier\n"
+"� quel point avez-vous confiance en cet utilisateur pour v�rifier "
+"correctement\n"
+"les cl�s des autres utilisateurs (vous pouvez v�rifier son passeport, "
+"v�rifier\n"
"les empreintes de diverses sources...) ?\n"
"\n"
" 1 = je ne sais pas\n"
@@ -1194,12 +1200,14 @@ msgstr "Note: Cette cl� a expir� !\n"
#: g10/pkclist.c:687
msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "ATTENTION: Cette cl� n'est pas certifi�e avec une signature de confiance !\n"
+msgstr ""
+"ATTENTION: Cette cl� n'est pas certifi�e avec une signature de confiance !\n"
#: g10/pkclist.c:689
msgid ""
" There is no indication that the signature belongs to the owner.\n"
-msgstr " Rien ne dit que la signature appartient � son propri�taire.\n"
+msgstr ""
+" Rien ne dit que la signature appartient � son propri�taire.\n"
#: g10/pkclist.c:706
msgid "WARNING: We do NOT trust this key!\n"
@@ -1212,11 +1220,14 @@ msgstr " La signature est certainement FAUSSE.\n"
#: g10/pkclist.c:714
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "ATTENTION: Les signatures de cette cl� n'ont pas une confiance suffisante !\n"
+msgstr ""
+"ATTENTION: Les signatures de cette cl� n'ont pas une confiance suffisante !\n"
#: g10/pkclist.c:717
msgid " It is not certain that the signature belongs to the owner.\n"
-msgstr " Il n'est pas s�r que la signature appartient � son propri�taire.\n"
+msgstr ""
+" Il n'est pas s�r que la signature appartient � son "
+"propri�taire.\n"
#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
#, c-format
@@ -1530,7 +1541,8 @@ msgstr ""
#: g10/keygen.c:883
msgid "Please don't put the email address into the real name or the comment\n"
-msgstr "Ne mettez pas d'adresse e-mail dans le nom r�el ou dans le commentaire\n"
+msgstr ""
+"Ne mettez pas d'adresse e-mail dans le nom r�el ou dans le commentaire\n"
#: g10/keygen.c:888
msgid "NnCcEeOoQq"
@@ -1695,26 +1707,28 @@ msgstr "ATTENTION: rien n'a �t� export�\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
-#: g10/getkey.c:449
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[Nom utilisateur introuvable]"
+
+#: g10/getkey.c:453
msgid "too many entries in unk cache - disabled\n"
msgstr "trop d'entr�es dans le cache unk - d�sactiv�\n"
-#: g10/getkey.c:2203
+#: g10/getkey.c:2207
#, 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:2245 g10/trustdb.c:577
+#: g10/getkey.c:2249 g10/trustdb.c:577
#, 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"
-#: g10/getkey.c:2532
-msgid "[User id not found]"
-msgstr "[Nom utilisateur introuvable]"
-
#: g10/import.c:184
#, c-format
msgid "skipping block of type %d\n"
@@ -2081,7 +2095,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Signer r�ellement ? "
-#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:157
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
#, c-format
msgid "signing failed: %s\n"
msgstr "la signature a �chou�: %s\n"
@@ -2287,252 +2301,257 @@ msgstr "t"
msgid "pref"
msgstr "pr�f"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:606 g10/keyedit.c:607
msgid "list preferences"
msgstr "lister les pr�f�rences"
#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pr�f"
+
+#: g10/keyedit.c:608
msgid "passwd"
msgstr "mot.pas"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
msgid "change the passphrase"
msgstr "changer le mot de passe"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "trust"
msgstr "confi."
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "change the ownertrust"
msgstr "changer la confiance"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revoke signatures"
msgstr "r�voquer les signatures"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revkey"
msgstr "revcl�"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revoke a secondary key"
msgstr "r�voquer une cl� secondaire"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable"
msgstr "d�sactiver"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable a key"
msgstr "d�sactiver une cl�"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable"
msgstr "activer"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable a key"
msgstr "activer une cl�"
-#: g10/delkey.c:110 g10/keyedit.c:632
+#: g10/delkey.c:110 g10/keyedit.c:633
msgid "can't do that in batchmode\n"
msgstr "impossible de faire cela en mode automatique\n"
#. check that they match
#. fixme: check that they both match
-#: g10/keyedit.c:670
+#: g10/keyedit.c:671
msgid "Secret key is available.\n"
msgstr "La cl� secr�te est disponible.\n"
-#: g10/keyedit.c:699
+#: g10/keyedit.c:700
msgid "Command> "
msgstr "Commande> "
-#: g10/keyedit.c:729
+#: g10/keyedit.c:730
msgid "Need the secret key to do this.\n"
msgstr "Il faut la cl� secr�te pour faire cela.\n"
-#: g10/keyedit.c:733
+#: g10/keyedit.c:734
msgid "Please use the command \"toggle\" first.\n"
msgstr "Utilisez la commande �toggle� d'abord.\n"
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
msgid "Really sign all user IDs? "
msgstr "Signer vraiment tous les utilisateurs ? "
-#: g10/keyedit.c:781
+#: g10/keyedit.c:782
msgid "Hint: Select the user IDs to sign\n"
msgstr "Aide: S�lectionner les utilisateurs � signer\n"
-#: g10/keyedit.c:813 g10/keyedit.c:995
+#: g10/keyedit.c:814 g10/keyedit.c:1000
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "la mise � jour de la base de confiance a �chou�: %s\n"
-#: g10/keyedit.c:824 g10/keyedit.c:845
+#: g10/keyedit.c:825 g10/keyedit.c:846
msgid "You must select at least one user ID.\n"
msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:827
msgid "You can't delete the last user ID!\n"
msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
msgid "Really remove all selected user IDs? "
msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
-#: g10/keyedit.c:830
+#: g10/keyedit.c:831
msgid "Really remove this user ID? "
msgstr "Enlever r�ellement cet utilisateur ? "
-#: g10/keyedit.c:866 g10/keyedit.c:888
+#: g10/keyedit.c:867 g10/keyedit.c:889
msgid "You must select at least one key.\n"
msgstr "Vous devez s�lectionner au moins une cl�.\n"
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
msgid "Do you really want to delete the selected keys? "
msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
-#: g10/keyedit.c:871
+#: g10/keyedit.c:872
msgid "Do you really want to delete this key? "
msgstr "Voulez-vous vraiment supprimer cette cl� ? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
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:893
+#: g10/keyedit.c:894
msgid "Do you really want to revoke this key? "
msgstr "Voulez-vous vraiment r�voquer cette cl� ? "
-#: g10/keyedit.c:959
+#: g10/keyedit.c:964
msgid "Save changes? "
msgstr "Enregistrer les changements? "
-#: g10/keyedit.c:962
+#: g10/keyedit.c:967
msgid "Quit without saving? "
msgstr "Quitter sans enregistrer? "
-#: g10/keyedit.c:973
+#: g10/keyedit.c:978
#, c-format
msgid "update failed: %s\n"
msgstr "la mise � jour a �chou�: %s\n"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:985
#, c-format
msgid "update secret failed: %s\n"
msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
-#: g10/keyedit.c:987
+#: g10/keyedit.c:992
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:1002
+#: g10/keyedit.c:1007
msgid "Invalid command (try \"help\")\n"
msgstr "Commande invalide (essayez �help�)\n"
-#: g10/keyedit.c:1082 g10/keyedit.c:1108
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
#, 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:1091
+#: g10/keyedit.c:1140
#, c-format
msgid " trust: %c/%c"
msgstr " confiance: %c/%c"
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1144
msgid "This key has been disabled"
msgstr "Cette cl� a �t� d�sactiv�e"
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1173
#, 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:1127
+#: g10/keyedit.c:1176
msgid "rev- faked revocation found\n"
msgstr "rev- une r�vocation truqu�e a �t� trouv�e\n"
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1178
#, 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:1367
+#: g10/keyedit.c:1420
msgid "Delete this good signature? (y/N/q)"
msgstr "Supprimer cette bonne signature ? (o/N/q)"
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1424
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Supprimer cette signature invalide ? (o/N/q)"
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1428
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Supprimer cette signature inconnue ? (o/N/q)"
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1434
msgid "Really delete this self-signature? (y/N)"
msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1448
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d signature supprim�e.\n"
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1449
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d signatures supprim�es\n"
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1452
msgid "Nothing deleted.\n"
msgstr "Rien n'a �t� supprim�.\n"
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1521
msgid "Please remove selections from the secret keys.\n"
msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1527
msgid "Please select at most one secondary key.\n"
msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1531
msgid "Changing expiration time for a secondary key.\n"
msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1533
msgid "Changing expiration time for the primary key.\n"
msgstr "Changer la date d'expiration de la cl� principale.\n"
-#: g10/keyedit.c:1522
+#: g10/keyedit.c:1575
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:1538
+#: g10/keyedit.c:1591
msgid "No corresponding signature in secret ring\n"
msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1652
#, c-format
msgid "No user ID with index %d\n"
msgstr "Pas d'utilisateur avec l'index %d\n"
-#: g10/keyedit.c:1645
+#: g10/keyedit.c:1698
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Pas de cl� secondaire avec l'index %d\n"
-#: g10/keyedit.c:1743
+#: g10/keyedit.c:1796
msgid "user ID: \""
msgstr "nom d'utilisateur: �"
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:1799
#, c-format
msgid ""
"\"\n"
@@ -2541,34 +2560,34 @@ msgstr ""
"�\n"
"sign� avec votre cl� %08lX � %s\n"
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1803
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:1774
+#: g10/keyedit.c:1827
msgid "You have signed these user IDs:\n"
msgstr "Vous avez sign� ces noms d'utilisateurs:\n"
-#: g10/keyedit.c:1788 g10/keyedit.c:1823
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " sign� par %08lX � %s\n"
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1846
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " r�voqu� par %08lX � %s\n"
-#: g10/keyedit.c:1813
+#: g10/keyedit.c:1866
msgid "You are about to revoke these signatures:\n"
msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1884
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:1860
+#: g10/keyedit.c:1913
msgid "no secret key\n"
msgstr "pas de cl� secr�te\n"
@@ -2699,7 +2718,8 @@ msgid "Experimental algorithms should not be used!\n"
msgstr "Les algorithmes exp�rimentaux ne devraient pas �tre utilis�s !\n"
#: g10/misc.c:238
-msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
+#, fuzzy
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"Cet algorithme de chiffrement est d�conseill�; utilisez-en un\n"
"plus standard !\n"
@@ -2722,7 +2742,7 @@ msgstr "gpg-agent n'est pas disponible dans cette session\n"
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
-#: g10/hkp.c:147 g10/passphrase.c:248
+#: g10/hkp.c:167 g10/passphrase.c:248
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "impossible de se connecter � `%s': %s\n"
@@ -2844,7 +2864,9 @@ msgstr "l'algorithme de chiffrement %d est inconnu ou d�sactiv�\n"
#: g10/pubkey-enc.c:192
#, c-format
msgid "NOTE: cipher algorithm %d not found in preferences\n"
-msgstr "NOTE: l'algorithme de chiffrement %d n'a pas �t� trouv� dans les pr�f�rences\n"
+msgstr ""
+"NOTE: l'algorithme de chiffrement %d n'a pas �t� trouv� dans les "
+"pr�f�rences\n"
#: g10/pubkey-enc.c:198
#, c-format
@@ -2856,31 +2878,31 @@ msgstr "NOTE: la cl� secr�te %08lX a expir� le %s\n"
msgid "requesting key %08lX from %s ...\n"
msgstr "requ�te de la cl� %08lX de %s...\n"
-#: g10/hkp.c:72
+#: g10/hkp.c:83
#, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "impossible d'obtenir les cl�s du serveur: %s\n"
-#: g10/hkp.c:91 g10/hkp.c:125
+#: g10/hkp.c:102 g10/hkp.c:136
msgid "no keyserver known (use option --keyserver)\n"
msgstr "aucun serveur de cl�s n'est connu (utilisez l'option �--keyserver�)\n"
-#: g10/hkp.c:99
+#: g10/hkp.c:110
#, c-format
msgid "%s: not a valid key ID\n"
msgstr "%s: l'identification de la cl� est invalide\n"
-#: g10/hkp.c:171
+#: g10/hkp.c:191
#, c-format
msgid "error sending to `%s': %s\n"
msgstr "erreur pendant l'envoi de `%s': %s\n"
-#: g10/hkp.c:183
+#: g10/hkp.c:203
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr "l'envoi � `%s' s'est d�roul� avec succ�s (r�sultat=%u)\n"
-#: g10/hkp.c:186
+#: g10/hkp.c:206
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr "l'envoi � `%s' a �chou�: le r�sultat est %u\n"
@@ -2976,7 +2998,8 @@ msgstr "enregistrement de base de confiance %lu: lseek a �chou�: %s\n"
#: g10/tdbio.c:122 g10/tdbio.c:1630
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
-msgstr "enregistrement de la base de confiance %lu: l'�criture a �chou� (n=%d): %s\n"
+msgstr ""
+"enregistrement de la base de confiance %lu: l'�criture a �chou� (n=%d): %s\n"
#: g10/tdbio.c:232
msgid "trustdb transaction too large\n"
@@ -3097,7 +3120,9 @@ msgstr "la base de confiance est corrompue; ex�cutez �gpg --fix-trustdb�.\n"
#: g10/trustdb.c:169
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "enregistrement de confiance %lu, type de requ�te %d: la lecture a �chou�: %s\n"
+msgstr ""
+"enregistrement de confiance %lu, type de requ�te %d: la lecture a �chou�: "
+"%s\n"
#: g10/trustdb.c:184
#, c-format
@@ -3336,7 +3361,8 @@ msgstr "Ooops, pas de nom d'utilisateur\n"
#: g10/trustdb.c:2386
#, c-format
msgid "check_trust: search dir record failed: %s\n"
-msgstr "check_trust: la recherche d'enregistrement de r�pertoire a �chou�: %s\n"
+msgstr ""
+"check_trust: la recherche d'enregistrement de r�pertoire a �chou�: %s\n"
#: g10/trustdb.c:2395
#, c-format
@@ -3763,7 +3789,8 @@ msgstr ""
#: g10/helptext.c:209
msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "R�p�tez le dernier mot de passe pour �tre s�r de ce que vous avez tap�."
+msgstr ""
+"R�p�tez le dernier mot de passe pour �tre s�r de ce que vous avez tap�."
#: g10/helptext.c:213
msgid "Give the name of the file to which the signature applies"
diff --git a/po/id.po b/po/id.po
index db5844def..561520070 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU Privacy Guard 1.0.1\n"
-"POT-Creation-Date: 2001-04-19 12:04+0200\n"
+"POT-Creation-Date: 2001-04-28 19:57+0200\n"
"PO-Revision-Date: 2000-02-06 18:04+07:00\n"
"Last-Translator: Tedi Heriyanto <[email protected]>\n"
"Language-Team: Indonesia <[email protected]>\n"
@@ -981,7 +981,7 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1190 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
msgid " Fingerprint:"
msgstr " Fingerprint:"
@@ -1675,25 +1675,27 @@ msgstr "PERINGATAN: tidak ada yang diekspor\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
-#: g10/getkey.c:449
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+#, fuzzy
+msgid "[User id not found]"
+msgstr "%s: user tidak ditemukan\n"
+
+#: g10/getkey.c:453
msgid "too many entries in unk cache - disabled\n"
msgstr "terlalu banyak masukan di unk cache - ditiadakan\n"
-#: g10/getkey.c:2203
+#: g10/getkey.c:2207
#, 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:2245 g10/trustdb.c:577
+#: g10/getkey.c:2249 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
-#: g10/getkey.c:2532
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: user tidak ditemukan\n"
-
#: g10/import.c:184
#, c-format
msgid "skipping block of type %d\n"
@@ -2060,7 +2062,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Ditandai? "
-#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:157
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
#, c-format
msgid "signing failed: %s\n"
msgstr "gagal menandai: %s\n"
@@ -2267,287 +2269,292 @@ msgstr "t"
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:606 g10/keyedit.c:607
msgid "list preferences"
msgstr "tampilkan preferensi"
#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
msgid "change the passphrase"
msgstr "ubah passphrase"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "change the ownertrust"
msgstr "ubah ownertrust"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revoke signatures"
msgstr "batalkan signature"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revoke a secondary key"
msgstr "batalkan kunci sekunder"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable a key"
msgstr "tiadakan kunci"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable a key"
msgstr "aktifkan kunci"
-#: g10/delkey.c:110 g10/keyedit.c:632
+#: g10/delkey.c:110 g10/keyedit.c:633
msgid "can't do that in batchmode\n"
msgstr "tidak dapat dilakukan dalam mode batch\n"
#. check that they match
#. fixme: check that they both match
-#: g10/keyedit.c:670
+#: g10/keyedit.c:671
msgid "Secret key is available.\n"
msgstr "Kunci rahasia tersedia.\n"
-#: g10/keyedit.c:699
+#: g10/keyedit.c:700
msgid "Command> "
msgstr "Perintah> "
-#: g10/keyedit.c:729
+#: g10/keyedit.c:730
msgid "Need the secret key to do this.\n"
msgstr "Perlu kunci rahasia.\n"
-#: g10/keyedit.c:733
+#: g10/keyedit.c:734
msgid "Please use the command \"toggle\" first.\n"
msgstr ""
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
msgid "Really sign all user IDs? "
msgstr "Tandai ID seluruh user? "
-#: g10/keyedit.c:781
+#: g10/keyedit.c:782
msgid "Hint: Select the user IDs to sign\n"
msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
-#: g10/keyedit.c:813 g10/keyedit.c:995
+#: g10/keyedit.c:814 g10/keyedit.c:1000
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "gagal perbarui trustdb: %s\n"
-#: g10/keyedit.c:824 g10/keyedit.c:845
+#: g10/keyedit.c:825 g10/keyedit.c:846
msgid "You must select at least one user ID.\n"
msgstr "Anda harus memilih minimum satu ID user.\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:827
msgid "You can't delete the last user ID!\n"
msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
msgid "Really remove all selected user IDs? "
msgstr "Hapus seluruh ID user terpilih? "
-#: g10/keyedit.c:830
+#: g10/keyedit.c:831
msgid "Really remove this user ID? "
msgstr "Hapus ID user ini? "
-#: g10/keyedit.c:866 g10/keyedit.c:888
+#: g10/keyedit.c:867 g10/keyedit.c:889
msgid "You must select at least one key.\n"
msgstr "Anda harus memilih minimum satu kunci.\n"
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
msgid "Do you really want to delete the selected keys? "
msgstr "Anda ingin menghapus kunci terpilih ini? "
-#: g10/keyedit.c:871
+#: g10/keyedit.c:872
msgid "Do you really want to delete this key? "
msgstr "Anda ingin menghapus kunci ini? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
msgid "Do you really want to revoke the selected keys? "
msgstr "Anda ingin membatalkan kunci terpilih ini? "
-#: g10/keyedit.c:893
+#: g10/keyedit.c:894
msgid "Do you really want to revoke this key? "
msgstr "Anda ingin membatalkan kunci ini? "
-#: g10/keyedit.c:959
+#: g10/keyedit.c:964
msgid "Save changes? "
msgstr "Simpan perubahan? "
-#: g10/keyedit.c:962
+#: g10/keyedit.c:967
msgid "Quit without saving? "
msgstr "Berhenti tanpa menyimpan? "
-#: g10/keyedit.c:973
+#: g10/keyedit.c:978
#, c-format
msgid "update failed: %s\n"
msgstr "gagal memperbarui: %s\n"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:985
#, c-format
msgid "update secret failed: %s\n"
msgstr "gagal perbarui rahasia: %s\n"
-#: g10/keyedit.c:987
+#: g10/keyedit.c:992
msgid "Key not changed so no update needed.\n"
msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1007
msgid "Invalid command (try \"help\")\n"
msgstr "Perintah tidak valid (coba \"help\")\n"
-#: g10/keyedit.c:1082 g10/keyedit.c:1108
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr ""
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1140
#, c-format
msgid " trust: %c/%c"
msgstr ""
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1144
msgid "This key has been disabled"
msgstr "Kunci ini telah ditiadakan"
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1173
#, fuzzy, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "kunci %08lX: subkey telah dibatalkan!\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1176
#, fuzzy
msgid "rev- faked revocation found\n"
msgstr " pembatalan kunci baru: %lu\n"
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1178
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr ""
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1420
msgid "Delete this good signature? (y/N/q)"
msgstr "Hapus signature baik ini? (y/T/q)"
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1424
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Hapus signature tidak valid ini? (y/T/q)"
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1428
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1434
msgid "Really delete this self-signature? (y/N)"
msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1448
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Menghapus %d signature.\n"
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1449
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Menghapus %d signature.\n"
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1452
msgid "Nothing deleted.\n"
msgstr "Tidak ada yang dihapus.\n"
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1521
msgid "Please remove selections from the secret keys.\n"
msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1527
msgid "Please select at most one secondary key.\n"
msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1531
msgid "Changing expiration time for a secondary key.\n"
msgstr "Merubah batas waktu untuk kunci sekunder.\n"
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1533
msgid "Changing expiration time for the primary key.\n"
msgstr "Merubah batas waktu untuk kunci primer.\n"
-#: g10/keyedit.c:1522
+#: g10/keyedit.c:1575
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:1538
+#: g10/keyedit.c:1591
msgid "No corresponding signature in secret ring\n"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1652
#, c-format
msgid "No user ID with index %d\n"
msgstr "Tidak ada ID user dengan index %d\n"
-#: g10/keyedit.c:1645
+#: g10/keyedit.c:1698
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Tidak ada kunci sekunder dengan index %d\n"
-#: g10/keyedit.c:1743
+#: g10/keyedit.c:1796
msgid "user ID: \""
msgstr "ID user: "
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:1799
#, c-format
msgid ""
"\"\n"
"signed with your key %08lX at %s\n"
msgstr "ditandai dengan kunci anda %08lX pada %s\n"
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1803
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:1774
+#: g10/keyedit.c:1827
msgid "You have signed these user IDs:\n"
msgstr "Anda telah menandai ID user ini:\n"
-#: g10/keyedit.c:1788 g10/keyedit.c:1823
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " ditandai oleh %08lX pada %s\n"
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1846
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " dibatalkan oleh %08lX pada %s\n"
-#: g10/keyedit.c:1813
+#: g10/keyedit.c:1866
msgid "You are about to revoke these signatures:\n"
msgstr "Anda akan membatalkan signature ini:\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1884
msgid "Really create the revocation certificates? (y/N)"
msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
-#: g10/keyedit.c:1860
+#: g10/keyedit.c:1913
msgid "no secret key\n"
msgstr "tidak ada kunci rahasia\n"
@@ -2681,7 +2688,7 @@ msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n"
#: g10/misc.c:238
#, fuzzy
-msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
@@ -2703,7 +2710,7 @@ msgstr ""
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:147 g10/passphrase.c:248
+#: g10/hkp.c:167 g10/passphrase.c:248
#, fuzzy, c-format
msgid "can't connect to `%s': %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
@@ -2838,31 +2845,31 @@ msgstr "CATATAN: kunci signature berakhir %s\n"
msgid "requesting key %08lX from %s ...\n"
msgstr ""
-#: g10/hkp.c:72
+#: g10/hkp.c:83
#, fuzzy, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "impor kunci dari key server"
-#: g10/hkp.c:91 g10/hkp.c:125
+#: g10/hkp.c:102 g10/hkp.c:136
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/hkp.c:99
+#: g10/hkp.c:110
#, fuzzy, c-format
msgid "%s: not a valid key ID\n"
msgstr "%s bukanlah set karakter yang valid\n"
-#: g10/hkp.c:171
+#: g10/hkp.c:191
#, fuzzy, c-format
msgid "error sending to `%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: g10/hkp.c:183
+#: g10/hkp.c:203
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr ""
-#: g10/hkp.c:186
+#: g10/hkp.c:206
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr ""
diff --git a/po/it.po b/po/it.po
index fd8f026cf..45d3aafe7 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-04-06 10:29+0200\n"
+"POT-Creation-Date: 2001-04-28 19:57+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"
@@ -25,27 +25,27 @@ msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
msgid "(you may have used the wrong program for this task)\n"
msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:287 util/miscutil.c:316
msgid "yes"
msgstr "s�"
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:288 util/miscutil.c:319
msgid "yY"
msgstr "sS"
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:289 util/miscutil.c:317
msgid "no"
msgstr "no"
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:290 util/miscutil.c:320
msgid "nN"
msgstr "nN"
-#: g10/keyedit.c:581 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:318
msgid "quit"
msgstr "quit"
-#: util/miscutil.c:311
+#: util/miscutil.c:321
msgid "qQ"
msgstr "qQ"
@@ -286,7 +286,8 @@ msgstr "nota: il file random_seed � vuoto\n"
#: cipher/random.c:340
msgid "warning: invalid size of random_seed file - not used\n"
-msgstr "attenzione: le dimensioni del file random_seed non sono valide - non usato\n"
+msgstr ""
+"attenzione: le dimensioni del file random_seed non sono valide - non usato\n"
#: cipher/random.c:348
#, c-format
@@ -985,7 +986,7 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1190 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
msgid " Fingerprint:"
msgstr " Impronta digitale:"
@@ -1684,24 +1685,26 @@ msgstr "ATTENZIONE: non � stato esportato nulla\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "troppe voci nella pk cache - disabilitata\n"
-#: g10/getkey.c:449
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[User ID non trovato]"
+
+#: g10/getkey.c:453
msgid "too many entries in unk cache - disabled\n"
msgstr "troppe voci nella unk cache - disabilitata\n"
-#: g10/getkey.c:2169
+#: g10/getkey.c:2207
#, 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:2211 g10/trustdb.c:577
+#: g10/getkey.c:2249 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
-#: g10/getkey.c:2499
-msgid "[User id not found]"
-msgstr "[User ID non trovato]"
-
#: g10/import.c:184
#, c-format
msgid "skipping block of type %d\n"
@@ -1878,7 +1881,8 @@ msgstr "chiave %08lX: non cambiata\n"
#: g10/import.c:610
#, c-format
msgid "secret key %08lX not imported (use %s to allow for it)\n"
-msgstr "la chiave segreta %08lX non � stata importata (usa %s per permetterlo)\n"
+msgstr ""
+"la chiave segreta %08lX non � stata importata (usa %s per permetterlo)\n"
#: g10/import.c:640
#, c-format
@@ -2068,7 +2072,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Firmo davvero? "
-#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:157
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallita: %s\n"
@@ -2274,252 +2278,257 @@ msgstr "t"
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:606 g10/keyedit.c:607
msgid "list preferences"
msgstr "elenca le impostazioni"
#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
msgid "change the passphrase"
msgstr "cambia la passphrase"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "change the ownertrust"
msgstr "cambia il valore di fiducia"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revoke signatures"
msgstr "revoca firme"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revoke a secondary key"
msgstr "revoca una chiave secondaria"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable a key"
msgstr "disabilita una chiave"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable"
msgstr "abilita"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable a key"
msgstr "abilita una chiave"
-#: g10/delkey.c:110 g10/keyedit.c:632
+#: g10/delkey.c:110 g10/keyedit.c:633
msgid "can't do that in batchmode\n"
msgstr "impossibile fare questo in modo batch\n"
#. check that they match
#. fixme: check that they both match
-#: g10/keyedit.c:670
+#: g10/keyedit.c:671
msgid "Secret key is available.\n"
msgstr "� disponibile una chiave segreta.\n"
-#: g10/keyedit.c:699
+#: g10/keyedit.c:700
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:729
+#: g10/keyedit.c:730
msgid "Need the secret key to do this.\n"
msgstr "Per fare questo serve la chiave segreta.\n"
-#: g10/keyedit.c:733
+#: g10/keyedit.c:734
msgid "Please use the command \"toggle\" first.\n"
msgstr "Per favore usa prima il comando \"toggle\".\n"
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
msgid "Really sign all user IDs? "
msgstr "Firmo davvero tutti gli user ID? "
-#: g10/keyedit.c:781
+#: g10/keyedit.c:782
msgid "Hint: Select the user IDs to sign\n"
msgstr "Suggerimento: seleziona gli user ID da firmare\n"
-#: g10/keyedit.c:813 g10/keyedit.c:995
+#: g10/keyedit.c:814 g10/keyedit.c:1000
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "aggiornamento del trustdb fallito: %s\n"
-#: g10/keyedit.c:824 g10/keyedit.c:845
+#: g10/keyedit.c:825 g10/keyedit.c:846
msgid "You must select at least one user ID.\n"
msgstr "Devi selezionare almeno un user ID.\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:827
msgid "You can't delete the last user ID!\n"
msgstr "Non puoi cancellare l'ultimo user ID!\n"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
msgid "Really remove all selected user IDs? "
msgstr "Tolgo davvero tutti gli user ID selezionati? "
-#: g10/keyedit.c:830
+#: g10/keyedit.c:831
msgid "Really remove this user ID? "
msgstr "Tolgo davvero questo user ID? "
-#: g10/keyedit.c:866 g10/keyedit.c:888
+#: g10/keyedit.c:867 g10/keyedit.c:889
msgid "You must select at least one key.\n"
msgstr "Devi selezionare almeno una chiave.\n"
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
msgid "Do you really want to delete the selected keys? "
msgstr "Vuoi davvero cancellare le chiavi selezionate? "
-#: g10/keyedit.c:871
+#: g10/keyedit.c:872
msgid "Do you really want to delete this key? "
msgstr "Vuoi davvero cancellare questa chiave? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
msgid "Do you really want to revoke the selected keys? "
msgstr "Vuoi davvero revocare le chiavi selezionate? "
-#: g10/keyedit.c:893
+#: g10/keyedit.c:894
msgid "Do you really want to revoke this key? "
msgstr "Vuoi davvero revocare questa chiave? "
-#: g10/keyedit.c:959
+#: g10/keyedit.c:964
msgid "Save changes? "
msgstr "Salvo i cambiamenti? "
-#: g10/keyedit.c:962
+#: g10/keyedit.c:967
msgid "Quit without saving? "
msgstr "Esco senza salvare? "
-#: g10/keyedit.c:973
+#: g10/keyedit.c:978
#, c-format
msgid "update failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:985
#, c-format
msgid "update secret failed: %s\n"
msgstr "aggiornamento della chiave segreta fallito: %s\n"
-#: g10/keyedit.c:987
+#: g10/keyedit.c:992
msgid "Key not changed so no update needed.\n"
msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1007
msgid "Invalid command (try \"help\")\n"
msgstr "Comando non valido (prova \"help\")\n"
-#: g10/keyedit.c:1082 g10/keyedit.c:1108
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
#, 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:1091
+#: g10/keyedit.c:1140
#, c-format
msgid " trust: %c/%c"
msgstr " fiducia: %c/%c"
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1144
msgid "This key has been disabled"
msgstr "Questa chiave � stata disabilitata"
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1173
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! la subchiave � stata revocata: %s\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1176
msgid "rev- faked revocation found\n"
msgstr "rev- trovata una revoca falsificata\n"
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1178
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? problema controllando la revoca: %s\n"
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1420
msgid "Delete this good signature? (y/N/q)"
msgstr "Cancellare questa firma corretta? (s/N/q)"
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1424
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Cancellare questa firma non valida? (s/N/q)"
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1428
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1434
msgid "Really delete this self-signature? (y/N)"
msgstr "Cancellare davvero questa autofirma? (s/N)"
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1448
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Cancellata %d firma.\n"
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1449
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Cancellate %d firme.\n"
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1452
msgid "Nothing deleted.\n"
msgstr "Non � stato cancellato nulla.\n"
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1521
msgid "Please remove selections from the secret keys.\n"
msgstr "Togli le selezioni dalle chiavi segrete.\n"
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1527
msgid "Please select at most one secondary key.\n"
msgstr "Seleziona al massimo una chiave secondaria.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1531
msgid "Changing expiration time for a secondary key.\n"
msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1533
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambio la data di scadenza per la chiave primaria.\n"
-#: g10/keyedit.c:1522
+#: g10/keyedit.c:1575
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:1538
+#: g10/keyedit.c:1591
msgid "No corresponding signature in secret ring\n"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1652
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nessun user ID con l'indice %d\n"
-#: g10/keyedit.c:1645
+#: g10/keyedit.c:1698
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Nessuna chiave secondaria con l'indice %d\n"
-#: g10/keyedit.c:1743
+#: g10/keyedit.c:1796
msgid "user ID: \""
msgstr "user ID: \""
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:1799
#, c-format
msgid ""
"\"\n"
@@ -2529,34 +2538,34 @@ msgstr ""
"firmata con la tua chiave %08lX a %s\n"
"\n"
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1803
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:1774
+#: g10/keyedit.c:1827
msgid "You have signed these user IDs:\n"
msgstr "Non puoi cancellare l'ultimo user ID!\n"
-#: g10/keyedit.c:1788 g10/keyedit.c:1823
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " firmata da %08lX il %s\n"
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1846
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " revocata da %08lX il %s\n"
-#: g10/keyedit.c:1813
+#: g10/keyedit.c:1866
msgid "You are about to revoke these signatures:\n"
msgstr "Stai per revocare queste firme:\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1884
msgid "Really create the revocation certificates? (y/N)"
msgstr "Creare davvero i certificati di revoca? (s/N)"
-#: g10/keyedit.c:1860
+#: g10/keyedit.c:1913
msgid "no secret key\n"
msgstr "manca la chiave segreta\n"
@@ -2687,7 +2696,8 @@ msgid "Experimental algorithms should not be used!\n"
msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
#: g10/misc.c:238
-msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
+#, fuzzy
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr "questo algoritmo di cifratura � deprecato; usane uno pi� standard!\n"
#: g10/parse-packet.c:119
@@ -2708,7 +2718,7 @@ msgstr "gpg-agent non � disponibile in questa sessione\n"
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
-#: g10/hkp.c:147 g10/passphrase.c:248
+#: g10/hkp.c:167 g10/passphrase.c:248
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "impossibile connettersi a `%s': %s\n"
@@ -2841,31 +2851,31 @@ msgstr "NOTA: chiave %08lX scaduta il %s\n"
msgid "requesting key %08lX from %s ...\n"
msgstr "richiedo la chiave %08lX a %s ...\n"
-#: g10/hkp.c:72
+#: g10/hkp.c:83
#, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "impossibile scaricare la chiave dal keyserver: %s\n"
-#: g10/hkp.c:91 g10/hkp.c:125
+#: g10/hkp.c:102 g10/hkp.c:136
msgid "no keyserver known (use option --keyserver)\n"
msgstr "non conosco nessun keyserver (usa l'opzione --keyserver)\n"
-#: g10/hkp.c:99
+#: g10/hkp.c:110
#, c-format
msgid "%s: not a valid key ID\n"
msgstr "%s: non � un key ID valido\n"
-#: g10/hkp.c:171
+#: g10/hkp.c:191
#, c-format
msgid "error sending to `%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: g10/hkp.c:183
+#: g10/hkp.c:203
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr "inviata con successo a `%s' (status=%u)\n"
-#: g10/hkp.c:186
+#: g10/hkp.c:206
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr "invio a `%s' fallito: status=%u\n"
@@ -3152,7 +3162,8 @@ msgstr "chiave %08lX: accettata come chiave affidabile\n"
#: g10/trustdb.c:546
#, c-format
msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "chiave %08lX: manca la chiave pubblica della chiave fidata - ignorata\n"
+msgstr ""
+"chiave %08lX: manca la chiave pubblica della chiave fidata - ignorata\n"
#: g10/trustdb.c:565
#, c-format
@@ -3775,7 +3786,8 @@ msgstr ""
"Dovresti specificare un motivo per questa certificazione. A seconda del\n"
"contesto hai la possibilit� di scegliere tra questa lista:\n"
" \"Key has been compromised\"\n"
-" Usa questo se hai un motivo per credere che una persona non autorizzata\n"
+" Usa questo se hai un motivo per credere che una persona non "
+"autorizzata\n"
" abbia avuto accesso alla tua chiave segreta.\n"
" \"Key is superseded\"\n"
" Usa questo se hai sostituito questa chiave con una pi� recente.\n"
diff --git a/po/ja.po b/po/ja.po
index 409915d4e..67ed12145 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-04-19 12:04+0200\n"
+"POT-Creation-Date: 2001-04-28 19:57+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"
@@ -1022,7 +1022,7 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1190 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
msgid " Fingerprint:"
msgstr " ����:"
@@ -1713,24 +1713,26 @@ msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
-#: g10/getkey.c:449
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[�桼����id�����Ĥ���ޤ���]"
+
+#: g10/getkey.c:453
msgid "too many entries in unk cache - disabled\n"
msgstr "unk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
-#: g10/getkey.c:2203
+#: g10/getkey.c:2207
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "����%08lX��縰%08lX�����Ѥ��ޤ�\n"
-#: g10/getkey.c:2245 g10/trustdb.c:577
+#: g10/getkey.c:2249 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "��%08lX: �������Τʤ���̩���Ǥ��������å�\n"
-#: g10/getkey.c:2532
-msgid "[User id not found]"
-msgstr "[�桼����id�����Ĥ���ޤ���]"
-
#: g10/import.c:184
#, c-format
msgid "skipping block of type %d\n"
@@ -2093,7 +2095,7 @@ msgstr ""
msgid "Really sign? "
msgstr "�����˽�̾���ޤ���? "
-#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:157
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
#, c-format
msgid "signing failed: %s\n"
msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
@@ -2300,252 +2302,257 @@ msgstr "t"
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:606 g10/keyedit.c:607
msgid "list preferences"
msgstr "ͥ���̤ΰ���"
#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
msgid "change the passphrase"
msgstr "�ѥ��ե졼�����ѹ�"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "change the ownertrust"
msgstr "��ͭ�Կ��Ѥ��ѹ�"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revoke signatures"
msgstr "��̾���˴�"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revoke a secondary key"
msgstr "�������˴�"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable a key"
msgstr "���λ��Ѥ�ػߤ���"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable a key"
msgstr "���λ��Ѥ���Ĥ���"
-#: g10/delkey.c:110 g10/keyedit.c:632
+#: g10/delkey.c:110 g10/keyedit.c:633
msgid "can't do that in batchmode\n"
msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n"
#. check that they match
#. fixme: check that they both match
-#: g10/keyedit.c:670
+#: g10/keyedit.c:671
msgid "Secret key is available.\n"
msgstr "��̩�������ѤǤ��ޤ���\n"
-#: g10/keyedit.c:699
+#: g10/keyedit.c:700
msgid "Command> "
msgstr "���ޥ��> "
-#: g10/keyedit.c:729
+#: g10/keyedit.c:730
msgid "Need the secret key to do this.\n"
msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
-#: g10/keyedit.c:733
+#: g10/keyedit.c:734
msgid "Please use the command \"toggle\" first.\n"
msgstr "�ޤ���toggle�ץ��ޥ�ɤ�ȤäƤ�������\n"
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
msgid "Really sign all user IDs? "
msgstr "���������桼����ID�˽�̾���ޤ���? "
-#: g10/keyedit.c:781
+#: g10/keyedit.c:782
msgid "Hint: Select the user IDs to sign\n"
msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
-#: g10/keyedit.c:813 g10/keyedit.c:995
+#: g10/keyedit.c:814 g10/keyedit.c:1000
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "���ѥǡ����١����ι����˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:824 g10/keyedit.c:845
+#: g10/keyedit.c:825 g10/keyedit.c:846
msgid "You must select at least one user ID.\n"
msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:827
msgid "You can't delete the last user ID!\n"
msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
msgid "Really remove all selected user IDs? "
msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
-#: g10/keyedit.c:830
+#: g10/keyedit.c:831
msgid "Really remove this user ID? "
msgstr "���Υ桼����ID�������˺�����ޤ���? "
-#: g10/keyedit.c:866 g10/keyedit.c:888
+#: g10/keyedit.c:867 g10/keyedit.c:889
msgid "You must select at least one key.\n"
msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
msgid "Do you really want to delete the selected keys? "
msgstr "���򤷤����������˺�����ޤ���? "
-#: g10/keyedit.c:871
+#: g10/keyedit.c:872
msgid "Do you really want to delete this key? "
msgstr "���θ��������˺�����ޤ���? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
msgid "Do you really want to revoke the selected keys? "
msgstr "���򤷤������������˴����ޤ���? "
-#: g10/keyedit.c:893
+#: g10/keyedit.c:894
msgid "Do you really want to revoke this key? "
msgstr "���θ����������˴����ޤ���? "
-#: g10/keyedit.c:959
+#: g10/keyedit.c:964
msgid "Save changes? "
msgstr "�ѹ�����¸���ޤ���? "
-#: g10/keyedit.c:962
+#: g10/keyedit.c:967
msgid "Quit without saving? "
msgstr "��¸�����˽�λ���ޤ���? "
-#: g10/keyedit.c:973
+#: g10/keyedit.c:978
#, c-format
msgid "update failed: %s\n"
msgstr "�����˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:985
#, c-format
msgid "update secret failed: %s\n"
msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:987
+#: g10/keyedit.c:992
msgid "Key not changed so no update needed.\n"
msgstr "����̵�ѹ��ʤΤǹ����Ϥ���ޤ���\n"
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1007
msgid "Invalid command (try \"help\")\n"
msgstr "̵���ʥ��ޥ�� (��help�פ򻲾�)\n"
-#: g10/keyedit.c:1082 g10/keyedit.c:1108
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr "%s%c %4u%c/%08lX ����: %s ����: %s"
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1140
#, c-format
msgid " trust: %c/%c"
msgstr " trust: %c/%c"
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1144
msgid "This key has been disabled"
msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1173
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! �������˴��ѤߤǤ�: %s\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1176
msgid "rev- faked revocation found\n"
msgstr "rev- �Ǥä��������˴���ȯ��\n"
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1178
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? �˴���ǧ�㳲: %s\n"
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1420
msgid "Delete this good signature? (y/N/q)"
msgstr "������������̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1424
msgid "Delete this invalid signature? (y/N/q)"
msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1428
msgid "Delete this unknown signature? (y/N/q)"
msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1434
msgid "Really delete this self-signature? (y/N)"
msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1448
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d�Ĥν�̾�������ޤ�����\n"
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1449
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d�Ĥν�̾�������ޤ�����\n"
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1452
msgid "Nothing deleted.\n"
msgstr "���������Ƥ��ޤ���\n"
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1521
msgid "Please remove selections from the secret keys.\n"
msgstr "��̩���������Ȥ��Ƥ���������\n"
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1527
msgid "Please select at most one secondary key.\n"
msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1531
msgid "Changing expiration time for a secondary key.\n"
msgstr "������ͭ�����¤��ѹ����ޤ���\n"
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1533
msgid "Changing expiration time for the primary key.\n"
msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
-#: g10/keyedit.c:1522
+#: g10/keyedit.c:1575
msgid "You can't change the expiration date of a v3 key\n"
msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
-#: g10/keyedit.c:1538
+#: g10/keyedit.c:1591
msgid "No corresponding signature in secret ring\n"
msgstr "��̩���ؤ��б������̾������ޤ���\n"
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1652
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
-#: g10/keyedit.c:1645
+#: g10/keyedit.c:1698
#, c-format
msgid "No secondary key with index %d\n"
msgstr "%d�֤������Ϥ���ޤ���\n"
-#: g10/keyedit.c:1743
+#: g10/keyedit.c:1796
msgid "user ID: \""
msgstr "�桼����ID: \""
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:1799
#, c-format
msgid ""
"\"\n"
@@ -2554,34 +2561,34 @@ msgstr ""
"\"\n"
"���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1803
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "���ν�̾�ˤ��������˴����������ޤ���? (y/N)"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1827
msgid "You have signed these user IDs:\n"
msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
-#: g10/keyedit.c:1788 g10/keyedit.c:1823
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " %08lX��%s�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1846
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " %08lX��%s���˴�����Ƥ��ޤ�\n"
-#: g10/keyedit.c:1813
+#: g10/keyedit.c:1866
msgid "You are about to revoke these signatures:\n"
msgstr "�����ν�̾���˴����褦�Ȥ��Ƥ��ޤ�:\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1884
msgid "Really create the revocation certificates? (y/N)"
msgstr "�˴�������������˺��ޤ���? (y/N)"
-#: g10/keyedit.c:1860
+#: g10/keyedit.c:1913
msgid "no secret key\n"
msgstr "��̩��������ޤ���\n"
@@ -2715,7 +2722,7 @@ msgstr "�¸���Υ��르�ꥺ��ϻ��Ѥ��٤��ǤϤ���ޤ���!\n"
#: g10/misc.c:238
#, fuzzy
-msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"���ΰŹ楢�르�ꥺ���ȿ�Ф���Ƥ��ޤ���\n"
"��ä�ɸ��Ū�ʥ��르�ꥺ����Ѥ��Ƥ�������!\n"
@@ -2738,7 +2745,7 @@ msgstr ""
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:147 g10/passphrase.c:248
+#: g10/hkp.c:167 g10/passphrase.c:248
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "`%s'����³�Ǥ��ޤ���: %s\n"
@@ -2874,31 +2881,31 @@ msgstr "����: ��̩��%08lX��%s�Ǵ����ڤ�Ǥ�\n"
msgid "requesting key %08lX from %s ...\n"
msgstr "��%08lX��%s���׵� ...\n"
-#: g10/hkp.c:72
+#: g10/hkp.c:83
#, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "�������С����鸰���ɤ߹���ޤ���: %s\n"
-#: g10/hkp.c:91 g10/hkp.c:125
+#: g10/hkp.c:102 g10/hkp.c:136
msgid "no keyserver known (use option --keyserver)\n"
msgstr "���Τθ������С��Ϥ���ޤ��� (--keyserver���ץ�����Ȥ��ޤ��礦)\n"
-#: g10/hkp.c:99
+#: g10/hkp.c:110
#, c-format
msgid "%s: not a valid key ID\n"
msgstr "%s: ��������ID�Ǥ���ޤ���\n"
-#: g10/hkp.c:171
+#: g10/hkp.c:191
#, c-format
msgid "error sending to `%s': %s\n"
msgstr "`%s'�ؤ��������顼: %s\n"
-#: g10/hkp.c:183
+#: g10/hkp.c:203
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr "`%s'�ؤ����������� (����=%u)\n"
-#: g10/hkp.c:186
+#: g10/hkp.c:206
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr "`%s'�ؤ������˼��Ԥ��ޤ���: ����=%u\n"
diff --git a/po/nl.po b/po/nl.po
index 333d0d0e7..f1d2ca811 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-04-19 12:04+0200\n"
+"POT-Creation-Date: 2001-04-28 19:57+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"
@@ -987,7 +987,7 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1190 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
msgid " Fingerprint:"
msgstr " Vingerafdruk:"
@@ -1701,26 +1701,28 @@ msgstr "LET OP: er is niets ge�xporteerd\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "te veel ingangen in de pk cache - uitgezet\n"
-#: g10/getkey.c:449
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+#, fuzzy
+msgid "[User id not found]"
+msgstr "%s: gebruiker niet gevonden\n"
+
+#: g10/getkey.c:453
msgid "too many entries in unk cache - disabled\n"
msgstr "te veel ingangen in de unk cache - uitgezet\n"
-#: g10/getkey.c:2203
+#: g10/getkey.c:2207
#, 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:2245 g10/trustdb.c:577
+#: g10/getkey.c:2249 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr ""
"sleutel %08lX: geheime sleutel zonder openbare sleutel - overgeslagen\n"
-#: g10/getkey.c:2532
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: gebruiker niet gevonden\n"
-
#: g10/import.c:184
#, c-format
msgid "skipping block of type %d\n"
@@ -2095,7 +2097,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Echt tekenen? "
-#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:157
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
#, c-format
msgid "signing failed: %s\n"
msgstr "ondertekening mislukt: %s\n"
@@ -2302,253 +2304,258 @@ msgstr "t"
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:606 g10/keyedit.c:607
msgid "list preferences"
msgstr "toon voorkeuren"
#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
msgid "change the passphrase"
msgstr "verander de sleuteltekst"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "change the ownertrust"
msgstr "verander het vertrouwen in de eigenaar"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revoke signatures"
msgstr "roep ondertekeningen terug"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revoke a secondary key"
msgstr "trek secundaire sleutel in"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable a key"
msgstr "sta het gebruik van een sleutel niet toe"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable a key"
msgstr "sta gebruik van een sleutel toe"
-#: g10/delkey.c:110 g10/keyedit.c:632
+#: g10/delkey.c:110 g10/keyedit.c:633
msgid "can't do that in batchmode\n"
msgstr "kan dat niet doen in lopende band-modus\n"
#. check that they match
#. fixme: check that they both match
-#: g10/keyedit.c:670
+#: g10/keyedit.c:671
msgid "Secret key is available.\n"
msgstr "Geheime sleutel is beschikbaar.\n"
-#: g10/keyedit.c:699
+#: g10/keyedit.c:700
msgid "Command> "
msgstr "Commando> "
-#: g10/keyedit.c:729
+#: g10/keyedit.c:730
msgid "Need the secret key to do this.\n"
msgstr "Ik heb de geheime sleutel nodig om dat te doen.\n"
-#: g10/keyedit.c:733
+#: g10/keyedit.c:734
msgid "Please use the command \"toggle\" first.\n"
msgstr ""
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
msgid "Really sign all user IDs? "
msgstr "Echt alle gebruikers tekenen? "
-#: g10/keyedit.c:781
+#: g10/keyedit.c:782
msgid "Hint: Select the user IDs to sign\n"
msgstr "Hint: Selecteer de gebruikersidentificaties om te tekenen\n"
-#: g10/keyedit.c:813 g10/keyedit.c:995
+#: g10/keyedit.c:814 g10/keyedit.c:1000
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "bijwerken van de vertrouwensdatabase ging niet goed: %s\n"
-#: g10/keyedit.c:824 g10/keyedit.c:845
+#: g10/keyedit.c:825 g10/keyedit.c:846
msgid "You must select at least one user ID.\n"
msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:827
msgid "You can't delete the last user ID!\n"
msgstr "U kunt de laatste gebruiker niet verwijderen!\n"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
msgid "Really remove all selected user IDs? "
msgstr "Al deze gebruikers echt verwijderen? "
-#: g10/keyedit.c:830
+#: g10/keyedit.c:831
msgid "Really remove this user ID? "
msgstr "Deze gebruiker echt verwijderen? "
-#: g10/keyedit.c:866 g10/keyedit.c:888
+#: g10/keyedit.c:867 g10/keyedit.c:889
msgid "You must select at least one key.\n"
msgstr "U moet op zijn minst een sleutel selecteren.\n"
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
msgid "Do you really want to delete the selected keys? "
msgstr "Wilt u echt alle geselecteerde sleutels verwijderen? "
-#: g10/keyedit.c:871
+#: g10/keyedit.c:872
msgid "Do you really want to delete this key? "
msgstr "Wilt u deze sleutel echt verwijderen? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
msgid "Do you really want to revoke the selected keys? "
msgstr "Wilt u echt alle geselecteerde sleutels intrekken? "
-#: g10/keyedit.c:893
+#: g10/keyedit.c:894
msgid "Do you really want to revoke this key? "
msgstr "Wilt u deze sleutel echt intrekken? "
-#: g10/keyedit.c:959
+#: g10/keyedit.c:964
msgid "Save changes? "
msgstr "Veranderingen bewaren? "
-#: g10/keyedit.c:962
+#: g10/keyedit.c:967
msgid "Quit without saving? "
msgstr "Be�indigen zonder te bewaren? "
-#: g10/keyedit.c:973
+#: g10/keyedit.c:978
#, c-format
msgid "update failed: %s\n"
msgstr "bijwerken ging niet: %s\n"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:985
#, c-format
msgid "update secret failed: %s\n"
msgstr "bijwerken van de geheime sleutel mislukte: %s\n"
-#: g10/keyedit.c:987
+#: g10/keyedit.c:992
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:1002
+#: g10/keyedit.c:1007
msgid "Invalid command (try \"help\")\n"
msgstr "Foutief commando (probeer \"help\")\n"
-#: g10/keyedit.c:1082 g10/keyedit.c:1108
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr ""
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1140
#, c-format
msgid " trust: %c/%c"
msgstr ""
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1144
msgid "This key has been disabled"
msgstr "Deze sleutel is niet beschikbaar"
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1173
#, fuzzy, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "sleutel %08lx: subsleutel is teruggeroepen!\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1176
#, fuzzy
msgid "rev- faked revocation found\n"
msgstr "nieuwe sleutelterugtrekkingen: %lu\n"
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1178
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr ""
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1420
msgid "Delete this good signature? (y/N/q)"
msgstr "Verwijder deze goede ondertekening? (j/N/q)"
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1424
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Verwijder deze ongeldige ondertekening? (j/N/q)"
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1428
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Verwijder deze onbekende ondertekening? (j/N/q)"
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1434
msgid "Really delete this self-signature? (y/N)"
msgstr "Deze zelfondertekening echt verwijderen? (j/N)"
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1448
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d ondertekening verwijderd.\n"
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1449
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d ondertekeningen verwijderd.\n"
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1452
msgid "Nothing deleted.\n"
msgstr "Niets verwijderd.\n"
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1521
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:1474
+#: g10/keyedit.c:1527
msgid "Please select at most one secondary key.\n"
msgstr "Selecteer a.u.b. maximaal ��n secundaire sleutel.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1531
msgid "Changing expiration time for a secondary key.\n"
msgstr "Vervaldatum voor secundaire sleutel instellen.\n"
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1533
msgid "Changing expiration time for the primary key.\n"
msgstr "Vervaldatum voor primaire sleutel instellen.\n"
-#: g10/keyedit.c:1522
+#: g10/keyedit.c:1575
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:1538
+#: g10/keyedit.c:1591
msgid "No corresponding signature in secret ring\n"
msgstr "Geen overeenkomende ondertekening in de geheime sleutelbos\n"
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1652
#, c-format
msgid "No user ID with index %d\n"
msgstr "Geen gebruikersidentificatie met index %d\n"
-#: g10/keyedit.c:1645
+#: g10/keyedit.c:1698
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Geen secundaire sleutel met index %d\n"
-#: g10/keyedit.c:1743
+#: g10/keyedit.c:1796
msgid "user ID: \""
msgstr "gebruikersidentificatie: \""
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:1799
#, c-format
msgid ""
"\"\n"
@@ -2557,34 +2564,34 @@ msgstr ""
"\"\n"
"tekende met uw sleutel %08lX op %s\n"
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1803
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:1774
+#: g10/keyedit.c:1827
msgid "You have signed these user IDs:\n"
msgstr "U heeft deze gebruikers ondertekend:\n"
-#: g10/keyedit.c:1788 g10/keyedit.c:1823
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " getekend door %08lX op %s\n"
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1846
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " ingetrokken door %08lX op %s\n"
-#: g10/keyedit.c:1813
+#: g10/keyedit.c:1866
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:1831
+#: g10/keyedit.c:1884
msgid "Really create the revocation certificates? (y/N)"
msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
-#: g10/keyedit.c:1860
+#: g10/keyedit.c:1913
msgid "no secret key\n"
msgstr "geen geheime sleutel\n"
@@ -2719,7 +2726,7 @@ msgstr "Experimentele algoritmes dienen niet gebruikt te worden!\n"
#: g10/misc.c:238
#, fuzzy
-msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr "dit versleutelalgoritme is verouderd; gebruik een meer algemene!\n"
#: g10/parse-packet.c:119
@@ -2740,7 +2747,7 @@ msgstr ""
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:147 g10/passphrase.c:248
+#: g10/hkp.c:167 g10/passphrase.c:248
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "kan geen verbinding maken met `%s': %s\n"
@@ -2875,31 +2882,31 @@ msgstr "LET OP: sleutel voor ondertekening is vervallen op %s\n"
msgid "requesting key %08lX from %s ...\n"
msgstr "opvragen van sleutel %08lX van %s ...\n"
-#: g10/hkp.c:72
+#: g10/hkp.c:83
#, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "kan de sleutel niet opvragen van de server: %s\n"
-#: g10/hkp.c:91 g10/hkp.c:125
+#: g10/hkp.c:102 g10/hkp.c:136
msgid "no keyserver known (use option --keyserver)\n"
msgstr "geen sleutelserver bekend (gebruik de optie --keyserver)\n"
-#: g10/hkp.c:99
+#: g10/hkp.c:110
#, c-format
msgid "%s: not a valid key ID\n"
msgstr "%s: ongeldig sleutelnummer\n"
-#: g10/hkp.c:171
+#: g10/hkp.c:191
#, c-format
msgid "error sending to `%s': %s\n"
msgstr "fout bij versturen naar `%s': %s\n"
-#: g10/hkp.c:183
+#: g10/hkp.c:203
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr "versturen naar `%s' gelukt (status=%u)\n"
-#: g10/hkp.c:186
+#: g10/hkp.c:206
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr "fout bij versturen naar `%s': status=%u\n"
diff --git a/po/pl.po b/po/pl.po
index 1a2115551..c3c3b368a 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-04-19 12:04+0200\n"
+"POT-Creation-Date: 2001-04-28 19:57+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"
@@ -993,7 +993,7 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1190 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
msgid " Fingerprint:"
msgstr " Odcisk:"
@@ -1706,24 +1706,26 @@ msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
-#: g10/getkey.c:449
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[brak identyfikatora u�ytkownika]"
+
+#: g10/getkey.c:453
msgid "too many entries in unk cache - disabled\n"
msgstr "zbyt wiele wpis�w w buforze nieznanych kluczy - wy��czony\n"
-#: g10/getkey.c:2203
+#: g10/getkey.c:2207
#, 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:2245 g10/trustdb.c:577
+#: g10/getkey.c:2249 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
-#: g10/getkey.c:2532
-msgid "[User id not found]"
-msgstr "[brak identyfikatora u�ytkownika]"
-
#: g10/import.c:184
#, c-format
msgid "skipping block of type %d\n"
@@ -2094,7 +2096,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Na pewno podpisa�? "
-#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:157
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
#, c-format
msgid "signing failed: %s\n"
msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
@@ -2300,253 +2302,258 @@ msgstr "p"
msgid "pref"
msgstr "opcje"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:606 g10/keyedit.c:607
msgid "list preferences"
msgstr "lista opcji"
#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "opcje"
+
+#: g10/keyedit.c:608
msgid "passwd"
msgstr "has�o"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
msgid "change the passphrase"
msgstr "zmiana wyra�enia przej�ciowego (has�a)"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "trust"
msgstr "zaufanie"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "change the ownertrust"
msgstr "zmiana zaufania w�a�ciciela"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revsig"
msgstr "unpod"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revoke signatures"
msgstr "uniewa�nienie podpisu"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revkey"
msgstr "unpkl"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revoke a secondary key"
msgstr "uniewa�nienie podklucza"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable"
msgstr "wy�kl"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable a key"
msgstr "wy��czy� klucz z u�ycia"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable"
msgstr "w�kl"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable a key"
msgstr "w��czy� klucz do u�ycia"
-#: g10/delkey.c:110 g10/keyedit.c:632
+#: g10/delkey.c:110 g10/keyedit.c:633
msgid "can't do that in batchmode\n"
msgstr "nie dzia�a w trybie wsadowym\n"
#. check that they match
#. fixme: check that they both match
-#: g10/keyedit.c:670
+#: g10/keyedit.c:671
msgid "Secret key is available.\n"
msgstr "Dost�pny jest klucz tajny.\n"
-#: g10/keyedit.c:699
+#: g10/keyedit.c:700
msgid "Command> "
msgstr "Polecenie> "
-#: g10/keyedit.c:729
+#: g10/keyedit.c:730
msgid "Need the secret key to do this.\n"
msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
-#: g10/keyedit.c:733
+#: g10/keyedit.c:734
msgid "Please use the command \"toggle\" first.\n"
msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
msgid "Really sign all user IDs? "
msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
-#: g10/keyedit.c:781
+#: g10/keyedit.c:782
msgid "Hint: Select the user IDs to sign\n"
msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
-#: g10/keyedit.c:813 g10/keyedit.c:995
+#: g10/keyedit.c:814 g10/keyedit.c:1000
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
-#: g10/keyedit.c:824 g10/keyedit.c:845
+#: g10/keyedit.c:825 g10/keyedit.c:846
msgid "You must select at least one user ID.\n"
msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:827
msgid "You can't delete the last user ID!\n"
msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
msgid "Really remove all selected user IDs? "
msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
-#: g10/keyedit.c:830
+#: g10/keyedit.c:831
msgid "Really remove this user ID? "
msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
-#: g10/keyedit.c:866 g10/keyedit.c:888
+#: g10/keyedit.c:867 g10/keyedit.c:889
msgid "You must select at least one key.\n"
msgstr "Musisz wybra� co najmniej jeden klucz.\n"
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
msgid "Do you really want to delete the selected keys? "
msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
-#: g10/keyedit.c:871
+#: g10/keyedit.c:872
msgid "Do you really want to delete this key? "
msgstr "Czy na pewno chcesz usun�� ten klucz? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
msgid "Do you really want to revoke the selected keys? "
msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
-#: g10/keyedit.c:893
+#: g10/keyedit.c:894
msgid "Do you really want to revoke this key? "
msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
-#: g10/keyedit.c:959
+#: g10/keyedit.c:964
msgid "Save changes? "
msgstr "Zapisa� zmiany? "
-#: g10/keyedit.c:962
+#: g10/keyedit.c:967
msgid "Quit without saving? "
msgstr "Wyj�� bez zapisania zmian? "
-#: g10/keyedit.c:973
+#: g10/keyedit.c:978
#, c-format
msgid "update failed: %s\n"
msgstr "naniesienie poprawek nie powiod�o si�: %s\n"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:985
#, c-format
msgid "update secret failed: %s\n"
msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
-#: g10/keyedit.c:987
+#: g10/keyedit.c:992
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:1002
+#: g10/keyedit.c:1007
msgid "Invalid command (try \"help\")\n"
msgstr "Niepoprawna komenda (spr�buj \"help\")\n"
-#: g10/keyedit.c:1082 g10/keyedit.c:1108
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
#, 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:1091
+#: g10/keyedit.c:1140
#, c-format
msgid " trust: %c/%c"
msgstr "zaufanie: %c/%c"
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1144
msgid "This key has been disabled"
msgstr "Ten klucz zosta� wy��czony z u�ytku"
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1173
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "podklucz zosta� uniewa�niony: %s\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1176
msgid "rev- faked revocation found\n"
msgstr "fa�szywy certyfikat uniewa�nienia\n"
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1178
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "problem przy sprawdzaniu uniewa�nienia: %s\n"
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1420
msgid "Delete this good signature? (y/N/q)"
msgstr "Usun�� ten poprawny podpis? (t/N/w)"
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1424
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Usun�� ten niepoprawny podpis? (t/N/w)"
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1428
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Usun�� ten nieznany podpis? (t/N/w)"
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1434
msgid "Really delete this self-signature? (y/N)"
msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N)"
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1448
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d podpis usuni�ty.\n"
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1449
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d podpis�w usuni�tych.\n"
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1452
msgid "Nothing deleted.\n"
msgstr "Nic nie zosta�o usuni�te.\n"
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1521
msgid "Please remove selections from the secret keys.\n"
msgstr "Prosz� usun�� znacznik wyboru z kluczy tajnych.\n"
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1527
msgid "Please select at most one secondary key.\n"
msgstr "Prosz� wybra� najwy�ej jeden podklucz.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1531
msgid "Changing expiration time for a secondary key.\n"
msgstr "Zmiana daty wa�no�ci podklucza.\n"
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1533
msgid "Changing expiration time for the primary key.\n"
msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
-#: g10/keyedit.c:1522
+#: g10/keyedit.c:1575
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:1538
+#: g10/keyedit.c:1591
msgid "No corresponding signature in secret ring\n"
msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy tajnych\n"
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1652
#, c-format
msgid "No user ID with index %d\n"
msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
-#: g10/keyedit.c:1645
+#: g10/keyedit.c:1698
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Brak podklucza o indeksie %d\n"
-#: g10/keyedit.c:1743
+#: g10/keyedit.c:1796
msgid "user ID: \""
msgstr "Identyfikator u�ytkownika: "
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:1799
#, c-format
msgid ""
"\"\n"
@@ -2555,34 +2562,34 @@ msgstr ""
"\"\n"
"podpisano Twoim kluczem %08lX w %s\n"
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1803
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:1774
+#: g10/keyedit.c:1827
msgid "You have signed these user IDs:\n"
msgstr "Te identyfikatory u�ytkownik�w s� podpisane przez Ciebie:\n"
-#: g10/keyedit.c:1788 g10/keyedit.c:1823
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
#, c-format
msgid " signed by %08lX at %s\n"
msgstr "podpisany przez %08lX w %s\n"
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1846
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr "uniewa�niony przez %08lX w %s\n"
-#: g10/keyedit.c:1813
+#: g10/keyedit.c:1866
msgid "You are about to revoke these signatures:\n"
msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1884
msgid "Really create the revocation certificates? (y/N)"
msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N)"
-#: g10/keyedit.c:1860
+#: g10/keyedit.c:1913
msgid "no secret key\n"
msgstr "brak klucza tajnego\n"
@@ -2739,7 +2746,7 @@ msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "z�y format zmiennej GPG_AGENT_INFO\n"
-#: g10/hkp.c:147 g10/passphrase.c:248
+#: g10/hkp.c:167 g10/passphrase.c:248
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "nie mo�na po��czy� si� z %s: %s\n"
@@ -2871,31 +2878,31 @@ msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
msgid "requesting key %08lX from %s ...\n"
msgstr "zapytanie o klucz %08lX w %s ...\n"
-#: g10/hkp.c:72
+#: g10/hkp.c:83
#, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "nie mo�na pobra� klucza z serwera: %s\n"
-#: g10/hkp.c:91 g10/hkp.c:125
+#: g10/hkp.c:102 g10/hkp.c:136
msgid "no keyserver known (use option --keyserver)\n"
msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
-#: g10/hkp.c:99
+#: g10/hkp.c:110
#, c-format
msgid "%s: not a valid key ID\n"
msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
-#: g10/hkp.c:171
+#: g10/hkp.c:191
#, c-format
msgid "error sending to `%s': %s\n"
msgstr "b��d przy wysy�aniu do '%s': %s\n"
-#: g10/hkp.c:183
+#: g10/hkp.c:203
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr "wysy�anie do '%s' powiod�o si� (status=%u)\n"
-#: g10/hkp.c:186
+#: g10/hkp.c:206
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr "wysy�anie do '%s' nie powiod�o si� (status=%u)\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6c1638ef4..d4383831a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"POT-Creation-Date: 2001-04-19 12:04+0200\n"
+"POT-Creation-Date: 2001-04-28 19:57+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"
@@ -1012,7 +1012,7 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1190 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
msgid " Fingerprint:"
msgstr " Impress�o digital:"
@@ -1715,25 +1715,27 @@ msgstr "AVISO: nada exportado\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "entradas demais no cache pk - desativado\n"
-#: g10/getkey.c:449
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+#, fuzzy
+msgid "[User id not found]"
+msgstr "%s: usu�rio n�o encontrado\n"
+
+#: g10/getkey.c:453
msgid "too many entries in unk cache - disabled\n"
msgstr "entradas demais no cache unk - desativado\n"
-#: g10/getkey.c:2203
+#: g10/getkey.c:2207
#, 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:2245 g10/trustdb.c:577
+#: g10/getkey.c:2249 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
-#: g10/getkey.c:2532
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: usu�rio n�o encontrado\n"
-
#: g10/import.c:184
#, c-format
msgid "skipping block of type %d\n"
@@ -2100,7 +2102,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Realmente assinar? "
-#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:157
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
#, c-format
msgid "signing failed: %s\n"
msgstr "assinatura falhou: %s\n"
@@ -2307,254 +2309,259 @@ msgstr "t"
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:606 g10/keyedit.c:607
msgid "list preferences"
msgstr "lista prefer�ncias"
#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
msgid "change the passphrase"
msgstr "muda a frase secreta"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "change the ownertrust"
msgstr "muda os valores de confian�a"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revoke signatures"
msgstr "revoga assinaturas"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revoke a secondary key"
msgstr "revoga uma chave secund�ria"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable a key"
msgstr "desativa uma chave"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable a key"
msgstr "ativa uma chave"
-#: g10/delkey.c:110 g10/keyedit.c:632
+#: g10/delkey.c:110 g10/keyedit.c:633
msgid "can't do that in batchmode\n"
msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
#. check that they match
#. fixme: check that they both match
-#: g10/keyedit.c:670
+#: g10/keyedit.c:671
msgid "Secret key is available.\n"
msgstr "Chave secreta dispon�vel.\n"
-#: g10/keyedit.c:699
+#: g10/keyedit.c:700
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:729
+#: g10/keyedit.c:730
msgid "Need the secret key to do this.\n"
msgstr "A chave secreta � necess�ria para fazer isto.\n"
-#: g10/keyedit.c:733
+#: g10/keyedit.c:734
msgid "Please use the command \"toggle\" first.\n"
msgstr ""
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
msgid "Really sign all user IDs? "
msgstr "Realmente assinar todos os IDs de usu�rio? "
-#: g10/keyedit.c:781
+#: g10/keyedit.c:782
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
-#: g10/keyedit.c:813 g10/keyedit.c:995
+#: g10/keyedit.c:814 g10/keyedit.c:1000
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "atualiza��o do banco de dados de confiabilidade falhou: %s\n"
-#: g10/keyedit.c:824 g10/keyedit.c:845
+#: g10/keyedit.c:825 g10/keyedit.c:846
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:826
+#: g10/keyedit.c:827
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:829
+#: g10/keyedit.c:830
msgid "Really remove all selected user IDs? "
msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
-#: g10/keyedit.c:830
+#: g10/keyedit.c:831
msgid "Really remove this user ID? "
msgstr "Realmente remover este ID de usu�rio? "
-#: g10/keyedit.c:866 g10/keyedit.c:888
+#: g10/keyedit.c:867 g10/keyedit.c:889
msgid "You must select at least one key.\n"
msgstr "Voc� deve selecionar pelo menos uma chave.\n"
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
msgid "Do you really want to delete the selected keys? "
msgstr "Voc� realmente quer remover as chaves selecionadas? "
-#: g10/keyedit.c:871
+#: g10/keyedit.c:872
msgid "Do you really want to delete this key? "
msgstr "Voc� realmente quer remover esta chave? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
msgid "Do you really want to revoke the selected keys? "
msgstr "Voc� realmente quer revogar as chaves selecionadas? "
-#: g10/keyedit.c:893
+#: g10/keyedit.c:894
msgid "Do you really want to revoke this key? "
msgstr "Voc� realmente quer revogar esta chave? "
-#: g10/keyedit.c:959
+#: g10/keyedit.c:964
msgid "Save changes? "
msgstr "Salvar altera��es? "
-#: g10/keyedit.c:962
+#: g10/keyedit.c:967
msgid "Quit without saving? "
msgstr "Sair sem salvar? "
-#: g10/keyedit.c:973
+#: g10/keyedit.c:978
#, c-format
msgid "update failed: %s\n"
msgstr "atualiza��o falhou: %s\n"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:985
#, c-format
msgid "update secret failed: %s\n"
msgstr "atualiza��o da chave secreta falhou: %s\n"
-#: g10/keyedit.c:987
+#: g10/keyedit.c:992
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:1002
+#: g10/keyedit.c:1007
msgid "Invalid command (try \"help\")\n"
msgstr "Comando inv�lido (tente \"help\")\n"
-#: g10/keyedit.c:1082 g10/keyedit.c:1108
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr ""
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1140
#, c-format
msgid " trust: %c/%c"
msgstr ""
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1144
msgid "This key has been disabled"
msgstr "Esta chave foi desativada"
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1173
#, fuzzy, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "chave %08lX: a subchave foi revogada!\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1176
#, fuzzy
msgid "rev- faked revocation found\n"
msgstr " novas revoga��es de chaves: %lu\n"
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1178
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr ""
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1420
msgid "Delete this good signature? (y/N/q)"
msgstr "Deletar esta assinatura v�lida? (s/N/q)"
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1424
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1428
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1434
msgid "Really delete this self-signature? (y/N)"
msgstr "Realmente remover esta auto-assinatura? (s/N)"
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1448
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d assinatura removida.\n"
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1449
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d assinaturas removidas.\n"
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1452
msgid "Nothing deleted.\n"
msgstr "Nada removido.\n"
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1521
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor remova as sele��es das chaves secretas.\n"
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1527
msgid "Please select at most one secondary key.\n"
msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1531
msgid "Changing expiration time for a secondary key.\n"
msgstr "Modificando a data de validade para uma chave secund�ria.\n"
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1533
msgid "Changing expiration time for the primary key.\n"
msgstr "Modificando a data de validade para uma chave prim�ria.\n"
-#: g10/keyedit.c:1522
+#: g10/keyedit.c:1575
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:1538
+#: g10/keyedit.c:1591
msgid "No corresponding signature in secret ring\n"
msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1652
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nenhum ID de usu�rio com �ndice %d\n"
-#: g10/keyedit.c:1645
+#: g10/keyedit.c:1698
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Nenhuma chave secund�ria com �ndice %d\n"
-#: g10/keyedit.c:1743
+#: g10/keyedit.c:1796
msgid "user ID: \""
msgstr "ID de usu�rio: \""
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:1799
#, c-format
msgid ""
"\"\n"
@@ -2563,34 +2570,34 @@ msgstr ""
"\"\n"
"assinado com sua chave %08lX em %s\n"
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1803
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:1774
+#: g10/keyedit.c:1827
msgid "You have signed these user IDs:\n"
msgstr "Voc� assinou estes IDs de usu�rio:\n"
-#: g10/keyedit.c:1788 g10/keyedit.c:1823
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " assinado por %08lX em %s\n"
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1846
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " revogado por %08lX em %s\n"
-#: g10/keyedit.c:1813
+#: g10/keyedit.c:1866
msgid "You are about to revoke these signatures:\n"
msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1884
msgid "Really create the revocation certificates? (y/N)"
msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
-#: g10/keyedit.c:1860
+#: g10/keyedit.c:1913
msgid "no secret key\n"
msgstr "nenhuma chave secreta\n"
@@ -2724,7 +2731,7 @@ msgstr "Algoritmos experimentais n�o devem ser usados!\n"
#: g10/misc.c:238
#, fuzzy
-msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"este algoritmo de criptografia � depreciado; por favor use algum\n"
"algoritmo padr�o!\n"
@@ -2747,7 +2754,7 @@ msgstr ""
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:147 g10/passphrase.c:248
+#: g10/hkp.c:167 g10/passphrase.c:248
#, fuzzy, c-format
msgid "can't connect to `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
@@ -2882,31 +2889,31 @@ msgstr "NOTA: chave de assinatura expirou %s\n"
msgid "requesting key %08lX from %s ...\n"
msgstr ""
-#: g10/hkp.c:72
+#: g10/hkp.c:83
#, fuzzy, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "imposs�vel escrever para o chaveiro: %s\n"
-#: g10/hkp.c:91 g10/hkp.c:125
+#: g10/hkp.c:102 g10/hkp.c:136
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/hkp.c:99
+#: g10/hkp.c:110
#, fuzzy, c-format
msgid "%s: not a valid key ID\n"
msgstr "%s n�o � um mapa de caracteres v�lido\n"
-#: g10/hkp.c:171
+#: g10/hkp.c:191
#, fuzzy, c-format
msgid "error sending to `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: g10/hkp.c:183
+#: g10/hkp.c:203
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr ""
-#: g10/hkp.c:186
+#: g10/hkp.c:206
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 8b03c6b59..63776ed61 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-04-19 12:04+0200\n"
+"POT-Creation-Date: 2001-04-28 19:57+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"
@@ -1002,7 +1002,7 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1190 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
msgid " Fingerprint:"
msgstr " Impress�o digital:"
@@ -1704,24 +1704,26 @@ msgstr "AVISO: nada exportado\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "entradas demais no cache pk - desactivado\n"
-#: g10/getkey.c:449
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[Utilizador n�o encontrado]"
+
+#: g10/getkey.c:453
msgid "too many entries in unk cache - disabled\n"
msgstr "entradas demais no cache unk - desactivado\n"
-#: g10/getkey.c:2203
+#: g10/getkey.c:2207
#, 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:2245 g10/trustdb.c:577
+#: g10/getkey.c:2249 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
-#: g10/getkey.c:2532
-msgid "[User id not found]"
-msgstr "[Utilizador n�o encontrado]"
-
#: g10/import.c:184
#, c-format
msgid "skipping block of type %d\n"
@@ -2088,7 +2090,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Realmente assinar? "
-#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:157
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
#, c-format
msgid "signing failed: %s\n"
msgstr "assinatura falhou: %s\n"
@@ -2294,252 +2296,257 @@ msgstr "t"
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:606 g10/keyedit.c:607
msgid "list preferences"
msgstr "lista prefer�ncias"
#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
msgid "change the passphrase"
msgstr "muda a frase secreta"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "change the ownertrust"
msgstr "muda os valores de confian�a"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revoke signatures"
msgstr "revoga assinaturas"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revoke a secondary key"
msgstr "revoga uma chave secund�ria"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable a key"
msgstr "desactiva uma chave"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable a key"
msgstr "activa uma chave"
-#: g10/delkey.c:110 g10/keyedit.c:632
+#: g10/delkey.c:110 g10/keyedit.c:633
msgid "can't do that in batchmode\n"
msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
#. check that they match
#. fixme: check that they both match
-#: g10/keyedit.c:670
+#: g10/keyedit.c:671
msgid "Secret key is available.\n"
msgstr "Chave secreta dispon�vel.\n"
-#: g10/keyedit.c:699
+#: g10/keyedit.c:700
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:729
+#: g10/keyedit.c:730
msgid "Need the secret key to do this.\n"
msgstr "A chave secreta � necess�ria para fazer isto.\n"
-#: g10/keyedit.c:733
+#: g10/keyedit.c:734
msgid "Please use the command \"toggle\" first.\n"
msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
msgid "Really sign all user IDs? "
msgstr "Realmente assinar todos os IDs de utilizador? "
-#: g10/keyedit.c:781
+#: g10/keyedit.c:782
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
-#: g10/keyedit.c:813 g10/keyedit.c:995
+#: g10/keyedit.c:814 g10/keyedit.c:1000
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "actualiza��o da base de dados de confian�a falhou: %s\n"
-#: g10/keyedit.c:824 g10/keyedit.c:845
+#: g10/keyedit.c:825 g10/keyedit.c:846
msgid "You must select at least one user ID.\n"
msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:827
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:829
+#: g10/keyedit.c:830
msgid "Really remove all selected user IDs? "
msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
-#: g10/keyedit.c:830
+#: g10/keyedit.c:831
msgid "Really remove this user ID? "
msgstr "Realmente remover este ID de utilizador? "
-#: g10/keyedit.c:866 g10/keyedit.c:888
+#: g10/keyedit.c:867 g10/keyedit.c:889
msgid "You must select at least one key.\n"
msgstr "Voc� deve selecionar pelo menos uma chave.\n"
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
msgid "Do you really want to delete the selected keys? "
msgstr "Voc� quer realmente remover as chaves selecionadas? "
-#: g10/keyedit.c:871
+#: g10/keyedit.c:872
msgid "Do you really want to delete this key? "
msgstr "Voc� quer realmente remover esta chave? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
msgid "Do you really want to revoke the selected keys? "
msgstr "Voc� quer realmente revogar as chaves selecionadas? "
-#: g10/keyedit.c:893
+#: g10/keyedit.c:894
msgid "Do you really want to revoke this key? "
msgstr "Voc� quer realmente revogar esta chave? "
-#: g10/keyedit.c:959
+#: g10/keyedit.c:964
msgid "Save changes? "
msgstr "Gravar altera��es? "
-#: g10/keyedit.c:962
+#: g10/keyedit.c:967
msgid "Quit without saving? "
msgstr "Sair sem gravar? "
-#: g10/keyedit.c:973
+#: g10/keyedit.c:978
#, c-format
msgid "update failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:985
#, c-format
msgid "update secret failed: %s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
-#: g10/keyedit.c:987
+#: g10/keyedit.c:992
msgid "Key not changed so no update needed.\n"
msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1007
msgid "Invalid command (try \"help\")\n"
msgstr "Comando inv�lido (tente \"help\")\n"
-#: g10/keyedit.c:1082 g10/keyedit.c:1108
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
#, 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:1091
+#: g10/keyedit.c:1140
#, c-format
msgid " trust: %c/%c"
msgstr " confian�a: %c/%c"
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1144
msgid "This key has been disabled"
msgstr "Esta chave foi desactivada"
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1173
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! subchave foi revogada: %s\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1176
msgid "rev- faked revocation found\n"
msgstr "rev- revoga��o falsa encontrada\n"
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1178
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? problema ao verificar revoga��o: %s\n"
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1420
msgid "Delete this good signature? (y/N/q)"
msgstr "Apagar esta assinatura v�lida? (s/N/q)"
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1424
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1428
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1434
msgid "Really delete this self-signature? (y/N)"
msgstr "Realmente remover esta auto-assinatura? (s/N)"
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1448
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d assinatura removida.\n"
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1449
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d assinaturas removidas.\n"
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1452
msgid "Nothing deleted.\n"
msgstr "Nada removido.\n"
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1521
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor remova as selec��es das chaves secretas.\n"
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1527
msgid "Please select at most one secondary key.\n"
msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1531
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:1480
+#: g10/keyedit.c:1533
msgid "Changing expiration time for the primary key.\n"
msgstr "Modificar a data de validade para uma chave prim�ria.\n"
-#: g10/keyedit.c:1522
+#: g10/keyedit.c:1575
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:1538
+#: g10/keyedit.c:1591
msgid "No corresponding signature in secret ring\n"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1652
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
-#: g10/keyedit.c:1645
+#: g10/keyedit.c:1698
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Nenhuma chave secund�ria com �ndice %d\n"
-#: g10/keyedit.c:1743
+#: g10/keyedit.c:1796
msgid "user ID: \""
msgstr "ID de utilizador: \""
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:1799
#, c-format
msgid ""
"\"\n"
@@ -2548,34 +2555,34 @@ msgstr ""
"\"\n"
"assinado com sua chave %08lX em %s\n"
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1803
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:1774
+#: g10/keyedit.c:1827
msgid "You have signed these user IDs:\n"
msgstr "Assinou estes identificadores de utilizadores:\n"
-#: g10/keyedit.c:1788 g10/keyedit.c:1823
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " assinado por %08lX em %s\n"
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1846
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " revogado por %08lX em %s\n"
-#: g10/keyedit.c:1813
+#: g10/keyedit.c:1866
msgid "You are about to revoke these signatures:\n"
msgstr "Est� prestes a revogar estas assinaturas:\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1884
msgid "Really create the revocation certificates? (y/N)"
msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
-#: g10/keyedit.c:1860
+#: g10/keyedit.c:1913
msgid "no secret key\n"
msgstr "nenhuma chave secreta\n"
@@ -2729,7 +2736,7 @@ msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
-#: g10/hkp.c:147 g10/passphrase.c:248
+#: g10/hkp.c:167 g10/passphrase.c:248
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "imposs�vel ligar a `%s': %s\n"
@@ -2862,31 +2869,31 @@ msgstr "NOTA: chave secreta %08lX expirou em %s\n"
msgid "requesting key %08lX from %s ...\n"
msgstr "a pedir chave %08lX de %s ...\n"
-#: g10/hkp.c:72
+#: g10/hkp.c:83
#, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "n�o consigo obterr chave do servidor: %s\n"
-#: g10/hkp.c:91 g10/hkp.c:125
+#: g10/hkp.c:102 g10/hkp.c:136
msgid "no keyserver known (use option --keyserver)\n"
msgstr "nenhum servidor de chaves conhecido (utilize a op��o --keyserver)\n"
-#: g10/hkp.c:99
+#: g10/hkp.c:110
#, c-format
msgid "%s: not a valid key ID\n"
msgstr "%s: n�o � um identificador de chave v�lido\n"
-#: g10/hkp.c:171
+#: g10/hkp.c:191
#, c-format
msgid "error sending to `%s': %s\n"
msgstr "erro ao enviar para `%s': %s\n"
-#: g10/hkp.c:183
+#: g10/hkp.c:203
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr "sucesso ao enviar para `%s' (estado=%u)\n"
-#: g10/hkp.c:186
+#: g10/hkp.c:206
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr "erro ao enviar para `%s': estado=%u\n"
diff --git a/po/ru.po b/po/ru.po
index db5f366bc..09189a068 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
# QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
msgid ""
msgstr ""
-"POT-Creation-Date: 2001-04-19 12:04+0200\n"
+"POT-Creation-Date: 2001-04-28 19:57+0200\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-01-26 22:08:36+0100\n"
"From: Gregory Steuck <[email protected]>\n"
@@ -1065,7 +1065,7 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1190 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
msgid " Fingerprint:"
msgstr ""
@@ -1777,25 +1777,27 @@ msgstr "��������: ������������ ���� � �������� ��� �������!\n"
msgid "too many entries in pk cache - disabled\n"
msgstr ""
-#: g10/getkey.c:449
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+#, fuzzy
+msgid "[User id not found]"
+msgstr "%s: ������������ �� ������\n"
+
+#: g10/getkey.c:453
msgid "too many entries in unk cache - disabled\n"
msgstr ""
-#: g10/getkey.c:2203
+#: g10/getkey.c:2207
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "������������ �������������� ���� %09lX ������ ��������� %08lX%\n"
-#: g10/getkey.c:2245 g10/trustdb.c:577
+#: g10/getkey.c:2249 g10/trustdb.c:577
#, fuzzy, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
-#: g10/getkey.c:2532
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: ������������ �� ������\n"
-
#: g10/import.c:184
#, c-format
msgid "skipping block of type %d\n"
@@ -2165,7 +2167,7 @@ msgstr ""
msgid "Really sign? "
msgstr "������������� ���������? "
-#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:157
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
#, fuzzy, c-format
msgid "signing failed: %s\n"
msgstr "������ ������������: %s\n"
@@ -2386,317 +2388,321 @@ msgstr ""
msgid "pref"
msgstr ""
-#: g10/keyedit.c:606
+#: g10/keyedit.c:606 g10/keyedit.c:607
msgid "list preferences"
msgstr ""
#: g10/keyedit.c:607
+msgid "showpref"
+msgstr ""
+
+#: g10/keyedit.c:608
msgid "passwd"
msgstr ""
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
#, fuzzy
msgid "change the passphrase"
msgstr "�������� �������� �����"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "trust"
msgstr ""
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "change the ownertrust"
msgstr "�������� ��������� �������"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
#, fuzzy
msgid "revsig"
msgstr "���������"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
#, fuzzy
msgid "revoke signatures"
msgstr "��������� ������� �� �����"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
#, fuzzy
msgid "revkey"
msgstr "����"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
#, fuzzy
msgid "revoke a secondary key"
msgstr "������� �������������� ����"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable"
msgstr ""
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
#, fuzzy
msgid "disable a key"
msgstr "������ ����"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable"
msgstr ""
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
#, fuzzy
msgid "enable a key"
msgstr "������ ����"
-#: g10/delkey.c:110 g10/keyedit.c:632
+#: g10/delkey.c:110 g10/keyedit.c:633
msgid "can't do that in batchmode\n"
msgstr "���������� ������� ��� � �������� ������.\n"
#. check that they match
#. fixme: check that they both match
-#: g10/keyedit.c:670
+#: g10/keyedit.c:671
#, fuzzy
msgid "Secret key is available.\n"
msgstr "������� ��������� ����.\n"
-#: g10/keyedit.c:699
+#: g10/keyedit.c:700
#, fuzzy
msgid "Command> "
msgstr "�������> "
-#: g10/keyedit.c:729
+#: g10/keyedit.c:730
#, fuzzy
msgid "Need the secret key to do this.\n"
msgstr "����� ��� �������, ����� ��������� ����.\n"
-#: g10/keyedit.c:733
+#: g10/keyedit.c:734
msgid "Please use the command \"toggle\" first.\n"
msgstr ""
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
#, fuzzy
msgid "Really sign all user IDs? "
msgstr "������������� ��������� ��� �������������� ������������? "
-#: g10/keyedit.c:781
+#: g10/keyedit.c:782
#, fuzzy
msgid "Hint: Select the user IDs to sign\n"
msgstr ""
"���������: �������� �������������� ������������ ������� ������ ���������\n"
-#: g10/keyedit.c:813 g10/keyedit.c:995
+#: g10/keyedit.c:814 g10/keyedit.c:1000
#, fuzzy, c-format
msgid "update of trustdb failed: %s\n"
msgstr "���������� ���� ������ ������� �� �������: %s\n"
-#: g10/keyedit.c:824 g10/keyedit.c:845
+#: g10/keyedit.c:825 g10/keyedit.c:846
#, fuzzy
msgid "You must select at least one user ID.\n"
msgstr "�� ������ ������� ���� �� ���� ������������� ������������.\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:827
#, fuzzy
msgid "You can't delete the last user ID!\n"
msgstr "�� �� ������ ������� ��������� ������������� ������������!\n"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
#, fuzzy
msgid "Really remove all selected user IDs? "
msgstr "������������� ������� ��� ��������� �������������� ������������? "
-#: g10/keyedit.c:830
+#: g10/keyedit.c:831
#, fuzzy
msgid "Really remove this user ID? "
msgstr "������������� ������� ���� ������������� ������������? "
-#: g10/keyedit.c:866 g10/keyedit.c:888
+#: g10/keyedit.c:867 g10/keyedit.c:889
msgid "You must select at least one key.\n"
msgstr "�� ������ ������� ���� �� ���� ����.\n"
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
#, fuzzy
msgid "Do you really want to delete the selected keys? "
msgstr "�� ������������� ������ ������� ��������� �����? "
-#: g10/keyedit.c:871
+#: g10/keyedit.c:872
#, fuzzy
msgid "Do you really want to delete this key? "
msgstr "�� ������������� ������ ������� ���� ����? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
#, fuzzy
msgid "Do you really want to revoke the selected keys? "
msgstr "�� ������������� ������ ������� ��������� �����? "
-#: g10/keyedit.c:893
+#: g10/keyedit.c:894
#, fuzzy
msgid "Do you really want to revoke this key? "
msgstr "�� ������������� ������ ������� ���� ����? "
-#: g10/keyedit.c:959
+#: g10/keyedit.c:964
msgid "Save changes? "
msgstr "��������� ���������? "
-#: g10/keyedit.c:962
+#: g10/keyedit.c:967
msgid "Quit without saving? "
msgstr "����� ��� ����������? "
-#: g10/keyedit.c:973
+#: g10/keyedit.c:978
#, fuzzy, c-format
msgid "update failed: %s\n"
msgstr "���������� �� �������: %s\n"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:985
#, fuzzy, c-format
msgid "update secret failed: %s\n"
msgstr "���������� ������� �� �������: %s\n"
-#: g10/keyedit.c:987
+#: g10/keyedit.c:992
msgid "Key not changed so no update needed.\n"
msgstr "���� �� ���������, ���������� �� �����.\n"
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1007
msgid "Invalid command (try \"help\")\n"
msgstr "������������ ������� (���������� \"help\")\n"
-#: g10/keyedit.c:1082 g10/keyedit.c:1108
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr ""
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1140
#, c-format
msgid " trust: %c/%c"
msgstr ""
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1144
#, fuzzy
msgid "This key has been disabled"
msgstr "���������: ���� �������� ����� ��� �����!\n"
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1173
#, fuzzy, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "build_sigrecs: ���� ist widerrufen\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1176
msgid "rev- faked revocation found\n"
msgstr ""
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1178
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr ""
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1420
msgid "Delete this good signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1424
msgid "Delete this invalid signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1428
#, fuzzy
msgid "Delete this unknown signature? (y/N/q)"
msgstr "������������� ���������� ����������"
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1434
#, fuzzy
msgid "Really delete this self-signature? (y/N)"
msgstr "������������� ���������� ����������"
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1448
#, fuzzy, c-format
msgid "Deleted %d signature.\n"
msgstr "%d ������ ��������\n"
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1449
#, fuzzy, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d ������ ��������\n"
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1452
#, fuzzy
msgid "Nothing deleted.\n"
msgstr "��������: ������������ ���� � �������� ��� �������!\n"
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1521
msgid "Please remove selections from the secret keys.\n"
msgstr ""
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1527
#, fuzzy
msgid "Please select at most one secondary key.\n"
msgstr "�� ������ ������� ���� �� ���� ����.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1531
msgid "Changing expiration time for a secondary key.\n"
msgstr ""
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1533
msgid "Changing expiration time for the primary key.\n"
msgstr ""
-#: g10/keyedit.c:1522
+#: g10/keyedit.c:1575
msgid "You can't change the expiration date of a v3 key\n"
msgstr ""
-#: g10/keyedit.c:1538
+#: g10/keyedit.c:1591
msgid "No corresponding signature in secret ring\n"
msgstr ""
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1652
#, fuzzy, c-format
msgid "No user ID with index %d\n"
msgstr "��� �������������� ������������ � �������� %d\n"
-#: g10/keyedit.c:1645
+#: g10/keyedit.c:1698
#, c-format
msgid "No secondary key with index %d\n"
msgstr "��� ��������������� ����� � �������� %d\n"
-#: g10/keyedit.c:1743
+#: g10/keyedit.c:1796
#, fuzzy
msgid "user ID: \""
msgstr "������� ������������� ������������: "
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:1799
#, fuzzy, c-format
msgid ""
"\"\n"
"signed with your key %08lX at %s\n"
msgstr "������ ����������� ������ %08lX\n"
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1803
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "������������� ���������� ����������"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1827
#, fuzzy
msgid "You have signed these user IDs:\n"
msgstr "�� �� ������ ������� ��������� ������������� ������������!\n"
-#: g10/keyedit.c:1788 g10/keyedit.c:1823
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
#, fuzzy, c-format
msgid " signed by %08lX at %s\n"
msgstr "������ ����������� ������ %08lX\n"
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1846
#, fuzzy, c-format
msgid " revoked by %08lX at %s\n"
msgstr "������ ����������� ������ %08lX\n"
-#: g10/keyedit.c:1813
+#: g10/keyedit.c:1866
#, fuzzy
msgid "You are about to revoke these signatures:\n"
msgstr "M�chten Sie einige der ung�ltigen Signaturen entfernen? "
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1884
#, fuzzy
msgid "Really create the revocation certificates? (y/N)"
msgstr "������������� ���������� ����������"
-#: g10/keyedit.c:1860
+#: g10/keyedit.c:1913
#, fuzzy
msgid "no secret key\n"
msgstr "������ ��������� ����"
@@ -2834,7 +2840,7 @@ msgid "Experimental algorithms should not be used!\n"
msgstr ""
#: g10/misc.c:238
-msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
#: g10/parse-packet.c:119
@@ -2855,7 +2861,7 @@ msgstr ""
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:147 g10/passphrase.c:248
+#: g10/hkp.c:167 g10/passphrase.c:248
#, fuzzy, c-format
msgid "can't connect to `%s': %s\n"
msgstr "���������� ������� ���� `%s': %s\n"
@@ -3010,31 +3016,31 @@ msgstr "��������������: ���� ������� ������� %s\n"
msgid "requesting key %08lX from %s ...\n"
msgstr ""
-#: g10/hkp.c:72
+#: g10/hkp.c:83
#, fuzzy, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "���������� �������� � ������ ������: %s\n"
-#: g10/hkp.c:91 g10/hkp.c:125
+#: g10/hkp.c:102 g10/hkp.c:136
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/hkp.c:99
+#: g10/hkp.c:110
#, fuzzy, c-format
msgid "%s: not a valid key ID\n"
msgstr "������������ ������ � �����������.\n"
-#: g10/hkp.c:171
+#: g10/hkp.c:191
#, fuzzy, c-format
msgid "error sending to `%s': %s\n"
msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
-#: g10/hkp.c:183
+#: g10/hkp.c:203
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr ""
-#: g10/hkp.c:186
+#: g10/hkp.c:206
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 03f5224bf..be09bde42 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-04-19 12:04+0200\n"
+"POT-Creation-Date: 2001-04-28 19:57+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"
@@ -1010,7 +1010,7 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1190 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
msgid " Fingerprint:"
msgstr " Fingeravtryck:"
@@ -1719,25 +1719,27 @@ msgstr "VARNING: exporterade ingenting\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "f�r m�nga poster i pk-cachen - inaktiverad\n"
-#: g10/getkey.c:449
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+#, fuzzy
+msgid "[User id not found]"
+msgstr "%s: hittade inte anv�ndaren\n"
+
+#: g10/getkey.c:453
msgid "too many entries in unk cache - disabled\n"
msgstr "f�r m�nga poster i unk-cachen - inaktiverad\n"
-#: g10/getkey.c:2203
+#: g10/getkey.c:2207
#, 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:2245 g10/trustdb.c:577
+#: g10/getkey.c:2249 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "nyckel %08lX: hemlig nyckel utan publik nyckel - hoppade �ver\n"
-#: g10/getkey.c:2532
-#, fuzzy
-msgid "[User id not found]"
-msgstr "%s: hittade inte anv�ndaren\n"
-
#: g10/import.c:184
#, c-format
msgid "skipping block of type %d\n"
@@ -2105,7 +2107,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Vill du verkligen signera? "
-#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:157
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
#, c-format
msgid "signing failed: %s\n"
msgstr "signeringen misslyckades: %s\n"
@@ -2312,255 +2314,260 @@ msgstr "t"
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:606 g10/keyedit.c:607
msgid "list preferences"
msgstr "skriv ut inst�llningar"
#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "pref"
+
+#: g10/keyedit.c:608
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
msgid "change the passphrase"
msgstr "�ndra l�senordsfrasen"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "trust"
msgstr "trust"
# originalet borde ha ett value
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "change the ownertrust"
msgstr "�ndra �gartillitsv�rdet"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revoke signatures"
msgstr "�terkalla signaturer"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revoke a secondary key"
msgstr "�terkalla en sekund�r nyckel"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable a key"
msgstr "deaktivera en nyckel"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable a key"
msgstr "aktivera en nyckel"
-#: g10/delkey.c:110 g10/keyedit.c:632
+#: g10/delkey.c:110 g10/keyedit.c:633
msgid "can't do that in batchmode\n"
msgstr "kan ej g�ra detta i batch-l�ge\n"
#. check that they match
#. fixme: check that they both match
-#: g10/keyedit.c:670
+#: g10/keyedit.c:671
msgid "Secret key is available.\n"
msgstr "Den hemliga nyckeln finns tillg�nglig.\n"
-#: g10/keyedit.c:699
+#: g10/keyedit.c:700
msgid "Command> "
msgstr "Kommando> "
-#: g10/keyedit.c:729
+#: g10/keyedit.c:730
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:733
+#: g10/keyedit.c:734
msgid "Please use the command \"toggle\" first.\n"
msgstr "Anv�nd kommandot \"toggle\" f�rst.\n"
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
msgid "Really sign all user IDs? "
msgstr "Vill du verkligen signera alla anv�ndaridentiteter? "
-#: g10/keyedit.c:781
+#: g10/keyedit.c:782
msgid "Hint: Select the user IDs to sign\n"
msgstr "Tips: V�lj det anv�ndarid du vill signera\n"
-#: g10/keyedit.c:813 g10/keyedit.c:995
+#: g10/keyedit.c:814 g10/keyedit.c:1000
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "uppdateringen av tillitsdatabasen misslyckades: %s\n"
-#: g10/keyedit.c:824 g10/keyedit.c:845
+#: g10/keyedit.c:825 g10/keyedit.c:846
msgid "You must select at least one user ID.\n"
msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:827
msgid "You can't delete the last user ID!\n"
msgstr "Du kan inte ta bort den sista anv�ndaridentiteten!\n"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
msgid "Really remove all selected user IDs? "
msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
-#: g10/keyedit.c:830
+#: g10/keyedit.c:831
msgid "Really remove this user ID? "
msgstr "Vill du verkligen ta bort denna anv�ndaridentitet? "
-#: g10/keyedit.c:866 g10/keyedit.c:888
+#: g10/keyedit.c:867 g10/keyedit.c:889
msgid "You must select at least one key.\n"
msgstr "Du m�ste v�lja �tminstone en nyckel.\n"
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
msgid "Do you really want to delete the selected keys? "
msgstr "Vill du verkligen ta bort valda nycklar? "
-#: g10/keyedit.c:871
+#: g10/keyedit.c:872
msgid "Do you really want to delete this key? "
msgstr "Vill du verkligen ta bort denna nyckel? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
msgid "Do you really want to revoke the selected keys? "
msgstr "Vill du verkligen �terkalla de valda nycklarna? "
-#: g10/keyedit.c:893
+#: g10/keyedit.c:894
msgid "Do you really want to revoke this key? "
msgstr "Vill du verkligen �terkalla denna nyckel? "
-#: g10/keyedit.c:959
+#: g10/keyedit.c:964
msgid "Save changes? "
msgstr "Spara �ndringarna? "
-#: g10/keyedit.c:962
+#: g10/keyedit.c:967
msgid "Quit without saving? "
msgstr "Avsluta utan att spara? "
-#: g10/keyedit.c:973
+#: g10/keyedit.c:978
#, c-format
msgid "update failed: %s\n"
msgstr "uppdateringen misslyckades: %s\n"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:985
#, c-format
msgid "update secret failed: %s\n"
msgstr "misslyckades med att uppdatera hemligheten: %s\n"
-#: g10/keyedit.c:987
+#: g10/keyedit.c:992
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:1002
+#: g10/keyedit.c:1007
msgid "Invalid command (try \"help\")\n"
msgstr "Ogiltigt kommando (f�rs�k med \"help\")\n"
-#: g10/keyedit.c:1082 g10/keyedit.c:1108
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr ""
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1140
#, c-format
msgid " trust: %c/%c"
msgstr ""
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1144
msgid "This key has been disabled"
msgstr "Denna nyckel har deaktiverats"
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1173
#, fuzzy, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "nyckeln %08lX: en undernyckel har �terkallats!\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1176
#, fuzzy
msgid "rev- faked revocation found\n"
msgstr " nya �terkallelser av nycklar: %lu\n"
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1178
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr ""
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1420
msgid "Delete this good signature? (y/N/q)"
msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1424
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1428
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Vill du radera denna ok�nda signatur? (j/N/a)"
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1434
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:1395
+#: g10/keyedit.c:1448
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Raderade %d signatur.\n"
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1449
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Raderade %d signaturer.\n"
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1452
msgid "Nothing deleted.\n"
msgstr "Ingenting raderat.\n"
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1521
msgid "Please remove selections from the secret keys.\n"
msgstr "Tag bort markeringar fr�n de hemliga nycklarna.\n"
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1527
msgid "Please select at most one secondary key.\n"
msgstr "V�lj som mest en sekund�r nyckel.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1531
msgid "Changing expiration time for a secondary key.\n"
msgstr "�ndrar giltighetstid f�r en sekund�r nyckel.\n"
-#: g10/keyedit.c:1480
+#: g10/keyedit.c:1533
msgid "Changing expiration time for the primary key.\n"
msgstr "�ndrar giltighetstid f�r den prim�ra nyckeln.\n"
-#: g10/keyedit.c:1522
+#: g10/keyedit.c:1575
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:1538
+#: g10/keyedit.c:1591
msgid "No corresponding signature in secret ring\n"
msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1652
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen anv�ndaridentitet med index %d\n"
-#: g10/keyedit.c:1645
+#: g10/keyedit.c:1698
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Ingen sekund�r nyckel med index %d\n"
-#: g10/keyedit.c:1743
+#: g10/keyedit.c:1796
msgid "user ID: \""
msgstr "anv�ndaridentitet: \""
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:1799
#, c-format
msgid ""
"\"\n"
@@ -2569,34 +2576,34 @@ msgstr ""
"\"\n"
"signerad med din nyckel %08lX %s\n"
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1803
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:1774
+#: g10/keyedit.c:1827
msgid "You have signed these user IDs:\n"
msgstr "Du har signerat f�ljande anv�ndaridentiteter:\n"
-#: g10/keyedit.c:1788 g10/keyedit.c:1823
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " signerad av %08lX %s\n"
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1846
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " �terkallad av %08lX %s\n"
-#: g10/keyedit.c:1813
+#: g10/keyedit.c:1866
msgid "You are about to revoke these signatures:\n"
msgstr "Du st�r i begrepp att �terkalla dessa signaturer:\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1884
msgid "Really create the revocation certificates? (y/N)"
msgstr "Vill du verkligen skapa �terkallelsecertifikaten? (j/N)"
-#: g10/keyedit.c:1860
+#: g10/keyedit.c:1913
msgid "no secret key\n"
msgstr "ingen hemlig nyckel\n"
@@ -2741,7 +2748,7 @@ msgstr "Experimentella algoritmer b�r inte anv�ndas!\n"
# XXX
#: g10/misc.c:238
#, fuzzy
-msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"avr�der fr�n denna chifferalgoritm, anv�nd ist�llet en mer normal algoritm!\n"
@@ -2763,7 +2770,7 @@ msgstr ""
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:147 g10/passphrase.c:248
+#: g10/hkp.c:167 g10/passphrase.c:248
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "kan inte ansluta till \"%s\": %s\n"
@@ -2897,31 +2904,31 @@ msgstr "NOTERA: den hemliga nyckeln %08lX gick ut %s\n"
msgid "requesting key %08lX from %s ...\n"
msgstr "fr�ga efter nyckeln %08lX fr�n %s ...\n"
-#: g10/hkp.c:72
+#: g10/hkp.c:83
#, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "kan inte h�mta nyckeln fr�n en nyckelserver: %s\n"
-#: g10/hkp.c:91 g10/hkp.c:125
+#: g10/hkp.c:102 g10/hkp.c:136
msgid "no keyserver known (use option --keyserver)\n"
msgstr "k�nner inte till n�gon nyckelserver (anv�nd flaggan --keyserver)\n"
-#: g10/hkp.c:99
+#: g10/hkp.c:110
#, c-format
msgid "%s: not a valid key ID\n"
msgstr "%s: ogiltig nyckelidentitet\n"
-#: g10/hkp.c:171
+#: g10/hkp.c:191
#, c-format
msgid "error sending to `%s': %s\n"
msgstr "fel vid s�ndning till \"%s\": %s\n"
-#: g10/hkp.c:183
+#: g10/hkp.c:203
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr "lyckades s�nda till \"%s\" (status=%u)\n"
-#: g10/hkp.c:186
+#: g10/hkp.c:206
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr "misslyckades s�nda till \"%s\": status=%u\n"
diff --git a/po/tr.po b/po/tr.po
index 2355d33a2..c66dd306b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.0.4\n"
-"POT-Creation-Date: 2001-04-19 12:04+0200\n"
+"POT-Creation-Date: 2001-04-28 19:57+0200\n"
"PO-Revision-Date: 2000-11-01 05:20+300\n"
"Last-Translator: Nilg�n Belma Bug�ner <[email protected]>\n"
"Language-Team: Turkish <[email protected]>\n"
@@ -986,7 +986,7 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
-#: g10/keyedit.c:1190 g10/pkclist.c:53
+#: g10/keyedit.c:1243 g10/pkclist.c:53
msgid " Fingerprint:"
msgstr " Parmak izi:"
@@ -1684,24 +1684,26 @@ msgstr "UYARI: hi�bir �ey g�nderilmedi\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "pk belle�inde �ok fazla girdi - iptal edildi\n"
-#: g10/getkey.c:449
+#. fixme: returning translatable constants instead of a user ID is
+#. * not good because they are probably not utf-8 encoded.
+#: g10/getkey.c:249 g10/getkey.c:2536
+msgid "[User id not found]"
+msgstr "[�zg�n dizi bulunamad�]"
+
+#: g10/getkey.c:453
msgid "too many entries in unk cache - disabled\n"
msgstr "unk belle�inde �ok fazla girdi - iptal edildi\n"
-#: g10/getkey.c:2203
+#: g10/getkey.c:2207
#, 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:2245 g10/trustdb.c:577
+#: g10/getkey.c:2249 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "%08lX anahtar�: genel anahtars�z gizli anahtar - atland�\n"
-#: g10/getkey.c:2532
-msgid "[User id not found]"
-msgstr "[�zg�n dizi bulunamad�]"
-
#: g10/import.c:184
#, c-format
msgid "skipping block of type %d\n"
@@ -2071,7 +2073,7 @@ msgstr ""
msgid "Really sign? "
msgstr ""
-#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:157
+#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
#, c-format
msgid "signing failed: %s\n"
msgstr "imzalama ba�ar�s�z: %s\n"
@@ -2275,252 +2277,257 @@ msgstr "b"
msgid "pref"
msgstr "�nayar"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:606 g10/keyedit.c:607
msgid "list preferences"
msgstr "�nayarlar� listeler"
#: g10/keyedit.c:607
+#, fuzzy
+msgid "showpref"
+msgstr "�nayar"
+
+#: g10/keyedit.c:608
msgid "passwd"
msgstr "aparola"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
msgid "change the passphrase"
msgstr "anahtar parolas�n� de�i�tirir"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "trust"
msgstr "b�vence"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
msgid "change the ownertrust"
msgstr "sahibinig�vencesini de�i�tirir"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revsig"
msgstr "imzafes"
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
msgid "revoke signatures"
msgstr "imzalar� fesheder"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revkey"
msgstr "anfes"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
msgid "revoke a secondary key"
msgstr "bir yard�mc� anahtar� y�r�rl�kten kald�r�r (fesheder)"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable"
msgstr "kald�r"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
msgid "disable a key"
msgstr "bir anahtar� kullan�mdan kald�r�r"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable"
msgstr "kullan"
-#: g10/keyedit.c:612
+#: g10/keyedit.c:613
msgid "enable a key"
msgstr "bir anahtar� kullan�ma sokar"
-#: g10/delkey.c:110 g10/keyedit.c:632
+#: g10/delkey.c:110 g10/keyedit.c:633
msgid "can't do that in batchmode\n"
msgstr "bu �nceden belirlenmi� i�lemler kipinde (in batchmode) yap�lamaz\n"
#. check that they match
#. fixme: check that they both match
-#: g10/keyedit.c:670
+#: g10/keyedit.c:671
msgid "Secret key is available.\n"
msgstr "Gizli key kullan��s�z.\n"
-#: g10/keyedit.c:699
+#: g10/keyedit.c:700
msgid "Command> "
msgstr "Komut-> "
-#: g10/keyedit.c:729
+#: g10/keyedit.c:730
msgid "Need the secret key to do this.\n"
msgstr "Bunu yapmak i�in gizli anahtar gerekli.\n"
-#: g10/keyedit.c:733
+#: g10/keyedit.c:734
msgid "Please use the command \"toggle\" first.\n"
msgstr "l�tfen �nce \"se�mece\" komutunu kullan�n.\n"
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
msgid "Really sign all user IDs? "
msgstr "T�m �zg�n diziler ger�ekten imzalanacak m�? "
-#: g10/keyedit.c:781
+#: g10/keyedit.c:782
msgid "Hint: Select the user IDs to sign\n"
msgstr "�pucu: �mzalamak i�in bir �zg�n dizi se�iniz\n"
-#: g10/keyedit.c:813 g10/keyedit.c:995
+#: g10/keyedit.c:814 g10/keyedit.c:1000
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "g�vence veritaban�n�n g�ncellenmesi ba�ar�s�z: %s\n"
-#: g10/keyedit.c:824 g10/keyedit.c:845
+#: g10/keyedit.c:825 g10/keyedit.c:846
msgid "You must select at least one user ID.\n"
msgstr "En az bir �zg�n dizi se�melisiniz.\n"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:827
msgid "You can't delete the last user ID!\n"
msgstr "Son �zg�n diziyi silemezsiniz!\n"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
msgid "Really remove all selected user IDs? "
msgstr "Se�ilen t�m �zg�n diziler ger�ekten silinecek mi? "
-#: g10/keyedit.c:830
+#: g10/keyedit.c:831
msgid "Really remove this user ID? "
msgstr "Bu �zg�n dizi ger�ekten silinecek mi? "
-#: g10/keyedit.c:866 g10/keyedit.c:888
+#: g10/keyedit.c:867 g10/keyedit.c:889
msgid "You must select at least one key.\n"
msgstr "En az bir anahtar se�melisiniz.\n"
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
msgid "Do you really want to delete the selected keys? "
msgstr "Se�ilen anahtarlar� ger�ekten silmek istiyor musunuz? "
-#: g10/keyedit.c:871
+#: g10/keyedit.c:872
msgid "Do you really want to delete this key? "
msgstr "Bu anahtar� ger�ekten silmek istiyor musunuz? "
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
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:893
+#: g10/keyedit.c:894
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:959
+#: g10/keyedit.c:964
msgid "Save changes? "
msgstr "De�i�iklikler kaydedilecek mi? "
-#: g10/keyedit.c:962
+#: g10/keyedit.c:967
msgid "Quit without saving? "
msgstr "Kaydetmeden ��k�ls�n m�? "
-#: g10/keyedit.c:973
+#: g10/keyedit.c:978
#, c-format
msgid "update failed: %s\n"
msgstr "g�ncelleme ba�ar�s�z: %s\n"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:985
#, c-format
msgid "update secret failed: %s\n"
msgstr "gizliyi g�ncelleme ba�ar�s�z: %s\n"
-#: g10/keyedit.c:987
+#: g10/keyedit.c:992
msgid "Key not changed so no update needed.\n"
msgstr "g�ncelleme gere�i olmad���ndan anahtar de�i�medi.\n"
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1007
msgid "Invalid command (try \"help\")\n"
msgstr "Komut ge�ersiz (\"yard�m\" komutunu deneyin)\n"
-#: g10/keyedit.c:1082 g10/keyedit.c:1108
+#: g10/keyedit.c:1131 g10/keyedit.c:1157
#, 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:1091
+#: g10/keyedit.c:1140
#, c-format
msgid " trust: %c/%c"
msgstr "g�vence: %c/%c"
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1144
msgid "This key has been disabled"
msgstr "Bu anahtar kullan�mdan kald�r�lm��"
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1173
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "fesh! yard�mc� anahtar y�r�rl�kten kald�r�lm��: %s\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1176
msgid "rev- faked revocation found\n"
msgstr "fesh- sahte y�r�rl�kten kald�rma sertifikas� bulundu\n"
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1178
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "fesh? y�r�rl�kten kald�rma kontrol edilirken problem: %s\n"
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1420
msgid "Delete this good signature? (y/N/q)"
msgstr "Bu do�ru imza silinsin mi? (e/H/�)"
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1424
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Bu ge�ersiz imza silinsin mi? (e/H/�"
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1428
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Bu bilinmeyen imza silinsin mi? (e/H/�"
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1434
msgid "Really delete this self-signature? (y/N)"
msgstr "Bu �z-imza ger�ekten silinecek mi? (e/H)"
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1448
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d imza silindi.\n"
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1449
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d adet imza silindi.\n"
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1452
msgid "Nothing deleted.\n"
msgstr "Hi�bir �ey silinmedi.\n"
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1521
msgid "Please remove selections from the secret keys.\n"
msgstr "L�tfen gizli anahtarlardan se�ilenleri silin.\n"
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1527
msgid "Please select at most one secondary key.\n"
msgstr "L�tfen en fazla bir yard�mc� anahtar se�in.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1531
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:1480
+#: g10/keyedit.c:1533
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:1522
+#: g10/keyedit.c:1575
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:1538
+#: g10/keyedit.c:1591
msgid "No corresponding signature in secret ring\n"
msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1652
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d endeksiyle �zg�n dizi yok\n"
-#: g10/keyedit.c:1645
+#: g10/keyedit.c:1698
#, c-format
msgid "No secondary key with index %d\n"
msgstr "%d endeksiyle yard�mc� anahtar yok\n"
-#: g10/keyedit.c:1743
+#: g10/keyedit.c:1796
msgid "user ID: \""
msgstr "�zg�n dizi: \""
-#: g10/keyedit.c:1746
+#: g10/keyedit.c:1799
#, c-format
msgid ""
"\"\n"
@@ -2529,36 +2536,36 @@ msgstr ""
"\"\n"
" %08lX anahtar�n�zla %s de imzaland�\n"
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1803
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:1774
+#: g10/keyedit.c:1827
msgid "You have signed these user IDs:\n"
msgstr "Bu �zg�n dizileri imzalam��s�n�z:\n"
-#: g10/keyedit.c:1788 g10/keyedit.c:1823
+#: g10/keyedit.c:1841 g10/keyedit.c:1876
#, c-format
msgid " signed by %08lX at %s\n"
msgstr " %08lX taraf�ndan %s de imzaland�\n"
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1846
#, 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:1813
+#: g10/keyedit.c:1866
msgid "You are about to revoke these signatures:\n"
msgstr "Bu imzalar� y�r�rl�kten kald�rmak �zeresiniz\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1884
msgid "Really create the revocation certificates? (y/N)"
msgstr ""
"Bu y�r�rl�kten kald�rma sertifikalar�n� ger�ekten yaratacak m�s�n�z? (e/H)"
-#: g10/keyedit.c:1860
+#: g10/keyedit.c:1913
msgid "no secret key\n"
msgstr "gizli anahtar yok\n"
@@ -2715,7 +2722,7 @@ msgstr ""
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr ""
-#: g10/hkp.c:147 g10/passphrase.c:248
+#: g10/hkp.c:167 g10/passphrase.c:248
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "\"%s\" sunucusuna ba�lan�lamad�: %s\n"
@@ -2849,31 +2856,31 @@ msgstr "NOT: %08lX gizli anahtar�n�n %s tarihinde kullan�m s�resi doldu\n"
msgid "requesting key %08lX from %s ...\n"
msgstr "%s den %08lX anahtar� isteniyor ...\n"
-#: g10/hkp.c:72
+#: g10/hkp.c:83
#, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "%s anahtar sunucusundan anahtar al�namad�\n"
-#: g10/hkp.c:91 g10/hkp.c:125
+#: g10/hkp.c:102 g10/hkp.c:136
msgid "no keyserver known (use option --keyserver)\n"
msgstr "anahtar sunucu bilinmiyor (--keyserver se�ene�i ile belirtin)\n"
-#: g10/hkp.c:99
+#: g10/hkp.c:110
#, c-format
msgid "%s: not a valid key ID\n"
msgstr "%s: ge�erli bir anahtar kimli�i de�il\n"
-#: g10/hkp.c:171
+#: g10/hkp.c:191
#, c-format
msgid "error sending to `%s': %s\n"
msgstr "\"%s\" sunucusuna g�nderme hatas�: %s\n"
-#: g10/hkp.c:183
+#: g10/hkp.c:203
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr "\"%s\" sunucusuna g�nderme i�lemi ba�ar�l� (durum=%u)\n"
-#: g10/hkp.c:186
+#: g10/hkp.c:206
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr "\"%s\" sunucusuna g�nderme i�lemi ba�ar�s�z (durum=%u)\n"
diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index 2594a7d65..570e17588 100755
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -1,5 +1,15 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
+#
+# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
PGM=GnuPG
lib_config_files=""
diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist
index 2bb979096..4fd36a5ef 100755
--- a/scripts/mk-w32-dist
+++ b/scripts/mk-w32-dist
@@ -1,6 +1,15 @@
#!/bin/sh
-# Hmm, we need the not real free zip utility - this should be
-# avoided. The easiest way will be to use an installer program.
+#
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
set -e
diff --git a/scripts/mkdiff b/scripts/mkdiff
index 6fad6c188..9c7e3a4a7 100755
--- a/scripts/mkdiff
+++ b/scripts/mkdiff
@@ -1,4 +1,13 @@
#!/bin/sh
+# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
if [ $# != 1 ] ; then
echo "usage: mkdiff package-name" >&2
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 994ac2518..2e5cd3a69 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -17,7 +17,7 @@ Thu Sep 14 14:20:38 CEST 2000 Werner Koch <[email protected]>
Wed Jul 5 13:28:45 CEST 2000 Werner Koch <wk@>
- * mail-signed-keys: New.
+ * mail-signed-keys: New.
Tue May 23 09:19:00 CEST 2000 Werner Koch <[email protected]>
@@ -25,12 +25,10 @@ Tue May 23 09:19:00 CEST 2000 Werner Koch <[email protected]>
Thu Jul 8 16:21:27 CEST 1999 Werner Koch <[email protected]>
-
* lspgpot: New
Wed Jul 7 13:08:40 CEST 1999 Werner Koch <[email protected]>
-
* Makefile.am: Support for libtool.
Tue Jun 8 13:36:25 CEST 1999 Werner Koch <[email protected]>
diff --git a/tools/bftest.c b/tools/bftest.c
index 1b24b1c3f..b15f4a1da 100644
--- a/tools/bftest.c
+++ b/tools/bftest.c
@@ -1,5 +1,5 @@
/* bftest.c - Blowfish test program
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/tools/clean-sat.c b/tools/clean-sat.c
index b1edb2010..8b6bfd77a 100644
--- a/tools/clean-sat.c
+++ b/tools/clean-sat.c
@@ -1,4 +1,13 @@
/* clean-sat.c
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
#include <stdio.h>
diff --git a/tools/crlf.c b/tools/crlf.c
index f81f77e69..e6ac8c70f 100644
--- a/tools/crlf.c
+++ b/tools/crlf.c
@@ -1,4 +1,13 @@
/* crlf.c
+ * Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ *
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
#include <stdio.h>
diff --git a/tools/lspgpot b/tools/lspgpot
index 585629b5b..8dc9c3047 100755
--- a/tools/lspgpot
+++ b/tools/lspgpot
@@ -1,6 +1,14 @@
#!/bin/sh
# lspgpot - script to extract the ownertrust values
# from PGP keyrings and list them in GnuPG ownertrust format.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
../g10/gpg --dry-run --with-fingerprint --with-colons $* | awk '
BEGIN { FS=":"
diff --git a/tools/mail-signed-keys b/tools/mail-signed-keys
index 2f1df9445..cee54b055 100755
--- a/tools/mail-signed-keys
+++ b/tools/mail-signed-keys
@@ -1,4 +1,13 @@
#!/bin/sh
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# FIXME: Add --dry-run, use only valid email addreses, extract only given keys
diff --git a/tools/mk-tdata.c b/tools/mk-tdata.c
index 70358dc47..dcfa859f1 100644
--- a/tools/mk-tdata.c
+++ b/tools/mk-tdata.c
@@ -1,7 +1,13 @@
-/* mk-tdata.c
+/* mk-tdata.c - Create some simple random testdata
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
- * Create some simple random testdata
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
*
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
#include <config.h>
diff --git a/tools/mpicalc.c b/tools/mpicalc.c
index 95ab47c29..2817c9932 100644
--- a/tools/mpicalc.c
+++ b/tools/mpicalc.c
@@ -1,5 +1,5 @@
/* mpitest.c - test the mpi functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This is an RPN calculator; values must be given in hex.
* Operation is like dc(1) except that the input/output radix is
diff --git a/tools/ring-a-party b/tools/ring-a-party
index 4b383f8ba..1993e2732 100755
--- a/tools/ring-a-party
+++ b/tools/ring-a-party
@@ -1,5 +1,14 @@
#!/bin/sh
# ring-a-party - print a keyring suitable for a key signing party
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
if [ $# -lt 1 ]; then
echo "usage: ring-a-party keyring [headerline]" >&2
diff --git a/tools/shmtest.c b/tools/shmtest.c
index 9791dcd0c..fceade1e1 100644
--- a/tools/shmtest.c
+++ b/tools/shmtest.c
@@ -1,7 +1,16 @@
/* shmtest.c
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
+
#include <config.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/util/dotlock.c b/util/dotlock.c
index a56789608..595d7003f 100644
--- a/util/dotlock.c
+++ b/util/dotlock.c
@@ -1,5 +1,5 @@
/* dotlock.c - dotfile locking
- * Copyright (C) 1998,2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/util/errors.c b/util/errors.c
index c4c1cb19e..67148ab6c 100644
--- a/util/errors.c
+++ b/util/errors.c
@@ -1,5 +1,5 @@
/* errors.c - error strings
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/util/fileutil.c b/util/fileutil.c
index 7910631c2..368216fcc 100644
--- a/util/fileutil.c
+++ b/util/fileutil.c
@@ -1,5 +1,5 @@
/* fileutil.c - file utilities
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/util/g10u.c b/util/g10u.c
index 2ce3a4e36..2109f7363 100644
--- a/util/g10u.c
+++ b/util/g10u.c
@@ -1,5 +1,5 @@
/* g10u.c - Wrapper for utility functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/util/http.c b/util/http.c
index 7cb782c04..b314b047a 100644
--- a/util/http.c
+++ b/util/http.c
@@ -1,5 +1,5 @@
/* http.c - HTTP protocol handler
- * Copyright (C) 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/util/logger.c b/util/logger.c
index d9e908aec..15bb9ac99 100644
--- a/util/logger.c
+++ b/util/logger.c
@@ -1,5 +1,5 @@
/* logger.c - log functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/util/memory.c b/util/memory.c
index 0f2d8e12d..8e498f3e9 100644
--- a/util/memory.c
+++ b/util/memory.c
@@ -1,14 +1,5 @@
/* memory.c - memory allocation
- * Copyright (C) 1998 Free Software Foundation, Inc.
- *
- * We use our own memory allocation functions instead of plain malloc(),
- * so that we can provide some special enhancements:
- * a) functions to provide memory from a secure memory.
- * b) by looking at the requested allocation size we
- * can reuse memory very quickly (e.g. MPI storage)
- * (really needed?)
- * c) memory usage reporting if compiled with M_DEBUG
- * d) memory checking if compiled with M_GUARD
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -25,6 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ *
+ * We use our own memory allocation functions instead of plain malloc(),
+ * so that we can provide some special enhancements:
+ * a) functions to provide memory from a secure memory.
+ * b) by looking at the requested allocation size we
+ * can reuse memory very quickly (e.g. MPI storage)
+ * (really needed?)
+ * c) memory usage reporting if compiled with M_DEBUG
+ * d) memory checking if compiled with M_GUARD
*/
#include <config.h>
diff --git a/util/miscutil.c b/util/miscutil.c
index 376834fa6..2fc7545b4 100644
--- a/util/miscutil.c
+++ b/util/miscutil.c
@@ -1,5 +1,5 @@
/* miscutil.c - miscellaneous utilities
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/util/secmem.c b/util/secmem.c
index ec74aeffd..12a8a6d6b 100644
--- a/util/secmem.c
+++ b/util/secmem.c
@@ -1,5 +1,5 @@
/* secmem.c - memory allocation from a secure heap
- * Copyright (C) 1998,1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/util/simple-gettext.c b/util/simple-gettext.c
index a45ecb2b2..64d6675a0 100644
--- a/util/simple-gettext.c
+++ b/util/simple-gettext.c
@@ -1,5 +1,6 @@
/* simple-gettext.c - a simplified version of gettext.
- * Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 1996, 1997, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -19,7 +20,7 @@
*/
/* This is a simplified version of gettext written by Ulrich Drepper.
- * It is used for the Win32 version of GnuPG becuase all the overhead
+ * It is used for the Win32 version of GnuPG beucase all the overhead
* of gettext is not needed and we have to do some special Win32 stuff.
* I decided that this is far easier than to tweak gettext for the special
* cases (I tried it but it is a lot of code). wk 15.09.99
diff --git a/util/strgutil.c b/util/strgutil.c
index c1531bbe3..aba340aff 100644
--- a/util/strgutil.c
+++ b/util/strgutil.c
@@ -1,5 +1,5 @@
/* strgutil.c - string utilities
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/util/ttyio.c b/util/ttyio.c
index c1e0d7951..4952ac6f0 100644
--- a/util/ttyio.c
+++ b/util/ttyio.c
@@ -1,5 +1,5 @@
/* ttyio.c - tty i/O functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/util/w32reg.c b/util/w32reg.c
index 0cf38090f..ecfe6ec5e 100644
--- a/util/w32reg.c
+++ b/util/w32reg.c
@@ -1,5 +1,5 @@
/* w32reg.c - MS-Windows Registry access
- * Copyright (C) 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*