summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>1999-06-26 12:23:06 +0200
committerWerner Koch <wk@gnupg.org>1999-06-26 12:23:06 +0200
commit080c9ca49f4d0b0aa07e00e1eb84bc39bf4c8562 (patch)
tree7d387cb3da17d9b3e25aef7f85acbad21f75be7f
parentSee ChangeLog: Wed Jun 16 20:16:21 CEST 1999 Werner Koch (diff)
downloadgnupg2-080c9ca49f4d0b0aa07e00e1eb84bc39bf4c8562.tar.xz
gnupg2-080c9ca49f4d0b0aa07e00e1eb84bc39bf4c8562.zip
See ChangeLog: Sat Jun 26 12:15:59 CEST 1999 Werner Koch
-rw-r--r--BUGS12
-rw-r--r--ChangeLog10
-rw-r--r--NEWS4
-rw-r--r--OBUGS10
-rw-r--r--README27
-rw-r--r--TODO2
-rw-r--r--VERSION2
-rw-r--r--acconfig.h1
-rw-r--r--acinclude.m47
-rw-r--r--cipher/ChangeLog10
-rw-r--r--cipher/Makefile.am8
-rw-r--r--cipher/cipher.c51
-rw-r--r--cipher/dynload.c24
-rw-r--r--cipher/md.c4
-rw-r--r--cipher/rndegd.c2
-rw-r--r--configure.in15
-rw-r--r--doc/gpg.sgml2
-rw-r--r--g10/ChangeLog14
-rw-r--r--g10/Makefile.am6
-rw-r--r--g10/dearmor.c2
-rw-r--r--g10/keyedit.c2
-rw-r--r--g10/parse-packet.c4
-rw-r--r--g10/tdbdump.c2
-rw-r--r--g10/tdbio.c2
-rw-r--r--include/ChangeLog5
-rw-r--r--include/cipher.h8
-rw-r--r--po/ChangeLog6
-rw-r--r--po/Makefile.in.in26
-rw-r--r--po/de.po335
-rw-r--r--po/es_ES.po941
-rw-r--r--po/fr.po328
-rw-r--r--po/it.po950
-rw-r--r--po/pl.po329
-rw-r--r--po/pt_BR.po1021
-rw-r--r--po/ru.po323
-rw-r--r--util/ChangeLog13
-rw-r--r--util/dotlock.c6
-rw-r--r--util/iobuf.c24
-rw-r--r--util/secmem.c5
39 files changed, 2641 insertions, 1902 deletions
diff --git a/BUGS b/BUGS
index f81db6e64..357d4ac66 100644
--- a/BUGS
+++ b/BUGS
@@ -26,8 +26,8 @@ and after about half a day in the rsync snapshots.
4. save
5. key has expiration date from 1. and gpg reports that pubkey
and seckey differ.
- The for loop the exp.date is set before v3 detection?
- [is this bug still alive?]
+ The for loop the exp.date is set before v3 detection?
+ [is this bug still alive? - can someone please check it]
[ *] #5
/home/jam/.gnupg/pubring.gpg: can't open gdbm file: Can't be writer
@@ -50,11 +50,5 @@ and after about half a day in the rsync snapshots.
"trustdb transaction too large" with about 500 signatures on a key
FAEBD5FC.
-[ **] #20 1999-06-16 <jashley@yorktown.designlab.ukans.edu> 0.9.7
- Using "addkey" in the edit menu with more than 1 subkey leads to
- "out of secure memory" in some cases.
-
-
-Next #21
-
+Next #22
diff --git a/ChangeLog b/ChangeLog
index 9645e592f..10c46392b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,17 @@
-Wed Jun 16 20:16:21 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+Sat Jun 26 12:15:59 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+
+ * acinclude.m4 (GNUPG_CHECK_RDYNAMIC): Support for HPUX and IRIX.
+ * configure.in (HAVE_DL_SHL_LOAD): New for HPUX (Dave Dykstra).
+ * VERSION: Now 0.9.8
+
+Wed Jun 16 20:16:21 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
* configure.in: Add test for docbook-to-man
Tue Jun 15 12:21:08 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
-
* acinclude.m4 (GNUPG_SYS_NM_PARSE): Support for {net,free}bsd,
Thu Jun 10 14:18:23 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
diff --git a/NEWS b/NEWS
index 0ad9bdee6..ce2366369 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+Noteworthy changes in version 0.9.8
+-----------------------------------
* New subcommand "delsig" in the edit menu.
@@ -14,6 +16,8 @@
New option -N to insert notations and a --set-policy-url.
A couple of other options to allow restting of options.
+ * Better support for HPUX
+
Noteworthy changes in version 0.9.7
-----------------------------------
diff --git a/OBUGS b/OBUGS
index 561b1a28c..a8bf33997 100644
--- a/OBUGS
+++ b/OBUGS
@@ -77,3 +77,13 @@
Import does not detect identical user IDs.
FIX: 1999-05-22
+[ **] #20 1999-06-16 <jashley@yorktown.designlab.ukans.edu> 0.9.7
+ Using "addkey" in the edit menu with more than 1 subkey leads to
+ "out of secure memory" in some cases.
+ FIX: 1999-06-17 (Twofish uses too much memory and the memory
+ becomes fragmented - workaround is using CAST5 to protect passphrases)
+
+[ *] #21 1999-06-17
+ Ctrl-D does not work correct for messages entered at the tty.
+ FIX: 1999-06-18 (Better EOF detection on terminals)
+
diff --git a/README b/README
index 34d59c975..6dcfd41d6 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
GnuPG - The GNU Privacy Guard
-------------------------------
- Version 0.9.7
+ Version 0.9.8
GnuPG is now in Beta test and you should report all bugs to the
mailing list (see below). The 0.9.x versions are released mainly
@@ -32,8 +32,8 @@
have problems, please subscribe to "gnupg-users@gnupg.org" by sending
mail with the subject "subscribe" to "gnupg-users-request@gnupg.org"
and ask there. The gnupg.org domain is hosted in Germany to avoid
- possible legal problems with gnu.org (technical advices may count
- as a violation of ITAR).
+ possible legal problems (technical advices may count as a violation
+ of ITAR).
See the file COPYING for copyright and warranty information.
@@ -45,11 +45,13 @@
patented worldwide) and RSA (which is patented in the United States
until Sep 20, 2000).
- The default algorithms are now DSA and ElGamal. ElGamal for signing
+ The default algorithms are DSA and ElGamal. ElGamal for signing
is still available, but because of the larger size of such
signatures it is deprecated (Please note that the GnuPG
implementation of ElGamal signatures is *not* insecure). Symmetric
- algorithms are: 3DES, Blowfish, and CAST5 (Twofish will come soon).
+ algorithms are: 3DES, Blowfish, CAST5 and Twofish (GnuPG does not
+ yet create Twofish encrypted messages because there no agreement
+ in the OpenPG WG on how to use it together with a MDC algorithm)
Digest algorithms available are MD5, RIPEMD160, SHA1, and TIGER/192.
@@ -436,10 +438,9 @@
To avoid possible legal problems we have decided, not to use
the normal www.gnu.org webserver.
- Please direct bug reports to <gnupg-bugs@gnu.org> or, better,
- post them to the mailing list <gnupg-devel@gnupg.org> (this is a
- closed list - subscribe before posting, see above (~line 33)).
- Please direct questions about GnuPG to the mailing list or
+ Please direct bug reports to <gnupg-bugs@gnu.org> or post
+ them direct to the mailing list <gnupg-devel@gnupg.org>.
+ Please direct questions about GnuPG to the users mailing list or
one of the pgp newsgroups and give me more time to improve
GnuPG. Commercial support for GnuPG is also available; please
see the GNU service directory or search other resources.
@@ -450,8 +451,8 @@
Version: GnuPG v0.9.7 (GNU/Linux)
Comment: For info see http://www.gnupg.org
-iQB1AwUBN1UgTx0Z9MEMmFelAQH93wMAt2JYGXSkJR9+VBeLlpKdjxoIylrlDWEL
-Jk5U/tuuM8H8G4ZJi7lDEhJNX77Jbh2LI18eCJJdrmWPrmDCNK2udDwcyKV4nW3k
-7Fzpc/j8fKJcICP+T9YU9wa0NJrrTg1v
-=dgdp
+iQB1AwUBN3SoBh0Z9MEMmFelAQE+9wL/bOTFEPvkO0drlWAu8k2P7udEzwfGlKhE
+Iyr6g75FSX4NnDkHB7RjyHYvQUkc8gicxYV8pBWe5c1bMYwrpe1cMvAu+BtUfDQc
+oHUbx9ln7CZ2BkEgzT5bjypugwtc6o7g
+=uTFn
-----END PGP SIGNATURE-----
diff --git a/TODO b/TODO
index d88e2b8c6..bc8e25be5 100644
--- a/TODO
+++ b/TODO
@@ -29,6 +29,8 @@
* convert the given user ID to UTF-8 and add an option to suppress this.
+ * A way to disable keys.
+
Nice to have
------------
diff --git a/VERSION b/VERSION
index 2f3b0fdfb..e3e180701 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.7b
+0.9.8
diff --git a/acconfig.h b/acconfig.h
index de4e44f5a..89931d519 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -76,6 +76,7 @@
#undef USE_DYNAMIC_LINKING
#undef HAVE_DL_DLOPEN
+#undef HAVE_DL_SHL_LOAD
#undef HAVE_DLD_DLD_LINK
#undef USE_SHM_COPROCESSING
diff --git a/acinclude.m4 b/acinclude.m4
index f124fc45f..4e1645b8d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -204,9 +204,14 @@ define(GNUPG_CHECK_RDYNAMIC,
CFLAGS_RDYNAMIC="-Wl,-dy"
;;
- openbsd* | freebsd2* | osf4* )
+ hpux* )
+ CFLAGS_RDYNAMIC="-Wl,-E"
+ ;;
+
+ openbsd* | freebsd2* | osf4* | irix* )
CFLAGS_RDYNAMIC=""
;;
+
* )
CFLAGS_RDYNAMIC="-Wl,-export-dynamic"
;;
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index b2fc6401c..30d2ddd22 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,13 @@
+Sat Jun 26 12:15:59 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+
+ * rndegd.c (do_write): s/ssize_t/int/ due to SunOS 4.1 probs.
+
+ * cipher.c (do_cbc_encrypt, do_cbc_decrypt): New.
+
+ * dynload.c (HAVE_DL_SHL_LOAD): Map hpux API to dlopen (Dave Dykstra).
+ * Makefile.am (install-exec-hook): Removed.
+
Sun May 23 14:20:22 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
* cipher.c (setup_cipher_table): Enable Twofish
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index a3b77a1a1..af6d8024b 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -98,11 +98,3 @@ rndegd: $(srcdir)/rndegd.c
-install-exec-hook:
- @list='$(pkglib_PROGRAMS)'; for p in $$list; do \
- if test -f $(pkglibdir)/$$p; then \
- echo "chmod 644 $(pkglibdir)/$$p"; \
- chmod 644 $(pkglibdir)/$$p; \
- fi; \
- done
-
diff --git a/cipher/cipher.c b/cipher/cipher.c
index a44dcc4a7..59b6f2efb 100644
--- a/cipher/cipher.c
+++ b/cipher/cipher.c
@@ -408,6 +408,49 @@ do_ecb_decrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nblocks )
}
}
+static void
+do_cbc_encrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nblocks )
+{
+ unsigned int n;
+ byte *ivp;
+ int i;
+ size_t blocksize = c->blocksize;
+
+ for(n=0; n < nblocks; n++ ) {
+ /* fixme: the xor should works on words and not on
+ * bytes. Maybe it is a good idea to enhance the cipher backend
+ * API to allow for CBC handling in the backend */
+ for(ivp=c->iv,i=0; i < blocksize; i++ )
+ outbuf[i] ^= *ivp++;
+ (*c->encrypt)( &c->context.c, outbuf, outbuf );
+ memcpy(c->iv, outbuf, blocksize );
+ inbuf += c->blocksize;
+ outbuf += c->blocksize;
+ }
+}
+
+static void
+do_cbc_decrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nblocks )
+{
+ unsigned int n;
+ byte *ivp;
+ int i;
+ size_t blocksize = c->blocksize;
+
+ for(n=0; n < nblocks; n++ ) {
+ /* because outbuf and inbuf might be the same, we have
+ * to save the original ciphertext block. We use lastiv
+ * for this here because it is not used otherwise */
+ memcpy(c->lastiv, inbuf, blocksize );
+ (*c->decrypt)( &c->context.c, outbuf, inbuf );
+ for(ivp=c->iv,i=0; i < blocksize; i++ )
+ outbuf[i] ^= *ivp++;
+ memcpy(c->iv, c->lastiv, blocksize );
+ inbuf += c->blocksize;
+ outbuf += c->blocksize;
+ }
+}
+
static void
do_cfb_encrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
@@ -524,6 +567,10 @@ cipher_encrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
assert(!(nbytes%8));
do_ecb_encrypt(c, outbuf, inbuf, nbytes/8 );
break;
+ case CIPHER_MODE_CBC:
+ assert(!(nbytes%8)); /* fixme: should be blocksize */
+ do_cbc_encrypt(c, outbuf, inbuf, nbytes/8 );
+ break;
case CIPHER_MODE_CFB:
case CIPHER_MODE_PHILS_CFB:
do_cfb_encrypt(c, outbuf, inbuf, nbytes );
@@ -550,6 +597,10 @@ cipher_decrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
assert(!(nbytes%8));
do_ecb_decrypt(c, outbuf, inbuf, nbytes/8 );
break;
+ case CIPHER_MODE_CBC:
+ assert(!(nbytes%8)); /* fixme: should assert on blocksize */
+ do_cbc_decrypt(c, outbuf, inbuf, nbytes/8 );
+ break;
case CIPHER_MODE_CFB:
case CIPHER_MODE_PHILS_CFB:
do_cfb_decrypt(c, outbuf, inbuf, nbytes );
diff --git a/cipher/dynload.c b/cipher/dynload.c
index 6caeb063c..e2c988e02 100644
--- a/cipher/dynload.c
+++ b/cipher/dynload.c
@@ -27,6 +27,9 @@
#include <dlfcn.h>
#elif defined(HAVE_DLD_DLD_LINK)
#include <dld.h>
+#elif defined(HAVE_DL_SHL_LOAD)
+ #include <dl.h>
+ #include <errno.h>
#endif
#include "util.h"
#include "cipher.h"
@@ -45,6 +48,27 @@
#define RTLD_NOW 1
#endif
+#ifdef HAVE_DL_SHL_LOAD /* HPUX has shl_load instead of dlopen */
+#define HAVE_DL_DLOPEN
+#define dlopen(PATHNAME,MODE) \
+ ((void *) shl_load(PATHNAME, DYNAMIC_PATH | \
+ (((MODE) & RTLD_NOW) ? BIND_IMMEDIATE : BIND_DEFERRED), 0L))
+#define dlclose(HANDLE) shl_unload((shl_t) (HANDLE))
+#define dlerror() (errno == 0 ? NULL : strerror(errno))
+
+static void *
+dlsym(void *handle, char *name)
+{
+ void *addr;
+ if (shl_findsym((shl_t *)&handle,name,(short)TYPE_UNDEFINED,&addr) != 0) {
+ return NULL;
+ }
+ return addr;
+}
+#endif /*HAVE_DL_SHL_LOAD*/
+
+
+
typedef struct ext_list {
struct ext_list *next;
int internal;
diff --git a/cipher/md.c b/cipher/md.c
index fc740479e..be921e4b0 100644
--- a/cipher/md.c
+++ b/cipher/md.c
@@ -341,12 +341,16 @@ md_final(MD_HANDLE a)
{
struct md_digest_list_s *r;
+ if( a->finalized )
+ return;
+
if( a->bufcount )
md_write( a, NULL, 0 );
for(r=a->list; r; r = r->next ) {
(*r->final)( &r->context.c );
}
+ a->finalized = 1;
}
diff --git a/cipher/rndegd.c b/cipher/rndegd.c
index 495586231..7f2598f60 100644
--- a/cipher/rndegd.c
+++ b/cipher/rndegd.c
@@ -50,7 +50,7 @@ static int
do_write( int fd, void *buf, size_t nbytes )
{
size_t nleft = nbytes;
- ssize_t nwritten;
+ int nwritten;
while( nleft > 0 ) {
nwritten = write( fd, buf, nleft);
diff --git a/configure.in b/configure.in
index 76ad05c1f..5eb68ea5f 100644
--- a/configure.in
+++ b/configure.in
@@ -108,7 +108,7 @@ dnl
AC_MSG_CHECKING([whether compilation of libgcrypt is requested])
AC_ARG_ENABLE(libgcrypt,
[ --enable-libgcrypt compile the libgcrypt [default=no]],
-[compile_libgcrypt="$enableval"],[compile_libgcrypt=yes])
+[compile_libgcrypt="$enableval"],[compile_libgcrypt=no])
AM_CONDITIONAL(COMPILE_LIBGCRYPT, test x$compile_libgcrypt = xyes)
AC_MSG_RESULT($compile_libgcrypt)
@@ -287,8 +287,14 @@ if test "$try_dynload" = yes ; then
AC_DEFINE(HAVE_DL_DLOPEN)
DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC"
use_gnupg_extensions=yes
-dnl else
-dnl
+ else
+ AC_CHECK_LIB(dld,shl_load)
+ if test "$ac_cv_lib_dld_shl_load" = "yes"; then
+ AC_DEFINE(USE_DYNAMIC_LINKING)
+ AC_DEFINE(HAVE_DL_SHL_LOAD)
+ DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC"
+ use_gnupg_extensions=yes
+dnl -----------------
dnl DLD is not ready for use. So I better disable this test
dnl
dnl AC_CHECK_LIB(dld,dld_link)
@@ -297,7 +303,8 @@ dnl AC_DEFINE(USE_DYNAMIC_LINKING)
dnl AC_DEFINE(HAVE_DLD_DLD_LINK)
dnl DYNLINK_LDFLAGS="$CFLAGS_RDYNAMIC"
dnl use_gnupg_extensions=yes
-dnl fi
+dnl ---------------
+ fi
fi
fi
else
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 645063db5..82e069b56 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -197,7 +197,7 @@ Same as --list-keys, but the signatures are listed too.
<varlistentry>
-<term>--list-sigs &OptParmNames;</term>
+<term>--check-sigs &OptParmNames;</term>
<listitem><para>
Same as --list-sigs, but the signatures are verified.
</para></listitem></varlistentry>
diff --git a/g10/ChangeLog b/g10/ChangeLog
index cadd4a122..96c2c9b5a 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,15 @@
-Tue Jun 15 12:21:08 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+Sat Jun 26 12:15:59 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+
+ * dearmor.c (enarmor_file): Fixed comment string.
+ * tdbdump.c (export_ownertrust): Text fix.
+ * tbio.c (tdbio_invalid): Ditto.
+ * parse-packet.c (parse_key): Made temp buffer larger.
+
+ * Makefile.am (install-data-local): Add missing backslashes
+
+Tue Jun 15 12:21:08 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
* g10.c (main): Made iterated+salted the default S2K method.
@@ -13,7 +23,7 @@ Tue Jun 15 12:21:08 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
Mon Jun 14 21:18:54 CEST 1999 Michael Roth <mroth@nessie.de>
* g10.c: New options --openpgp, --no-tty, --emit-version,
- --default-comment and --lock-multiple
+ --default-comment and --lock-multiple
Thu Jun 10 14:18:23 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 22e08f27b..6170b1691 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -86,8 +86,8 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/options.skel \
$(DESTDIR)$(pkgdatadir)/options.skel
@set -e;\
- if test -f $(DESTDIR)$(bindir)/gpgm ; then
- echo "removing obsolete gpgm binary"
- rm $(DESTDIR)$(bindir)/gpgm ;
+ if test -f $(DESTDIR)$(bindir)/gpgm ; then \
+ echo "removing obsolete gpgm binary" ; \
+ rm $(DESTDIR)$(bindir)/gpgm ; \
fi
diff --git a/g10/dearmor.c b/g10/dearmor.c
index 43fc6b059..e87dffcd9 100644
--- a/g10/dearmor.c
+++ b/g10/dearmor.c
@@ -103,7 +103,7 @@ enarmor_file( const char *fname )
goto leave;
afx.what = 4;
- afx.hdrlines = "Comment: Use \"gpgm --dearmor\" for unpacking\n";
+ afx.hdrlines = "Comment: Use \"gpg --dearmor\" for unpacking\n";
iobuf_push_filter( out, armor_filter, &afx );
while( (c = iobuf_get(inp)) != -1 )
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 614043888..91a4d6bdf 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -842,10 +842,12 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands )
break;
case cmdADDKEY:
+ secmem_dump_stats();
if( generate_subkeypair( keyblock, sec_keyblock ) ) {
redisplay = 1;
sec_modified = modified = 1;
}
+ secmem_dump_stats();
break;
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 730386cc2..5ce7e2660 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -1281,7 +1281,7 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
if( pkttype == PKT_SECRET_KEY || pkttype == PKT_SECRET_SUBKEY ) {
PKT_secret_key *sk = pkt->pkt.secret_key;
- byte temp[8];
+ byte temp[16];
if( !npkey ) {
sk->skey[0] = mpi_set_opaque( NULL,
@@ -1370,6 +1370,8 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
* so a
* sk->protect.ivlen = cipher_get_blocksize(sk->protect.algo);
* won't work. The only solution I see is to hardwire it here.
+ * NOTE: if you change the ivlen above 16, don't forget to
+ * enlarge temp.
*/
switch( sk->protect.algo ) {
case 7: case 8: case 9: /* reserved for AES */
diff --git a/g10/tdbdump.c b/g10/tdbdump.c
index 1d1808466..2d3502caf 100644
--- a/g10/tdbdump.c
+++ b/g10/tdbdump.c
@@ -399,7 +399,7 @@ export_ownertrust()
init_trustdb();
printf(_("# List of assigned trustvalues, created %s\n"
- "# (Use \"gpgm --import-ownertrust\" to restore them)\n"),
+ "# (Use \"gpg --import-ownertrust\" to restore them)\n"),
asctimestamp( make_timestamp() ) );
for(recnum=0; !tdbio_read_record( recnum, &rec, 0); recnum++ ) {
if( rec.rectype == RECTYPE_DIR ) {
diff --git a/g10/tdbio.c b/g10/tdbio.c
index 1d05aae37..39f1d5677 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -1627,7 +1627,7 @@ void
tdbio_invalid(void)
{
log_error(_(
- "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n") );
+ "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n") );
g10_exit(2);
}
diff --git a/include/ChangeLog b/include/ChangeLog
index 930b954c5..5f4cb82b0 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 26 12:15:59 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+
+ * cipher.h (MD_HANDLE): Assigned a structure name.
+
Fri Apr 9 12:26:25 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
* cipher.h (BLOWFISH160): Removed.
diff --git a/include/cipher.h b/include/cipher.h
index 19b29771a..a420f4f6b 100644
--- a/include/cipher.h
+++ b/include/cipher.h
@@ -72,17 +72,21 @@ typedef struct cipher_handle_s *CIPHER_HANDLE;
#define CIPHER_MODE_PHILS_CFB 3
#define CIPHER_MODE_AUTO_CFB 4
#define CIPHER_MODE_DUMMY 5 /* used with algo DUMMY for no encryption */
+#define CIPHER_MODE_CBC 6
struct md_digest_list_s;
-typedef struct {
+struct gcry_md_context {
int secure;
FILE *debug;
+ int finalized;
struct md_digest_list_s *list;
int bufcount;
int bufsize;
byte buffer[1];
-} *MD_HANDLE;
+};
+
+typedef struct gcry_md_context *MD_HANDLE;
int g10c_debug_mode;
diff --git a/po/ChangeLog b/po/ChangeLog
index ba64ae99c..9d8490e21 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,5 +1,9 @@
-Thu Jun 10 14:18:23 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+Sat Jun 26 12:15:59 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+ * pt_BR.po: Updated (Thiago).
+
+Thu Jun 10 14:18:23 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
* it.po: Updated (Marco).
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index cf3aa8cb7..111b40fcb 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -24,8 +24,6 @@ gnulocaledir = $(prefix)/share/locale
gettextsrcdir = $(prefix)/share/gettext/po
subdir = po
-DESTDIR =
-
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
@@ -113,16 +111,16 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+ $(MKINSTALLDIRS) $(datadir); \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
case "$$cat" in \
- *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
- *) destdir=$(DESTDIR)$(localedir);; \
+ *.gmo) destdir=$(gnulocaledir);; \
+ *) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$$destdir/$$lang/LC_MESSAGES; \
@@ -155,12 +153,12 @@ install-data-yes: all
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
+ $(MKINSTALLDIRS) $(gettextsrcdir); \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+ $(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
@@ -173,12 +171,12 @@ uninstall:
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
- rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
done
- rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
+ rm -f $(gettextsrcdir)/po-Makefile.in.in
check: all
diff --git a/po/de.po b/po/de.po
index 48f4973a2..4aae57073 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@
# Walter Koch <walterk@dip.de>, 1998.
msgid ""
msgstr ""
-"POT-Creation-Date: 1999-06-08 21:26+0200\n"
+"POT-Creation-Date: 1999-06-26 11:22+0200\n"
"PO-Revision-Date: 1999-05-30 21:56+0200\n"
"Last-Translator: Walter Koch <walterk@mail.dip.de>\n"
"Language-Team: German <de@li.org>\n"
@@ -274,7 +274,7 @@ msgstr ""
"Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
"(Es werden noch %d Byte benЖtigt.)\n"
-#: g10/g10.c:169
+#: g10/g10.c:174
msgid ""
"@Commands:\n"
" "
@@ -282,131 +282,131 @@ msgstr ""
"@Befehle:\n"
" "
-#: g10/g10.c:171
+#: g10/g10.c:176
msgid "|[file]|make a signature"
msgstr "|[Datei]|Eine Unterschrift erzeugen"
-#: g10/g10.c:172
+#: g10/g10.c:177
msgid "|[file]|make a clear text signature"
msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
-#: g10/g10.c:173
+#: g10/g10.c:178
msgid "make a detached signature"
msgstr "Eine abgetrennte Unterschrift erzeugen"
-#: g10/g10.c:174
+#: g10/g10.c:179
msgid "encrypt data"
msgstr "Daten verschlЭsseln"
-#: g10/g10.c:175
+#: g10/g10.c:180
msgid "encryption only with symmetric cipher"
msgstr "Daten symmetrisch verschlЭsseln"
-#: g10/g10.c:176
+#: g10/g10.c:181
msgid "store only"
msgstr "Nur speichern"
-#: g10/g10.c:177
+#: g10/g10.c:182
msgid "decrypt data (default)"
msgstr "Daten entschlЭsseln (Voreinstellung)"
-#: g10/g10.c:178
+#: g10/g10.c:183
msgid "verify a signature"
msgstr "Signatur prЭfen"
-#: g10/g10.c:179
+#: g10/g10.c:184
msgid "list keys"
msgstr "Liste der SchlЭssel"
-#: g10/g10.c:181
+#: g10/g10.c:186
msgid "list keys and signatures"
msgstr "Liste der SchlЭssel und ihrer Signaturen"
-#: g10/g10.c:182
+#: g10/g10.c:187
msgid "check key signatures"
msgstr "Signaturen der SchlЭssel prЭfen"
-#: g10/g10.c:183
+#: g10/g10.c:188
msgid "list keys and fingerprints"
msgstr "Liste der SchlЭssel und ihrer \"FingerabdrЭcke\""
-#: g10/g10.c:184
+#: g10/g10.c:189
msgid "list secret keys"
msgstr "Liste der geheimen SchlЭssel"
-#: g10/g10.c:185
+#: g10/g10.c:190
msgid "generate a new key pair"
msgstr "Ein neues SchlЭsselpaar erzeugen"
-#: g10/g10.c:186
+#: g10/g10.c:191
msgid "remove key from the public keyring"
msgstr "SchlЭssel entfernen"
-#: g10/g10.c:187
+#: g10/g10.c:192
msgid "sign or edit a key"
msgstr "Unterschreiben oder Bearbeiten eines SchlЭssels"
-#: g10/g10.c:188
+#: g10/g10.c:193
msgid "generate a revocation certificate"
msgstr "Ein SchlЭsselwiderruf-Zertifikat erzeugen"
-#: g10/g10.c:189
+#: g10/g10.c:194
msgid "export keys"
msgstr "SchlЭssel exportieren"
-#: g10/g10.c:190
+#: g10/g10.c:195
msgid "export keys to a key server"
msgstr "SchlЭssel zu einem SchlЭsselserver exportieren"
-#: g10/g10.c:191
+#: g10/g10.c:196
msgid "import keys from a key server"
msgstr "SchlЭssel von einem SchlЭsselserver importieren"
-#: g10/g10.c:194
+#: g10/g10.c:199
msgid "import/merge keys"
msgstr "SchlЭssel importieren/kombinieren"
-#: g10/g10.c:196
+#: g10/g10.c:201
msgid "list only the sequence of packets"
msgstr "Lediglich die Struktur der Datenpakete anzeigen"
-#: g10/g10.c:198
+#: g10/g10.c:203
msgid "export the ownertrust values"
msgstr "Exportieren der \"Owner trust\" Werte"
-#: g10/g10.c:200
+#: g10/g10.c:205
msgid "import ownertrust values"
msgstr "Importieren der \"Owner trust\" Werte"
-#: g10/g10.c:202
+#: g10/g10.c:207
msgid "|[NAMES]|update the trust database"
msgstr "|[NAMEN]|дndern der \"Trust\"-Datenbank"
-#: g10/g10.c:204
+#: g10/g10.c:209
msgid "|[NAMES]|check the trust database"
msgstr "|[NAMEN]|эberprЭfen der \"Trust\"-Datenbank"
-#: g10/g10.c:205
+#: g10/g10.c:210
msgid "fix a corrupted trust database"
msgstr "Reparieren einer beschДdigten \"Trust\"-Datenbank"
-#: g10/g10.c:206
+#: g10/g10.c:211
msgid "De-Armor a file or stdin"
msgstr "Datei oder stdin von der ASCII-HЭlle befreien"
-#: g10/g10.c:207
+#: g10/g10.c:212
msgid "En-Armor a file or stdin"
msgstr "Datei oder stdin in eine ASCII-HЭlle einpacken"
-#: g10/g10.c:208
+#: g10/g10.c:213
msgid "|algo [files]|print message digests"
msgstr "|algo [Dateien]|Message-Digests fЭr die Dateien ausgeben"
-#: g10/g10.c:209
+#: g10/g10.c:214
msgid "print all message digests"
msgstr "Message-Digests fЭr die Eingabedaten ausgeben"
-#: g10/g10.c:215
+#: g10/g10.c:220
msgid ""
"@\n"
"Options:\n"
@@ -416,152 +416,160 @@ msgstr ""
"Optionen:\n"
" "
-#: g10/g10.c:217
+#: g10/g10.c:222
msgid "create ascii armored output"
msgstr "Ausgabe mit ASCII-HЭlle versehen"
-#: g10/g10.c:218
+#: g10/g10.c:223
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|VerschlЭsseln fЭr NAME"
-#: g10/g10.c:222
+#: g10/g10.c:227
msgid "use this user-id to sign or decrypt"
msgstr "Mit dieser User-ID signieren"
-#: g10/g10.c:223
+#: g10/g10.c:228
msgid "|N|set compress level N (0 disables)"
msgstr "Kompressionsstufe auf N setzen (0=keine Kompr.)"
-#: g10/g10.c:225
+#: g10/g10.c:230
msgid "use canonical text mode"
msgstr "Textmodus benutzen"
-#: g10/g10.c:226
+#: g10/g10.c:231
msgid "use as output file"
msgstr "Als Ausgabedatei benutzen"
-#: g10/g10.c:227
+#: g10/g10.c:232
msgid "verbose"
msgstr "Detaillierte Informationen"
-#: g10/g10.c:228
+#: g10/g10.c:233
msgid "be somewhat more quiet"
msgstr "Etwas weniger Infos"
-#: g10/g10.c:229
+#: g10/g10.c:234
+msgid "don't use the terminal at all"
+msgstr ""
+
+#: g10/g10.c:235
msgid "force v3 signatures"
msgstr "v3 Signaturen erzwingen"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "always use a MDC for encryption"
msgstr "Beim VerschlЭsseln ein Siegel (MDC) verwenden"
-#: g10/g10.c:231
+#: g10/g10.c:237
msgid "do not make any changes"
msgstr "Keine wirklichen дnderungen durchfЭhren"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:233
+#: g10/g10.c:239
msgid "batch mode: never ask"
msgstr "Stapelmodus: Keine Abfragen"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "assume yes on most questions"
msgstr "\"Ja\" als Standardantwort annehmen"
-#: g10/g10.c:235
+#: g10/g10.c:241
msgid "assume no on most questions"
msgstr "\"Nein\" als Standardantwort annehmen"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "add this keyring to the list of keyrings"
msgstr "Als Жffentlichen SchlЭsselbund mitbenutzen"
-#: g10/g10.c:237
+#: g10/g10.c:243
msgid "add this secret keyring to the list"
msgstr "Als geheimen SchlЭsselbund mitbenutzen"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|NAME als voreingestellten SchlЭssel benutzen"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|SchlЭssel bei diesem Server nachschlagen"
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAME|Terminalzeichensatz NAME benutzen"
-#: g10/g10.c:241
+#: g10/g10.c:247
msgid "read options from file"
msgstr "Optionen aus der Datei lesen"
-#: g10/g10.c:243
+#: g10/g10.c:249
msgid "set debugging flags"
msgstr "Debug-Flags einschalten"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "enable full debugging"
msgstr "Alle Debug-Flags einschalten"
-#: g10/g10.c:245
+#: g10/g10.c:251
msgid "|FD|write status info to this FD"
msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
-#: g10/g10.c:246
+#: g10/g10.c:252
msgid "do not write comment packets"
msgstr "Keine Kommentarpakete schreiben"
-#: g10/g10.c:247
+#: g10/g10.c:253
msgid "(default is 1)"
msgstr "BenЖtigte Vollvertrauen (Voreinstellung 1)"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid "(default is 3)"
msgstr "BenЖtigte Teilvertrauen (Voreinstellung 3)"
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "|FILE|load extension module FILE"
msgstr "|DATEI|Erweiterungsmodul DATEI laden"
-#: g10/g10.c:251
+#: g10/g10.c:257
msgid "emulate the mode described in RFC1991"
msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
-#: g10/g10.c:252
+#: g10/g10.c:258
+msgid "set all packet, cipher and digest options to OpenPGP behavior"
+msgstr ""
+
+#: g10/g10.c:259
msgid "|N|use passphrase mode N"
msgstr "|N|Verwenden des Mantra-Modus N"
-#: g10/g10.c:254
+#: g10/g10.c:261
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NAME|Das Hashverfahren NAME fЭr Mantras benutzen"
-#: g10/g10.c:256
+#: g10/g10.c:263
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NAME|Das VerschlЭ.verfahren NAME fЭr Mantras benutzen"
-#: g10/g10.c:257
+#: g10/g10.c:264
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|Das VerschlЭ.verfahren NAME benutzen"
-#: g10/g10.c:258
+#: g10/g10.c:265
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|Das Hashverfahren NAME benutzen"
-#: g10/g10.c:259
+#: g10/g10.c:266
msgid "|N|use compress algorithm N"
msgstr "|N|Die Komprimierverfahren N benutzen"
-#: g10/g10.c:260
+#: g10/g10.c:267
msgid "throw keyid field of encrypted packets"
msgstr "Entferne die Absender-ID verschlЭsselter Pakete"
-#: g10/g10.c:261
+#: g10/g10.c:268
msgid "|NAME=VALUE|use this notation data"
msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
-#: g10/g10.c:263
+#: g10/g10.c:270
msgid ""
"@\n"
"Examples:\n"
@@ -581,15 +589,15 @@ msgstr ""
" --list-keys [Namen] SchlЭssel anzeigen\n"
" --fingerprint [Namen] \"FingerabdrЭcke\" anzeigen\n"
-#: g10/g10.c:337
+#: g10/g10.c:347
msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
msgstr "Berichte Эber Bugs (Programmfehler) bitte an <gnupg-bugs@gnu.org>.\n"
-#: g10/g10.c:341
+#: g10/g10.c:351
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Aufruf: gpg [Optionen] [Dateien] (-h fЭr Hilfe)"
-#: g10/g10.c:344
+#: g10/g10.c:354
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -599,7 +607,7 @@ msgstr ""
"Signieren, prЭfen, verschlЭsseln, entschlЭsseln\n"
"Die voreingestellte Operation ist abhДngig von den Eingabedaten\n"
-#: g10/g10.c:349
+#: g10/g10.c:359
msgid ""
"\n"
"Supported algorithms:\n"
@@ -607,161 +615,161 @@ msgstr ""
"\n"
"UnterstЭtzte Verfahren:\n"
-#: g10/g10.c:423
+#: g10/g10.c:433
msgid "usage: gpg [options] "
msgstr "Aufruf: gpg [Optionen] "
-#: g10/g10.c:463
+#: g10/g10.c:473
msgid "conflicting commands\n"
msgstr "WidersprЭchliche Befehle\n"
-#: g10/g10.c:595
+#: g10/g10.c:605
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
-#: g10/g10.c:599
+#: g10/g10.c:609
#, c-format
msgid "option file `%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
-#: g10/g10.c:606
+#: g10/g10.c:616
#, c-format
msgid "reading options from `%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
-#: g10/g10.c:755
+#: g10/g10.c:782
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s ist kein gЭltiger Zeichensatz.\n"
-#: g10/g10.c:799 g10/g10.c:811
+#: g10/g10.c:827 g10/g10.c:839
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgewДhlte VerschlЭsslungsverfahren ist ungЭltig\n"
-#: g10/g10.c:805 g10/g10.c:817
+#: g10/g10.c:833 g10/g10.c:845
msgid "selected digest algorithm is invalid\n"
msgstr "Das ausgewДhlte Hashverfahren ist ungЭltig\n"
-#: g10/g10.c:821
+#: g10/g10.c:849
msgid "the given policy URL is invalid\n"
msgstr "Die angegebene URL fЭr Richtlinien ist ungЭltig\n"
-#: g10/g10.c:824
+#: g10/g10.c:852
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "Das Komprimierverfahren muъ im Bereich %d bis %d liegen\n"
-#: g10/g10.c:826
+#: g10/g10.c:854
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed mЭssen grЖъer als 0 sein\n"
-#: g10/g10.c:828
+#: g10/g10.c:856
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed mЭssen grЖъer als 1 sein\n"
-#: g10/g10.c:830
+#: g10/g10.c:858
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth muъ im Bereich 1 bis 255 liegen\n"
-#: g10/g10.c:833
+#: g10/g10.c:861
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
-#: g10/g10.c:837
+#: g10/g10.c:865
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ungЭltiger \"simple S2K\"-Modus; Wert muъ 0, 1 oder 3 sein\n"
-#: g10/g10.c:914
+#: g10/g10.c:942
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
-#: g10/g10.c:920
+#: g10/g10.c:948
msgid "--store [filename]"
msgstr "--store [Dateiname]"
-#: g10/g10.c:927
+#: g10/g10.c:955
msgid "--symmetric [filename]"
msgstr "--symmetric [Dateiname]"
-#: g10/g10.c:935
+#: g10/g10.c:963
msgid "--encrypt [filename]"
msgstr "--encrypt [Dateiname]"
-#: g10/g10.c:948
+#: g10/g10.c:976
msgid "--sign [filename]"
msgstr "--sign [Dateiname]"
-#: g10/g10.c:961
+#: g10/g10.c:989
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [Dateiname]"
-#: g10/g10.c:975
+#: g10/g10.c:1003
msgid "--clearsign [filename]"
msgstr "--clearsign [Dateiname]"
-#: g10/g10.c:987
+#: g10/g10.c:1015
msgid "--decrypt [filename]"
msgstr "--decrypt [Dateiname]"
-#: g10/g10.c:996
+#: g10/g10.c:1024
msgid "--edit-key username [commands]"
msgstr "--edit-key Username [Befehle]"
-#: g10/g10.c:1010
+#: g10/g10.c:1038
msgid "--delete-secret-key username"
msgstr "--delete-secret-key Username"
-#: g10/g10.c:1013
+#: g10/g10.c:1041
msgid "--delete-key username"
msgstr "--delete-key Benutzername"
-#: g10/encode.c:231 g10/g10.c:1036 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1064 g10/sign.c:366
#, c-format
msgid "can't open %s: %s\n"
msgstr "'%s' kann nicht geЖffnet werden: %s\n"
-#: g10/g10.c:1047
+#: g10/g10.c:1075
msgid "-k[v][v][v][c] [userid] [keyring]"
msgstr "-k[v][v][v][c] [Benutzername] [Keyring]"
-#: g10/g10.c:1106
+#: g10/g10.c:1134
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Entfernen der ASCII-HЭlle ist fehlgeschlagen: %s\n"
-#: g10/g10.c:1114
+#: g10/g10.c:1142
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Anbringen der ASCII-HЭlle ist fehlgeschlagen: %s\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1208
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "UngЭltiges Hashverfahren '%s'\n"
-#: g10/g10.c:1255
+#: g10/g10.c:1283
msgid "[filename]"
msgstr "[Dateiname]"
-#: g10/g10.c:1259
+#: g10/g10.c:1287
msgid "Go ahead and type your message ...\n"
msgstr "Auf geht's - Botschaft eintippen ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1262 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1290 g10/verify.c:66
#, c-format
msgid "can't open `%s'\n"
msgstr "'%s' kann nicht geЖffnet werden\n"
-#: g10/g10.c:1429
+#: g10/g10.c:1457
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"Das erste Zeichen eines \"notation\"-Namens muъ ein Buchstabe oder\n"
"ein Unterstrich sein\n"
-#: g10/g10.c:1435
+#: g10/g10.c:1463
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -769,12 +777,12 @@ msgstr ""
"Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
"enthalten und muъ mit einem '=' enden\n"
-#: g10/g10.c:1441
+#: g10/g10.c:1469
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
"Punkte in einem \"notation\"-Namen mЭssen von anderen Zeichen umgeben sein\n"
-#: g10/g10.c:1449
+#: g10/g10.c:1477
msgid "a notation value must not use any control characters\n"
msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
@@ -1370,7 +1378,8 @@ msgid "DSA keypair will have 1024 bits.\n"
msgstr "Der DSA SchlЭssel wird 1024 Bits haben.\n"
#: g10/keygen.c:859
-msgid "Key generation cancelled.\n"
+#, fuzzy
+msgid "Key generation canceled.\n"
msgstr "SchlЭsselerzeugung abgebrochen.\n"
#: g10/keygen.c:869
@@ -1442,7 +1451,7 @@ msgstr "%s: WARNUNG: Leere Datei\n"
msgid "reading from `%s'\n"
msgstr "Lesen von '%s'\n"
-#: g10/encode.c:417
+#: g10/encode.c:431
#, c-format
msgid "%s/%s encrypted for: %s\n"
msgstr "%s verschlЭsselt fЭr: %s\n"
@@ -1834,7 +1843,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Wirklich unterschreiben? "
-#: g10/keyedit.c:369 g10/keyedit.c:1779 g10/keyedit.c:1828 g10/sign.c:128
+#: g10/keyedit.c:369 g10/keyedit.c:1790 g10/keyedit.c:1839 g10/sign.c:128
#, c-format
msgid "signing failed: %s\n"
msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -2141,95 +2150,102 @@ msgstr "MЖchten Sie alle ausgewДhlten User-IDs wirklich entfernen? "
msgid "Really remove this user id? "
msgstr "Diese User-ID wirklich entfernen? "
-#: g10/keyedit.c:856 g10/keyedit.c:878
+#: g10/keyedit.c:858 g10/keyedit.c:880
msgid "You must select at least one key.\n"
msgstr "Zumindestens ein SchlЭssel muъ ausgewДhlt werden.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:862
msgid "Do you really want to delete the selected keys? "
msgstr "MЖchten Sie die ausgewДhlten SchlЭssel wirklich entfernen? "
-#: g10/keyedit.c:861
+#: g10/keyedit.c:863
msgid "Do you really want to delete this key? "
msgstr "MЖchten Sie diesen SchlЭssel wirklich entfernen? "
-#: g10/keyedit.c:882
+#: g10/keyedit.c:884
msgid "Do you really want to revoke the selected keys? "
msgstr "MЖchten Sie die ausgewДhlten SchlЭssel wirklich widerrufen? "
-#: g10/keyedit.c:883
+#: g10/keyedit.c:885
msgid "Do you really want to revoke this key? "
msgstr "MЖchten Sie diesen SchlЭssel wirklich wiederrufen? "
-#: g10/keyedit.c:937
+#: g10/keyedit.c:939
msgid "Invalid command (try \"help\")\n"
msgstr "UngЭltiger Befehl (versuchen Sie's mal mit \"help\")\n"
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1294
msgid "Delete this good signature? (y/N/q)"
msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1298
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Diese ungЭltige Beglaubigung entfernen= (j/N/q)"
-#: g10/keyedit.c:1297
+#: g10/keyedit.c:1302
+#, fuzzy
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
+
+#: g10/keyedit.c:1308
msgid "Really delete this self-signature? (y/N)"
msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1322
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d Beglaubigungen entfernt.\n"
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1323
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d Beglaubigungen entfernt.\n"
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1326
msgid "Nothing deleted.\n"
msgstr "Nichts entfernt.\n"
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1395
msgid "Please remove selections from the secret keys.\n"
msgstr "Bitte entfernen Sie die Auswahl von den geheimen SchlЭsseln.\n"
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1401
msgid "Please select at most one secondary key.\n"
msgstr "Bitte wДhlen Sie hЖchstens einen ZweitschlЭssel aus.\n"
-#: g10/keyedit.c:1394
-msgid "Changing exiration time for a secondary key.\n"
+#: g10/keyedit.c:1405
+#, fuzzy
+msgid "Changing expiration time for a secondary key.\n"
msgstr "дndern des Verfallsdatums des ZweitschlЭssels.\n"
-#: g10/keyedit.c:1396
-msgid "Changing exiration time for the primary key.\n"
+#: g10/keyedit.c:1407
+#, fuzzy
+msgid "Changing expiration time for the primary key.\n"
msgstr "дndern des Verfallsdatums des HauptschlЭssels.\n"
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1448
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:1453
+#: g10/keyedit.c:1464
msgid "No corresponding signature in secret ring\n"
msgstr "Keine entsprechende Signatur im geheimen SchlЭsselbund\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1524
#, c-format
msgid "No user id with index %d\n"
msgstr "Keine User-ID mit Index %d\n"
-#: g10/keyedit.c:1559
+#: g10/keyedit.c:1570
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Kein ZweitschlЭssel mit Index %d\n"
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1668
msgid "user ID: \""
msgstr "User-ID: \""
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1671
#, c-format
msgid ""
"\"\n"
@@ -2238,15 +2254,15 @@ msgstr ""
"\"\n"
"unterschrieben mit Ihrem SchlЭssel %08lX um %s\n"
-#: g10/keyedit.c:1664
+#: g10/keyedit.c:1675
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "Ein Widerrufszertifikat fЭr diese Unterschrift erzeugen (j/N)"
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1755
msgid "Really create the revocation certificates? (y/N)"
msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1778
msgid "no secret key\n"
msgstr "Kein geheimer SchlЭssel\n"
@@ -2396,11 +2412,11 @@ msgstr "%u-Bit %s SchlЭssel, ID %08lX, erzeugt %s"
msgid " (main key ID %08lX)"
msgstr " (HauptschlЭssel-ID %08lX)"
-#: g10/passphrase.c:190
+#: g10/passphrase.c:192
msgid "Enter passphrase: "
msgstr "Geben Sie das Mantra ein: "
-#: g10/passphrase.c:194
+#: g10/passphrase.c:196
msgid "Repeat passphrase: "
msgstr "Geben Sie das Mantra nochmal ein: "
@@ -2650,7 +2666,8 @@ msgid "%s: failed to append a record: %s\n"
msgstr "%s: konnte Satz nicht anhДngen: %s\n"
#: g10/tdbio.c:1630
-msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
+#, fuzzy
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
msgstr ""
"Die \"Trust\"-Datenbank ist beschДdigt; verwenden Sie \"gpgm "
"--fix-trustdb\".\n"
@@ -3363,6 +3380,18 @@ msgstr ""
# "your keyring if it is really invalid and not just unchecked due to\n"
# "a missing public key (marked by \"sig?\")."
#: g10/helptext.c:181
+#, fuzzy
+msgid "keyedit.delsig.unknown"
+msgstr ""
+"Diese Beglaubigung ist ungЭltig. Es ist sinnvoll sie aus Ihrem\n"
+"SchlЭsselbund zu entfernen, sofern sie wirklich ungЭltig ist und nicht nur\n"
+"wegen eines fehlenden Жff.SchlЭssel (\"sig?\") unkontrollierbar ist."
+
+# ("keyedit.delsig.invalid"),
+# "The signature is not valid. It does make sense to remove it from\n"
+# "your keyring if it is really invalid and not just unchecked due to\n"
+# "a missing public key (marked by \"sig?\")."
+#: g10/helptext.c:187
msgid "keyedit.delsig.invalid"
msgstr ""
"Diese Beglaubigung ist ungЭltig. Es ist sinnvoll sie aus Ihrem\n"
@@ -3375,7 +3404,7 @@ msgstr ""
# "GnuPG might not be able to use this key anymore. So do this\n"
# "only if this self-signature is for some reason not valid and\n"
# "a second one is available."
-#: g10/helptext.c:186
+#: g10/helptext.c:191
msgid "keyedit.delsig.selfsig"
msgstr ""
"Diese Beglaubigung bindet die User-ID an den SchlЭssel. Normalerweise ist\n"
@@ -3388,7 +3417,7 @@ msgstr ""
# ################################
# ####### Help msgids ############
# ################################
-#: g10/helptext.c:195
+#: g10/helptext.c:200
msgid "passphrase.enter"
msgstr ""
"Bitte geben Sie das Mantra ein. Dies ist ein geheimer Satz, der aus\n"
@@ -3403,7 +3432,7 @@ msgstr ""
"werden,\n"
"sind i.d.R. eine gute Wahl"
-#: g10/helptext.c:202
+#: g10/helptext.c:207
msgid "passphrase.repeat"
msgstr ""
"Um sicher zu gehen, daъ Sie sich bei der Eingabe des Mantras nicht\n"
@@ -3411,21 +3440,21 @@ msgstr ""
"Эbereinstimmen, wird das Mantra akzeptiert."
# "Give the name fo the file to which the signature applies"
-#: g10/helptext.c:206
+#: g10/helptext.c:211
msgid "detached_signature.filename"
msgstr ""
"Geben Sie den Namen der Datei an, zu dem die abgetrennte Unterschrift gehЖrt"
# "Answer \"yes\" if it is okay to overwrite the file"
-#: g10/helptext.c:210
+#: g10/helptext.c:215
msgid "openfile.overwrite.okay"
msgstr "Geben Sie \"ja\" ein, wenn Sie die Datei Эberschreiben mЖchten"
-#: g10/helptext.c:224
+#: g10/helptext.c:229
msgid "No help available"
msgstr "Keine Hilfe vorhanden."
-#: g10/helptext.c:236
+#: g10/helptext.c:241
#, c-format
msgid "No help available for `%s'"
msgstr "Keine Hilfe fЭr '%s' vorhanden."
diff --git a/po/es_ES.po b/po/es_ES.po
index bd35f0b84..4bea02b69 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
# GPG version: 0.9.7
msgid ""
msgstr ""
-"POT-Creation-Date: 1999-05-23 15:36+0200\n"
+"POT-Creation-Date: 1999-06-26 11:22+0200\n"
"PO-Revision-Date: 1999-06-06 18:33+0200\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-13 10:49:25+0100\n"
@@ -34,14 +34,22 @@ msgstr "operaciСn imposible sin memoria segura inicializada\n"
msgid "(you may have used the wrong program for this task)\n"
msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
-#: util/miscutil.c:156
+#: util/miscutil.c:156 util/miscutil.c:173
msgid "yes"
msgstr "sМ"
-#: util/miscutil.c:157
+#: util/miscutil.c:157 util/miscutil.c:175
msgid "yY"
msgstr "sS"
+#: g10/keyedit.c:559 util/miscutil.c:174
+msgid "quit"
+msgstr ""
+
+#: util/miscutil.c:176
+msgid "qQ"
+msgstr ""
+
#: util/errors.c:54
msgid "general error"
msgstr "Error general"
@@ -235,16 +243,19 @@ msgid "not encrypted"
msgstr "no cifrado"
#: util/logger.c:218
+#, c-format
msgid "... this is a bug (%s:%d:%s)\n"
msgstr "... esto es un bug (%s:%d:%s)\n"
#: util/logger.c:224
+#, c-format
msgid "you found a bug ... (%s:%d)\n"
msgstr "Ha encontrado Vd. un bug... (%s:%d)\n"
#: cipher/random.c:412
msgid "WARNING: using insecure random number generator!!\n"
-msgstr "ATENCIсN: ║se estА usando un generador de nЗmeros aleatorios inseguro!\n"
+msgstr ""
+"ATENCIсN: ║se estА usando un generador de nЗmeros aleatorios inseguro!\n"
#: cipher/random.c:413
msgid ""
@@ -260,7 +271,8 @@ msgstr ""
"║NO USE NINGзN DATO GENERADO POR ESTE PROGRAMA!\n"
"\n"
-#: cipher/rndlinux.c:110
+#: cipher/rndlinux.c:135
+#, c-format
msgid ""
"\n"
"Not enough random bytes available. Please do some other work to give\n"
@@ -271,7 +283,7 @@ msgstr ""
"otro trabajo para que el sistema pueda recolectar mАs entropМa\n"
"(se necesitan %d bytes mАs).\n"
-#: g10/g10.c:165
+#: g10/g10.c:174
msgid ""
"@Commands:\n"
" "
@@ -279,131 +291,131 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/g10.c:167
+#: g10/g10.c:176
msgid "|[file]|make a signature"
msgstr "|[file]|hace una firma"
-#: g10/g10.c:168
+#: g10/g10.c:177
msgid "|[file]|make a clear text signature"
msgstr "|[file]|hace una firma en texto claro"
-#: g10/g10.c:169
+#: g10/g10.c:178
msgid "make a detached signature"
msgstr "hace una firma separada"
-#: g10/g10.c:170
+#: g10/g10.c:179
msgid "encrypt data"
msgstr "cifra datos"
-#: g10/g10.c:171
+#: g10/g10.c:180
msgid "encryption only with symmetric cipher"
msgstr "cifra sСlo con un cifrado simИtrico"
-#: g10/g10.c:172
+#: g10/g10.c:181
msgid "store only"
msgstr "sСlo almacenar"
-#: g10/g10.c:173
+#: g10/g10.c:182
msgid "decrypt data (default)"
msgstr "descifra datos (predefinido)"
-#: g10/g10.c:174
+#: g10/g10.c:183
msgid "verify a signature"
msgstr "verifica una firma"
-#: g10/g10.c:175
+#: g10/g10.c:184
msgid "list keys"
msgstr "lista claves"
-#: g10/g10.c:177
+#: g10/g10.c:186
msgid "list keys and signatures"
msgstr "lista claves y firmas"
-#: g10/g10.c:178
+#: g10/g10.c:187
msgid "check key signatures"
msgstr "comprueba las firmas de las claves"
-#: g10/g10.c:179
+#: g10/g10.c:188
msgid "list keys and fingerprints"
msgstr "lista claves y huellas dactilares"
-#: g10/g10.c:180
+#: g10/g10.c:189
msgid "list secret keys"
msgstr "lista claves secretas"
-#: g10/g10.c:181
+#: g10/g10.c:190
msgid "generate a new key pair"
msgstr "genera un nuevo par de claves"
-#: g10/g10.c:182
+#: g10/g10.c:191
msgid "remove key from the public keyring"
msgstr "elimina la clave del anillo pЗblico"
-#: g10/g10.c:183
+#: g10/g10.c:192
msgid "sign or edit a key"
msgstr "firma o modifica una clave"
-#: g10/g10.c:184
+#: g10/g10.c:193
msgid "generate a revocation certificate"
msgstr "genera un certificado de revocaciСn"
-#: g10/g10.c:185
+#: g10/g10.c:194
msgid "export keys"
msgstr "exporta claves"
-#: g10/g10.c:186
+#: g10/g10.c:195
msgid "export keys to a key server"
msgstr "exporta claves a un servidor de claves"
-#: g10/g10.c:187
+#: g10/g10.c:196
msgid "import keys from a key server"
msgstr "importa claves desde un servidor de claves"
-#: g10/g10.c:190
+#: g10/g10.c:199
msgid "import/merge keys"
msgstr "importa/fusiona claves"
-#: g10/g10.c:192
+#: g10/g10.c:201
msgid "list only the sequence of packets"
msgstr "lista sСlo la secuencia de paquetes"
-#: g10/g10.c:194
+#: g10/g10.c:203
msgid "export the ownertrust values"
msgstr "exporta los valores de confianza"
-#: g10/g10.c:196
+#: g10/g10.c:205
msgid "import ownertrust values"
msgstr "importa los valores de confianza"
-#: g10/g10.c:198
+#: g10/g10.c:207
msgid "|[NAMES]|update the trust database"
msgstr "|[NOMBRES]|actualiza la base de datos de confianza"
-#: g10/g10.c:200
+#: g10/g10.c:209
msgid "|[NAMES]|check the trust database"
msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
-#: g10/g10.c:201
+#: g10/g10.c:210
msgid "fix a corrupted trust database"
msgstr "arregla una base de datos de confianza daЯada"
-#: g10/g10.c:202
+#: g10/g10.c:211
msgid "De-Armor a file or stdin"
msgstr "quita la armadura de un fichero o stdin"
-#: g10/g10.c:203
+#: g10/g10.c:212
msgid "En-Armor a file or stdin"
msgstr "crea la armadura a un fichero o stdin"
-#: g10/g10.c:204
+#: g10/g10.c:213
msgid "|algo [files]|print message digests"
msgstr "|algo [ficheros]|imprime resЗmenes de mensaje"
-#: g10/g10.c:205
+#: g10/g10.c:214
msgid "print all message digests"
msgstr "imprime todos los resЗmenes de mensaje"
-#: g10/g10.c:211
+#: g10/g10.c:220
msgid ""
"@\n"
"Options:\n"
@@ -413,152 +425,164 @@ msgstr ""
"Opciones:\n"
" "
-#: g10/g10.c:213
+#: g10/g10.c:222
msgid "create ascii armored output"
msgstr "crea una salida ascii con armadura"
-#: g10/g10.c:214
+#: g10/g10.c:223
msgid "|NAME|encrypt for NAME"
msgstr "|NOMBRE|cifra para NOMBRE"
-#: g10/g10.c:218
+#: g10/g10.c:227
msgid "use this user-id to sign or decrypt"
msgstr "usa este usuario para firmar o descifrar"
-#: g10/g10.c:219
+#: g10/g10.c:228
msgid "|N|set compress level N (0 disables)"
msgstr "|N|establece nivel de compresiСn N (0 no comprime)"
-#: g10/g10.c:221
+#: g10/g10.c:230
msgid "use canonical text mode"
msgstr "usa modo de texto canСnico"
-#: g10/g10.c:222
+#: g10/g10.c:231
msgid "use as output file"
msgstr "usa como fichero de salida"
-#: g10/g10.c:223
+#: g10/g10.c:232
msgid "verbose"
msgstr "prolijo"
-#: g10/g10.c:224
+#: g10/g10.c:233
msgid "be somewhat more quiet"
msgstr "algo mАs discreto"
-#: g10/g10.c:225
+#: g10/g10.c:234
+msgid "don't use the terminal at all"
+msgstr ""
+
+#: g10/g10.c:235
msgid "force v3 signatures"
msgstr "fuerza firmas v3"
-#: g10/g10.c:226
+#: g10/g10.c:236
msgid "always use a MDC for encryption"
msgstr "siempre usa un MCD para cifrar"
-#: g10/g10.c:227
+#: g10/g10.c:237
msgid "do not make any changes"
msgstr "no hace ningЗn cambio"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:229
+#: g10/g10.c:239
msgid "batch mode: never ask"
msgstr "proceso por lotes: nunca preguntar"
-#: g10/g10.c:230
+#: g10/g10.c:240
msgid "assume yes on most questions"
msgstr "asume \"sМ\" en casi todas las preguntas"
-#: g10/g10.c:231
+#: g10/g10.c:241
msgid "assume no on most questions"
msgstr "asume \"no\" en casi todas las preguntas"
-#: g10/g10.c:232
+#: g10/g10.c:242
msgid "add this keyring to the list of keyrings"
msgstr "aЯade este anillo a la lista de anillos"
-#: g10/g10.c:233
+#: g10/g10.c:243
msgid "add this secret keyring to the list"
msgstr "aЯade este anillo secreto a la lista"
-#: g10/g10.c:234
+#: g10/g10.c:244
msgid "|NAME|use NAME as default secret key"
msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
-#: g10/g10.c:235
+#: g10/g10.c:245
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|SERVIDOR|usa este servidor de claves"
-#: g10/g10.c:236
+#: g10/g10.c:246
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
-#: g10/g10.c:237
+#: g10/g10.c:247
msgid "read options from file"
msgstr "lee opciones del fichero"
-#: g10/g10.c:239
+#: g10/g10.c:249
msgid "set debugging flags"
msgstr "establece los parАmetros de depuraciСn"
-#: g10/g10.c:240
+#: g10/g10.c:250
msgid "enable full debugging"
msgstr "habilita depuraciСn completa"
-#: g10/g10.c:241
+#: g10/g10.c:251
msgid "|FD|write status info to this FD"
msgstr "|DF|escribe informaciСn de estado en descriptor DF"
-#: g10/g10.c:242
+#: g10/g10.c:252
msgid "do not write comment packets"
msgstr "no escribe paquetes de comentario"
-#: g10/g10.c:243
+#: g10/g10.c:253
msgid "(default is 1)"
msgstr "(por defecto es 1)"
-#: g10/g10.c:244
+#: g10/g10.c:254
msgid "(default is 3)"
msgstr "(por defecto es 3)"
-#: g10/g10.c:246
+#: g10/g10.c:256
msgid "|FILE|load extension module FILE"
msgstr "|FICHERO|carga mСdulo de extensiones FICHERO"
-#: g10/g10.c:247
+#: g10/g10.c:257
msgid "emulate the mode described in RFC1991"
msgstr "emula el modo descrito en la RFC1991"
-#: g10/g10.c:248
+#: g10/g10.c:258
+msgid "set all packet, cipher and digest options to OpenPGP behavior"
+msgstr ""
+
+#: g10/g10.c:259
msgid "|N|use passphrase mode N"
msgstr "|N|usa modo de contraseЯa N"
-#: g10/g10.c:250
+#: g10/g10.c:261
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr ""
"|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE\n"
"para las contraseЯas"
-#: g10/g10.c:252
+#: g10/g10.c:263
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr ""
"|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
"contraseЯas"
-#: g10/g10.c:253
+#: g10/g10.c:264
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
-#: g10/g10.c:254
+#: g10/g10.c:265
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
-#: g10/g10.c:255
+#: g10/g10.c:266
msgid "|N|use compress algorithm N"
msgstr "|N|usa el algoritmo de compresiСn N"
-#: g10/g10.c:256
+#: g10/g10.c:267
msgid "throw keyid field of encrypted packets"
msgstr "elimina el campo keyid de los paquetes cifrados"
-#: g10/g10.c:258
+#: g10/g10.c:268
+msgid "|NAME=VALUE|use this notation data"
+msgstr ""
+
+#: g10/g10.c:270
msgid ""
"@\n"
"Examples:\n"
@@ -578,15 +602,15 @@ msgstr ""
" --list-keys [nombres] muestra las claves\n"
" --fingerprint [nombres] muestra las huellas dactilares\n"
-#: g10/g10.c:327
+#: g10/g10.c:347
msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\n"
-#: g10/g10.c:331
+#: g10/g10.c:351
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
-#: g10/g10.c:334
+#: g10/g10.c:354
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -596,7 +620,7 @@ msgstr ""
"Firma, comprueba, cifra o descifra.\n"
"La operaciСn por defecto depende del tipo de datos de entrada.\n"
-#: g10/g10.c:339
+#: g10/g10.c:359
msgid ""
"\n"
"Supported algorithms:\n"
@@ -604,139 +628,174 @@ msgstr ""
"\n"
"Algoritmos soportados:\n"
-#: g10/g10.c:413
+#: g10/g10.c:433
msgid "usage: gpg [options] "
msgstr "uso: gpg [opciones] "
-#: g10/g10.c:453
+#: g10/g10.c:473
msgid "conflicting commands\n"
msgstr "comandos incompatibles\n"
-#: g10/g10.c:580
+#: g10/g10.c:605
+#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
-#: g10/g10.c:584
+#: g10/g10.c:609
+#, c-format
msgid "option file `%s': %s\n"
msgstr "fichero de opciones `%s': %s\n"
-#: g10/g10.c:591
+#: g10/g10.c:616
+#, c-format
msgid "reading options from `%s'\n"
msgstr "leyendo opciones desde `%s'\n"
-#: g10/g10.c:737
+#: g10/g10.c:782
+#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s no es un juego de caracteres vАlido\n"
-#: g10/g10.c:780 g10/g10.c:792
+#: g10/g10.c:827 g10/g10.c:839
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado no es vАlido\n"
-#: g10/g10.c:786 g10/g10.c:798
+#: g10/g10.c:833 g10/g10.c:845
msgid "selected digest algorithm is invalid\n"
msgstr "el algoritmo de resumen seleccionado no es vАlido\n"
-#: g10/g10.c:801
+#: g10/g10.c:849
+msgid "the given policy URL is invalid\n"
+msgstr ""
+
+#: g10/g10.c:852
+#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "el algoritmo de compresiСn debe estar en el rango %d-%d\n"
-#: g10/g10.c:803
+#: g10/g10.c:854
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser mayor que 0\n"
-#: g10/g10.c:805
+#: g10/g10.c:856
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser mayor que 1\n"
-#: g10/g10.c:807
+#: g10/g10.c:858
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth debe estar en el rango 1-255\n"
-#: g10/g10.c:810
+#: g10/g10.c:861
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
-#: g10/g10.c:814
+#: g10/g10.c:865
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
-#: g10/g10.c:891
+#: g10/g10.c:942
+#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicializaciСn de la base de datos de confianza fallida: %s\n"
-#: g10/g10.c:897
+#: g10/g10.c:948
msgid "--store [filename]"
msgstr "--store [nombre_fichero]"
-#: g10/g10.c:904
+#: g10/g10.c:955
msgid "--symmetric [filename]"
msgstr "--symmetric [nombre_fichero]"
-#: g10/g10.c:912
+#: g10/g10.c:963
msgid "--encrypt [filename]"
msgstr "--encrypt [nombre_fichero]"
-#: g10/g10.c:925
+#: g10/g10.c:976
msgid "--sign [filename]"
msgstr "--sign [nombre_fichero]"
-#: g10/g10.c:938
+#: g10/g10.c:989
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nombre_fichero]"
-#: g10/g10.c:952
+#: g10/g10.c:1003
msgid "--clearsign [filename]"
msgstr "--clearsign [nombre_fichero]"
-#: g10/g10.c:964
+#: g10/g10.c:1015
msgid "--decrypt [filename]"
msgstr "--decrypt [nombre_fichero]"
-#: g10/g10.c:973
+#: g10/g10.c:1024
msgid "--edit-key username [commands]"
msgstr "--edit-key nombre_usuario [comandos]"
-#: g10/g10.c:987
+#: g10/g10.c:1038
msgid "--delete-secret-key username"
msgstr "--delete-secret-key nombre_usuario"
-#: g10/g10.c:990
+#: g10/g10.c:1041
msgid "--delete-key username"
msgstr "--delete-key nombre_usuario"
-#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311
+#: g10/encode.c:231 g10/g10.c:1064 g10/sign.c:366
+#, c-format
msgid "can't open %s: %s\n"
msgstr "no puede abrirse `%s': %s\n"
-#: g10/g10.c:1024
+#: g10/g10.c:1075
msgid "-k[v][v][v][c] [userid] [keyring]"
msgstr "-k[v][v][v][c] [id_usuario] [anillo]"
-#: g10/g10.c:1083
+#: g10/g10.c:1134
+#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminaciСn de armadura fallida: %s\n"
-#: g10/g10.c:1091
+#: g10/g10.c:1142
+#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creaciСn de armadura fallida: %s\n"
-#: g10/g10.c:1157
+#: g10/g10.c:1208
+#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de distribuciСn no vАlido `%s'\n"
-#: g10/g10.c:1232
+#: g10/g10.c:1283
msgid "[filename]"
msgstr "[nombre_fichero]"
-#: g10/g10.c:1236
+#: g10/g10.c:1287
msgid "Go ahead and type your message ...\n"
msgstr "Adelante, teclee su mensaje ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1290 g10/verify.c:66
+#, c-format
msgid "can't open `%s'\n"
msgstr "no puede abrirse `%s'\n"
+#: g10/g10.c:1457
+msgid ""
+"the first character of a notation name must be a letter or an underscore\n"
+msgstr ""
+
+#: g10/g10.c:1463
+msgid ""
+"a notation name must have only letters, digits, dots or underscores and end "
+"with an '='\n"
+msgstr ""
+
+#: g10/g10.c:1469
+msgid "dots in a notation name must be surrounded by other characters\n"
+msgstr ""
+
+#: g10/g10.c:1477
+msgid "a notation value must not use any control characters\n"
+msgstr ""
+
#: g10/armor.c:296
+#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
@@ -765,6 +824,7 @@ msgid "unexpected armor:"
msgstr "armadura inesperada"
#: g10/armor.c:629
+#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "caracteres no vАlidos radix64 %02x ignorados\n"
@@ -781,6 +841,7 @@ msgid "malformed CRC\n"
msgstr "Suma de comprobaciСn mal creada\n"
#: g10/armor.c:714
+#, c-format
msgid "CRC error; %06lx - %06lx\n"
msgstr "Error en suma de comprobaciСn: %06lx - %06lx\n"
@@ -797,16 +858,19 @@ msgid "no valid OpenPGP data found.\n"
msgstr "no se han encontrados datos OpenPGP vАlidos\n"
#: g10/armor.c:1005
+#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armadura incorrecta: lМnea mАs larga de %d caracteres\n"
#: g10/armor.c:1009
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
-msgstr "caracter \"quoted printable\" en la armadura - probablemente se usС\n"
+msgstr ""
+"caracter \"quoted printable\" en la armadura - probablemente se usС\n"
"un MTA defectuoso\n"
#: g10/pkclist.c:137
+#, c-format
msgid ""
"No trust value assigned to %lu:\n"
"%4u%c/%08lX %s \""
@@ -879,7 +943,8 @@ msgstr ""
msgid ""
"No certificates with undefined trust found.\n"
"\n"
-msgstr "No se ha encontrado ningЗn certificado sin valor de confianza.\n"
+msgstr ""
+"No se ha encontrado ningЗn certificado sin valor de confianza.\n"
"\n"
#: g10/pkclist.c:264
@@ -891,6 +956,7 @@ msgstr ""
"\n"
#: g10/pkclist.c:281
+#, c-format
msgid "key %08lX: key has been revoked!\n"
msgstr "clave %08lX: ║esta clave ha sido revocada!\n"
@@ -899,22 +965,27 @@ msgid "Use this key anyway? "
msgstr "©Usar esta clave de todas formas? "
#: g10/pkclist.c:291
+#, c-format
msgid "key %08lX: subkey has been revoked!\n"
msgstr "clave %08lX: ║esta subclave ha sido revocada!\n"
#: g10/pkclist.c:321
+#, c-format
msgid "%08lX: key has expired\n"
msgstr "%08lX: clave caducada\n"
#: g10/pkclist.c:327
+#, c-format
msgid "%08lX: no info to calculate a trust probability\n"
msgstr "%08lX: no hay informaciСn para calcular la probabilidad de confianza\n"
#: g10/pkclist.c:341
+#, c-format
msgid "%08lX: We do NOT trust this key\n"
msgstr "%08lX: ║Esta clave NO es de confianza!\n"
#: g10/pkclist.c:347
+#, c-format
msgid ""
"%08lX: It is not sure that this key really belongs to the owner\n"
"but it is accepted anyway\n"
@@ -985,17 +1056,24 @@ msgstr " La firma es probablemente una FALSIFICACIсN.\n"
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
-"ATENCIсN: ║Esta clave no estА certificada con suficientes firmas de confianza!\n"
+"ATENCIсN: ║Esta clave no estА certificada con suficientes firmas de "
+"confianza!\n"
#: g10/pkclist.c:516
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " No es seguro que la firma pertenezca al propietario.\n"
-#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673
+#: g10/pkclist.c:580 g10/pkclist.c:602 g10/pkclist.c:665 g10/pkclist.c:705
+#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorado: %s\n"
-#: g10/pkclist.c:591
+#: g10/pkclist.c:588 g10/pkclist.c:687
+#, fuzzy, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: problema lectura del bloque de clave: %s\n"
+
+#: g10/pkclist.c:611
msgid ""
"You did not specify a user ID. (you may use \"-r\")\n"
"\n"
@@ -1003,19 +1081,20 @@ msgstr ""
"No se ha especificado un ID de usuario (puede usar \"-r\")\n"
"\n"
-#: g10/pkclist.c:596
+#: g10/pkclist.c:616
msgid "Enter the user ID: "
msgstr "Introduzca el ID de usuario: "
-#: g10/pkclist.c:607
+#: g10/pkclist.c:627
msgid "No such user ID.\n"
msgstr "ID de usuario inexistente.\n"
-#: g10/pkclist.c:653
+#: g10/pkclist.c:673
+#, c-format
msgid "%s: error checking key: %s\n"
msgstr "%s: error comprobando la clave: %s\n"
-#: g10/pkclist.c:679
+#: g10/pkclist.c:711
msgid "no valid addressees\n"
msgstr "no hay direcciones vАlidas\n"
@@ -1032,22 +1111,27 @@ msgid "Please select what kind of key you want:\n"
msgstr "Por favor seleccione tipo de clave deseado:\n"
#: g10/keygen.c:388
+#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA y ElGamal (por defecto)\n"
#: g10/keygen.c:389
+#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (sСlo firma)\n"
#: g10/keygen.c:391
+#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (sСlo cifrado)\n"
#: g10/keygen.c:392
+#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (firma y cifrado)\n"
#: g10/keygen.c:394
+#, c-format
msgid " (%d) ElGamal in a v3 packet\n"
msgstr " (%d) ElGamal en un paquete v3\n"
@@ -1064,6 +1148,7 @@ msgid "Invalid selection.\n"
msgstr "ElecciСn no vАlida.\n"
#: g10/keygen.c:442
+#, c-format
msgid ""
"About to generate a new %s keypair.\n"
" minimum keysize is 768 bits\n"
@@ -1096,6 +1181,7 @@ msgstr "tamaЯo insuficiente; 768 es el valor mМnimo permitido\n"
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
#: g10/keygen.c:466
+#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "tamaЯo excesivo; %d es el mАximo valor permitido.\n"
@@ -1125,10 +1211,12 @@ msgid "Do you really need such a large keysize? "
msgstr "©De verdad necesita una clave tan grande? "
#: g10/keygen.c:489
+#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "El tamaЯo requerido es de %u bits\n"
#: g10/keygen.c:492 g10/keygen.c:496
+#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeados a %u bits\n"
@@ -1162,6 +1250,7 @@ msgstr "La clave nunca caduca\n"
#. print the date when the key expires
#: g10/keygen.c:546
+#, c-format
msgid "Key expires at %s\n"
msgstr "La clave caduca el %s\n"
@@ -1220,10 +1309,12 @@ msgid "Invalid character in comment\n"
msgstr "Caracter no vАlido en el comentario\n"
#: g10/keygen.c:669
+#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "EstА usando el juego de caracteres `%s'.\n"
#: g10/keygen.c:675
+#, c-format
msgid ""
"You selected this USER-ID:\n"
" \"%s\"\n"
@@ -1249,7 +1340,7 @@ msgstr ""
"Necesita una contraseЯa para proteger su clave secreta.\n"
"\n"
-#: g10/keyedit.c:433 g10/keygen.c:748
+#: g10/keyedit.c:455 g10/keygen.c:748
msgid "passphrase not correctly repeated; try again.\n"
msgstr "contraseЯa repetida incorrecta, intИntelo de nuevo.\n"
@@ -1287,14 +1378,17 @@ msgid "DSA keypair will have 1024 bits.\n"
msgstr "El par de claves DSA tendrА 1024 bits.\n"
#: g10/keygen.c:859
-msgid "Key generation cancelled.\n"
+#, fuzzy
+msgid "Key generation canceled.\n"
msgstr "CreaciСn de claves cancelada.\n"
#: g10/keygen.c:869
+#, c-format
msgid "writing public certificate to `%s'\n"
msgstr "escribiendo certificado pЗblico en `%s'\n"
#: g10/keygen.c:870
+#, c-format
msgid "writing secret certificate to `%s'\n"
msgstr "escribiendo certificado privado en `%s'\n"
@@ -1308,20 +1402,24 @@ msgid ""
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
msgstr ""
"Tenga en cuenta que esta clave no puede ser usada para cifrado. Puede usar\n"
-"el comando \"--edit-key\" para crear una clave secundaria con este propСsito.\n"
+"el comando \"--edit-key\" para crear una clave secundaria con este "
+"propСsito.\n"
#: g10/keygen.c:963 g10/keygen.c:1062
+#, c-format
msgid "Key generation failed: %s\n"
msgstr "CreaciСn de la clave fallida: %s\n"
-#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:105
+#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"clave pЗblica creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
-#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:107
+#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
@@ -1332,36 +1430,44 @@ msgstr ""
msgid "Really create? "
msgstr "©Crear de verdad? "
-#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467
+#: g10/encode.c:91 g10/openfile.c:118 g10/openfile.c:208 g10/tdbio.c:467
#: g10/tdbio.c:528
+#, c-format
msgid "%s: can't open: %s\n"
msgstr "%s: no puede abrirse: %s\n"
#: g10/encode.c:113
+#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error creando contraseЯa: %s\n"
#: g10/encode.c:167 g10/encode.c:287
+#, c-format
msgid "%s: WARNING: empty file\n"
msgstr "%s: ATENCIсN: fichero vacМo\n"
#: g10/encode.c:237
+#, c-format
msgid "reading from `%s'\n"
msgstr "leyendo desde `%s'\n"
-#: g10/encode.c:417
+#: g10/encode.c:431
+#, c-format
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s cifrado para: %s\n"
#: g10/export.c:147
+#, c-format
msgid "%s: user not found: %s\n"
msgstr "%s: usuario no encontrado: %s\n"
#: g10/export.c:156
+#, c-format
msgid "certificate read problem: %s\n"
msgstr "problema en la lectura del certificado: %s\n"
#: g10/export.c:165
+#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
@@ -1378,74 +1484,92 @@ msgid "too many entries in unk cache - disabled\n"
msgstr "demasiados registros en la cache unk - anulada\n"
#: g10/getkey.c:1535 g10/getkey.c:1591
+#, 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/import.c:116
+#, c-format
msgid "can't open `%s': %s\n"
msgstr "no puede abrirse `%s': %s\n"
#: g10/import.c:160
+#, c-format
msgid "skipping block of type %d\n"
msgstr "ignorando bloque de tipo %d\n"
#: g10/import.c:167 g10/trustdb.c:2560 g10/trustdb.c:2668
+#, c-format
msgid "%lu keys so far processed\n"
msgstr "hasta ahora se han procesado %lu claves\n"
#: g10/import.c:172
+#, c-format
msgid "error reading `%s': %s\n"
msgstr "error leyendo `%s': %s\n"
#: g10/import.c:175
+#, c-format
msgid "Total number processed: %lu\n"
msgstr " Cantidad total procesada: %lu\n"
#: g10/import.c:177
+#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sin identificativo: %lu\n"
#: g10/import.c:179
+#, c-format
msgid " imported: %lu"
msgstr " importadas: %lu"
#: g10/import.c:185
+#, c-format
msgid " unchanged: %lu\n"
msgstr " sin cambios: %lu\n"
#: g10/import.c:187
+#, c-format
msgid " new user IDs: %lu\n"
msgstr " nuevos identificativos: %lu\n"
#: g10/import.c:189
+#, c-format
msgid " new subkeys: %lu\n"
msgstr " nuevas subclaves: %lu\n"
#: g10/import.c:191
+#, c-format
msgid " new signatures: %lu\n"
msgstr " nuevas firmas: %lu\n"
#: g10/import.c:193
+#, c-format
msgid " new key revocations: %lu\n"
msgstr " nuevas revocaciones: %lu\n"
#: g10/import.c:195
+#, c-format
msgid " secret keys read: %lu\n"
msgstr " claves secretas leМdas: %lu\n"
#: g10/import.c:197
+#, c-format
msgid " secret keys imported: %lu\n"
msgstr " claves secretas importadas: %lu\n"
#: g10/import.c:199
+#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "claves secretas sin cambios: %lu\n"
#: g10/import.c:342 g10/import.c:529
+#, c-format
msgid "key %08lX: no user id\n"
msgstr "clave %08lX: no hay identificativo de usuario\n"
#: g10/import.c:353
+#, c-format
msgid "key %08lX: no valid user ids\n"
msgstr "clave %08lX: no hay identificativos de usuario vАlidos\n"
@@ -1454,6 +1578,7 @@ msgid "this may be caused by a missing self-signature\n"
msgstr "esto puede ser debido a la ausencia de autofirma\n"
#: g10/import.c:366 g10/import.c:596
+#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "clave %08lX: clave pЗblica no encontrada: %s\n"
@@ -1461,122 +1586,141 @@ msgstr "clave %08lX: clave pЗblica no encontrada: %s\n"
msgid "no default public keyring\n"
msgstr "no hay anillo pЗblico por defecto\n"
-#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501
+#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559
+#, c-format
msgid "writing to `%s'\n"
msgstr "escribiendo en `%s'\n"
-#: g10/import.c:379 g10/import.c:435
-msgid "can't lock keyring `%': %s\n"
-msgstr "no puede bloquearse el anillo pЗblico `%s': %s\n"
+#: g10/import.c:379 g10/import.c:435 g10/import.c:544 g10/import.c:645
+#, c-format
+msgid "can't lock keyring `%s': %s\n"
+msgstr "no puede bloquearse el anillo `%s': %s\n"
-#: g10/import.c:382
-msgid "error writing keyring `%': %s\n"
+#: g10/import.c:382 g10/import.c:438 g10/import.c:547 g10/import.c:648
+#, c-format
+msgid "error writing keyring `%s': %s\n"
msgstr "error escribiendo anillo `%s': %s\n"
#: g10/import.c:387
+#, c-format
msgid "key %08lX: public key imported\n"
msgstr "clave %08lX: clave pЗblica importada\n"
#: g10/import.c:399
+#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "clave %08lX: no se corresponde con nuestra copia\n"
#: g10/import.c:411 g10/import.c:604
+#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n"
#: g10/import.c:417 g10/import.c:610
+#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n"
-#: g10/import.c:438 g10/import.c:547 g10/import.c:648
-msgid "error writing keyring `%s': %s\n"
-msgstr "error escribiendo anillo `%s': %s\n"
-
#: g10/import.c:444
+#, c-format
msgid "key %08lX: 1 new user-id\n"
msgstr "clave %08lX: 1 nuevo identificativo de usuario\n"
#: g10/import.c:447
+#, c-format
msgid "key %08lX: %d new user-ids\n"
msgstr "clave %08lX: %d nuevos identificativos de usuario\n"
#: g10/import.c:450
+#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "clave %08lX: 1 nueva firma\n"
#: g10/import.c:453
+#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "clave %08lX: %d nuevas firmas\n"
#: g10/import.c:456
+#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "clave %08lX: 1 nueva subclave\n"
#: g10/import.c:459
+#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "clave %08lX: %d nuevas subclaves\n"
#: g10/import.c:469
+#, c-format
msgid "key %08lX: not changed\n"
msgstr "clave %08lX: sin cambios\n"
-#: g10/import.c:544 g10/import.c:645
-msgid "can't lock keyring `%s': %s\n"
-msgstr "no puede bloquearse el anillo `%s': %s\n"
-
#: g10/import.c:552
+#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "clave %08lX: clave secreta importada\n"
#. we can't merge secret keys
#: g10/import.c:556
+#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "clave %08lX: ya estaba en el anillo secreto\n"
#: g10/import.c:561
+#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "clave %08lX: clave secreta no encontrada: %s\n"
#: g10/import.c:590
+#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"clave %08lX: falta la clave pЗblica - imposibile applicar el\n"
"certificado de revocaciСn\n"
#: g10/import.c:621
+#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "clave %08lX: certificado de revocaciСn no vАlido: %s - rechazado\n"
#: g10/import.c:653
+#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "clave %08lX: certificado de revocaciСn importado\n"
#: g10/import.c:686
+#, c-format
msgid "key %08lX: no user-id for signature\n"
msgstr "clave %08lX: no hay identificativo de usuario para la firma\n"
#: g10/import.c:693 g10/import.c:717
+#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "clave %08lX: algoritmo de clave pЗblica no soportado\n"
#: g10/import.c:694
+#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "clave %08lX: autofirma no vАlida\n"
#: g10/import.c:709
+#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "clave %08lX: no hay subclave para unir\n"
#: g10/import.c:718
+#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "clave %08lX.%lu: uniСn de subclave no vАlida\n"
#: g10/import.c:750
+#, c-format
msgid "key %08lX: skipped userid '"
msgstr "clave %08lX: ignorado identificativo de usuario '"
#: g10/import.c:773
+#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "clave %08lX: subclave ignorada\n"
@@ -1585,85 +1729,98 @@ msgstr "clave %08lX: subclave ignorada\n"
#. * the secret key used to create this signature - it
#. * seems that this makes sense
#: g10/import.c:798
+#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "clave %08lX: firma no exportable (clase %02x) - ignorada\n"
#: g10/import.c:807
+#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr ""
"clave %08lX: certificado de revocaciСn en lugar equivocado - ignorado\n"
#: g10/import.c:815
+#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "clave %08lX: certificado de revocaciСn no valido: %s - ignorado\n"
#: g10/import.c:915
+#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
#: g10/import.c:966
+#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "clave %08lX: certificado de revocaciСn aЯadido\n"
#: g10/import.c:1079 g10/import.c:1134
+#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
-#: g10/keyedit.c:91
+#: g10/keyedit.c:92
+#, c-format
msgid "%s: user not found\n"
msgstr "%s: usuario no encontrado\n"
-#: g10/keyedit.c:177
+#: g10/keyedit.c:153
msgid "[revocation]"
msgstr "[revocaciСn]"
-#: g10/keyedit.c:178
+#: g10/keyedit.c:154
msgid "[self-signature]"
msgstr "[autofirma]"
-#: g10/keyedit.c:196
+#: g10/keyedit.c:218
msgid "1 bad signature\n"
msgstr "1 firma incorrecta\n"
-#: g10/keyedit.c:198
+#: g10/keyedit.c:220
+#, c-format
msgid "%d bad signatures\n"
msgstr "%d firmas incorrectas\n"
-#: g10/keyedit.c:200
+#: g10/keyedit.c:222
msgid "1 signature not checked due to a missing key\n"
msgstr "1 firma no comprobada por falta de clave\n"
-#: g10/keyedit.c:202
+#: g10/keyedit.c:224
+#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d firmas no comprobadas por falta de clave\n"
-#: g10/keyedit.c:204
+#: g10/keyedit.c:226
msgid "1 signature not checked due to an error\n"
msgstr "1 firma no comprobada por causa de un error\n"
-#: g10/keyedit.c:206
+#: g10/keyedit.c:228
+#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d firmas no comprobadas por causa de un error\n"
-#: g10/keyedit.c:208
+#: g10/keyedit.c:230
msgid "1 user id without valid self-signature detected\n"
msgstr "Detectado 1 identificativo de usuario sin autofirma vАlida\n"
-#: g10/keyedit.c:210
+#: g10/keyedit.c:232
+#, c-format
msgid "%d user ids without valid self-signatures detected\n"
msgstr "Detectados %d identificativos de usuario sin autofirma vАlida\n"
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:290
+#: g10/keyedit.c:312
+#, c-format
msgid "Already signed by key %08lX\n"
msgstr "Ya firmada por la clave %08lX\n"
-#: g10/keyedit.c:298
+#: g10/keyedit.c:320
+#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "Nada que firmar con la clave %08lX\n"
-#: g10/keyedit.c:307
+#: g10/keyedit.c:329
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -1671,34 +1828,37 @@ msgstr ""
"©EstА realmente seguro de querer firmar esta clave\n"
"con su clave: \""
-#: g10/keyedit.c:316
+#: g10/keyedit.c:338
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
-msgstr "La firma se marcarА como no exportable.\n"
+msgstr ""
+"La firma se marcarА como no exportable.\n"
"\n"
-#: g10/keyedit.c:321
+#: g10/keyedit.c:343
msgid "Really sign? "
msgstr "©Firmar de verdad? "
-#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75
+#: g10/keyedit.c:369 g10/keyedit.c:1790 g10/keyedit.c:1839 g10/sign.c:128
+#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallida: %s\n"
-#: g10/keyedit.c:400
+#: g10/keyedit.c:422
msgid "This key is not protected.\n"
msgstr "Esta clave no estА protegida.\n"
-#: g10/keyedit.c:403
+#: g10/keyedit.c:425
msgid "Key is protected.\n"
msgstr "La clave estА protegida.\n"
-#: g10/keyedit.c:420
+#: g10/keyedit.c:442
+#, c-format
msgid "Can't edit this key: %s\n"
msgstr "No puede editarse esta clave: %s\n"
-#: g10/keyedit.c:425
+#: g10/keyedit.c:447
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -1706,7 +1866,7 @@ msgstr ""
"Introduzca la nueva contraseЯa para esta clave secreta.\n"
"\n"
-#: g10/keyedit.c:437
+#: g10/keyedit.c:459
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -1714,334 +1874,380 @@ msgstr ""
"No ha especificado contraseЯa. Esto es probablemente una *mala* idea.\n"
"\n"
-#: g10/keyedit.c:440
+#: g10/keyedit.c:462
msgid "Do you really want to do this? "
msgstr "©Realmente quiere hacer esto? "
-#: g10/keyedit.c:501
+#: g10/keyedit.c:523
msgid "moving a key signature to the correct place\n"
msgstr "moviendo la firma de la clave al lugar correcto\n"
-#: g10/keyedit.c:537
-msgid "quit"
-msgstr ""
-
-#: g10/keyedit.c:537
+#: g10/keyedit.c:559
msgid "quit this menu"
msgstr "sale de este menЗ"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:560
msgid "q"
msgstr ""
-#: g10/keyedit.c:539
+#: g10/keyedit.c:561
msgid "save"
msgstr ""
-#: g10/keyedit.c:539
+#: g10/keyedit.c:561
msgid "save and quit"
msgstr "graba y sale"
-#: g10/keyedit.c:540
+#: g10/keyedit.c:562
msgid "help"
msgstr ""
-#: g10/keyedit.c:540
+#: g10/keyedit.c:562
msgid "show this help"
msgstr "muestra esta ayuda"
-#: g10/keyedit.c:542
+#: g10/keyedit.c:564
msgid "fpr"
msgstr ""
-#: g10/keyedit.c:542
+#: g10/keyedit.c:564
msgid "show fingerprint"
msgstr "muestra huella dactilar"
-#: g10/keyedit.c:543
+#: g10/keyedit.c:565
msgid "list"
msgstr ""
-#: g10/keyedit.c:543
+#: g10/keyedit.c:565
msgid "list key and user ids"
msgstr "lista clave e identificativos de usuario"
-#: g10/keyedit.c:544
+#: g10/keyedit.c:566
msgid "l"
msgstr ""
-#: g10/keyedit.c:545
+#: g10/keyedit.c:567
msgid "uid"
msgstr ""
-#: g10/keyedit.c:545
+#: g10/keyedit.c:567
msgid "select user id N"
msgstr "selecciona identificativo de usuario N"
-#: g10/keyedit.c:546
+#: g10/keyedit.c:568
msgid "key"
msgstr ""
-#: g10/keyedit.c:546
+#: g10/keyedit.c:568
msgid "select secondary key N"
msgstr "selecciona clave secundaria N"
-#: g10/keyedit.c:547
+#: g10/keyedit.c:569
msgid "check"
msgstr ""
-#: g10/keyedit.c:547
+#: g10/keyedit.c:569
msgid "list signatures"
msgstr "lista firmas"
-#: g10/keyedit.c:548
+#: g10/keyedit.c:570
msgid "c"
msgstr ""
-#: g10/keyedit.c:549
+#: g10/keyedit.c:571
msgid "sign"
msgstr ""
-#: g10/keyedit.c:549
+#: g10/keyedit.c:571
msgid "sign the key"
msgstr "firma la clave"
-#: g10/keyedit.c:550
+#: g10/keyedit.c:572
msgid "s"
msgstr ""
-#: g10/keyedit.c:551
+#: g10/keyedit.c:573
#, fuzzy
msgid "lsign"
msgstr "firmando:"
-#: g10/keyedit.c:551
+#: g10/keyedit.c:573
msgid "sign the key locally"
msgstr "firma la clave localmente"
-#: g10/keyedit.c:552
+#: g10/keyedit.c:574
msgid "debug"
msgstr ""
-#: g10/keyedit.c:553
+#: g10/keyedit.c:575
msgid "adduid"
msgstr ""
-#: g10/keyedit.c:553
+#: g10/keyedit.c:575
msgid "add a user id"
msgstr "aЯade un identificativo de usuario"
-#: g10/keyedit.c:554
+#: g10/keyedit.c:576
msgid "deluid"
msgstr ""
-#: g10/keyedit.c:554
+#: g10/keyedit.c:576
msgid "delete user id"
msgstr "borra un identificativo de usuario"
-#: g10/keyedit.c:555
+#: g10/keyedit.c:577
msgid "addkey"
msgstr ""
-#: g10/keyedit.c:555
+#: g10/keyedit.c:577
msgid "add a secondary key"
msgstr "aЯade una clave secundaria"
-#: g10/keyedit.c:556
+#: g10/keyedit.c:578
msgid "delkey"
msgstr ""
-#: g10/keyedit.c:556
+#: g10/keyedit.c:578
msgid "delete a secondary key"
msgstr "borra una clave secundaria"
-#: g10/keyedit.c:557
+#: g10/keyedit.c:579
+#, fuzzy
+msgid "delsig"
+msgstr "firmando:"
+
+#: g10/keyedit.c:579
+#, fuzzy
+msgid "delete signatures"
+msgstr "lista firmas"
+
+#: g10/keyedit.c:580
msgid "expire"
msgstr ""
-#: g10/keyedit.c:557
+#: g10/keyedit.c:580
msgid "change the expire date"
msgstr "cambia fecha de caducidad"
-#: g10/keyedit.c:558
+#: g10/keyedit.c:581
msgid "toggle"
msgstr ""
-#: g10/keyedit.c:558
+#: g10/keyedit.c:581
msgid "toggle between secret and public key listing"
msgstr "cambia entre lista de claves secretas y pЗblicas"
-#: g10/keyedit.c:560
+#: g10/keyedit.c:583
msgid "t"
msgstr ""
-#: g10/keyedit.c:561
+#: g10/keyedit.c:584
msgid "pref"
msgstr ""
-#: g10/keyedit.c:561
+#: g10/keyedit.c:584
msgid "list preferences"
msgstr "muestra preferencias"
-#: g10/keyedit.c:562
+#: g10/keyedit.c:585
msgid "passwd"
msgstr ""
-#: g10/keyedit.c:562
+#: g10/keyedit.c:585
msgid "change the passphrase"
msgstr "cambia la contraseЯa"
-#: g10/keyedit.c:563
+#: g10/keyedit.c:586
msgid "trust"
msgstr ""
-#: g10/keyedit.c:563
+#: g10/keyedit.c:586
msgid "change the ownertrust"
msgstr "cambia valores de confianza"
-#: g10/keyedit.c:564
+#: g10/keyedit.c:587
msgid "revsig"
msgstr ""
-#: g10/keyedit.c:564
+#: g10/keyedit.c:587
msgid "revoke signatures"
msgstr "revoca firmas"
-#: g10/keyedit.c:565
+#: g10/keyedit.c:588
msgid "revkey"
msgstr ""
-#: g10/keyedit.c:565
+#: g10/keyedit.c:588
msgid "revoke a secondary key"
msgstr "revoca una clave secundaria"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:607
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:613
+#: g10/keyedit.c:636
msgid "Secret key is available.\n"
msgstr "Clave secreta disponible.\n"
-#: g10/keyedit.c:642
+#: g10/keyedit.c:665
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:669
+#: g10/keyedit.c:692
msgid "Need the secret key to do this.\n"
msgstr "Se necesita la clave secreta para hacer esto.\n"
-#: g10/keyedit.c:691
+#: g10/keyedit.c:714
msgid "Save changes? "
msgstr "©Grabar cambios? "
-#: g10/keyedit.c:694
+#: g10/keyedit.c:717
msgid "Quit without saving? "
msgstr "©Salir sin grabar? "
-#: g10/keyedit.c:704
+#: g10/keyedit.c:727
+#, c-format
msgid "update failed: %s\n"
msgstr "actualizaciСn fallida: %s\n"
-#: g10/keyedit.c:711
+#: g10/keyedit.c:734
+#, c-format
msgid "update secret failed: %s\n"
msgstr "actualizaciСn de la clave secreta fallida: %s\n"
-#: g10/keyedit.c:718
+#: g10/keyedit.c:741
msgid "Key not changed so no update needed.\n"
msgstr "Clave sin cambios, no se necesita actualizaciСn.\n"
-#: g10/keyedit.c:721 g10/keyedit.c:780
+#: g10/keyedit.c:744 g10/keyedit.c:803
+#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "actualizaciСn de confianza fallida: %s\n"
-#: g10/keyedit.c:754
+#: g10/keyedit.c:777
msgid "Really sign all user ids? "
msgstr "©Firmar realmente todos los identificativos de usuario? "
-#: g10/keyedit.c:755
+#: g10/keyedit.c:778
msgid "Hint: Select the user ids to sign\n"
msgstr "Sugerencia: seleccione los identificativos de usuario a firmar\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:814 g10/keyedit.c:835
msgid "You must select at least one user id.\n"
msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:816
msgid "You can't delete the last user id!\n"
msgstr "║No puede borrar el Зltimo identificativo de usuario!\n"
-#: g10/keyedit.c:796
+#: g10/keyedit.c:819
msgid "Really remove all selected user ids? "
msgstr "©Borrar realmente todos los identificativos seleccionados? "
-#: g10/keyedit.c:797
+#: g10/keyedit.c:820
msgid "Really remove this user id? "
msgstr "©Borrar realmente este identificativo? "
-#: g10/keyedit.c:820 g10/keyedit.c:842
+#: g10/keyedit.c:858 g10/keyedit.c:880
msgid "You must select at least one key.\n"
msgstr "Debe seleccionar por lo menos una clave.\n"
-#: g10/keyedit.c:824
+#: g10/keyedit.c:862
msgid "Do you really want to delete the selected keys? "
msgstr "©Borrar realmente las claves seleccionadas? "
-#: g10/keyedit.c:825
+#: g10/keyedit.c:863
msgid "Do you really want to delete this key? "
msgstr "©Borrar realmente esta clave? "
-#: g10/keyedit.c:846
+#: g10/keyedit.c:884
msgid "Do you really want to revoke the selected keys? "
msgstr "©Revocar realmente las claves seleccionadas? "
-#: g10/keyedit.c:847
+#: g10/keyedit.c:885
msgid "Do you really want to revoke this key? "
msgstr "©Revocar realmente esta clave? "
-#: g10/keyedit.c:901
+#: g10/keyedit.c:939
msgid "Invalid command (try \"help\")\n"
msgstr "Comando no vАlido (pruebe \"help\")\n"
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
+msgid "Delete this good signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:1298
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:1302
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:1308
+#, fuzzy
+msgid "Really delete this self-signature? (y/N)"
+msgstr "©Crear los certificados de revocaciСn realmente? (s/N)"
+
+#: g10/keyedit.c:1322
+#, fuzzy, c-format
+msgid "Deleted %d signature.\n"
+msgstr "%d firmas incorrectas\n"
+
+#: g10/keyedit.c:1323
+#, fuzzy, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "%d firmas incorrectas\n"
+
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "Nothing deleted.\n"
+msgstr "ATENCIсN: no se ha exportado nada\n"
+
+#: g10/keyedit.c:1395
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor, quite la selecciСn de las claves secretas.\n"
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1401
msgid "Please select at most one secondary key.\n"
msgstr "Por favor, seleccione como mАximo una clave secundaria.\n"
-#: g10/keyedit.c:1303
-msgid "Changing exiration time for a secondary key.\n"
+#: g10/keyedit.c:1405
+#, fuzzy
+msgid "Changing expiration time for a secondary key.\n"
msgstr "Cambiando caducidad de clave secundaria.\n"
-#: g10/keyedit.c:1305
-msgid "Changing exiration time for the primary key.\n"
+#: g10/keyedit.c:1407
+#, fuzzy
+msgid "Changing expiration time for the primary key.\n"
msgstr "Cambiando caducidad de clave primaria.\n"
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1448
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:1362
+#: g10/keyedit.c:1464
msgid "No corresponding signature in secret ring\n"
msgstr "No hay firma correspondiente en anillo secreto\n"
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1524
+#, 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:1468
+#: g10/keyedit.c:1570
+#, c-format
msgid "No secondary key with index %d\n"
msgstr "No hay ninguna clave secundaria con el Мndice %d\n"
-#: g10/keyedit.c:1566
+#: g10/keyedit.c:1668
msgid "user ID: \""
msgstr "ID de usuario: \""
-#: g10/keyedit.c:1569
+#: g10/keyedit.c:1671
+#, c-format
msgid ""
"\"\n"
"signed with your key %08lX at %s\n"
@@ -2049,19 +2255,20 @@ msgstr ""
"\"\n"
"firmada con su clave %08lX el %s\n"
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1675
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "©Crear un certificado de revocaciСn para esta clave (s/N)?"
-#: g10/keyedit.c:1653
+#: g10/keyedit.c:1755
msgid "Really create the revocation certificates? (y/N)"
msgstr "©Crear los certificados de revocaciСn realmente? (s/N)"
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1778
msgid "no secret key\n"
msgstr "no hay clave secreta\n"
#: g10/mainproc.c:184
+#, c-format
msgid "public key is %08lX\n"
msgstr "la clave pЗblica es %08lX\n"
@@ -2087,6 +2294,7 @@ msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ATENCIсN: ║el mensaje cifrado ha sido manipulado!\n"
#: g10/mainproc.c:257
+#, c-format
msgid "decryption failed: %s\n"
msgstr "descifrado fallido: %s\n"
@@ -2095,43 +2303,60 @@ msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: el remitente solicitС \"sСlo-para-tus-ojos\"\n"
#: g10/mainproc.c:277
+#, c-format
msgid "original file name='%.*s'\n"
msgstr "nombre fichero original='%.*s'\n"
-#: g10/mainproc.c:890
+#: g10/mainproc.c:505 g10/mainproc.c:514
+#, fuzzy
+msgid "WARNING: invalid notation data found\n"
+msgstr "no se han encontrados datos OpenPGP vАlidos\n"
+
+#: g10/mainproc.c:517
+msgid "Notation: "
+msgstr ""
+
+#: g10/mainproc.c:524
+msgid "Policy: "
+msgstr ""
+
+#: g10/mainproc.c:929
msgid "signature verification suppressed\n"
msgstr "suprimida la verificaciСn de la firma\n"
-#: g10/mainproc.c:896
+#: g10/mainproc.c:935
+#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Firma creada %.*s usando identificativo de clave %s %08lX\n"
#. just in case that we have no userid
-#: g10/mainproc.c:922 g10/mainproc.c:933
+#: g10/mainproc.c:961 g10/mainproc.c:972
msgid "BAD signature from \""
msgstr "Firma INCORRECTA de \""
-#: g10/mainproc.c:923 g10/mainproc.c:934
+#: g10/mainproc.c:962 g10/mainproc.c:973
msgid "Good signature from \""
msgstr "Firma correcta de \""
-#: g10/mainproc.c:925
+#: g10/mainproc.c:964
msgid " aka \""
msgstr "tambiИn conocido como \""
-#: g10/mainproc.c:975
+#: g10/mainproc.c:1015
+#, c-format
msgid "Can't check signature: %s\n"
msgstr "Imposible comprobar la firma: %s\n"
-#: g10/mainproc.c:1056
+#: g10/mainproc.c:1109
msgid "old style (PGP 2.x) signature\n"
msgstr "firma viejo estilo (PGP 2.x)\n"
-#: g10/mainproc.c:1061
+#: g10/mainproc.c:1114
msgid "invalid root packet detected in proc_tree()\n"
msgstr "paquete raМz no vАlido detectado en proc_tree()\n"
#: g10/misc.c:93
+#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "no se pueden desactivar los core dumps: %s\n"
@@ -2158,10 +2383,12 @@ msgstr ""
"estАndar.\n"
#: g10/parse-packet.c:112
+#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "no puedo manejar el algoritmo de clave pЗblica %d\n"
-#: g10/parse-packet.c:872
+#: g10/parse-packet.c:931
+#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "el subpaquete de tipo %d tiene el bit crМtico activado\n"
@@ -2176,18 +2403,20 @@ msgstr ""
"del usuario: \""
#: g10/passphrase.c:166
+#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
#: g10/passphrase.c:171
+#, c-format
msgid " (main key ID %08lX)"
msgstr "(ID clave primaria %08lX)"
-#: g10/passphrase.c:190
+#: g10/passphrase.c:192
msgid "Enter passphrase: "
msgstr "Introduzca contraseЯa: "
-#: g10/passphrase.c:194
+#: g10/passphrase.c:196
msgid "Repeat passphrase: "
msgstr "Repita contraseЯa: "
@@ -2195,19 +2424,21 @@ msgstr "Repita contraseЯa: "
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "datos no grabados; use la opciСn \"--output\" para grabarlos\n"
-#: g10/plaintext.c:208
+#: g10/plaintext.c:266
msgid "Please enter name of data file: "
msgstr "Introduzca el nombre del fichero de datos: "
-#: g10/plaintext.c:229
+#: g10/plaintext.c:287
msgid "reading stdin ...\n"
msgstr "leyendo stdin...\n"
-#: g10/plaintext.c:302
+#: g10/plaintext.c:360
+#, c-format
msgid "can't open signed data `%s'\n"
msgstr "imposible abrir datos firmados `%s'\n"
#: g10/pubkey-enc.c:79
+#, c-format
msgid "anonymous receiver; trying secret key %08lX ...\n"
msgstr "destinatario anСnimo, probando clave secreta %08lX ...\n"
@@ -2220,10 +2451,12 @@ msgid "old encoding of the DEK is not supported\n"
msgstr "la codificaciСn vieja de DEK no estА soportada\n"
#: g10/pubkey-enc.c:191
+#, c-format
msgid "NOTE: cipher algorithm %d not found in preferences\n"
msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n"
#: g10/seckey-cert.c:55
+#, c-format
msgid "protection algorithm %d is not supported\n"
msgstr "el algoritmo de protecciСn %d no estА soportado\n"
@@ -2247,14 +2480,17 @@ msgstr ""
"firmas!\n"
#: g10/sig-check.c:291
+#, c-format
msgid "public key is %lu second newer than the signature\n"
msgstr "la clave pЗblica es %lu segundos mАs nueva que la firma\n"
#: g10/sig-check.c:292
+#, c-format
msgid "public key is %lu seconds newer than the signature\n"
-msgstr "la clave pЗblica es %lu segundos mАs nueva que la firma\n"
+msgstr "la clave pЗblica es %lu segundos mАs nueva que la firma\n"
#: g10/sig-check.c:308
+#, c-format
msgid "NOTE: signature key expired %s\n"
msgstr "NOTA: clave de la firma caducada el %s\n"
@@ -2262,35 +2498,42 @@ msgstr "NOTA: clave de la firma caducada el %s\n"
msgid "assuming bad signature due to an unknown critical bit\n"
msgstr "asumiendo firma mala debido a un bit crМtico desconocido\n"
-#: g10/sign.c:79
+#: g10/sign.c:132
+#, c-format
msgid "%s signature from: %s\n"
msgstr "firma %s de %s\n"
-#: g10/sign.c:210 g10/sign.c:496
+#: g10/sign.c:263 g10/sign.c:554
+#, c-format
msgid "can't create %s: %s\n"
msgstr "no puede crearse %s: %s\n"
-#: g10/sign.c:306
+#: g10/sign.c:361
msgid "signing:"
msgstr "firmando:"
-#: g10/sign.c:346
+#: g10/sign.c:401
+#, c-format
msgid "WARNING: `%s' is an empty file\n"
msgstr "ATENCIсN `%s' es un fichero vacМo\n"
#: g10/textfilter.c:128
+#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "no se pueden manejar lМneas de texto de mАs de %d caracteres\n"
#: g10/textfilter.c:197
+#, c-format
msgid "input line longer than %d characters\n"
msgstr "lМnea de longitud superior a %d caracteres\n"
#: g10/tdbio.c:116 g10/tdbio.c:1505
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
#: g10/tdbio.c:122 g10/tdbio.c:1512
+#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr ""
"resgisto base de datos de confianza %lu: escritura fallida (n=%d): %s\n"
@@ -2300,179 +2543,222 @@ msgid "trustdb transaction too large\n"
msgstr "transacciСn en la base de datos de confianza demasiado grande\n"
#: g10/tdbio.c:424
+#, c-format
msgid "%s: can't access: %s\n"
msgstr "%s: no puede abrirse: %s\n"
#: g10/ringedit.c:296 g10/tdbio.c:444
+#, c-format
msgid "%s: can't create directory: %s\n"
msgstr "%s: no puede crearse el directorio: %s\n"
#: g10/ringedit.c:302 g10/tdbio.c:447
+#, c-format
msgid "%s: directory created\n"
msgstr "%s: directorio creado\n"
#: g10/tdbio.c:451
+#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: ║el directorio no existe!\n"
-#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:144 g10/openfile.c:215 g10/ringedit.c:1344 g10/tdbio.c:457
+#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: no puede crearse: %s\n"
#: g10/tdbio.c:472 g10/tdbio.c:521
+#, c-format
msgid "%s: can't create lock\n"
msgstr "%s: no puede crearse bloqueo\n"
#: g10/tdbio.c:486
+#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: fallo en la creaciСn del registro de versiСn: %s"
#: g10/tdbio.c:490
+#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: se ha creado base de datos de confianza no vАlida\n"
#: g10/tdbio.c:493
+#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: se ha creado base de datos de confianza\n"
#: g10/tdbio.c:530
+#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: base de datos de confianza no vАlida\n"
#: g10/tdbio.c:563
+#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: fallo en la creaciСn de la tabla hash: %s\n"
#: g10/tdbio.c:571
+#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: error actualizando el registro de versiСn: %s\n"
#: g10/tdbio.c:587 g10/tdbio.c:626 g10/tdbio.c:648 g10/tdbio.c:678
#: g10/tdbio.c:703 g10/tdbio.c:1438 g10/tdbio.c:1465
+#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: error leyendo registro de versiСn: %s\n"
#: g10/tdbio.c:600 g10/tdbio.c:659
+#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: error escribiendo registro de versiСn: %s\n"
#: g10/tdbio.c:1132
+#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "base de datos de confianza: fallo lseek: %s\n"
#: g10/tdbio.c:1140
+#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "base de datos de confianza: error lectura (n=%d): %s\n"
#: g10/tdbio.c:1161
+#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: no es una base de datos de confianza\n"
#: g10/tdbio.c:1177
+#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: registro de versiСn con nЗmero de registro %lu\n"
#: g10/tdbio.c:1182
+#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: versiСn del fichero %d no vАlida\n"
#: g10/tdbio.c:1471
+#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: error leyendo registro libre: %s\n"
#: g10/tdbio.c:1479
+#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: error escribiendo registro de directorio: %s\n"
#: g10/tdbio.c:1489
+#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: fallo en poner a cero un registro: %s\n"
#: g10/tdbio.c:1519
+#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: fallo al aЯadir un registro: %s\n"
#: g10/tdbio.c:1630
-msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
+#, fuzzy
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
msgstr ""
"La base de datos de confianza estА daЯada. Por favor, ejecute\n"
"\"gpgm --fix-trust-db\".\n"
#: g10/trustdb.c:163
+#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "registro de confianza %lu, peticiСn tipo %d: fallo lectura: %s\n"
#: g10/trustdb.c:178
+#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
#: g10/trustdb.c:192
+#, c-format
msgid "trust record %lu: delete failed: %s\n"
msgstr "registro de confianza %lu: fallo al borrar: %s\n"
#: g10/trustdb.c:206
+#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "base de datos de confianza: fallo sincronizaciСn: %s\n"
#: g10/trustdb.c:386
+#, c-format
msgid "error reading dir record for LID %lu: %s\n"
msgstr "error leyendo registro de directorio del LID %lu: %s\n"
#: g10/trustdb.c:393
+#, c-format
msgid "lid %lu: expected dir record, got type %d\n"
msgstr "lid %lu: esperaba registro directorio, encontrado tipo %d\n"
#: g10/trustdb.c:398
+#, c-format
msgid "no primary key for LID %lu\n"
msgstr "no hay clave primaria para el LID %lu\n"
#: g10/trustdb.c:403
+#, c-format
msgid "error reading primary key for LID %lu: %s\n"
msgstr "error leyendo clave primaria para el LID %lu: %s\n"
#: g10/trustdb.c:442
+#, c-format
msgid "get_dir_record: search_record failed: %s\n"
msgstr "get_dir_record: search_record fallida: %s\n"
#: g10/trustdb.c:510
+#, c-format
msgid "NOTE: secret key %08lX is NOT protected.\n"
msgstr "NOTA: la clave secreta %08lX NO estА protegida.\n"
#: g10/trustdb.c:518
+#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "clave %08lX: clave secreta sin clave pЗblica - ignorada\n"
#: g10/trustdb.c:525
+#, c-format
msgid "key %08lX: secret and public key don't match\n"
msgstr "clave %08lX: las claves pЗblica y secreta no se corresponden\n"
#: g10/trustdb.c:535
+#, c-format
msgid "key %08lX: can't put it into the trustdb\n"
msgstr "clave %08lX: imposible incluirla en la base de datos de confianza\n"
#: g10/trustdb.c:541
+#, c-format
msgid "key %08lX: query record failed\n"
msgstr "clave %08lX: peticiСn de registro fallida\n"
#: g10/trustdb.c:550
+#, c-format
msgid "key %08lX: already in trusted key table\n"
msgstr "clave %08lX: ya estА en la tabla de confianza\n"
#: g10/trustdb.c:553
+#, c-format
msgid "key %08lX: accepted as trusted key.\n"
msgstr "clave %08lX: aceptada como clave de confianza.\n"
#: g10/trustdb.c:561
+#, c-format
msgid "enumerate secret keys failed: %s\n"
msgstr "enum_secret_keys fallido: %s\n"
#: g10/trustdb.c:851
+#, c-format
msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
msgstr ""
"NOTA: el registro de firma %lu[%d] estА en la lista\n"
"de bЗsqueda de %lu pero estА marcado como comprobado\n"
#: g10/trustdb.c:855
+#, c-format
msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n"
msgstr ""
"NOTA: el registro de firma %lu[%d] estА en la lista\n"
@@ -2480,26 +2766,31 @@ msgstr ""
#. we need the dir record
#: g10/trustdb.c:862
+#, c-format
msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n"
msgstr ""
"El registro de firma %lu[%d] en la lista de bЗsqueda de %lu\n"
"no apunta a un registro de directorio\n"
#: g10/trustdb.c:868
+#, c-format
msgid "lid %lu: no primary key\n"
msgstr "lid %lu: ninguna clave primaria\n"
#: g10/trustdb.c:901
+#, c-format
msgid "lid %lu: user id not found in keyblock\n"
msgstr ""
"lid %lu: no se ha encontrado identificativo de usuario\n"
"en el bloque de clave\n"
#: g10/trustdb.c:905
+#, c-format
msgid "lid %lu: user id without signature\n"
msgstr "lid %lu: identificativo de usuario sin firma\n"
#: g10/trustdb.c:912
+#, c-format
msgid "lid %lu: self-signature in hintlist\n"
msgstr "lid %lu: autofirma en lista de bЗsqueda\n"
@@ -2516,40 +2807,49 @@ msgid "very strange: no public key\n"
msgstr "muy raro: no hay clave pЗblica\n"
#: g10/trustdb.c:982
+#, c-format
msgid "hintlist %lu[%d] of %lu does not point to a dir record\n"
msgstr ""
"la lista de bЗsqueda %lu[%d] de %lu no apunta a\n"
"un registro de directorio\n"
#: g10/trustdb.c:988
+#, c-format
msgid "lid %lu does not have a key\n"
msgstr "lid %lu no dispone de clave\n"
#: g10/trustdb.c:998
+#, c-format
msgid "lid %lu: can't get keyblock: %s\n"
msgstr "lid %lu: no puedo obtener el bloque de clave: %s\n"
#: g10/trustdb.c:1055 g10/trustdb.c:2030
+#, c-format
msgid "tdbio_search_dir failed: %s\n"
msgstr "tdbio_search_dir fallida: %s\n"
#: g10/trustdb.c:1210
+#, c-format
msgid "key %08lX.%lu: Good subkey binding\n"
msgstr "clave %08lX.%lu: buena uniСn de subclave\n"
#: g10/trustdb.c:1216 g10/trustdb.c:1259
+#, c-format
msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
msgstr "clave %08lX.%lu: uniСn de subclave no vАlida\n"
#: g10/trustdb.c:1232
+#, c-format
msgid "key %08lX.%lu: Valid key revocation\n"
msgstr "clave %08lX.%lu: revocaciСn de clave vАlida\n"
#: g10/trustdb.c:1238
+#, c-format
msgid "key %08lX.%lu: Invalid key revocation: %s\n"
msgstr "clave %08lX.%lu: revocaciСn de clave no vАlida: %s\n"
#: g10/trustdb.c:1253
+#, c-format
msgid "key %08lX.%lu: Valid subkey revocation\n"
msgstr "clave %08lX.%lu: revocaciСn de subclave vАlida\n"
@@ -2609,6 +2909,7 @@ msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
msgstr ""
#: g10/trustdb.c:1734
+#, c-format
msgid "sig record %lu[%d] points to wrong record.\n"
msgstr "registro de firma %lu[%d] apunta al registro equivocado.\n"
@@ -2627,124 +2928,154 @@ msgid "Ooops, no user ids\n"
msgstr "Oh oh, no hay identificativos de usuario\n"
#: g10/trustdb.c:2529
+#, c-format
msgid "lid ?: insert failed: %s\n"
msgstr "lid ?: inserciСn fallida: %s\n"
#: g10/trustdb.c:2534
+#, c-format
msgid "lid %lu: insert failed: %s\n"
msgstr "lid %lu: inserciСn fallida: %s\n"
#: g10/trustdb.c:2540
+#, c-format
msgid "lid %lu: inserted\n"
msgstr "lid %lu: insertada\n"
#: g10/trustdb.c:2545 g10/trustdb.c:2654
+#, c-format
msgid "lid %lu: update failed: %s\n"
msgstr "lid %lu: actualizaciСn fallida: %s\n"
#: g10/trustdb.c:2551 g10/trustdb.c:2660
+#, c-format
msgid "lid %lu: updated\n"
msgstr "lid %lu: actualizado\n"
#: g10/trustdb.c:2556 g10/trustdb.c:2664
+#, c-format
msgid "lid %lu: okay\n"
msgstr "lid %lu: bien\n"
#: g10/trustdb.c:2562 g10/trustdb.c:2671
+#, c-format
msgid "%lu keys processed\n"
msgstr "se han procesado %lu claves\n"
#: g10/trustdb.c:2564 g10/trustdb.c:2675
+#, c-format
msgid "\t%lu keys with errors\n"
msgstr "\t%lu claves con errores\n"
#: g10/trustdb.c:2566 g10/trustdb.c:2677
+#, c-format
msgid "\t%lu keys updated\n"
msgstr "\t%lu claves actualizadas\n"
#: g10/trustdb.c:2568
+#, c-format
msgid "\t%lu keys inserted\n"
msgstr "\t%lu claves insertadas\n"
#: g10/trustdb.c:2571
+#, c-format
msgid "enumerate keyblocks failed: %s\n"
msgstr "enumeraciСn bloques de clave fallido: %s\n"
#: g10/trustdb.c:2598
+#, c-format
msgid "%s: keyblock read problem: %s\n"
msgstr "%s: problema lectura del bloque de clave: %s\n"
#: g10/trustdb.c:2612
+#, c-format
msgid "%s: update failed: %s\n"
msgstr "%s: actualizaciСn fallida: %s\n"
#: g10/trustdb.c:2615
+#, c-format
msgid "%s: updated\n"
msgstr "%s: actualizada\n"
#: g10/trustdb.c:2617
+#, c-format
msgid "%s: okay\n"
msgstr "%s: bien\n"
#: g10/trustdb.c:2632
+#, c-format
msgid "lid %lu: dir record w/o key - skipped\n"
msgstr "lid %lu: registro de directiorio sin clave - ignorado\n"
#: g10/trustdb.c:2645
+#, c-format
msgid "lid %lu: keyblock not found: %s\n"
msgstr "lid %lu: bloque de clave no encontrado: %s\n"
#: g10/trustdb.c:2673
+#, c-format
msgid "\t%lu keys skipped\n"
msgstr "\t%lu claves ignoradas\n"
#: g10/trustdb.c:2743
+#, c-format
msgid "check_trust: search dir record failed: %s\n"
msgstr "check_trust: bЗsqueda registro directorio fallida: %s\n"
#: g10/trustdb.c:2750
+#, c-format
msgid "key %08lX: insert trust record failed: %s\n"
msgstr "clave %08lX: inserciСn del registro de confianza fallida: %s\n"
#: g10/trustdb.c:2754
+#, c-format
msgid "key %08lX.%lu: inserted into trustdb\n"
msgstr "clave %08lX.%lu: incluida en la base de datos de confianza\n"
#: g10/trustdb.c:2762
+#, c-format
msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
msgstr ""
"clave %08lX.%lu: creada en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
#: g10/trustdb.c:2769
+#, c-format
msgid "key %08lX.%lu: expired at %s\n"
msgstr "clave %08lX.%lu: caducada el %s\n"
#: g10/trustdb.c:2777
+#, c-format
msgid "key %08lX.%lu: trust check failed: %s\n"
msgstr "clave %08lX.%lu: comprobaciСn de confianza fallida: %s\n"
#: g10/trustdb.c:2881
+#, c-format
msgid "user '%s' not found: %s\n"
msgstr "usuario '%s' no encontrado: %s\n"
#: g10/trustdb.c:2883
+#, c-format
msgid "problem finding '%s' in trustdb: %s\n"
msgstr "problema buscando '%s' en la tabla de confianza: %s\n"
#: g10/trustdb.c:2886
+#, c-format
msgid "user '%s' not in trustdb - inserting\n"
msgstr "usuario '%s' no estА en la tabla de confianza - insertando\n"
#: g10/trustdb.c:2889
+#, c-format
msgid "failed to put '%s' into trustdb: %s\n"
msgstr "fallo al poner '%s' en la tabla de confianza: %s\n"
#: g10/ringedit.c:316
+#, c-format
msgid "%s: can't create keyring: %s\n"
msgstr "%s: no se puede crear el anillo: %s\n"
#: g10/ringedit.c:333 g10/ringedit.c:1349
+#, c-format
msgid "%s: keyring created\n"
msgstr "%s: anillo creado\n"
@@ -2753,10 +3084,12 @@ msgid "WARNING: 2 files with confidential information exists.\n"
msgstr "ATENCIсN: existen 2 ficheros con informaciСn confidencial.\n"
#: g10/ringedit.c:1527
+#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s es el que no se ha modificado\n"
#: g10/ringedit.c:1528
+#, c-format
msgid "%s is the new one\n"
msgstr "%s es el nuevo\n"
@@ -2769,19 +3102,22 @@ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
#: g10/skclist.c:113
+#, c-format
msgid "skipped `%s': %s\n"
msgstr "`%s' ignorado: %s\n"
#: g10/skclist.c:119
+#, c-format
msgid ""
"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
"signatures!\n"
msgstr ""
-"`%s' ignorada: esta es una clave ElGamal generada por PGP que NO es "
-"segura para las firmas\n"
+"`%s' ignorada: esta es una clave ElGamal generada por PGP que NO es segura "
+"para las firmas\n"
#. do not overwrite
#: g10/openfile.c:65
+#, c-format
msgid "File `%s' exists. "
msgstr "El fichero `%s' ya existe. "
@@ -2789,23 +3125,32 @@ msgstr "El fichero `%s' ya existe. "
msgid "Overwrite (y/N)? "
msgstr "©Sobreescribir (s/N)? "
-#: g10/openfile.c:92
+#: g10/openfile.c:97
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr ""
+
+#: g10/openfile.c:122
msgid "writing to stdout\n"
msgstr "escribiendo en stdout\n"
-#: g10/openfile.c:149
+#: g10/openfile.c:181
+#, c-format
msgid "assuming signed data in `%s'\n"
msgstr "asumiendo que hay datos firmados en `%s'\n"
-#: g10/openfile.c:199
+#: g10/openfile.c:231
+#, c-format
msgid "%s: new options file created\n"
msgstr "%s: se ha creado un nuevo fichero de opciones\n"
#: g10/encr-data.c:66
+#, c-format
msgid "%s encrypted data\n"
msgstr "datos cifrados %s\n"
#: g10/encr-data.c:68
+#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrado con algoritmo desconocido %d\n"
@@ -2820,6 +3165,7 @@ msgid "weak key created - retrying\n"
msgstr "creada clave dИbil - reintentando\n"
#: g10/seskey.c:57
+#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"║imposible evitar clave dИbil para cifrado simИtrico despuИs de %d "
@@ -2922,30 +3268,53 @@ msgstr ""
msgid "keyedit.remove.subkey.okay"
msgstr ""
-#: g10/helptext.c:175
+#: g10/helptext.c:176
+msgid "keyedit.delsig.valid"
+msgstr ""
+
+#: g10/helptext.c:181
+msgid "keyedit.delsig.unknown"
+msgstr ""
+
+#: g10/helptext.c:187
+msgid "keyedit.delsig.invalid"
+msgstr ""
+
+#: g10/helptext.c:191
+msgid "keyedit.delsig.selfsig"
+msgstr ""
+
+#: g10/helptext.c:200
msgid "passphrase.enter"
msgstr ""
-#: g10/helptext.c:182
+#: g10/helptext.c:207
msgid "passphrase.repeat"
msgstr ""
-#: g10/helptext.c:186
+#: g10/helptext.c:211
msgid "detached_signature.filename"
msgstr ""
-#: g10/helptext.c:190
+#: g10/helptext.c:215
msgid "openfile.overwrite.okay"
msgstr ""
-#: g10/helptext.c:204
+#: g10/helptext.c:229
msgid "No help available"
msgstr "Ayuda no disponible"
-#: g10/helptext.c:216
+#: g10/helptext.c:241
+#, c-format
msgid "No help available for `%s'"
msgstr "Ayuda no disponible para `%s'"
+#~ msgid "can't lock keyring `%': %s\n"
+#~ msgstr "no puede bloquearse el anillo pЗblico `%s': %s\n"
+
+#~ msgid "error writing keyring `%': %s\n"
+#~ msgstr "error escribiendo anillo `%s': %s\n"
+
#~ msgid "can't open file: %s\n"
#~ msgstr "no puede abrirse el fichero: %s\n"
diff --git a/po/fr.po b/po/fr.po
index 252ffa1cd..bad3630cd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 0.9.7\n"
-"POT-Creation-Date: 1999-06-08 21:26+0200\n"
+"POT-Creation-Date: 1999-06-26 11:22+0200\n"
"PO-Revision-Date: 1999-05-24 21:48+02:00\n"
"Last-Translator: GaКl QuИri <gqueri@mail.dotcom.fr>\n"
"Language-Team: French <traduc@Linux.EU.ORG>\n"
@@ -276,7 +276,7 @@ msgstr ""
"Il n'y a pas assez d'octets alИatoires disponibles. Faites autre chose\n"
"pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n"
-#: g10/g10.c:169
+#: g10/g10.c:174
msgid ""
"@Commands:\n"
" "
@@ -284,132 +284,132 @@ msgstr ""
"@Commandes:\n"
" "
-#: g10/g10.c:171
+#: g10/g10.c:176
msgid "|[file]|make a signature"
msgstr "|[fichier]|faire une signature"
-#: g10/g10.c:172
+#: g10/g10.c:177
msgid "|[file]|make a clear text signature"
msgstr "|[fichier]|faire une signature en texte clair"
-#: g10/g10.c:173
+#: g10/g10.c:178
msgid "make a detached signature"
msgstr "faire une signature dИtachИe"
-#: g10/g10.c:174
+#: g10/g10.c:179
msgid "encrypt data"
msgstr "chiffrer les donnИes"
-#: g10/g10.c:175
+#: g10/g10.c:180
msgid "encryption only with symmetric cipher"
msgstr "chiffrement symИtrique seulement"
-#: g10/g10.c:176
+#: g10/g10.c:181
msgid "store only"
msgstr "pas d'action"
-#: g10/g10.c:177
+#: g10/g10.c:182
msgid "decrypt data (default)"
msgstr "dИchiffrer les donnИes (dИfaut)"
-#: g10/g10.c:178
+#: g10/g10.c:183
msgid "verify a signature"
msgstr "vИrifier une signature"
-#: g10/g10.c:179
+#: g10/g10.c:184
msgid "list keys"
msgstr "lister les clИs"
-#: g10/g10.c:181
+#: g10/g10.c:186
msgid "list keys and signatures"
msgstr "lister les clИs et les signatures"
-#: g10/g10.c:182
+#: g10/g10.c:187
msgid "check key signatures"
msgstr "vИrifier les signatures des clИs"
-#: g10/g10.c:183
+#: g10/g10.c:188
msgid "list keys and fingerprints"
msgstr "lister les clИs et les empreintes"
-#: g10/g10.c:184
+#: g10/g10.c:189
msgid "list secret keys"
msgstr "lister les clИs secrХtes"
-#: g10/g10.c:185
+#: g10/g10.c:190
msgid "generate a new key pair"
msgstr "gИnИrer une nouvelle paire de clИs"
-#: g10/g10.c:186
+#: g10/g10.c:191
msgid "remove key from the public keyring"
msgstr "enlever la clИ du porte-clИs public"
-#: g10/g10.c:187
+#: g10/g10.c:192
msgid "sign or edit a key"
msgstr "signer ou Иditer une clИ"
-#: g10/g10.c:188
+#: g10/g10.c:193
msgid "generate a revocation certificate"
msgstr "gИnИrer un certificat de rИvocation"
-#: g10/g10.c:189
+#: g10/g10.c:194
msgid "export keys"
msgstr "exporter les clИs"
-#: g10/g10.c:190
+#: g10/g10.c:195
msgid "export keys to a key server"
msgstr "exporter les clИs vers un serveur de clИs"
-#: g10/g10.c:191
+#: g10/g10.c:196
msgid "import keys from a key server"
msgstr "importer les clИs d'un serveur de clИs"
-#: g10/g10.c:194
+#: g10/g10.c:199
msgid "import/merge keys"
msgstr "importer/fusionner les clИs"
-#: g10/g10.c:196
+#: g10/g10.c:201
msgid "list only the sequence of packets"
msgstr "ne lister que les paquets"
-#: g10/g10.c:198
+#: g10/g10.c:203
msgid "export the ownertrust values"
msgstr "exporter les indices de confiance"
-#: g10/g10.c:200
+#: g10/g10.c:205
msgid "import ownertrust values"
msgstr "importer les indices de confiance"
#
-#: g10/g10.c:202
+#: g10/g10.c:207
msgid "|[NAMES]|update the trust database"
msgstr "|[NOMS]|mettre la base de confiance Ю jour"
-#: g10/g10.c:204
+#: g10/g10.c:209
msgid "|[NAMES]|check the trust database"
msgstr "|[NOMS]|vИrifier la base de confiance"
-#: g10/g10.c:205
+#: g10/g10.c:210
msgid "fix a corrupted trust database"
msgstr "rИparer une base de confiance corrompue"
-#: g10/g10.c:206
+#: g10/g10.c:211
msgid "De-Armor a file or stdin"
msgstr "Enlever l'armure d'un fichier ou de stdin"
-#: g10/g10.c:207
+#: g10/g10.c:212
msgid "En-Armor a file or stdin"
msgstr "Mettre une armure Ю un fichier ou Ю stdin"
-#: g10/g10.c:208
+#: g10/g10.c:213
msgid "|algo [files]|print message digests"
msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
-#: g10/g10.c:209
+#: g10/g10.c:214
msgid "print all message digests"
msgstr "Иcrire toutes les fonctions de hachage"
-#: g10/g10.c:215
+#: g10/g10.c:220
msgid ""
"@\n"
"Options:\n"
@@ -419,154 +419,162 @@ msgstr ""
"Options:\n"
" "
-#: g10/g10.c:217
+#: g10/g10.c:222
msgid "create ascii armored output"
msgstr "crИer une sortie ascii avec armure"
-#: g10/g10.c:218
+#: g10/g10.c:223
msgid "|NAME|encrypt for NAME"
msgstr "|NOM|chiffrer pour NOM"
-#: g10/g10.c:222
+#: g10/g10.c:227
msgid "use this user-id to sign or decrypt"
msgstr "utiliser ce nom pour signer ou dИchiffrer"
-#: g10/g10.c:223
+#: g10/g10.c:228
msgid "|N|set compress level N (0 disables)"
msgstr "|N|niveau de compression N (0 dИsactive)"
-#: g10/g10.c:225
+#: g10/g10.c:230
msgid "use canonical text mode"
msgstr "utiliser le mode texte canonique"
-#: g10/g10.c:226
+#: g10/g10.c:231
msgid "use as output file"
msgstr "utiliser comme fichier de sortie"
-#: g10/g10.c:227
+#: g10/g10.c:232
msgid "verbose"
msgstr "bavard"
-#: g10/g10.c:228
+#: g10/g10.c:233
msgid "be somewhat more quiet"
msgstr "devenir beaucoup plus silencieux"
+#: g10/g10.c:234
+msgid "don't use the terminal at all"
+msgstr ""
+
#
-#: g10/g10.c:229
+#: g10/g10.c:235
msgid "force v3 signatures"
msgstr "forcer les signatures en v3"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "always use a MDC for encryption"
msgstr "toujours utiliser un sceau pour le chiffrement"
-#: g10/g10.c:231
+#: g10/g10.c:237
msgid "do not make any changes"
msgstr "ne rien changer"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:233
+#: g10/g10.c:239
msgid "batch mode: never ask"
msgstr "mode automatique : ne jamais rien demander"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "assume yes on most questions"
msgstr "rИpondre oui Ю la plupart des questions"
-#: g10/g10.c:235
+#: g10/g10.c:241
msgid "assume no on most questions"
msgstr "rИpondre non Ю la plupart des questions"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "add this keyring to the list of keyrings"
msgstr "ajouter ce porte-clИs Ю la liste des porte-clИs"
-#: g10/g10.c:237
+#: g10/g10.c:243
msgid "add this secret keyring to the list"
msgstr "ajouter ce porte-clИs secret Ю la liste"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|NAME|use NAME as default secret key"
msgstr "|NOM|utiliser NOM comme clИ secrХte par dИfaut"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HтTE|utiliser ce serveur pour chercher des clИs"
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOM|le terminal utilise la table de caractХres NOM"
-#: g10/g10.c:241
+#: g10/g10.c:247
msgid "read options from file"
msgstr "lire les options du fichier"
-#: g10/g10.c:243
+#: g10/g10.c:249
msgid "set debugging flags"
msgstr "choisir les attributs de dИboguage"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "enable full debugging"
msgstr "permettre un dИboguage complet"
-#: g10/g10.c:245
+#: g10/g10.c:251
msgid "|FD|write status info to this FD"
msgstr "|FD|Иcrire l'Иtat sur ce descripteur"
-#: g10/g10.c:246
+#: g10/g10.c:252
msgid "do not write comment packets"
msgstr "ne pas Иcrire de paquets de commentaire"
-#: g10/g10.c:247
+#: g10/g10.c:253
msgid "(default is 1)"
msgstr "nombre de signatures complХtes requises (1)"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid "(default is 3)"
msgstr "nombre de signatures marginales requises (3)"
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "|FILE|load extension module FILE"
msgstr "|FICH|charger le module d'extension FICH"
-#: g10/g10.c:251
+#: g10/g10.c:257
msgid "emulate the mode described in RFC1991"
msgstr "imiter le mode dИcrit dans la RFC1991"
+#: g10/g10.c:258
+msgid "set all packet, cipher and digest options to OpenPGP behavior"
+msgstr ""
+
# FIXMOI : faudra trouver mieux ...
-#: g10/g10.c:252
+#: g10/g10.c:259
msgid "|N|use passphrase mode N"
msgstr "|N|utiliser le mode de codage des mots de passe N"
-#: g10/g10.c:254
+#: g10/g10.c:261
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
-#: g10/g10.c:256
+#: g10/g10.c:263
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
-#: g10/g10.c:257
+#: g10/g10.c:264
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
-#: g10/g10.c:258
+#: g10/g10.c:265
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOM|utiliser la fonction de hachage NOM"
-#: g10/g10.c:259
+#: g10/g10.c:266
msgid "|N|use compress algorithm N"
msgstr "|N|utiliser l'algorithme de compression N"
-#: g10/g10.c:260
+#: g10/g10.c:267
msgid "throw keyid field of encrypted packets"
msgstr "supprimer l'identification des paquets chiffrИs"
-#: g10/g10.c:261
+#: g10/g10.c:268
msgid "|NAME=VALUE|use this notation data"
msgstr ""
-#: g10/g10.c:263
+#: g10/g10.c:270
msgid ""
"@\n"
"Examples:\n"
@@ -586,15 +594,15 @@ msgstr ""
" --list-keys [utilisateur] montrer les clИs\n"
" --fingerprint [utilisateur] montrer les empreintes\n"
-#: g10/g10.c:337
+#: g10/g10.c:347
msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
msgstr "Rapporter toutes anomalies Ю <gnupg-bugs@gnu.org>.\n"
-#: g10/g10.c:341
+#: g10/g10.c:351
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
-#: g10/g10.c:344
+#: g10/g10.c:354
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -604,7 +612,7 @@ msgstr ""
"signer, vИrifier, chiffer ou dИchiffrer\n"
"l'opИration par dИfaut dИpend des donnИes entrИes\n"
-#: g10/g10.c:349
+#: g10/g10.c:359
msgid ""
"\n"
"Supported algorithms:\n"
@@ -612,169 +620,169 @@ msgstr ""
"\n"
"Algorithmes supportИs:\n"
-#: g10/g10.c:423
+#: g10/g10.c:433
msgid "usage: gpg [options] "
msgstr "utilisation: gpg [options] "
-#: g10/g10.c:463
+#: g10/g10.c:473
msgid "conflicting commands\n"
msgstr "commandes en conflit\n"
-#: g10/g10.c:595
+#: g10/g10.c:605
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTE : pas de fichier d'options par dИfaut `%s'\n"
-#: g10/g10.c:599
+#: g10/g10.c:609
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichier d'options `%s' : %s\n"
-#: g10/g10.c:606
+#: g10/g10.c:616
#, c-format
msgid "reading options from `%s'\n"
msgstr "lire les options de `%s'\n"
-#: g10/g10.c:755
+#: g10/g10.c:782
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s n'est pas une table de caractХres valide\n"
-#: g10/g10.c:799 g10/g10.c:811
+#: g10/g10.c:827 g10/g10.c:839
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement sИlectionnИ est invalide\n"
-#: g10/g10.c:805 g10/g10.c:817
+#: g10/g10.c:833 g10/g10.c:845
msgid "selected digest algorithm is invalid\n"
msgstr "la fonction de hachage sИlectionnИe est invalide\n"
-#: g10/g10.c:821
+#: g10/g10.c:849
msgid "the given policy URL is invalid\n"
msgstr ""
-#: g10/g10.c:824
+#: g10/g10.c:852
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "l'algorithme de compression doit faire partie de l'Иchelle %d..%d\n"
-#: g10/g10.c:826
+#: g10/g10.c:854
msgid "completes-needed must be greater than 0\n"
msgstr "╚ completes-needed ╩ doit Йtre supИrieur Ю 0\n"
-#: g10/g10.c:828
+#: g10/g10.c:856
msgid "marginals-needed must be greater than 1\n"
msgstr "╚ marginals-needed ╩ doit Йtre supИrieur Ю 1\n"
-#: g10/g10.c:830
+#: g10/g10.c:858
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "╚ max-cert-depth ╩ doit Йtre compris entre 1 et 255\n"
-#: g10/g10.c:833
+#: g10/g10.c:861
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTE : le mode S2K simple (0) est fortement dИconseillИ\n"
-#: g10/g10.c:837
+#: g10/g10.c:865
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mode S2K invalide ; doit Йtre 0, 1 ou 3\n"
-#: g10/g10.c:914
+#: g10/g10.c:942
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "n'a pas pu initialiser la base de confiance : %s\n"
-#: g10/g10.c:920
+#: g10/g10.c:948
msgid "--store [filename]"
msgstr "--store [nom du fichier]"
-#: g10/g10.c:927
+#: g10/g10.c:955
msgid "--symmetric [filename]"
msgstr "--symmetric [nom du fichier]"
-#: g10/g10.c:935
+#: g10/g10.c:963
msgid "--encrypt [filename]"
msgstr "--encrypt [nom du fichier]"
-#: g10/g10.c:948
+#: g10/g10.c:976
msgid "--sign [filename]"
msgstr "--sign [nom du fichier]"
-#: g10/g10.c:961
+#: g10/g10.c:989
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nom du fichier]"
-#: g10/g10.c:975
+#: g10/g10.c:1003
msgid "--clearsign [filename]"
msgstr "--clearsign [nom du fichier]"
-#: g10/g10.c:987
+#: g10/g10.c:1015
msgid "--decrypt [filename]"
msgstr "--decrypt [nom du fichier]"
-#: g10/g10.c:996
+#: g10/g10.c:1024
msgid "--edit-key username [commands]"
msgstr "--edit-key utilisateur [commandes]"
-#: g10/g10.c:1010
+#: g10/g10.c:1038
msgid "--delete-secret-key username"
msgstr "--delete-secret-key utilisateur"
-#: g10/g10.c:1013
+#: g10/g10.c:1041
msgid "--delete-key username"
msgstr "--delete-key utilisateur"
-#: g10/encode.c:231 g10/g10.c:1036 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1064 g10/sign.c:366
#, c-format
msgid "can't open %s: %s\n"
msgstr "ne peut ouvrir %s: %s\n"
-#: g10/g10.c:1047
+#: g10/g10.c:1075
msgid "-k[v][v][v][c] [userid] [keyring]"
msgstr "-k[v][v][v][c] [utilisateur] [porte-clИs]"
-#: g10/g10.c:1106
+#: g10/g10.c:1134
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "suppression d'armure non rИussie : %s\n"
-#: g10/g10.c:1114
+#: g10/g10.c:1142
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "construction d'armure non rИussie : %s \n"
-#: g10/g10.c:1180
+#: g10/g10.c:1208
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algorithme de hachage `%s' invalide\n"
-#: g10/g10.c:1255
+#: g10/g10.c:1283
msgid "[filename]"
msgstr "[nom du fichier]"
-#: g10/g10.c:1259
+#: g10/g10.c:1287
msgid "Go ahead and type your message ...\n"
msgstr "Continuez et tapez votre message...\n"
-#: g10/decrypt.c:59 g10/g10.c:1262 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1290 g10/verify.c:66
#, c-format
msgid "can't open `%s'\n"
msgstr "ne peut ouvrir `%s'\n"
-#: g10/g10.c:1429
+#: g10/g10.c:1457
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
-#: g10/g10.c:1435
+#: g10/g10.c:1463
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
msgstr ""
-#: g10/g10.c:1441
+#: g10/g10.c:1469
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
-#: g10/g10.c:1449
+#: g10/g10.c:1477
msgid "a notation value must not use any control characters\n"
msgstr ""
@@ -1363,7 +1371,8 @@ msgid "DSA keypair will have 1024 bits.\n"
msgstr "La paire de clИs DSA fera 1024 bits.\n"
#: g10/keygen.c:859
-msgid "Key generation cancelled.\n"
+#, fuzzy
+msgid "Key generation canceled.\n"
msgstr "La gИnИration a ИtИ annulИe.\n"
#: g10/keygen.c:869
@@ -1436,7 +1445,7 @@ msgstr "%s : ATTENTION : fichier vide\n"
msgid "reading from `%s'\n"
msgstr "lecture de `%s'\n"
-#: g10/encode.c:417
+#: g10/encode.c:431
#, c-format
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s chiffrИ pour : %s\n"
@@ -1826,7 +1835,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Signer rИellement ? "
-#: g10/keyedit.c:369 g10/keyedit.c:1779 g10/keyedit.c:1828 g10/sign.c:128
+#: g10/keyedit.c:369 g10/keyedit.c:1790 g10/keyedit.c:1839 g10/sign.c:128
#, c-format
msgid "signing failed: %s\n"
msgstr "la signature a ИchouИ : %s\n"
@@ -2137,97 +2146,104 @@ msgstr "Enlever rИellement tous les utilisateurs sИlectionnИs ? "
msgid "Really remove this user id? "
msgstr "Enlever rИellement cet utilisateur ? "
-#: g10/keyedit.c:856 g10/keyedit.c:878
+#: g10/keyedit.c:858 g10/keyedit.c:880
msgid "You must select at least one key.\n"
msgstr "Vous devez sИlectionner au moins une clИ.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:862
msgid "Do you really want to delete the selected keys? "
msgstr "Voulez-vous vraiment supprimer les clИs sИlectionnИes ? "
-#: g10/keyedit.c:861
+#: g10/keyedit.c:863
msgid "Do you really want to delete this key? "
msgstr "Voulez-vous vraiment supprimer cette clИ ? "
-#: g10/keyedit.c:882
+#: g10/keyedit.c:884
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:883
+#: g10/keyedit.c:885
msgid "Do you really want to revoke this key? "
msgstr "Voulez-vous vraiment rИvoquer cette clИ ? "
-#: g10/keyedit.c:937
+#: g10/keyedit.c:939
msgid "Invalid command (try \"help\")\n"
msgstr "Commande invalide (essayez ╚ help ╩)\n"
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1294
msgid "Delete this good signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1298
msgid "Delete this invalid signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:1297
+#: g10/keyedit.c:1302
+#, fuzzy
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Faut-il vraiment gИnИrer les certificats de rИvocation ? (o/N)"
+
+#: g10/keyedit.c:1308
#, fuzzy
msgid "Really delete this self-signature? (y/N)"
msgstr "Faut-il vraiment gИnИrer les certificats de rИvocation ? (o/N)"
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1322
#, fuzzy, c-format
msgid "Deleted %d signature.\n"
msgstr "%d mauvaises signatures\n"
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1323
#, fuzzy, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d mauvaises signatures\n"
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1326
#, fuzzy
msgid "Nothing deleted.\n"
msgstr "ATTENTION : rien n'a ИtИ exportИ\n"
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1395
msgid "Please remove selections from the secret keys.\n"
msgstr "Enlevez les sИlections des clИs secrХtes.\n"
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1401
msgid "Please select at most one secondary key.\n"
msgstr "Vous devez sИlectionner au plus une clИ secondaire.\n"
-#: g10/keyedit.c:1394
-msgid "Changing exiration time for a secondary key.\n"
+#: g10/keyedit.c:1405
+#, fuzzy
+msgid "Changing expiration time for a secondary key.\n"
msgstr "Changer la date d'expiration d'une clИ secondaire.\n"
-#: g10/keyedit.c:1396
-msgid "Changing exiration time for the primary key.\n"
+#: g10/keyedit.c:1407
+#, fuzzy
+msgid "Changing expiration time for the primary key.\n"
msgstr "Changer la date d'expiration de la clИ principale.\n"
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1448
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:1453
+#: g10/keyedit.c:1464
msgid "No corresponding signature in secret ring\n"
msgstr "Pas de signature correspondante dans le porte-clИs secret\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1524
#, c-format
msgid "No user id with index %d\n"
msgstr "Pas d'utilisateur avec l'index %d\n"
-#: g10/keyedit.c:1559
+#: g10/keyedit.c:1570
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Pas de clИ secondaire avec l'index %d\n"
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1668
msgid "user ID: \""
msgstr "nom d'utilisateur : ╚ "
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1671
#, c-format
msgid ""
"\"\n"
@@ -2236,15 +2252,15 @@ msgstr ""
" ╩\n"
"signИ avec votre clИ %08lX Ю %s\n"
-#: g10/keyedit.c:1664
+#: g10/keyedit.c:1675
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "GИnИrer un certificat de rИvocation pour cette signature ? (o/N)"
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1755
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:1767
+#: g10/keyedit.c:1778
msgid "no secret key\n"
msgstr "pas de clИ secrХte\n"
@@ -2393,11 +2409,11 @@ msgstr "clИ de %u bits %s, ID %08lX, crИИe le %s"
msgid " (main key ID %08lX)"
msgstr " (ID clИ principale %08lX)"
-#: g10/passphrase.c:190
+#: g10/passphrase.c:192
msgid "Enter passphrase: "
msgstr "Entrez le mot de passe : "
-#: g10/passphrase.c:194
+#: g10/passphrase.c:196
msgid "Repeat passphrase: "
msgstr "RИpИtez le mot de passe : "
@@ -2650,7 +2666,8 @@ msgid "%s: failed to append a record: %s\n"
msgstr "%s : n'a pas pu ajouter un enregistrement : %s\n"
#: g10/tdbio.c:1630
-msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
+#, fuzzy
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
msgstr ""
"La base de confiance est corrompue ; exИcutez ╚ gpgm --fix-trustdb ╩.\n"
@@ -3308,37 +3325,42 @@ msgstr "RИpondez ╚ oui ╩ si vous voulez signer TOUS les noms d'utilisateurs"
#: g10/helptext.c:181
#, fuzzy
+msgid "keyedit.delsig.unknown"
+msgstr "RИpondez ╚ oui ╩ si vous voulez signer TOUS les noms d'utilisateurs"
+
+#: g10/helptext.c:187
+#, fuzzy
msgid "keyedit.delsig.invalid"
msgstr "RИpondez ╚ oui ╩ si vous voulez signer TOUS les noms d'utilisateurs"
-#: g10/helptext.c:186
+#: g10/helptext.c:191
msgid "keyedit.delsig.selfsig"
msgstr ""
-#: g10/helptext.c:195
+#: g10/helptext.c:200
msgid "passphrase.enter"
msgstr ""
"Entrez le mot de passe ; c'est une phrase secrХte \n"
" Blurb, blurb,.... "
-#: g10/helptext.c:202
+#: g10/helptext.c:207
msgid "passphrase.repeat"
msgstr ""
"RИpИtez le dernier mot de passe, pour Йtre sШr de ce que vous avez tapИ."
-#: g10/helptext.c:206
+#: g10/helptext.c:211
msgid "detached_signature.filename"
msgstr "Donnez le nom du fichier auquel la signature se rapporte"
-#: g10/helptext.c:210
+#: g10/helptext.c:215
msgid "openfile.overwrite.okay"
msgstr "Entrez ╚ oui ╩ s'il faut vraiment rИИcrire le fichier"
-#: g10/helptext.c:224
+#: g10/helptext.c:229
msgid "No help available"
msgstr "Pas d'aide disponible"
-#: g10/helptext.c:236
+#: g10/helptext.c:241
#, c-format
msgid "No help available for `%s'"
msgstr "Pas d'aide disponible pour `%s'"
diff --git a/po/it.po b/po/it.po
index eb34c2578..441036a66 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-0.9.7\n"
-"POT-Creation-Date: 1999-05-06 13:37+0200\n"
+"POT-Creation-Date: 1999-06-26 11:22+0200\n"
"PO-Revision-Date: 1999-05-15 18:09+02:00\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <it@li.org>\n"
@@ -25,14 +25,23 @@ 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:156
+#: util/miscutil.c:156 util/miscutil.c:173
msgid "yes"
msgstr "sЛ"
-#: util/miscutil.c:157
+#: util/miscutil.c:157 util/miscutil.c:175
msgid "yY"
msgstr "sS"
+#: g10/keyedit.c:559 util/miscutil.c:174
+msgid "quit"
+msgstr "quit"
+
+#: util/miscutil.c:176
+#, fuzzy
+msgid "qQ"
+msgstr "q"
+
#: util/errors.c:54
msgid "general error"
msgstr "errore generale"
@@ -225,22 +234,22 @@ msgstr "errore di rete"
msgid "not encrypted"
msgstr "non cifrato"
-#: util/logger.c:178
+#: util/logger.c:218
#, c-format
msgid "... this is a bug (%s:%d:%s)\n"
msgstr "... questo Х un bug (%s:%d:%s)\n"
-#: util/logger.c:184
+#: util/logger.c:224
#, c-format
msgid "you found a bug ... (%s:%d)\n"
msgstr "Hai trovato un bug... (%s:%d)\n"
-#: cipher/random.c:408
+#: cipher/random.c:412
msgid "WARNING: using insecure random number generator!!\n"
msgstr ""
"ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
-#: cipher/random.c:409
+#: cipher/random.c:413
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@ -251,7 +260,7 @@ msgstr ""
"Il generatore di numeri casuali Х solo un ripiego per fare\n"
"compilare il programma - non Х assolutamente un RNG forte!\n"
-#: cipher/rndlinux.c:110
+#: cipher/rndlinux.c:135
#, c-format
msgid ""
"\n"
@@ -263,7 +272,7 @@ msgstr ""
"altra cosa per dare all'OS la possibilitЮ di raccogliere altra entropia!\n"
"(Servono ancora %d altri byte)\n"
-#: g10/g10.c:163
+#: g10/g10.c:174
msgid ""
"@Commands:\n"
" "
@@ -271,131 +280,131 @@ msgstr ""
"@Comandi:\n"
" "
-#: g10/g10.c:165
+#: g10/g10.c:176
msgid "|[file]|make a signature"
msgstr "|[file]|fai una firma"
-#: g10/g10.c:166
+#: g10/g10.c:177
msgid "|[file]|make a clear text signature"
msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
-#: g10/g10.c:167
+#: g10/g10.c:178
msgid "make a detached signature"
msgstr "fai una firma separata"
-#: g10/g10.c:168
+#: g10/g10.c:179
msgid "encrypt data"
msgstr "cifra dati"
-#: g10/g10.c:169
+#: g10/g10.c:180
msgid "encryption only with symmetric cipher"
msgstr "cifra solo con un cifrario simmetrico"
-#: g10/g10.c:170
+#: g10/g10.c:181
msgid "store only"
msgstr "immagazzina soltanto"
-#: g10/g10.c:171
+#: g10/g10.c:182
msgid "decrypt data (default)"
msgstr "decifra dati (predefinito)"
-#: g10/g10.c:172
+#: g10/g10.c:183
msgid "verify a signature"
msgstr "verifica una firma"
-#: g10/g10.c:173
+#: g10/g10.c:184
msgid "list keys"
msgstr "elenca le chiavi"
-#: g10/g10.c:175
+#: g10/g10.c:186
msgid "list keys and signatures"
msgstr "elenca le chiavi e le firme"
-#: g10/g10.c:176
+#: g10/g10.c:187
msgid "check key signatures"
msgstr "controlla le firme delle chiavi"
-#: g10/g10.c:177
+#: g10/g10.c:188
msgid "list keys and fingerprints"
msgstr "elenca le chiavi e le impronte digitali"
-#: g10/g10.c:178
+#: g10/g10.c:189
msgid "list secret keys"
msgstr "elenca le chiavi segrete"
-#: g10/g10.c:179
+#: g10/g10.c:190
msgid "generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
-#: g10/g10.c:180
+#: g10/g10.c:191
msgid "remove key from the public keyring"
msgstr "rimuove una chiave dal portachiavi pubblico"
-#: g10/g10.c:181
+#: g10/g10.c:192
msgid "sign or edit a key"
msgstr "firma o modifica una chiave"
-#: g10/g10.c:182
+#: g10/g10.c:193
msgid "generate a revocation certificate"
msgstr "genera un certificato di revoca"
-#: g10/g10.c:183
+#: g10/g10.c:194
msgid "export keys"
msgstr "esporta delle chiavi"
-#: g10/g10.c:184
+#: g10/g10.c:195
msgid "export keys to a key server"
msgstr "esporta le chiavi a un key server"
-#: g10/g10.c:185
+#: g10/g10.c:196
msgid "import keys from a key server"
msgstr "importa le chiavi da un key server"
-#: g10/g10.c:188
+#: g10/g10.c:199
msgid "import/merge keys"
msgstr "importa/aggiungi delle chiavi"
-#: g10/g10.c:190
+#: g10/g10.c:201
msgid "list only the sequence of packets"
msgstr "elenca solo la sequenza dei pacchetti"
-#: g10/g10.c:192
+#: g10/g10.c:203
msgid "export the ownertrust values"
msgstr "esporta i valori di fiducia"
-#: g10/g10.c:194
+#: g10/g10.c:205
msgid "import ownertrust values"
msgstr "importa i valori di fiducia"
-#: g10/g10.c:196
+#: g10/g10.c:207
msgid "|[NAMES]|update the trust database"
msgstr "|[NOMI]|controlla il database della fiducia"
-#: g10/g10.c:198
+#: g10/g10.c:209
msgid "|[NAMES]|check the trust database"
msgstr "|[NOMI]|controlla il database della fiducia"
-#: g10/g10.c:199
+#: g10/g10.c:210
msgid "fix a corrupted trust database"
msgstr "ripara un database della fiducia rovinato"
-#: g10/g10.c:200
+#: g10/g10.c:211
msgid "De-Armor a file or stdin"
msgstr "rimuovi l'armatura a un file o a stdin"
-#: g10/g10.c:201
+#: g10/g10.c:212
msgid "En-Armor a file or stdin"
msgstr "crea l'armatura a un file o a stdin"
-#: g10/g10.c:202
+#: g10/g10.c:213
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|stampa tutti i message digests"
-#: g10/g10.c:203
+#: g10/g10.c:214
msgid "print all message digests"
msgstr "stampa tutti i message digests"
-#: g10/g10.c:209
+#: g10/g10.c:220
msgid ""
"@\n"
"Options:\n"
@@ -405,147 +414,160 @@ msgstr ""
"Opzioni:\n"
" "
-#: g10/g10.c:211
+#: g10/g10.c:222
msgid "create ascii armored output"
msgstr "crea un output ascii con armatura"
-#: g10/g10.c:212
+#: g10/g10.c:223
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|cifra per NOME"
-#: g10/g10.c:216
+#: g10/g10.c:227
msgid "use this user-id to sign or decrypt"
msgstr "usa questo user-id per firmare o decifrare"
-#: g10/g10.c:217
+#: g10/g10.c:228
msgid "|N|set compress level N (0 disables)"
msgstr "|N|imposta il livello di compressione (0 disabilita)"
-#: g10/g10.c:219
+#: g10/g10.c:230
msgid "use canonical text mode"
msgstr "usa il modo testo canonico"
-#: g10/g10.c:220
+#: g10/g10.c:231
msgid "use as output file"
msgstr "usa come file di output"
-#: g10/g10.c:221
+#: g10/g10.c:232
msgid "verbose"
msgstr "prolisso"
-#: g10/g10.c:222
+#: g10/g10.c:233
msgid "be somewhat more quiet"
msgstr "meno prolisso"
-#: g10/g10.c:223
+#: g10/g10.c:234
+msgid "don't use the terminal at all"
+msgstr ""
+
+#: g10/g10.c:235
msgid "force v3 signatures"
msgstr "forza l'uso di firme v3"
-#: g10/g10.c:224
+#: g10/g10.c:236
msgid "always use a MDC for encryption"
msgstr "usa sempre un MDC per cifrare"
-#: g10/g10.c:225
+#: g10/g10.c:237
msgid "do not make any changes"
msgstr "non fa cambiamenti"
-#: g10/g10.c:226
+#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
+#: g10/g10.c:239
msgid "batch mode: never ask"
msgstr "modo batch: non fare domande"
-#: g10/g10.c:227
+#: g10/g10.c:240
msgid "assume yes on most questions"
msgstr "assumi \"sЛ\" a quasi tutte le domande"
-#: g10/g10.c:228
+#: g10/g10.c:241
msgid "assume no on most questions"
msgstr "assumi \"no\" a quasi tutte le domande"
-#: g10/g10.c:229
+#: g10/g10.c:242
msgid "add this keyring to the list of keyrings"
msgstr "aggiungi questo portachiavi alla lista"
-#: g10/g10.c:230
+#: g10/g10.c:243
msgid "add this secret keyring to the list"
msgstr "aggiungi questo portachiavi segreto alla lista"
-#: g10/g10.c:231
+#: g10/g10.c:244
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|usa NAME come chiave segreta predefinita"
-#: g10/g10.c:232
+#: g10/g10.c:245
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|cerca le chiavi in questo keyserver"
-#: g10/g10.c:233
+#: g10/g10.c:246
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAME|imposta il set di caratteri del terminale NOME"
-#: g10/g10.c:234
+#: g10/g10.c:247
msgid "read options from file"
msgstr "leggi le opzioni dal file"
-#: g10/g10.c:236
+#: g10/g10.c:249
msgid "set debugging flags"
msgstr "imposta i flag di debugging"
-#: g10/g10.c:237
+#: g10/g10.c:250
msgid "enable full debugging"
msgstr "abilita il debugging completo"
-#: g10/g10.c:238
+#: g10/g10.c:251
msgid "|FD|write status info to this FD"
msgstr "|FD|scrivi le informazioni di stato su questo fd"
-#: g10/g10.c:239
+#: g10/g10.c:252
msgid "do not write comment packets"
msgstr "non scrivere pacchetti di commento"
-#: g10/g10.c:240
+#: g10/g10.c:253
msgid "(default is 1)"
msgstr "(predefinito Х 1)"
-#: g10/g10.c:241
+#: g10/g10.c:254
msgid "(default is 3)"
msgstr "(predefinito Х 3)"
-#: g10/g10.c:243
+#: g10/g10.c:256
msgid "|FILE|load extension module FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
-#: g10/g10.c:244
+#: g10/g10.c:257
msgid "emulate the mode described in RFC1991"
msgstr "emula il modo descritto in RFC 1991"
-#: g10/g10.c:245
+#: g10/g10.c:258
+msgid "set all packet, cipher and digest options to OpenPGP behavior"
+msgstr ""
+
+#: g10/g10.c:259
msgid "|N|use passphrase mode N"
msgstr "|N|usa il modo N per la passphrase"
-#: g10/g10.c:247
+#: g10/g10.c:261
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NAME|usa l'algoritmo di message digest NOME"
-#: g10/g10.c:249
+#: g10/g10.c:263
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NAME|usa l'alg. di cifratura NOME per le passphrase"
-#: g10/g10.c:250
+#: g10/g10.c:264
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|usa l'algoritmo di cifratura NOME"
-#: g10/g10.c:251
+#: g10/g10.c:265
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|usa l'algoritmo di message digest NOME"
-#: g10/g10.c:252
+#: g10/g10.c:266
msgid "|N|use compress algorithm N"
msgstr "|N|usa l'algoritmo di compressione N"
-#: g10/g10.c:253
+#: g10/g10.c:267
msgid "throw keyid field of encrypted packets"
msgstr "elimina il campo keyid dei pacchetti cifrati"
-#: g10/g10.c:255
+#: g10/g10.c:268
+msgid "|NAME=VALUE|use this notation data"
+msgstr ""
+
+#: g10/g10.c:270
msgid ""
"@\n"
"Examples:\n"
@@ -565,15 +587,15 @@ msgstr ""
" --list-keys [nomi] mostra le chiavi\n"
" --fingerprint [nomi] mostra le impronte digitali\n"
-#: g10/g10.c:323
+#: g10/g10.c:347
msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
-#: g10/g10.c:327
+#: g10/g10.c:351
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opzioni] [file] (-h per l'aiuto)"
-#: g10/g10.c:330
+#: g10/g10.c:354
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -583,7 +605,7 @@ msgstr ""
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
-#: g10/g10.c:335
+#: g10/g10.c:359
msgid ""
"\n"
"Supported algorithms:\n"
@@ -591,149 +613,172 @@ msgstr ""
"\n"
"Algoritmi gestiti:\n"
-#: g10/g10.c:409
+#: g10/g10.c:433
msgid "usage: gpg [options] "
msgstr "uso: gpg [options] "
-#: g10/g10.c:449
+#: g10/g10.c:473
msgid "conflicting commands\n"
msgstr "comandi in conflitto\n"
-#: g10/g10.c:576
+#: g10/g10.c:605
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: manca il file con le opzioni predefinite `%s'\n"
-#: g10/g10.c:580
+#: g10/g10.c:609
#, c-format
msgid "option file `%s': %s\n"
msgstr "file con le opzioni `%s': %s\n"
-#: g10/g10.c:587
+#: g10/g10.c:616
#, c-format
msgid "reading options from `%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
-#: g10/g10.c:731
+#: g10/g10.c:782
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s non Х un set di caratteri valido\n"
-#: g10/g10.c:774 g10/g10.c:786
+#: g10/g10.c:827 g10/g10.c:839
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non Х valido\n"
-#: g10/g10.c:780 g10/g10.c:792
+#: g10/g10.c:833 g10/g10.c:845
msgid "selected digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non Х valido\n"
-#: g10/g10.c:795
+#: g10/g10.c:849
+msgid "the given policy URL is invalid\n"
+msgstr ""
+
+#: g10/g10.c:852
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "l'algoritmo di compressione deve essere tra %d e %d\n"
-#: g10/g10.c:797
+#: g10/g10.c:854
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve essere maggiore di 0\n"
-#: g10/g10.c:799
+#: g10/g10.c:856
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve essere maggiore di 1\n"
-#: g10/g10.c:801
+#: g10/g10.c:858
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth deve essere tra 1 e 255\n"
-#: g10/g10.c:804
+#: g10/g10.c:861
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: l'uso del modo S2K semplice (0) Х fortemente scoraggiato\n"
-#: g10/g10.c:808
+#: g10/g10.c:865
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
-#: g10/g10.c:885
+#: g10/g10.c:942
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
-#: g10/g10.c:891
+#: g10/g10.c:948
msgid "--store [filename]"
msgstr "--store [nomefile]"
-#: g10/g10.c:898
+#: g10/g10.c:955
msgid "--symmetric [filename]"
msgstr "--symmetric [nomefile]"
-#: g10/g10.c:906
+#: g10/g10.c:963
msgid "--encrypt [filename]"
msgstr "--encrypt [nomefile]"
-#: g10/g10.c:919
+#: g10/g10.c:976
msgid "--sign [filename]"
msgstr "--sign [nomefile]"
-#: g10/g10.c:932
+#: g10/g10.c:989
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
-#: g10/g10.c:946
+#: g10/g10.c:1003
msgid "--clearsign [filename]"
msgstr "--clearsign [nomefile]"
-#: g10/g10.c:958
+#: g10/g10.c:1015
msgid "--decrypt [filename]"
msgstr "--decrypt [nomefile]"
-#: g10/g10.c:967
+#: g10/g10.c:1024
msgid "--edit-key username [commands]"
msgstr "--edit-key nomeutente [comandi]"
-#: g10/g10.c:981
+#: g10/g10.c:1038
msgid "--delete-secret-key username"
msgstr "--delete-secret-key nomeutente"
-#: g10/g10.c:984
+#: g10/g10.c:1041
msgid "--delete-key username"
msgstr "--delete-key nomeutente"
-#: g10/encode.c:234 g10/g10.c:1007 g10/sign.c:311
+#: g10/encode.c:231 g10/g10.c:1064 g10/sign.c:366
#, c-format
msgid "can't open %s: %s\n"
msgstr "impossibile aprire `%s': %s\n"
-#: g10/g10.c:1018
+#: g10/g10.c:1075
msgid "-k[v][v][v][c] [userid] [keyring]"
msgstr "-k[v][v][v][c] [userid] [portachiavi]"
-#: g10/g10.c:1077
+#: g10/g10.c:1134
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "rimozione dell'armatura fallita: %s\n"
-#: g10/g10.c:1085
+#: g10/g10.c:1142
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
-#: g10/g10.c:1151
+#: g10/g10.c:1208
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo di hash non valido `%s'\n"
-#: g10/g10.c:1226
+#: g10/g10.c:1283
msgid "[filename]"
msgstr "[nomefile]"
-#: g10/g10.c:1230
+#: g10/g10.c:1287
msgid "Go ahead and type your message ...\n"
msgstr "Vai avanti e scrivi il messaggio...\n"
-#: g10/decrypt.c:59 g10/g10.c:1233 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1290 g10/verify.c:66
#, c-format
msgid "can't open `%s'\n"
msgstr "impossibile aprire `%s'\n"
+#: g10/g10.c:1457
+msgid ""
+"the first character of a notation name must be a letter or an underscore\n"
+msgstr ""
+
+#: g10/g10.c:1463
+msgid ""
+"a notation name must have only letters, digits, dots or underscores and end "
+"with an '='\n"
+msgstr ""
+
+#: g10/g10.c:1469
+msgid "dots in a notation name must be surrounded by other characters\n"
+msgstr ""
+
+#: g10/g10.c:1477
+msgid "a notation value must not use any control characters\n"
+msgstr ""
+
#: g10/armor.c:296
#, c-format
msgid "armor: %s\n"
@@ -755,54 +800,54 @@ msgstr "header della firma in chiaro non valido\n"
msgid "nested clear text signatures\n"
msgstr "firme in chiaro innestate\n"
-#: g10/armor.c:498
+#: g10/armor.c:500
msgid "invalid dash escaped line: "
msgstr "riga protetta con il trattino non valida: "
-#: g10/armor.c:510
+#: g10/armor.c:512
msgid "unexpected armor:"
msgstr "armatura inaspettata:"
-#: g10/armor.c:627
+#: g10/armor.c:629
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "Carattere radix64 non valido %02x saltato\n"
-#: g10/armor.c:670
+#: g10/armor.c:672
msgid "premature eof (no CRC)\n"
msgstr "eof prematura (nessun CRC)\n"
-#: g10/armor.c:704
+#: g10/armor.c:706
msgid "premature eof (in CRC)\n"
msgstr "eof prematura (nel CRC)\n"
-#: g10/armor.c:708
+#: g10/armor.c:710
msgid "malformed CRC\n"
msgstr "CRC malformato\n"
-#: g10/armor.c:712
+#: g10/armor.c:714
#, c-format
msgid "CRC error; %06lx - %06lx\n"
msgstr "errore nel CRC; %06lx - %06lx\n"
-#: g10/armor.c:729
+#: g10/armor.c:731
msgid "premature eof (in Trailer)\n"
msgstr "eof prematura (nella coda)\n"
-#: g10/armor.c:733
+#: g10/armor.c:735
msgid "error in trailer line\n"
msgstr "errore nella riga della coda\n"
-#: g10/armor.c:997
+#: g10/armor.c:1001
msgid "no valid OpenPGP data found.\n"
msgstr "Non sono stati trovati dati OpenPGP validi.\n"
-#: g10/armor.c:1001
+#: g10/armor.c:1005
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armatura non valida: linea piu` lunga di %d caratteri\n"
-#: g10/armor.c:1005
+#: g10/armor.c:1009
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -877,7 +922,8 @@ msgstr ""
msgid ""
"No path leading to one of our keys found.\n"
"\n"
-msgstr "Non Х stato trovato alcun percorso che porti a una delle nostre chiavi.\n"
+msgstr ""
+"Non Х stato trovato alcun percorso che porti a una delle nostre chiavi.\n"
#: g10/pkclist.c:262
msgid ""
@@ -952,60 +998,65 @@ msgstr ""
"prossima domanda.\n"
"\n"
-#: g10/pkclist.c:411
+#: g10/pkclist.c:411 g10/pkclist.c:433
msgid "WARNING: Using untrusted key!\n"
msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
-#: g10/pkclist.c:447
+#: g10/pkclist.c:454
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "ATTENZIONE: questa chiave Х stata revocata dal suo proprietario!\n"
-#: g10/pkclist.c:448
+#: g10/pkclist.c:455
msgid " This could mean that the signature is forgery.\n"
msgstr " Questo puР significare che la firma Х stata falsificata.\n"
-#: g10/pkclist.c:452
+#: g10/pkclist.c:459
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "ATTENZIONE: questa subchiave Х stata revocata dal proprietario!\n"
-#: g10/pkclist.c:473
+#: g10/pkclist.c:480
msgid "Note: This key has expired!\n"
msgstr "Nota: questa chiave Х scaduta!\n"
-#: g10/pkclist.c:480
+#: g10/pkclist.c:487
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "ATTENZIONE: questa chiave non Х certificata con una firma fidata!\n"
-#: g10/pkclist.c:482
+#: g10/pkclist.c:489
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Non ci sono indicazioni che la firma appartenga al proprietario.\n"
-#: g10/pkclist.c:498
+#: g10/pkclist.c:505
msgid "WARNING: We do NOT trust this key!\n"
msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
-#: g10/pkclist.c:499
+#: g10/pkclist.c:506
msgid " The signature is probably a FORGERY.\n"
msgstr " La firma Х probabilmente un FALSO.\n"
-#: g10/pkclist.c:506
+#: g10/pkclist.c:513
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"ATTENZIONE: questa chiave non Х certificata con firme abbastanza fidate!\n"
-#: g10/pkclist.c:509
+#: g10/pkclist.c:516
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Non Х sicuro che la firma appartenga al proprietario.\n"
-#: g10/pkclist.c:562 g10/pkclist.c:575 g10/pkclist.c:638 g10/pkclist.c:666
+#: g10/pkclist.c:580 g10/pkclist.c:602 g10/pkclist.c:665 g10/pkclist.c:705
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: saltata: %s\n"
-#: g10/pkclist.c:584
+#: g10/pkclist.c:588 g10/pkclist.c:687
+#, fuzzy, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: il keyblock ha problemi di lettura: %s\n"
+
+#: g10/pkclist.c:611
msgid ""
"You did not specify a user ID. (you may use \"-r\")\n"
"\n"
@@ -1013,20 +1064,20 @@ msgstr ""
"Non hai specificato un user ID. (puoi usare \"-r\")\n"
"\n"
-#: g10/pkclist.c:589
+#: g10/pkclist.c:616
msgid "Enter the user ID: "
msgstr "Inserisci l'user ID: "
-#: g10/pkclist.c:600
+#: g10/pkclist.c:627
msgid "No such user ID.\n"
msgstr "User ID inesistente.\n"
-#: g10/pkclist.c:646
+#: g10/pkclist.c:673
#, c-format
msgid "%s: error checking key: %s\n"
msgstr "%s: errore nel controllare la chiave: %s\n"
-#: g10/pkclist.c:672
+#: g10/pkclist.c:711
msgid "no valid addressees\n"
msgstr "nessun indirizzo valido\n"
@@ -1268,7 +1319,7 @@ msgstr ""
"Ti serve una passphrase per proteggere la tua chiave segreta.\n"
"\n"
-#: g10/keyedit.c:433 g10/keygen.c:748
+#: g10/keyedit.c:455 g10/keygen.c:748
msgid "passphrase not correctly repeated; try again.\n"
msgstr "passphrase non ripetuta correttamente; riprova.\n"
@@ -1305,7 +1356,8 @@ msgid "DSA keypair will have 1024 bits.\n"
msgstr "La coppia DSA avrЮ 1024 bit.\n"
#: g10/keygen.c:859
-msgid "Key generation cancelled.\n"
+#, fuzzy
+msgid "Key generation canceled.\n"
msgstr "Generazione della chiave annullata.\n"
#: g10/keygen.c:869
@@ -1328,14 +1380,15 @@ msgid ""
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
msgstr ""
"Nota che questa chiave non puР essere usata per cifrare. Forse vorrai usare\n"
-"il comando \"--edit-key\" per generare una chiave secondaria per questo scopo.\n"
+"il comando \"--edit-key\" per generare una chiave secondaria per questo "
+"scopo.\n"
#: g10/keygen.c:963 g10/keygen.c:1062
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
-#: g10/keygen.c:1007 g10/sig-check.c:299 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:105
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1343,7 +1396,7 @@ msgstr ""
"la chiave Х stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
-#: g10/keygen.c:1009 g10/sig-check.c:301 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:107
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1355,7 +1408,7 @@ msgstr ""
msgid "Really create? "
msgstr "Crea davvero? "
-#: g10/encode.c:91 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
+#: g10/encode.c:91 g10/openfile.c:118 g10/openfile.c:208 g10/tdbio.c:467
#: g10/tdbio.c:528
#, c-format
msgid "%s: can't open: %s\n"
@@ -1366,22 +1419,17 @@ msgstr "%s: impossibile aprire: %s\n"
msgid "error creating passphrase: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
-#: g10/encode.c:167 g10/encode.c:290
+#: g10/encode.c:167 g10/encode.c:287
#, c-format
msgid "%s: WARNING: empty file\n"
msgstr "%s: ATTENZIONE: file vuoto\n"
-#: g10/encode.c:240
+#: g10/encode.c:237
#, c-format
msgid "reading from `%s'\n"
msgstr "lettura da `%s'\n"
-#: g10/encode.c:435 g10/sign.c:346
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "ATTENZIONE: `%s' Х un file vuoto\n"
-
-#: g10/encode.c:605
+#: g10/encode.c:431
#, c-format
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s cifrato per: %s\n"
@@ -1419,9 +1467,9 @@ msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
#: g10/import.c:116
-#, c-format
-msgid "can't open file: %s\n"
-msgstr "impossibile aprire il file: %s\n"
+#, fuzzy, c-format
+msgid "can't open `%s': %s\n"
+msgstr "impossibile aprire `%s': %s\n"
#: g10/import.c:160
#, c-format
@@ -1434,9 +1482,9 @@ msgid "%lu keys so far processed\n"
msgstr "Per ora sono state esaminate %lu chiavi\n"
#: g10/import.c:172
-#, c-format
-msgid "read error: %s\n"
-msgstr "errore di lettura: %s\n"
+#, fuzzy, c-format
+msgid "error reading `%s': %s\n"
+msgstr "errore nella creazione della passhprase: %s\n"
#: g10/import.c:175
#, c-format
@@ -1493,7 +1541,7 @@ msgstr "chiavi segrete importate %lu\n"
msgid " secret keys unchanged: %lu\n"
msgstr "chiavi segrete non cambiate %lu\n"
-#: g10/import.c:342 g10/import.c:534
+#: g10/import.c:342 g10/import.c:529
#, c-format
msgid "key %08lX: no user id\n"
msgstr "chiave %08lX: nessun user id\n"
@@ -1507,7 +1555,7 @@ msgstr "chiave %08lX: nessun user id valido\n"
msgid "this may be caused by a missing self-signature\n"
msgstr "questo puР essere causato da una autofirma mancante\n"
-#: g10/import.c:366 g10/import.c:604
+#: g10/import.c:366 g10/import.c:596
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
@@ -1516,159 +1564,140 @@ msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
msgid "no default public keyring\n"
msgstr "nessun portachiavi pubblico predefinito\n"
-#: g10/import.c:376 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:501
+#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559
#, c-format
msgid "writing to `%s'\n"
msgstr "scrittura in `%s'\n"
-#: g10/import.c:380 g10/import.c:440 g10/import.c:658
-#, c-format
-msgid "can't lock public keyring: %s\n"
+#: g10/import.c:379 g10/import.c:435 g10/import.c:544 g10/import.c:645
+#, fuzzy, c-format
+msgid "can't lock keyring `%s': %s\n"
msgstr "impossibile bloccare il portachiavi pubblico: %s\n"
-#: g10/import.c:383
-#, c-format
-msgid "can't write to keyring: %s\n"
-msgstr "impossibile scrivere sul portachiavi pubblico: %s\n"
+#: g10/import.c:382 g10/import.c:438 g10/import.c:547 g10/import.c:648
+#, fuzzy, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "%s: errore durante la scrittura del record di versione: %s\n"
#: g10/import.c:387
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "chiave %08lX: chiave pubblica importata\n"
-#: g10/import.c:400
+#: g10/import.c:399
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
-#: g10/import.c:413 g10/import.c:613
+#: g10/import.c:411 g10/import.c:604
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
-#: g10/import.c:420 g10/import.c:620
+#: g10/import.c:417 g10/import.c:610
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
-#: g10/import.c:437 g10/import.c:549 g10/import.c:655
-msgid "writing keyblock\n"
-msgstr "scrittura del keyblock\n"
-
-#: g10/import.c:443 g10/import.c:661
-#, c-format
-msgid "can't write keyblock: %s\n"
-msgstr "impossibile aprire il keyblock: %s\n"
-
-#: g10/import.c:448
+#: g10/import.c:444
#, c-format
msgid "key %08lX: 1 new user-id\n"
msgstr "chiave %08lX: un nuovo user id\n"
-#: g10/import.c:451
+#: g10/import.c:447
#, c-format
msgid "key %08lX: %d new user-ids\n"
msgstr "chiave %08lX: %d nuovi user id\n"
-#: g10/import.c:454
+#: g10/import.c:450
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "chiave %08lX: una nuova firma\n"
-#: g10/import.c:457
+#: g10/import.c:453
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "chiave %08lX: %d nuove firme\n"
-#: g10/import.c:460
+#: g10/import.c:456
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "chiave %08lX: una nuova subchiave\n"
-#: g10/import.c:463
+#: g10/import.c:459
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "chiave %08lX: %d nuove subchiavi\n"
-#: g10/import.c:473
+#: g10/import.c:469
#, c-format
msgid "key %08lX: not changed\n"
msgstr "chiave %08lX: non cambiata\n"
#: g10/import.c:552
#, c-format
-msgid "can't lock secret keyring: %s\n"
-msgstr "impossibile bloccare il portachiavi segreto: %s\n"
-
-#: g10/import.c:555
-#, c-format
-msgid "can't write keyring: %s\n"
-msgstr "impossibile scrivere il portachiavi: %s\n"
-
-#: g10/import.c:559
-#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "chiave %08lX: chiave segreta importata\n"
#. we can't merge secret keys
-#: g10/import.c:564
+#: g10/import.c:556
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "chiave %08lX: giЮ nel portachiavi segreto\n"
-#: g10/import.c:569
+#: g10/import.c:561
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
-#: g10/import.c:598
+#: g10/import.c:590
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
"certificato di revoca\n"
-#: g10/import.c:631
+#: g10/import.c:621
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
-#: g10/import.c:665
+#: g10/import.c:653
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "chiave %08lX: certificato di revoca importato\n"
-#: g10/import.c:699
+#: g10/import.c:686
#, c-format
msgid "key %08lX: no user-id for signature\n"
msgstr "chiave %08lX: nessun user id per la firma\n"
-#: g10/import.c:706 g10/import.c:731
+#: g10/import.c:693 g10/import.c:717
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
-#: g10/import.c:707
+#: g10/import.c:694
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "chiave %08lX: autofirma non valida\n"
-#: g10/import.c:723
+#: g10/import.c:709
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
-#: g10/import.c:732
+#: g10/import.c:718
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "chiave %08lX: legame con la subchiave non valido:\n"
-#: g10/import.c:764
+#: g10/import.c:750
#, c-format
msgid "key %08lX: skipped userid '"
msgstr "chiave %08lX: saltato l'user id '"
-#: g10/import.c:787
+#: g10/import.c:773
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "chiave %08lX: saltata la subchiave\n"
@@ -1677,93 +1706,98 @@ msgstr "chiave %08lX: saltata la subchiave\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:812
+#: g10/import.c:798
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "chiave %08lX: firma non esportabile (chiave %02x) - saltata\n"
-#: g10/import.c:821
+#: g10/import.c:807
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n"
-#: g10/import.c:829
+#: g10/import.c:815
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "chiave %08lX: certificato di revoca non valido: %s - saltato\n"
-#: g10/import.c:890
+#: g10/import.c:915
+#, c-format
+msgid "key %08lX: duplicated user ID detected - merged\n"
+msgstr ""
+
+#: g10/import.c:966
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "chiave %08lX: certificato di revoca aggiunto\n"
-#: g10/import.c:1008 g10/import.c:1063
+#: g10/import.c:1079 g10/import.c:1134
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
-#: g10/keyedit.c:91
+#: g10/keyedit.c:92
#, c-format
msgid "%s: user not found\n"
msgstr "%s: utente non trovato\n"
-#: g10/keyedit.c:177
+#: g10/keyedit.c:153
msgid "[revocation]"
msgstr "[revoca]"
-#: g10/keyedit.c:178
+#: g10/keyedit.c:154
msgid "[self-signature]"
msgstr "[autofirma]"
-#: g10/keyedit.c:196
+#: g10/keyedit.c:218
msgid "1 bad signature\n"
msgstr "una firma non corretta\n"
-#: g10/keyedit.c:198
+#: g10/keyedit.c:220
#, c-format
msgid "%d bad signatures\n"
msgstr "%d firme non corrette\n"
-#: g10/keyedit.c:200
+#: g10/keyedit.c:222
msgid "1 signature not checked due to a missing key\n"
msgstr "1 firma non controllata per mancanza della chiave\n"
-#: g10/keyedit.c:202
+#: g10/keyedit.c:224
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d firme non controllate per mancanza delle chiavi\n"
-#: g10/keyedit.c:204
+#: g10/keyedit.c:226
msgid "1 signature not checked due to an error\n"
msgstr "1 firma non controllata a causa di un errore\n"
-#: g10/keyedit.c:206
+#: g10/keyedit.c:228
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d firme non controllate a causa di errori\n"
-#: g10/keyedit.c:208
+#: g10/keyedit.c:230
msgid "1 user id without valid self-signature detected\n"
msgstr "Trovato 1 user id senza autofirma valida\n"
-#: g10/keyedit.c:210
+#: g10/keyedit.c:232
#, c-format
msgid "%d user ids without valid self-signatures detected\n"
msgstr "Trovati %d user id senza autofirme valide\n"
#. Fixme: see whether there is a revocation in which
#. * case we should allow to sign it again.
-#: g10/keyedit.c:290
+#: g10/keyedit.c:312
#, c-format
msgid "Already signed by key %08lX\n"
msgstr "GiЮ firmato dalla chiave %08lX\n"
-#: g10/keyedit.c:298
+#: g10/keyedit.c:320
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "Niente da firmare con la chiave %08lX\n"
-#: g10/keyedit.c:307
+#: g10/keyedit.c:329
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -1771,35 +1805,37 @@ msgstr ""
"Sei davvero sicuro di volere firmare questa chiave\n"
"con la tua chiave: \""
-#: g10/keyedit.c:316
+#: g10/keyedit.c:338
msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
-msgstr "La firma sarЮ segnata come non esportabile.\n\n"
+msgstr ""
+"La firma sarЮ segnata come non esportabile.\n"
+"\n"
-#: g10/keyedit.c:321
+#: g10/keyedit.c:343
msgid "Really sign? "
msgstr "Firmo davvero? "
-#: g10/keyedit.c:347 g10/keyedit.c:1684 g10/keyedit.c:1733 g10/sign.c:75
+#: g10/keyedit.c:369 g10/keyedit.c:1790 g10/keyedit.c:1839 g10/sign.c:128
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallita: %s\n"
-#: g10/keyedit.c:400
+#: g10/keyedit.c:422
msgid "This key is not protected.\n"
msgstr "Questa chiave non Х protetta.\n"
-#: g10/keyedit.c:403
+#: g10/keyedit.c:425
msgid "Key is protected.\n"
msgstr "La chiave Х protetta.\n"
-#: g10/keyedit.c:420
+#: g10/keyedit.c:442
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Impossibile modificare questa chiave: %s\n"
-#: g10/keyedit.c:425
+#: g10/keyedit.c:447
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -1807,7 +1843,7 @@ msgstr ""
"Inserisci la nuova passphrase per questa chiave segreta.\n"
"\n"
-#: g10/keyedit.c:437
+#: g10/keyedit.c:459
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -1815,338 +1851,378 @@ msgstr ""
"Non vuoi una passphrase - questa Х probabilmente una *cattiva* idea!\n"
"\n"
-#: g10/keyedit.c:440
+#: g10/keyedit.c:462
msgid "Do you really want to do this? "
msgstr "Vuoi veramente farlo?"
-#: g10/keyedit.c:499
+#: g10/keyedit.c:523
msgid "moving a key signature to the correct place\n"
msgstr "spostamento della firma di una chiave nel posto corretto\n"
-#: g10/keyedit.c:535
-msgid "quit"
-msgstr "quit"
-
-#: g10/keyedit.c:535
+#: g10/keyedit.c:559
msgid "quit this menu"
msgstr "abbandona questo menЫ"
-#: g10/keyedit.c:536
+#: g10/keyedit.c:560
msgid "q"
msgstr "q"
-#: g10/keyedit.c:537
+#: g10/keyedit.c:561
msgid "save"
msgstr "save"
-#: g10/keyedit.c:537
+#: g10/keyedit.c:561
msgid "save and quit"
msgstr "salva ed esci"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:562
msgid "help"
msgstr "help"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:562
msgid "show this help"
msgstr "mostra questo aiuto"
-#: g10/keyedit.c:540
+#: g10/keyedit.c:564
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:540
+#: g10/keyedit.c:564
msgid "show fingerprint"
msgstr "mostra le impronte digitali"
-#: g10/keyedit.c:541
+#: g10/keyedit.c:565
msgid "list"
msgstr "list"
-#: g10/keyedit.c:541
+#: g10/keyedit.c:565
msgid "list key and user ids"
msgstr "elenca le chiavi e gli user id"
-#: g10/keyedit.c:542
+#: g10/keyedit.c:566
msgid "l"
msgstr "l"
-#: g10/keyedit.c:543
+#: g10/keyedit.c:567
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:543
+#: g10/keyedit.c:567
msgid "select user id N"
msgstr "scegli l'user id N"
-#: g10/keyedit.c:544
+#: g10/keyedit.c:568
msgid "key"
msgstr "key"
-#: g10/keyedit.c:544
+#: g10/keyedit.c:568
msgid "select secondary key N"
msgstr "scegli la chiave secondaria N"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:569
msgid "check"
msgstr "check"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:569
msgid "list signatures"
msgstr "elenca le firme"
-#: g10/keyedit.c:546
+#: g10/keyedit.c:570
msgid "c"
msgstr "c"
-#: g10/keyedit.c:547
+#: g10/keyedit.c:571
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:547
+#: g10/keyedit.c:571
msgid "sign the key"
msgstr "firma la chiave"
-#: g10/keyedit.c:548
+#: g10/keyedit.c:572
msgid "s"
msgstr "s"
-#: g10/keyedit.c:549
+#: g10/keyedit.c:573
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:549
+#: g10/keyedit.c:573
msgid "sign the key locally"
msgstr "firma la chiave localmente"
-#: g10/keyedit.c:550
+#: g10/keyedit.c:574
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:551
+#: g10/keyedit.c:575
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:551
+#: g10/keyedit.c:575
msgid "add a user id"
msgstr "aggiungi un user id"
-#: g10/keyedit.c:552
+#: g10/keyedit.c:576
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:552
+#: g10/keyedit.c:576
msgid "delete user id"
msgstr "cancella un user id"
-#: g10/keyedit.c:553
+#: g10/keyedit.c:577
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:553
+#: g10/keyedit.c:577
msgid "add a secondary key"
msgstr "aggiungi una chiave secondaria"
-#: g10/keyedit.c:554
+#: g10/keyedit.c:578
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:554
+#: g10/keyedit.c:578
msgid "delete a secondary key"
msgstr "cancella una chiave secondaria"
-#: g10/keyedit.c:555
+#: g10/keyedit.c:579
+#, fuzzy
+msgid "delsig"
+msgstr "lsign"
+
+#: g10/keyedit.c:579
+#, fuzzy
+msgid "delete signatures"
+msgstr "elenca le firme"
+
+#: g10/keyedit.c:580
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:555
+#: g10/keyedit.c:580
msgid "change the expire date"
msgstr "cambia la data di scadenza"
-#: g10/keyedit.c:556
+#: g10/keyedit.c:581
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:556
+#: g10/keyedit.c:581
msgid "toggle between secret and public key listing"
msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
-#: g10/keyedit.c:558
+#: g10/keyedit.c:583
msgid "t"
msgstr "t"
-#: g10/keyedit.c:559
+#: g10/keyedit.c:584
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:559
+#: g10/keyedit.c:584
msgid "list preferences"
msgstr "elenca le impostazioni"
-#: g10/keyedit.c:560
+#: g10/keyedit.c:585
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:560
+#: g10/keyedit.c:585
msgid "change the passphrase"
msgstr "cambia la passphrase"
-#: g10/keyedit.c:561
+#: g10/keyedit.c:586
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:561
+#: g10/keyedit.c:586
msgid "change the ownertrust"
msgstr "cambia il valore di fiducia"
-#: g10/keyedit.c:562
+#: g10/keyedit.c:587
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:562
+#: g10/keyedit.c:587
msgid "revoke signatures"
msgstr "revoca firme"
-#: g10/keyedit.c:563
+#: g10/keyedit.c:588
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:563
+#: g10/keyedit.c:588
msgid "revoke a secondary key"
msgstr "revoca una chiave secondaria"
-#: g10/keyedit.c:582
+#: g10/keyedit.c:607
msgid "can't do that in batchmode\n"
msgstr "impossibile fare questo in batch mode\n"
#. check that they match
#. FIXME: check that they both match
-#: g10/keyedit.c:609
+#: g10/keyedit.c:636
msgid "Secret key is available.\n"
msgstr "х disponibile una chiave segreta.\n"
-#: g10/keyedit.c:638
+#: g10/keyedit.c:665
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:665
+#: g10/keyedit.c:692
msgid "Need the secret key to do this.\n"
msgstr "Per fare questo serve la chiave segreta.\n"
-#: g10/keyedit.c:687
+#: g10/keyedit.c:714
msgid "Save changes? "
msgstr "Salvo i cambiamenti? "
-#: g10/keyedit.c:690
+#: g10/keyedit.c:717
msgid "Quit without saving? "
msgstr "Esco senza salvare? "
-#: g10/keyedit.c:700
+#: g10/keyedit.c:727
#, c-format
msgid "update failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
-#: g10/keyedit.c:707
+#: g10/keyedit.c:734
#, c-format
msgid "update secret failed: %s\n"
msgstr "aggiornamento della chiave segreta fallito: %s\n"
-#: g10/keyedit.c:714
+#: g10/keyedit.c:741
msgid "Key not changed so no update needed.\n"
msgstr "La chiave non Х cambiata quindi non sono necessari aggiornamenti.\n"
-#: g10/keyedit.c:717 g10/keyedit.c:776
+#: g10/keyedit.c:744 g10/keyedit.c:803
#, c-format
msgid "update of trustdb failed: %s\n"
msgstr "aggiornamento del trustdb fallito: %s\n"
-#: g10/keyedit.c:750
+#: g10/keyedit.c:777
msgid "Really sign all user ids? "
msgstr "Firmo davvero tutti gli user id? "
-#: g10/keyedit.c:751
+#: g10/keyedit.c:778
msgid "Hint: Select the user ids to sign\n"
msgstr "Suggerimento: seleziona gli user id da firmare\n"
-#: g10/keyedit.c:787
+#: g10/keyedit.c:814 g10/keyedit.c:835
msgid "You must select at least one user id.\n"
msgstr "Devi selezionare almeno un user id.\n"
-#: g10/keyedit.c:789
+#: g10/keyedit.c:816
msgid "You can't delete the last user id!\n"
msgstr "Non puoi cancellare l'ultimo user id!\n"
-#: g10/keyedit.c:792
+#: g10/keyedit.c:819
msgid "Really remove all selected user ids? "
msgstr "Tolgo davvero tutti gli user id selezionati? "
-#: g10/keyedit.c:793
+#: g10/keyedit.c:820
msgid "Really remove this user id? "
msgstr "Tolgo davvero questo user id? "
-#: g10/keyedit.c:816 g10/keyedit.c:838
+#: g10/keyedit.c:858 g10/keyedit.c:880
msgid "You must select at least one key.\n"
msgstr "Devi selezionare almeno una chiave.\n"
-#: g10/keyedit.c:820
+#: g10/keyedit.c:862
msgid "Do you really want to delete the selected keys? "
msgstr "Vuoi davvero cancellare le chiavi selezionate? "
-#: g10/keyedit.c:821
+#: g10/keyedit.c:863
msgid "Do you really want to delete this key? "
msgstr "Vuoi davvero cancellare questa chiave? "
-#: g10/keyedit.c:842
+#: g10/keyedit.c:884
msgid "Do you really want to revoke the selected keys? "
msgstr "Vuoi davvero revocare le chiavi selezionate? "
-#: g10/keyedit.c:843
+#: g10/keyedit.c:885
msgid "Do you really want to revoke this key? "
msgstr "Vuoi davvero revocare questa chiave? "
-#: g10/keyedit.c:897
+#: g10/keyedit.c:939
msgid "Invalid command (try \"help\")\n"
msgstr "Comando non valido (prova \"help\")\n"
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1294
+msgid "Delete this good signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:1298
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:1302
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:1308
+#, fuzzy
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Creare davvero i certificati di revoca? (s/N)"
+
+#: g10/keyedit.c:1322
+#, fuzzy, c-format
+msgid "Deleted %d signature.\n"
+msgstr "%d firme non corrette\n"
+
+#: g10/keyedit.c:1323
+#, fuzzy, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "%d firme non corrette\n"
+
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "Nothing deleted.\n"
+msgstr "ATTENZIONE: non Х stato esportato nulla\n"
+
+#: g10/keyedit.c:1395
msgid "Please remove selections from the secret keys.\n"
msgstr "Togli le selezioni dalle chiavi segrete.\n"
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1401
msgid "Please select at most one secondary key.\n"
msgstr "Seleziona al massimo una chiave secondaria.\n"
-#: g10/keyedit.c:1299
-msgid "Changing exiration time for a secondary key.\n"
+#: g10/keyedit.c:1405
+#, fuzzy
+msgid "Changing expiration time for a secondary key.\n"
msgstr "Modifico il tempo di scadenza per una chiave secondaria.\n"
-#: g10/keyedit.c:1301
-msgid "Changing exiration time for the primary key.\n"
+#: g10/keyedit.c:1407
+#, fuzzy
+msgid "Changing expiration time for the primary key.\n"
msgstr "Modifico il tempo di scadenza per la chiave primaria.\n"
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1448
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:1358
+#: g10/keyedit.c:1464
msgid "No corresponding signature in secret ring\n"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1524
#, c-format
msgid "No user id with index %d\n"
msgstr "Nessun user id con l'indice %d\n"
-#: g10/keyedit.c:1464
+#: g10/keyedit.c:1570
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Nessuna chiave secondaria con l'indice %d\n"
-#: g10/keyedit.c:1562
+#: g10/keyedit.c:1668
msgid "user ID: \""
msgstr "user ID: \""
-#: g10/keyedit.c:1565
+#: g10/keyedit.c:1671
#, c-format
msgid ""
"\"\n"
@@ -2156,24 +2232,24 @@ msgstr ""
"firmata con la tua chiave %08lX a %s\n"
"\n"
-#: g10/keyedit.c:1569
+#: g10/keyedit.c:1675
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "Creare un certificato di revoca per questa firma? (s/N)"
-#: g10/keyedit.c:1649
+#: g10/keyedit.c:1755
msgid "Really create the revocation certificates? (y/N)"
msgstr "Creare davvero i certificati di revoca? (s/N)"
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1778
msgid "no secret key\n"
msgstr "manca la chiave segreta\n"
-#: g10/mainproc.c:185
+#: g10/mainproc.c:184
#, c-format
msgid "public key is %08lX\n"
msgstr "la chiave pubblica Х %08lX\n"
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
msgid "public key encrypted data: good DEK\n"
msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
@@ -2181,108 +2257,113 @@ msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
#. * this type - do this by building a list of keys with their stati
#. * and store it with the context. do_proc_packets can then use
#. * this list to display some information
-#: g10/mainproc.c:220
+#: g10/mainproc.c:219
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "decifratura della chiave pubblica fallita: %s\n"
-#: g10/mainproc.c:249
+#: g10/mainproc.c:247
msgid "decryption okay\n"
msgstr "decifratura corretta\n"
-#: g10/mainproc.c:253
+#: g10/mainproc.c:252
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "ATTENZIONE: il messaggio cifrato Х stato manipolato!\n"
+
+#: g10/mainproc.c:257
#, c-format
msgid "decryption failed: %s\n"
msgstr "decifratura fallita: %s\n"
-#: g10/mainproc.c:270
+#: g10/mainproc.c:275
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
-#: g10/mainproc.c:272
+#: g10/mainproc.c:277
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome del file originale='%.*s'\n"
-#: g10/mainproc.c:876
+#: g10/mainproc.c:505 g10/mainproc.c:514
+#, fuzzy
+msgid "WARNING: invalid notation data found\n"
+msgstr "Non sono stati trovati dati OpenPGP validi.\n"
+
+#: g10/mainproc.c:517
+msgid "Notation: "
+msgstr ""
+
+#: g10/mainproc.c:524
+msgid "Policy: "
+msgstr ""
+
+#: g10/mainproc.c:929
msgid "signature verification suppressed\n"
msgstr "verifica della firma soppressa\n"
-#: g10/mainproc.c:883
+#: g10/mainproc.c:935
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n"
-#: g10/mainproc.c:895
-msgid "encrypted message is valid\n"
-msgstr "il messaggio cifrato Х valido\n"
-
-#: g10/mainproc.c:899
-msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "ATTENZIONE: il messaggio cifrato Х stato manipolato!\n"
-
-#: g10/mainproc.c:904
-#, c-format
-msgid "Can't check MDC: %s\n"
-msgstr "Impossibile controllare il MDC: %s\n"
-
#. just in case that we have no userid
-#: g10/mainproc.c:925 g10/mainproc.c:936
+#: g10/mainproc.c:961 g10/mainproc.c:972
msgid "BAD signature from \""
msgstr "Firma NON corretta da \""
-#: g10/mainproc.c:926 g10/mainproc.c:937
+#: g10/mainproc.c:962 g10/mainproc.c:973
msgid "Good signature from \""
msgstr "Firma valida da \""
-#: g10/mainproc.c:928
+#: g10/mainproc.c:964
msgid " aka \""
msgstr " anche noto come \""
-#: g10/mainproc.c:974
+#: g10/mainproc.c:1015
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossibile controllare la firma: %s\n"
-#: g10/mainproc.c:1047
+#: g10/mainproc.c:1109
msgid "old style (PGP 2.x) signature\n"
msgstr "firma vecchio stile (PGP 2.x)\n"
-#: g10/mainproc.c:1052
+#: g10/mainproc.c:1114
msgid "invalid root packet detected in proc_tree()\n"
msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
-#: g10/misc.c:90
+#: g10/misc.c:93
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "impossibile disabilitare i core dump: %s\n"
-#: g10/misc.c:93
+#: g10/misc.c:96
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENZIONE: il programma potrebbe creare un file di core!\n"
-#: g10/misc.c:200
+#: g10/misc.c:203
msgid "Experimental algorithms should not be used!\n"
msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
-#: g10/misc.c:214
+#: g10/misc.c:217
msgid ""
"RSA keys are deprecated; please consider creating a new key and use this key "
"in the future\n"
msgstr ""
-"Le chiavi RSA sono deprecate; per favore considera di creare una nuova chiave\n"
+"Le chiavi RSA sono deprecate; per favore considera di creare una nuova "
+"chiave\n"
"e usarla in futuro\n"
-#: g10/misc.c:236
+#: g10/misc.c:239
msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
msgstr "questo algoritmo di cifratura Х deprecato; usatene uno piЫ standard!\n"
-#: g10/parse-packet.c:113
+#: g10/parse-packet.c:112
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
-#: g10/parse-packet.c:892
+#: g10/parse-packet.c:931
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -2307,11 +2388,11 @@ msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
msgid " (main key ID %08lX)"
msgstr " (key ID principale %08lX)"
-#: g10/passphrase.c:190
+#: g10/passphrase.c:192
msgid "Enter passphrase: "
msgstr "Inserisci la passphrase: "
-#: g10/passphrase.c:194
+#: g10/passphrase.c:196
msgid "Repeat passphrase: "
msgstr "Ripeti la passphrase: "
@@ -2320,15 +2401,15 @@ msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
-#: g10/plaintext.c:208
+#: g10/plaintext.c:266
msgid "Please enter name of data file: "
msgstr "Inserisci il nome del file di dati: "
-#: g10/plaintext.c:229
+#: g10/plaintext.c:287
msgid "reading stdin ...\n"
msgstr "viene letto stdin...\n"
-#: g10/plaintext.c:292
+#: g10/plaintext.c:360
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "impossibile aprire i dati firmati `%s'\n"
@@ -2367,56 +2448,61 @@ msgstr ""
"ATTENZIONE: Individuata una chiave debole - per favore cambia ancora la\n"
"passphrase.\n"
-#: g10/sig-check.c:186
+#: g10/sig-check.c:187
msgid "assuming bad MDC due to an unknown critical bit\n"
msgstr "si presume un MDC non valido a causa di un bit critico sconosciuto\n"
-#: g10/sig-check.c:282
+#: g10/sig-check.c:283
msgid ""
"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
msgstr ""
"questa Х una chiave ElGamal generata da PGP e NON Х sicura per le firme!\n"
-#: g10/sig-check.c:290
+#: g10/sig-check.c:291
#, c-format
msgid "public key is %lu second newer than the signature\n"
msgstr "la chiave pubblica Х %lu secondo piЫ recente della firma\n"
-#: g10/sig-check.c:291
+#: g10/sig-check.c:292
#, c-format
msgid "public key is %lu seconds newer than the signature\n"
msgstr "la chiave pubblica Х %lu secondi piЫ recente della firma\n"
-#: g10/sig-check.c:307
+#: g10/sig-check.c:308
#, c-format
msgid "NOTE: signature key expired %s\n"
msgstr "NOTA: chiave per firmare scaduta il %s\n"
-#: g10/sig-check.c:364
+#: g10/sig-check.c:365
msgid "assuming bad signature due to an unknown critical bit\n"
msgstr ""
"si presume una firma non valida a causa di un bit critico sconosciuto\n"
-#: g10/sign.c:79
+#: g10/sign.c:132
#, c-format
msgid "%s signature from: %s\n"
msgstr "Firma %s da: %s\n"
-#: g10/sign.c:210 g10/sign.c:496
+#: g10/sign.c:263 g10/sign.c:554
#, c-format
msgid "can't create %s: %s\n"
msgstr "impossibile creare %s: %s\n"
-#: g10/sign.c:306
+#: g10/sign.c:361
msgid "signing:"
msgstr "firma:"
-#: g10/textfilter.c:122
+#: g10/sign.c:401
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "ATTENZIONE: `%s' Х un file vuoto\n"
+
+#: g10/textfilter.c:128
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "impossibile gestire linee di testo piЫ lunghe di %d caratteri\n"
-#: g10/textfilter.c:189
+#: g10/textfilter.c:197
#, c-format
msgid "input line longer than %d characters\n"
msgstr "linea di input piЫ lunga di %d caratteri\n"
@@ -2455,7 +2541,7 @@ msgstr "%s: directory creata\n"
msgid "%s: directory does not exist!\n"
msgstr "%s: la directory non esiste!\n"
-#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:144 g10/openfile.c:215 g10/ringedit.c:1344 g10/tdbio.c:457
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: impossibile creare: %s\n"
@@ -2552,7 +2638,8 @@ msgid "%s: failed to append a record: %s\n"
msgstr "%s: accodatura a un record fallita: %s\n"
#: g10/tdbio.c:1630
-msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
+#, fuzzy
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
msgstr "Il trustdb Х danneggiato; eseguire \"gpgm --fix-trust-db\".\n"
#: g10/trustdb.c:163
@@ -2645,7 +2732,8 @@ msgstr "enumerate secret keys fallito: %s\n"
#: g10/trustdb.c:851
#, c-format
msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
-msgstr "NOTA: rec di %lu[%d] nella hintlist di %lu ma marcato come verificato\n"
+msgstr ""
+"NOTA: rec di %lu[%d] nella hintlist di %lu ma marcato come verificato\n"
#: g10/trustdb.c:855
#, c-format
@@ -2745,7 +2833,8 @@ msgstr "Autofirma non valida"
#: g10/trustdb.c:1403
msgid "Valid user ID revocation skipped due to a newer self signature\n"
-msgstr "Evitata la revoca dell'user ID valida a causa di una autofirma piЫ recente\n"
+msgstr ""
+"Evitata la revoca dell'user ID valida a causa di una autofirma piЫ recente\n"
#: g10/trustdb.c:1410
msgid "Valid user ID revocation\n"
@@ -2979,7 +3068,9 @@ msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
#: g10/skclist.c:88 g10/skclist.c:125
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "la chiave non Х indicata come insicura - impossibile usarla con il RNG finto!\n"
+msgstr ""
+"la chiave non Х indicata come insicura - impossibile usarla con il RNG "
+"finto!\n"
#: g10/skclist.c:113
#, c-format
@@ -2996,40 +3087,45 @@ msgstr ""
"le firme!\n"
#. do not overwrite
-#: g10/openfile.c:63
+#: g10/openfile.c:65
#, c-format
msgid "File `%s' exists. "
msgstr "Il file `%s' esiste. "
-#: g10/openfile.c:65
+#: g10/openfile.c:67
msgid "Overwrite (y/N)? "
msgstr "Sovrascrivo (s/N)? "
-#: g10/openfile.c:90
+#: g10/openfile.c:97
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr ""
+
+#: g10/openfile.c:122
msgid "writing to stdout\n"
msgstr "scrivo su stdout\n"
-#: g10/openfile.c:147
+#: g10/openfile.c:181
#, c-format
msgid "assuming signed data in `%s'\n"
msgstr "presumo che i dati firmati siano in `%s'\n"
-#: g10/openfile.c:197
+#: g10/openfile.c:231
#, c-format
msgid "%s: new options file created\n"
msgstr "%s: creato un nuovo file delle opzioni\n"
-#: g10/encr-data.c:60
+#: g10/encr-data.c:66
#, c-format
msgid "%s encrypted data\n"
msgstr "dati cifrati con %s\n"
-#: g10/encr-data.c:62
+#: g10/encr-data.c:68
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrato con l'algoritmo sconosciuto %d\n"
-#: g10/encr-data.c:77
+#: g10/encr-data.c:85
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
@@ -3144,27 +3240,73 @@ msgstr "keyedit.remove.uid.okay"
msgid "keyedit.remove.subkey.okay"
msgstr "keyedit.remove.subkey.okay"
-#: g10/helptext.c:175
+#: g10/helptext.c:176
+#, fuzzy
+msgid "keyedit.delsig.valid"
+msgstr "keyedit.sign_all.okay"
+
+#: g10/helptext.c:181
+#, fuzzy
+msgid "keyedit.delsig.unknown"
+msgstr "keyedit.sign_all.okay"
+
+#: g10/helptext.c:187
+#, fuzzy
+msgid "keyedit.delsig.invalid"
+msgstr "keyedit.sign_all.okay"
+
+#: g10/helptext.c:191
+msgid "keyedit.delsig.selfsig"
+msgstr ""
+
+#: g10/helptext.c:200
msgid "passphrase.enter"
msgstr "passphrase.enter"
-#: g10/helptext.c:182
+#: g10/helptext.c:207
msgid "passphrase.repeat"
msgstr "passphrase.repeat"
-#: g10/helptext.c:186
+#: g10/helptext.c:211
msgid "detached_signature.filename"
msgstr "detached_signature.filename"
-#: g10/helptext.c:190
+#: g10/helptext.c:215
msgid "openfile.overwrite.okay"
msgstr "openfile.overwrite.okay"
-#: g10/helptext.c:204
+#: g10/helptext.c:229
msgid "No help available"
msgstr "Non Х disponibile un aiuto"
-#: g10/helptext.c:216
+#: g10/helptext.c:241
#, c-format
msgid "No help available for `%s'"
msgstr "Non Х disponibile un aiuto per `%s'"
+
+#~ msgid "can't open file: %s\n"
+#~ msgstr "impossibile aprire il file: %s\n"
+
+#~ msgid "read error: %s\n"
+#~ msgstr "errore di lettura: %s\n"
+
+#~ msgid "can't write to keyring: %s\n"
+#~ msgstr "impossibile scrivere sul portachiavi pubblico: %s\n"
+
+#~ msgid "writing keyblock\n"
+#~ msgstr "scrittura del keyblock\n"
+
+#~ msgid "can't write keyblock: %s\n"
+#~ msgstr "impossibile aprire il keyblock: %s\n"
+
+#~ msgid "can't lock secret keyring: %s\n"
+#~ msgstr "impossibile bloccare il portachiavi segreto: %s\n"
+
+#~ msgid "can't write keyring: %s\n"
+#~ msgstr "impossibile scrivere il portachiavi: %s\n"
+
+#~ msgid "encrypted message is valid\n"
+#~ msgstr "il messaggio cifrato Х valido\n"
+
+#~ msgid "Can't check MDC: %s\n"
+#~ msgstr "Impossibile controllare il MDC: %s\n"
diff --git a/po/pl.po b/po/pl.po
index 75036c618..e88544761 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-0.9.7\n"
-"POT-Creation-Date: 1999-06-08 21:26+0200\n"
+"POT-Creation-Date: 1999-06-26 11:22+0200\n"
"PO-Revision-Date: 1999-05-30 19:08+02:00\n"
"Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -285,7 +285,7 @@ msgstr ""
"ProszЙ kontynuowaФ inne dziaЁania aby system mСgЁ zebraФ odpowiedni╠\n"
"ilo╤Ф entropii do ich wygenerowania (brakuje %d bajtСw).\n"
-#: g10/g10.c:169
+#: g10/g10.c:174
msgid ""
"@Commands:\n"
" "
@@ -293,131 +293,131 @@ msgstr ""
"@Polecenia:\n"
" "
-#: g10/g10.c:171
+#: g10/g10.c:176
msgid "|[file]|make a signature"
msgstr "|[plik]|zЁo©enie podpisu"
-#: g10/g10.c:172
+#: g10/g10.c:177
msgid "|[file]|make a clear text signature"
msgstr "|[plik]|zЁo©enie podpisu na czytelnym dokumencie"
-#: g10/g10.c:173
+#: g10/g10.c:178
msgid "make a detached signature"
msgstr "sporz╠dzenie podpisu oddzielonego od dokumentu"
-#: g10/g10.c:174
+#: g10/g10.c:179
msgid "encrypt data"
msgstr "szyfrowanie danych"
-#: g10/g10.c:175
+#: g10/g10.c:180
msgid "encryption only with symmetric cipher"
msgstr "szyfrowanie tylko szyfrem symetrycznym"
-#: g10/g10.c:176
+#: g10/g10.c:181
msgid "store only"
msgstr "tylko zapis"
-#: g10/g10.c:177
+#: g10/g10.c:182
msgid "decrypt data (default)"
msgstr "odszyfrowywanie danych (domy╤lnie)"
-#: g10/g10.c:178
+#: g10/g10.c:183
msgid "verify a signature"
msgstr "sprawdzenie podpisu"
-#: g10/g10.c:179
+#: g10/g10.c:184
msgid "list keys"
msgstr "lista kluczy"
-#: g10/g10.c:181
+#: g10/g10.c:186
msgid "list keys and signatures"
msgstr "lista kluczy i podpisСw"
-#: g10/g10.c:182
+#: g10/g10.c:187
msgid "check key signatures"
msgstr "sprawdzenie podpisСw kluczy"
-#: g10/g10.c:183
+#: g10/g10.c:188
msgid "list keys and fingerprints"
msgstr "lista kluczy i ich odciskСw"
-#: g10/g10.c:184
+#: g10/g10.c:189
msgid "list secret keys"
msgstr "lista kluczy tajnych"
-#: g10/g10.c:185
+#: g10/g10.c:190
msgid "generate a new key pair"
msgstr "generacja nowej pary klucza"
-#: g10/g10.c:186
+#: g10/g10.c:191
msgid "remove key from the public keyring"
msgstr "usuniЙcie klucza ze zbioru kluczy publicznych"
-#: g10/g10.c:187
+#: g10/g10.c:192
msgid "sign or edit a key"
msgstr "podpisanie lub modyfikacja klucza"
-#: g10/g10.c:188
+#: g10/g10.c:193
msgid "generate a revocation certificate"
msgstr "generacja certyfikatu uniewa©nienia klucza"
-#: g10/g10.c:189
+#: g10/g10.c:194
msgid "export keys"
msgstr "eksport kluczy do pliku"
-#: g10/g10.c:190
+#: g10/g10.c:195
msgid "export keys to a key server"
msgstr "eksport kluczy do serwera kluczy"
-#: g10/g10.c:191
+#: g10/g10.c:196
msgid "import keys from a key server"
msgstr "import kluczy z serwera kluczy"
-#: g10/g10.c:194
+#: g10/g10.c:199
msgid "import/merge keys"
msgstr "import/doЁ╠czenie kluczy"
-#: g10/g10.c:196
+#: g10/g10.c:201
msgid "list only the sequence of packets"
msgstr "wypisane sekwencji pakietСw"
-#: g10/g10.c:198
+#: g10/g10.c:203
msgid "export the ownertrust values"
msgstr "eksport warto╤ci zaufania"
-#: g10/g10.c:200
+#: g10/g10.c:205
msgid "import ownertrust values"
msgstr "wczytanie warto╤Фi zaufania"
-#: g10/g10.c:202
+#: g10/g10.c:207
msgid "|[NAMES]|update the trust database"
msgstr "|[NAZWY]|naniesienie poprawek do bazy zaufania"
-#: g10/g10.c:204
+#: g10/g10.c:209
msgid "|[NAMES]|check the trust database"
msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
-#: g10/g10.c:205
+#: g10/g10.c:210
msgid "fix a corrupted trust database"
msgstr "naprawa uszkodzonej Bazy Zaufania"
-#: g10/g10.c:206
+#: g10/g10.c:211
msgid "De-Armor a file or stdin"
msgstr "zdjЙcie opakowania ASCII pliku lub potoku"
-#: g10/g10.c:207
+#: g10/g10.c:212
msgid "En-Armor a file or stdin"
msgstr "opakowanie ASCII pliku lub potoku"
-#: g10/g10.c:208
+#: g10/g10.c:213
msgid "|algo [files]|print message digests"
msgstr "|algo [pliki]|skrСty wiadomo╤ci"
-#: g10/g10.c:209
+#: g10/g10.c:214
msgid "print all message digests"
msgstr "wszystkie skrСty wiadomo╤ci"
-#: g10/g10.c:215
+#: g10/g10.c:220
msgid ""
"@\n"
"Options:\n"
@@ -427,152 +427,160 @@ msgstr ""
"Opcje:\n"
" "
-#: g10/g10.c:217
+#: g10/g10.c:222
msgid "create ascii armored output"
msgstr "plik wynikowy w opakowaniu ASCII"
-#: g10/g10.c:218
+#: g10/g10.c:223
msgid "|NAME|encrypt for NAME"
msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
-#: g10/g10.c:222
+#: g10/g10.c:227
msgid "use this user-id to sign or decrypt"
msgstr "identyfikator do podpisania lub odszyfrowania"
-#: g10/g10.c:223
+#: g10/g10.c:228
msgid "|N|set compress level N (0 disables)"
msgstr "|N|poziom kompresji N (0 - brak)"
-#: g10/g10.c:225
+#: g10/g10.c:230
msgid "use canonical text mode"
msgstr "kanoniczny format tekstowy"
-#: g10/g10.c:226
+#: g10/g10.c:231
msgid "use as output file"
msgstr "plik wyj╤ciowy"
-#: g10/g10.c:227
+#: g10/g10.c:232
msgid "verbose"
msgstr "z informacjami dodatkowymi"
-#: g10/g10.c:228
+#: g10/g10.c:233
msgid "be somewhat more quiet"
msgstr "mniej komunikatСww"
-#: g10/g10.c:229
+#: g10/g10.c:234
+msgid "don't use the terminal at all"
+msgstr ""
+
+#: g10/g10.c:235
msgid "force v3 signatures"
msgstr "wymuszenie trzeciej wersji formatu podpisСw"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "always use a MDC for encryption"
msgstr "do szyfrowania bЙdzie u©ywany MDC"
-#: g10/g10.c:231
+#: g10/g10.c:237
msgid "do not make any changes"
msgstr "pozostawienie bez zmian"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:233
+#: g10/g10.c:239
msgid "batch mode: never ask"
msgstr "tryb wsadowy: ©adnych pytaЯ"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "assume yes on most questions"
msgstr "automatyczna odpowied╪ tak na wiЙkszo╤Ф pytaЯ"
-#: g10/g10.c:235
+#: g10/g10.c:241
msgid "assume no on most questions"
msgstr "automatyczna odpowied╪ nie na wiЙkszo╤Ф pytaЯ"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "add this keyring to the list of keyrings"
msgstr "dodaФ zbiСr kluczy do listy u©ywanych"
-#: g10/g10.c:237
+#: g10/g10.c:243
msgid "add this secret keyring to the list"
msgstr "dodaФ zbiСr kluczy tajnych do listy"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|NAME|use NAME as default secret key"
msgstr "|NAZWA|u©ycie NAZWA jako domy╤lnego klucza tajnego"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|serwer kluczy w ktСrym bЙd╠ poszukiwane"
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAZWA|zestaw znakСw terminala NAZWA"
-#: g10/g10.c:241
+#: g10/g10.c:247
msgid "read options from file"
msgstr "wczytanie opcji z pliku"
-#: g10/g10.c:243
+#: g10/g10.c:249
msgid "set debugging flags"
msgstr "ustawienie opcji ╤ledzenia wykonania programu"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "enable full debugging"
msgstr "umo©liwienie peЁnego ╤ledzenia programu"
-#: g10/g10.c:245
+#: g10/g10.c:251
msgid "|FD|write status info to this FD"
msgstr "|FD|zapisaФ opis stanu do FD"
-#: g10/g10.c:246
+#: g10/g10.c:252
msgid "do not write comment packets"
msgstr "nie zapisywaФ pakietСw z komentarzem"
-#: g10/g10.c:247
+#: g10/g10.c:253
msgid "(default is 1)"
msgstr "(domy╤lnie 1)"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid "(default is 3)"
msgstr "(domy╤lnie 3)"
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "|FILE|load extension module FILE"
msgstr "|PLIK|Ёadowanie moduЁu rozszerzenia z PLIK"
-#: g10/g10.c:251
+#: g10/g10.c:257
msgid "emulate the mode described in RFC1991"
msgstr "emulacja trybu opisanego w RFC1991"
-#: g10/g10.c:252
+#: g10/g10.c:258
+msgid "set all packet, cipher and digest options to OpenPGP behavior"
+msgstr ""
+
+#: g10/g10.c:259
msgid "|N|use passphrase mode N"
msgstr "|N|N-ty tryb wprowadzania wyra©enia przej╤ciowego"
-#: g10/g10.c:254
+#: g10/g10.c:261
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|ALG|algorytm obliczania skrСtСw wiadomo╤ci ALG"
-#: g10/g10.c:256
+#: g10/g10.c:263
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|ALG|algorytmu szyfruj╠cy ALG dla hasЁa"
-#: g10/g10.c:257
+#: g10/g10.c:264
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAZWA|algorytm szyfruj╠cy NAZWA"
-#: g10/g10.c:258
+#: g10/g10.c:265
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAZWA|algorytm obliczania skrСtСw wiadomo╤ci NAZWA"
-#: g10/g10.c:259
+#: g10/g10.c:266
msgid "|N|use compress algorithm N"
msgstr "|N|algorytm kompresji N"
-#: g10/g10.c:260
+#: g10/g10.c:267
msgid "throw keyid field of encrypted packets"
msgstr "usuniЙcie identyfikatorСw kluczy z pakietСw"
-#: g10/g10.c:261
+#: g10/g10.c:268
msgid "|NAME=VALUE|use this notation data"
msgstr ""
-#: g10/g10.c:263
+#: g10/g10.c:270
msgid ""
"@\n"
"Examples:\n"
@@ -593,15 +601,15 @@ msgstr ""
" --list-keys [nazwy] pokazuje klucze\n"
" --fingerprint [nazwy] pokazuje odciski kluczy\n"
-#: g10/g10.c:337
+#: g10/g10.c:347
msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
msgstr "BЁЙdy prosimy zgЁaszaФ na adres <gnupg-bugs@gnu.org>.\n"
-#: g10/g10.c:341
+#: g10/g10.c:351
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "WywoЁanie: gpg [opcje] [pliki] (-h podaje pomoc)"
-#: g10/g10.c:344
+#: g10/g10.c:354
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -611,7 +619,7 @@ msgstr ""
"podpisywanie, sprawdzanie podpisСw, szyfrowanie, deszyfrowanie\n"
"domy╤lnie wykonywana operacja zale©y od danych wej╤ciowych\n"
-#: g10/g10.c:349
+#: g10/g10.c:359
msgid ""
"\n"
"Supported algorithms:\n"
@@ -619,169 +627,169 @@ msgstr ""
"\n"
"ObsЁugiwane algorytmy:\n"
-#: g10/g10.c:423
+#: g10/g10.c:433
msgid "usage: gpg [options] "
msgstr "wywoЁanie: gpg [opcje]"
-#: g10/g10.c:463
+#: g10/g10.c:473
msgid "conflicting commands\n"
msgstr "sprzeczne polecenia\n"
-#: g10/g10.c:595
+#: g10/g10.c:605
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "UWAGA: brak domy╤lnego pliku opcji '%s'\n"
-#: g10/g10.c:599
+#: g10/g10.c:609
#, c-format
msgid "option file `%s': %s\n"
msgstr "plik opcji '%s': %s\n"
-#: g10/g10.c:606
+#: g10/g10.c:616
#, c-format
msgid "reading options from `%s'\n"
msgstr "odczyt opcji z '%s'\n"
-#: g10/g10.c:755
+#: g10/g10.c:782
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s nie jest poprawn╠ nazw╠ zestawu znakСw\n"
-#: g10/g10.c:799 g10/g10.c:811
+#: g10/g10.c:827 g10/g10.c:839
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfruj╠cy jest niepoprawny\n"
-#: g10/g10.c:805 g10/g10.c:817
+#: g10/g10.c:833 g10/g10.c:845
msgid "selected digest algorithm is invalid\n"
msgstr "wybrany algorytm geenracji skrСtСw wiadomo╤ci jest niepoprawny\n"
-#: g10/g10.c:821
+#: g10/g10.c:849
msgid "the given policy URL is invalid\n"
msgstr ""
-#: g10/g10.c:824
+#: g10/g10.c:852
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "ustawienie algortytmu kompresji musi pochodziФ z zakresu %d..%d\n"
-#: g10/g10.c:826
+#: g10/g10.c:854
msgid "completes-needed must be greater than 0\n"
msgstr "warto╤Ф completes-needed musi byФ wiЙksza od 0\n"
-#: g10/g10.c:828
+#: g10/g10.c:856
msgid "marginals-needed must be greater than 1\n"
msgstr "warto╤Ф marginals-needed musi byФ wiЙksza od 1\n"
-#: g10/g10.c:830
+#: g10/g10.c:858
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "warto╤Ф max-cert-depth musi mie╤ciФ siЙ w zakresie od 1 do 255\n"
-#: g10/g10.c:833
+#: g10/g10.c:861
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
-#: g10/g10.c:837
+#: g10/g10.c:865
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "Niepoprawny tryb S2K; musi mieФ warto╤Ф 0, 1 lub 3\n"
-#: g10/g10.c:914
+#: g10/g10.c:942
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Inicjowanie Bazy Zaufania nie powiodЁo siЙ: %s\n"
-#: g10/g10.c:920
+#: g10/g10.c:948
msgid "--store [filename]"
msgstr "--store [plik]"
-#: g10/g10.c:927
+#: g10/g10.c:955
msgid "--symmetric [filename]"
msgstr "--symmetric [plik]"
-#: g10/g10.c:935
+#: g10/g10.c:963
msgid "--encrypt [filename]"
msgstr "--encrypt [plik]"
-#: g10/g10.c:948
+#: g10/g10.c:976
msgid "--sign [filename]"
msgstr "--sign [plik]"
-#: g10/g10.c:961
+#: g10/g10.c:989
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [plik]"
-#: g10/g10.c:975
+#: g10/g10.c:1003
msgid "--clearsign [filename]"
msgstr "--clearsign [plik]\""
-#: g10/g10.c:987
+#: g10/g10.c:1015
msgid "--decrypt [filename]"
msgstr "--decrypt [plik]"
-#: g10/g10.c:996
+#: g10/g10.c:1024
msgid "--edit-key username [commands]"
msgstr "--edit-key nazwa u©ytkownika [polecenia]"
-#: g10/g10.c:1010
+#: g10/g10.c:1038
msgid "--delete-secret-key username"
msgstr "--delete-secret-key nazwa u©ytkownika"
-#: g10/g10.c:1013
+#: g10/g10.c:1041
msgid "--delete-key username"
msgstr "--delete-key nazwa u©ytkownika"
-#: g10/encode.c:231 g10/g10.c:1036 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1064 g10/sign.c:366
#, c-format
msgid "can't open %s: %s\n"
msgstr "nie mogЙ otworzyФ %s: %s\n"
-#: g10/g10.c:1047
+#: g10/g10.c:1075
msgid "-k[v][v][v][c] [userid] [keyring]"
msgstr "-k[v][v][v][c] [identyfikator] [zbiСr kluczy]"
-#: g10/g10.c:1106
+#: g10/g10.c:1134
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "usuniЙcie opakowania ASCII nie powiodЁo siЙ: %s\n"
-#: g10/g10.c:1114
+#: g10/g10.c:1142
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "opakowywanie ASCII nie powiodЁo siЙ: %s\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1208
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "niewЁa╤ciwy algorytm skrСtu '%s'\n"
-#: g10/g10.c:1255
+#: g10/g10.c:1283
msgid "[filename]"
msgstr "[nazwa pliku]"
-#: g10/g10.c:1259
+#: g10/g10.c:1287
msgid "Go ahead and type your message ...\n"
msgstr "Wpisz tutaj swoj╠ wiadomo╤Ф ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1262 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1290 g10/verify.c:66
#, c-format
msgid "can't open `%s'\n"
msgstr "nie mogЙ otworzyФ '%s'\n"
-#: g10/g10.c:1429
+#: g10/g10.c:1457
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
-#: g10/g10.c:1435
+#: g10/g10.c:1463
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
msgstr ""
-#: g10/g10.c:1441
+#: g10/g10.c:1469
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
-#: g10/g10.c:1449
+#: g10/g10.c:1477
msgid "a notation value must not use any control characters\n"
msgstr ""
@@ -1373,7 +1381,8 @@ msgid "DSA keypair will have 1024 bits.\n"
msgstr "Para kluczy dla DSA bЙdzie miaЁa 1024 bity dЁugo╤ci.\n"
#: g10/keygen.c:859
-msgid "Key generation cancelled.\n"
+#, fuzzy
+msgid "Key generation canceled.\n"
msgstr "Procedura generacji klucza zostaЁa anulowana.\n"
#: g10/keygen.c:869
@@ -1444,7 +1453,7 @@ msgstr "%s: OSTRZE╞ENIE: plik jest pusty\n"
msgid "reading from `%s'\n"
msgstr "odczyt z '%s'\n"
-#: g10/encode.c:417
+#: g10/encode.c:431
#, c-format
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s zaszyfrowany dla: %s\n"
@@ -1838,7 +1847,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Na pewno podpisaФ? "
-#: g10/keyedit.c:369 g10/keyedit.c:1779 g10/keyedit.c:1828 g10/sign.c:128
+#: g10/keyedit.c:369 g10/keyedit.c:1790 g10/keyedit.c:1839 g10/sign.c:128
#, c-format
msgid "signing failed: %s\n"
msgstr "zЁo©enie podpisu nie powiodЁo siЙ: %s\n"
@@ -2148,97 +2157,104 @@ msgstr "Czy na pewno usun╠Ф wszystkie wybrane identyfikatory u©ytkownika? "
msgid "Really remove this user id? "
msgstr "Czy na pewno usun╠Ф ten identyfikator u©ytkownika? "
-#: g10/keyedit.c:856 g10/keyedit.c:878
+#: g10/keyedit.c:858 g10/keyedit.c:880
msgid "You must select at least one key.\n"
msgstr "Musisz wybraФ co najmniej jeden klucz.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:862
msgid "Do you really want to delete the selected keys? "
msgstr "Czy na pewno chcesz usun╠Ф wybrane klucze? "
-#: g10/keyedit.c:861
+#: g10/keyedit.c:863
msgid "Do you really want to delete this key? "
msgstr "Czy na pewno chcesz usun╠Ф ten klucz? "
-#: g10/keyedit.c:882
+#: g10/keyedit.c:884
msgid "Do you really want to revoke the selected keys? "
msgstr "Czy na pewno chcesz uniewa©niФ wybrane klucze? "
-#: g10/keyedit.c:883
+#: g10/keyedit.c:885
msgid "Do you really want to revoke this key? "
msgstr "Czy na pewno chcesz uniewa©niФ ten klucz? "
-#: g10/keyedit.c:937
+#: g10/keyedit.c:939
msgid "Invalid command (try \"help\")\n"
msgstr "Niepoprawna komenda (sprСbuj \"help\")\n"
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1294
msgid "Delete this good signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1298
msgid "Delete this invalid signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:1297
+#: g10/keyedit.c:1302
+#, fuzzy
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Na pewno utworzyФ certyfikaty uniewa©nienia ? (t/N)"
+
+#: g10/keyedit.c:1308
#, fuzzy
msgid "Really delete this self-signature? (y/N)"
msgstr "Na pewno utworzyФ certyfikaty uniewa©nienia ? (t/N)"
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1322
#, fuzzy, c-format
msgid "Deleted %d signature.\n"
msgstr "%d niepoprawnych podpisСw\n"
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1323
#, fuzzy, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d niepoprawnych podpisСw\n"
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1326
#, fuzzy
msgid "Nothing deleted.\n"
msgstr "OSTRZE╞ENIE: nic nie zostaЁo wyeksportowane!\n"
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1395
msgid "Please remove selections from the secret keys.\n"
msgstr "ProszЙ usun╠Ф znacznik wyboru z kluczy tajnych.\n"
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1401
msgid "Please select at most one secondary key.\n"
msgstr "ProszЙ wybraФ najwy©ej jeden podklucz.\n"
-#: g10/keyedit.c:1394
-msgid "Changing exiration time for a secondary key.\n"
+#: g10/keyedit.c:1405
+#, fuzzy
+msgid "Changing expiration time for a secondary key.\n"
msgstr "Zmiana daty wa©no╤ci podklucza.\n"
-#: g10/keyedit.c:1396
-msgid "Changing exiration time for the primary key.\n"
+#: g10/keyedit.c:1407
+#, fuzzy
+msgid "Changing expiration time for the primary key.\n"
msgstr "Zmiana daty wa©no╤ci gЁСwnego klucza.\n"
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1448
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:1453
+#: g10/keyedit.c:1464
msgid "No corresponding signature in secret ring\n"
msgstr "Brak odpowiadaj╠cego podpisu w zbiorze kluczy tajnych\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1524
#, c-format
msgid "No user id with index %d\n"
msgstr "Brak identyfikatora u©ytkownika o numerze %d.\n"
-#: g10/keyedit.c:1559
+#: g10/keyedit.c:1570
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Brak podklucza o indeksie %d\n"
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1668
msgid "user ID: \""
msgstr "Identyfikator u©ytkownika: "
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1671
#, c-format
msgid ""
"\"\n"
@@ -2247,15 +2263,15 @@ msgstr ""
"\"\n"
"podpisano Twoim kluczem %08lX w %s\n"
-#: g10/keyedit.c:1664
+#: g10/keyedit.c:1675
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "StworzyФ certyfikat uniewa©nienia tego podpisu? (t/N)"
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1755
msgid "Really create the revocation certificates? (y/N)"
msgstr "Na pewno utworzyФ certyfikaty uniewa©nienia ? (t/N)"
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1778
msgid "no secret key\n"
msgstr "brak klucza prywatnego\n"
@@ -2406,11 +2422,11 @@ msgstr "dЁugo╤Ф %u bitСw, typ %s, klucz %08lX, stworzony %s"
msgid " (main key ID %08lX)"
msgstr " (gЁСwny ID klucza %08lX)"
-#: g10/passphrase.c:190
+#: g10/passphrase.c:192
msgid "Enter passphrase: "
msgstr "Wyra©enie przej╤ciowe: "
-#: g10/passphrase.c:194
+#: g10/passphrase.c:196
msgid "Repeat passphrase: "
msgstr "PowtСrzone wyra©enie przej╤ciowe: "
@@ -2658,7 +2674,8 @@ msgid "%s: failed to append a record: %s\n"
msgstr "%s: dopisanie rekordu nie powiodЁo siЙ: %s\n"
#: g10/tdbio.c:1630
-msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
+#, fuzzy
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
msgstr ""
"Baza zaufania jest uszkodzona; proszЙ uruchomiФ \"gpgm --fix-trust-db\".\n"
@@ -3319,38 +3336,44 @@ msgstr ""
#: g10/helptext.c:181
#, fuzzy
+msgid "keyedit.delsig.unknown"
+msgstr ""
+"Odpowiedz \"tak\" je╤li chcesz podpisaФ wszystkie identyfikatory klucza"
+
+#: g10/helptext.c:187
+#, fuzzy
msgid "keyedit.delsig.invalid"
msgstr ""
"Odpowiedz \"tak\" je╤li chcesz podpisaФ wszystkie identyfikatory klucza"
-#: g10/helptext.c:186
+#: g10/helptext.c:191
msgid "keyedit.delsig.selfsig"
msgstr ""
-#: g10/helptext.c:195
+#: g10/helptext.c:200
msgid "passphrase.enter"
msgstr ""
"ProszЙ wprowadziФ wyra©enie przej╤ciowe (tajne zdanie)\n"
" Bla, bla, bla ..."
-#: g10/helptext.c:202
+#: g10/helptext.c:207
msgid "passphrase.repeat"
msgstr ""
"ProszЙ powtСrzyФ podane wyra©enie przej╤ciowe dla wyeliminowania pomyЁek."
-#: g10/helptext.c:206
+#: g10/helptext.c:211
msgid "detached_signature.filename"
msgstr "Nazwa pliku ktСrego dotyczy ten podpis"
-#: g10/helptext.c:210
+#: g10/helptext.c:215
msgid "openfile.overwrite.okay"
msgstr "Odpowiedz \"tak\" je╤li na pewno chcesz nadpisaФ ten plik"
-#: g10/helptext.c:224
+#: g10/helptext.c:229
msgid "No help available"
msgstr "Pomoc niedostЙpna"
-#: g10/helptext.c:236
+#: g10/helptext.c:241
#, c-format
msgid "No help available for `%s'"
msgstr "Brak pomocy o '%s'"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1109eae8d..3963ff03b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,10 +1,11 @@
# Portuguese messages for gnupg
-# Thiago Jung Bauermann <jungmann@usa.net>, 1998.
+# Thiago Jung Bauermann <jungmann@cwb.matrix.com.br>, 1999.
+# Revised by Rafael Caetano dos Santos <rcaetano@linux.ime.usp.br>.
# I tried to make this one close to es_ES by Urko Lusa
#
msgid ""
msgstr ""
-"POT-Creation-Date: 1999-06-08 21:26+0200\n"
+"POT-Creation-Date: 1999-06-26 11:22+0200\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-20 23:46:36-0200\n"
"From: Thiago Jung Bauermann <jungmann@usa.net>\n"
@@ -22,11 +23,11 @@ msgstr "Aviso: usando memСria insegura!\n"
#: util/secmem.c:249
msgid "operation is not possible without initialized secure memory\n"
-msgstr ""
+msgstr "a operaГЦo nЦo И possМvel sem memСria segura inicializada\n"
#: util/secmem.c:250
msgid "(you may have used the wrong program for this task)\n"
-msgstr ""
+msgstr "(vocЙ pode ter usado o programa errado para esta tarefa)\n"
#: util/miscutil.c:156 util/miscutil.c:173
msgid "yes"
@@ -36,6 +37,7 @@ msgstr "sim"
msgid "yY"
msgstr "sS"
+# INICIO MENU
#: g10/keyedit.c:559 util/miscutil.c:174
msgid "quit"
msgstr "sair"
@@ -46,244 +48,202 @@ msgid "qQ"
msgstr "s"
#: util/errors.c:54
-#, fuzzy
msgid "general error"
-msgstr "Erro geral"
+msgstr "erro geral"
#: util/errors.c:55
-#, fuzzy
msgid "unknown packet type"
-msgstr "Formato desconhecido"
+msgstr "formato de pacote desconhecido"
#: util/errors.c:56
-#, fuzzy
msgid "unknown version"
-msgstr "VersЦo desconhecida"
+msgstr "versЦo desconhecida"
#: util/errors.c:57
-#, fuzzy
msgid "unknown pubkey algorithm"
-msgstr "Algoritmo de chave pЗblica desconhecido"
+msgstr "algoritmo de chave pЗblica desconhecido"
#: util/errors.c:58
-#, fuzzy
msgid "unknown digest algorithm"
-msgstr "Algoritmo de \"digest\" desconhecido"
+msgstr "algoritmo de \"digest\" desconhecido"
#: util/errors.c:59
-#, fuzzy
msgid "bad public key"
-msgstr "Chave pЗblica incorreta"
+msgstr "chave pЗblica invАlida"
#: util/errors.c:60
-#, fuzzy
msgid "bad secret key"
-msgstr "Chave secreta incorreta"
+msgstr "chave secreta incorreta"
#: util/errors.c:61
-#, fuzzy
msgid "bad signature"
-msgstr "Assinatura incorreta"
+msgstr "assinatura incorreta"
#: util/errors.c:62
-#, fuzzy
msgid "checksum error"
-msgstr "Erro de \"checksum\""
+msgstr "erro de \"checksum\""
#: util/errors.c:63
-#, fuzzy
msgid "bad passphrase"
-msgstr "Frase secreta incorreta"
+msgstr "frase secreta incorreta"
#: util/errors.c:64
-#, fuzzy
msgid "public key not found"
-msgstr "Chave pЗblica nЦo encontrada"
+msgstr "chave pЗblica nЦo encontrada"
#: util/errors.c:65
-#, fuzzy
msgid "unknown cipher algorithm"
-msgstr "Algoritmo de criptografia desconhecido"
+msgstr "algoritmo de criptografia desconhecido"
+# keyring == molho ???
#: util/errors.c:66
-#, fuzzy
msgid "can't open the keyring"
-msgstr "NЦo И possМvel abrir o anel de chaves"
+msgstr "nЦo И possМvel abrir o chaveiro"
#: util/errors.c:67
-#, fuzzy
msgid "invalid packet"
-msgstr "Valor invАlido"
+msgstr "pacote invАlido"
#: util/errors.c:68
-#, fuzzy
msgid "invalid armor"
-msgstr "Armadura invАlida"
+msgstr "armadura invАlida"
#: util/errors.c:69
-#, fuzzy
msgid "no such user id"
-msgstr "Identificador de usuАrio inexistente"
+msgstr "identificaГЦo de usuАrio inexistente"
#: util/errors.c:70
-#, fuzzy
msgid "secret key not available"
-msgstr "Chave secreta nЦo disponМvel"
+msgstr "chave secreta nЦo disponМvel"
#: util/errors.c:71
-#, fuzzy
msgid "wrong secret key used"
-msgstr "Chave secreta incorreta"
+msgstr "chave secreta incorreta"
+# suportado ???
#: util/errors.c:72
-#, fuzzy
msgid "not supported"
-msgstr "NЦo suportado"
+msgstr "nЦo suportado"
#: util/errors.c:73
-#, fuzzy
msgid "bad key"
-msgstr "Chave incorreta"
+msgstr "chave incorreta"
#: util/errors.c:74
-#, fuzzy
msgid "file read error"
-msgstr "Erro de leitura"
+msgstr "erro de leitura"
#: util/errors.c:75
-#, fuzzy
msgid "file write error"
-msgstr "Erro de escrita"
+msgstr "erro de escrita"
#: util/errors.c:76
-#, fuzzy
msgid "unknown compress algorithm"
-msgstr "Algoritmo de compressЦo desconhecido"
+msgstr "algoritmo de compressЦo desconhecido"
#: util/errors.c:77
-#, fuzzy
msgid "file open error"
-msgstr "Erro abrindo arquivo"
+msgstr "erro na abertura de arquivo"
#: util/errors.c:78
-#, fuzzy
msgid "file create error"
-msgstr "Erro criando arquivo"
+msgstr "erro na criaГЦo de arquivo"
+# frase secreta ???
#: util/errors.c:79
-#, fuzzy
msgid "invalid passphrase"
-msgstr "Frase secreta invАlida"
+msgstr "frase secreta invАlida"
#: util/errors.c:80
-#, fuzzy
msgid "unimplemented pubkey algorithm"
-msgstr "Algoritmo de chave pЗblica nЦo implementado"
+msgstr "algoritmo de chave pЗblica nЦo implementado"
#: util/errors.c:81
-#, fuzzy
msgid "unimplemented cipher algorithm"
-msgstr "Algoritmo de criptografia nЦo implementado"
+msgstr "algoritmo de criptografia nЦo implementado"
#: util/errors.c:82
-#, fuzzy
msgid "unknown signature class"
-msgstr "Classe de assinatura desconhecida"
+msgstr "classe de assinatura desconhecida"
+# confiabilidade ???
+# do jeito que estА, pode parecer que o BD И confiАvel, quando na verdade
+# os dados И que sЦo sobre confianГa
#: util/errors.c:83
-#, fuzzy
msgid "trust database error"
-msgstr "Erro no banco de dados de confianГa"
+msgstr "erro no banco de dados de confiabilidade"
#: util/errors.c:84
-#, fuzzy
msgid "bad MPI"
msgstr "MPI incorreto"
#: util/errors.c:85
-#, fuzzy
msgid "resource limit"
-msgstr "Limite de recurso"
+msgstr "limite de recurso"
#: util/errors.c:86
-#, fuzzy
msgid "invalid keyring"
-msgstr "Anel de chaves invАlido"
+msgstr "chaveiro invАlido"
#: util/errors.c:87
-#, fuzzy
msgid "bad certificate"
-msgstr "Certificado incorreto"
+msgstr "certificado incorreto"
#: util/errors.c:88
-#, fuzzy
msgid "malformed user id"
-msgstr "IdentificaГЦo de usuАrio mal formada"
+msgstr "identificaГЦo de usuАrio malformada"
#: util/errors.c:89
-#, fuzzy
msgid "file close error"
-msgstr "Erro fechando arquivo"
+msgstr "erro no fechamento de arquivo"
#: util/errors.c:90
-#, fuzzy
msgid "file rename error"
-msgstr "Erro renomeando arquivo"
+msgstr "erro na renomeaГЦo de arquivo"
#: util/errors.c:91
-#, fuzzy
msgid "file delete error"
-msgstr "Erro deletando arquivo"
+msgstr "erro na remoГЦo de arquivo"
#: util/errors.c:92
-#, fuzzy
msgid "unexpected data"
-msgstr "Dados inesperados"
+msgstr "dados inesperados"
#: util/errors.c:93
-#, fuzzy
msgid "timestamp conflict"
-msgstr "Conflito com \"timestamp\""
+msgstr "conflito de \"timestamp\""
#: util/errors.c:94
-#, fuzzy
msgid "unusable pubkey algorithm"
-msgstr "Algoritmo de chave pЗblica inutilizАvel"
+msgstr "algoritmo de chave pЗblica inutilizАvel"
#: util/errors.c:95
-#, fuzzy
msgid "file exists"
-msgstr "O arquivo jА existe"
+msgstr "o arquivo jА existe"
#: util/errors.c:96
-#, fuzzy
msgid "weak key"
-msgstr "Chave fraca"
+msgstr "chave fraca"
#: util/errors.c:97
-#, fuzzy
msgid "invalid argument"
-msgstr "Armadura invАlida"
+msgstr "argumento invАlido"
#: util/errors.c:98
-#, fuzzy
msgid "bad URI"
-msgstr "MPI incorreto"
+msgstr "URI incorreto"
#: util/errors.c:99
-#, fuzzy
msgid "unsupported URI"
-msgstr "NЦo suportado"
+msgstr "URI nЦo suportado"
#: util/errors.c:100
-#, fuzzy
msgid "network error"
-msgstr "Erro geral"
+msgstr "erro na rede"
#: util/errors.c:102
-#, fuzzy
msgid "not encrypted"
-msgstr "dados codificados com\n"
+msgstr "nЦo criptografado"
#: util/logger.c:218
#, c-format
@@ -308,7 +268,7 @@ msgid ""
"\n"
msgstr ""
"O gerador de nЗmeros aleatСrios И apenas um \"remendo\"\n"
-"para poder compilar - Ele nЦo И seguro!\n"
+"para poder compilar - nЦo И de modo algum um bom gerador!\n"
"\n"
"NцO USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
"\n"
@@ -325,7 +285,7 @@ msgstr ""
"para que o sistema possa coletar mais entropia!\n"
"(SЦo necessАrios mais %d bytes)\n"
-#: g10/g10.c:169
+#: g10/g10.c:174
msgid ""
"@Commands:\n"
" "
@@ -333,131 +293,134 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/g10.c:171
+#: g10/g10.c:176
msgid "|[file]|make a signature"
msgstr "|[arquivo]|faz uma assinatura"
-#: g10/g10.c:172
+#: g10/g10.c:177
msgid "|[file]|make a clear text signature"
msgstr "|[arquivo]|faz uma assinatura em texto puro"
-#: g10/g10.c:173
+#: g10/g10.c:178
msgid "make a detached signature"
msgstr "faz uma assinatura separada"
-#: g10/g10.c:174
+#: g10/g10.c:179
msgid "encrypt data"
-msgstr "codifica dados"
+msgstr "criptografa dados"
-#: g10/g10.c:175
+#: g10/g10.c:180
msgid "encryption only with symmetric cipher"
-msgstr "codifica apenas com criptografia simИtrica"
+msgstr "criptografa apenas com criptografia simИtrica"
-#: g10/g10.c:176
+#: g10/g10.c:181
msgid "store only"
msgstr "apenas armazena"
-#: g10/g10.c:177
+#: g10/g10.c:182
msgid "decrypt data (default)"
-msgstr "decodifica dados (padrЦo)"
+msgstr "descriptografa dados (padrЦo)"
-#: g10/g10.c:178
+#: g10/g10.c:183
msgid "verify a signature"
msgstr "verifica uma assinatura"
-#: g10/g10.c:179
+#: g10/g10.c:184
msgid "list keys"
msgstr "lista as chaves"
-#: g10/g10.c:181
+#: g10/g10.c:186
msgid "list keys and signatures"
msgstr "lista as chaves e as assinaturas"
-#: g10/g10.c:182
+#: g10/g10.c:187
msgid "check key signatures"
msgstr "confere as assinaturas das chaves"
-#: g10/g10.c:183
+#: g10/g10.c:188
msgid "list keys and fingerprints"
msgstr "lista as chaves e as impressУes digitais"
-#: g10/g10.c:184
+#: g10/g10.c:189
msgid "list secret keys"
msgstr "lista as chaves secretas"
-#: g10/g10.c:185
+#: g10/g10.c:190
msgid "generate a new key pair"
msgstr "gera um novo par de chaves"
-#: g10/g10.c:186
+#: g10/g10.c:191
msgid "remove key from the public keyring"
-msgstr "remove a chave do anel de chaves pЗblico"
+msgstr "remove a chave do chaveiro pЗblico"
-#: g10/g10.c:187
+#: g10/g10.c:192
msgid "sign or edit a key"
msgstr "assina ou edita uma chave"
-#: g10/g10.c:188
+#: g10/g10.c:193
msgid "generate a revocation certificate"
msgstr "gera um certificado de revogaГЦo"
-#: g10/g10.c:189
+#: g10/g10.c:194
msgid "export keys"
msgstr "exporta as chaves"
-#: g10/g10.c:190
+#: g10/g10.c:195
msgid "export keys to a key server"
-msgstr ""
+msgstr "exporta chaves para um servidor"
-#: g10/g10.c:191
+#: g10/g10.c:196
msgid "import keys from a key server"
-msgstr ""
+msgstr "importa chaves de um servidor"
-#: g10/g10.c:194
+#: g10/g10.c:199
msgid "import/merge keys"
msgstr "importa/funde as chaves"
-#: g10/g10.c:196
+#: g10/g10.c:201
msgid "list only the sequence of packets"
msgstr "lista apenas as seqЭЙncias de pacotes"
-#: g10/g10.c:198
+# ownertrust ???
+#: g10/g10.c:203
msgid "export the ownertrust values"
msgstr "exporta os valores de confianГa"
-#: g10/g10.c:200
+#: g10/g10.c:205
msgid "import ownertrust values"
msgstr "importa os valores de confianГa"
-#: g10/g10.c:202
+#: g10/g10.c:207
msgid "|[NAMES]|update the trust database"
-msgstr "|[NOMES]|atualiza o banco de dados de confianГa"
+msgstr "|[NOMES]|atualiza o banco de dados de confiabilidade"
-#: g10/g10.c:204
+#: g10/g10.c:209
msgid "|[NAMES]|check the trust database"
-msgstr "|[NOMES]|confere o banco de dados de confianГa"
+msgstr "|[NOMES]|confere o banco de dados de confiabilidade"
-#: g10/g10.c:205
+#: g10/g10.c:210
msgid "fix a corrupted trust database"
-msgstr "conserta um banco de dados de confianГa danificado"
+msgstr ""
+"conserta um banco de dados de confiabilidade\n"
+"danificado"
-#: g10/g10.c:206
+#: g10/g10.c:211
msgid "De-Armor a file or stdin"
-msgstr "Retira a armadura de um arquivo ou \"stdin\""
+msgstr "Retira a armadura de um arquivo ou de \"stdin\""
-#: g10/g10.c:207
+#: g10/g10.c:212
msgid "En-Armor a file or stdin"
msgstr "Cria armadura para um arquivo ou \"stdin\""
-#: g10/g10.c:208
+#: g10/g10.c:213
msgid "|algo [files]|print message digests"
msgstr "|algo [arquivos]|imprime \"digests\" de mensagens"
-#: g10/g10.c:209
+#: g10/g10.c:214
msgid "print all message digests"
msgstr "imprime todos os \"digests\" de mensagens"
-#: g10/g10.c:215
+#: g10/g10.c:220
msgid ""
"@\n"
"Options:\n"
@@ -467,159 +430,168 @@ msgstr ""
"OpГУes:\n"
" "
-#: g10/g10.c:217
+#: g10/g10.c:222
msgid "create ascii armored output"
-msgstr "cria uma saМda ascii com armadura"
+msgstr "cria uma saМda com armadura ascii"
-#: g10/g10.c:218
-#, fuzzy
+#: g10/g10.c:223
msgid "|NAME|encrypt for NAME"
-msgstr "|NOME| estabelece mapa de caracteres do terminal para NOME"
+msgstr "|NOME|criptografa para NOME"
-#: g10/g10.c:222
+#: g10/g10.c:227
msgid "use this user-id to sign or decrypt"
-msgstr "usa este identificador de usuАrio para assinar ou decodificar"
+msgstr ""
+"usa este identificador de usuАrio para assinar\n"
+"ou descriptografar"
-#: g10/g10.c:223
+#: g10/g10.c:228
msgid "|N|set compress level N (0 disables)"
msgstr "|N|estabelece nМvel de compressЦo N (0 desabilita)"
-#: g10/g10.c:225
+#: g10/g10.c:230
msgid "use canonical text mode"
msgstr "usa modo de texto canТnico"
-#: g10/g10.c:226
+#: g10/g10.c:231
msgid "use as output file"
msgstr "usa como arquivo de saМda"
-#: g10/g10.c:227
+#: g10/g10.c:232
msgid "verbose"
-msgstr "prolixo"
+msgstr "detalhado"
-#: g10/g10.c:228
+#: g10/g10.c:233
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
-#: g10/g10.c:229
+#: g10/g10.c:234
+msgid "don't use the terminal at all"
+msgstr ""
+
+#: g10/g10.c:235
msgid "force v3 signatures"
msgstr "forГa assinaturas v3"
-#: g10/g10.c:230
-#, fuzzy
+#: g10/g10.c:236
msgid "always use a MDC for encryption"
-msgstr "usa este identificador de usuАrio para codificar"
+msgstr "sempre usar um MDC para criptografar"
-#: g10/g10.c:231
+#: g10/g10.c:237
msgid "do not make any changes"
-msgstr ""
+msgstr "nЦo fazer alteraГУes"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:233
+#: g10/g10.c:239
msgid "batch mode: never ask"
-msgstr "processo de lote: nunca perguntar"
+msgstr "modo nЦo-interativo: nunca perguntar"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "assume yes on most questions"
msgstr "assumir sim para a maioria das perguntas"
-#: g10/g10.c:235
+#: g10/g10.c:241
msgid "assume no on most questions"
msgstr "assumir nЦo para a maioria das perguntas"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "add this keyring to the list of keyrings"
-msgstr "adiciona este anel de chaves Ю lista de anИis de chaves"
+msgstr "adiciona este chaveiro Ю lista de chaveiros"
-#: g10/g10.c:237
+#: g10/g10.c:243
msgid "add this secret keyring to the list"
-msgstr "adiciona este anel de chaves secreto Ю lista"
+msgstr "adiciona este chaveiro secreto Ю lista"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usa NOME como chave secreta padrЦo"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "|HOST|use this keyserver to lookup keys"
-msgstr ""
+msgstr "|ENDEREгO|usa este servidor para buscar chaves"
-#: g10/g10.c:240
-#, fuzzy
+#: g10/g10.c:246
msgid "|NAME|set terminal charset to NAME"
-msgstr "|NOME| estabelece mapa de caracteres do terminal para NOME"
+msgstr "|NOME|define mapa de caracteres do terminal como NOME"
-#: g10/g10.c:241
+#: g10/g10.c:247
msgid "read options from file"
msgstr "lЙ opГУes do arquivo"
-#: g10/g10.c:243
+#: g10/g10.c:249
msgid "set debugging flags"
-msgstr "estabelece parБmetros de depuraГЦo"
+msgstr "define parБmetros de depuraГЦo"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "enable full debugging"
msgstr "habilita depuraГЦo completa"
-#: g10/g10.c:245
+#: g10/g10.c:251
msgid "|FD|write status info to this FD"
-msgstr "|DA|escreve informaГУes de status para este DA"
+msgstr ""
+"|DA|escreve informaГУes de status para o descritor\n"
+"de arquivo DA"
-#: g10/g10.c:246
+#: g10/g10.c:252
msgid "do not write comment packets"
msgstr "nЦo escreve pacotes de comentАrio"
-#: g10/g10.c:247
+#: g10/g10.c:253
msgid "(default is 1)"
msgstr "(o padrЦo И 1)"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid "(default is 3)"
msgstr "(o padrЦo И 3)"
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "|FILE|load extension module FILE"
msgstr "|ARQUIVO|carrega mСdulo de extensЦo ARQUIVO"
-#: g10/g10.c:251
+#: g10/g10.c:257
msgid "emulate the mode described in RFC1991"
msgstr "emula o modo descrito no RFC1991"
-#: g10/g10.c:252
+#: g10/g10.c:258
+msgid "set all packet, cipher and digest options to OpenPGP behavior"
+msgstr ""
+
+#: g10/g10.c:259
msgid "|N|use passphrase mode N"
msgstr "|N|usa frase secreta modo N"
-#: g10/g10.c:254
+#: g10/g10.c:261
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr ""
"|NOME|usa algoritmo de \"digest\" de mensagens NOME para\n"
"frases secretas"
-#: g10/g10.c:256
+#: g10/g10.c:263
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr ""
"|NOME|usa algoritmo de criptografia NOME para\n"
"frases secretas"
-#: g10/g10.c:257
+#: g10/g10.c:264
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usa algoritmo de criptografia NOME"
-#: g10/g10.c:258
+#: g10/g10.c:265
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usa algoritmo de \"digest\" de mensagens NOME"
-#: g10/g10.c:259
+#: g10/g10.c:266
msgid "|N|use compress algorithm N"
msgstr "|N|usa algoritmo de compressЦo N"
-#: g10/g10.c:260
+#: g10/g10.c:267
msgid "throw keyid field of encrypted packets"
-msgstr "elimina o campo keyid dos pacotes codificados"
+msgstr "elimina o campo keyid dos pacotes criptografados"
-#: g10/g10.c:261
+#: g10/g10.c:268
msgid "|NAME=VALUE|use this notation data"
msgstr ""
-#: g10/g10.c:263
+#: g10/g10.c:270
msgid ""
"@\n"
"Examples:\n"
@@ -633,31 +605,32 @@ msgstr ""
"@\n"
"Exemplos:\n"
"\n"
-" -se -r Bob [arquivo] assina e codifica para usuАrio Bob\n"
+" -se -r Bob [arquivo] assina e criptografa para usuАrio Bob\n"
" --clearsign [arquivo] cria uma assinatura em texto puro\n"
" --detach-sign [arquivo] cria uma assinatura separada\n"
" --list-keys [nomes] mostra chaves\n"
" --fingerprint [nomes] mostra impressУes digitais\n"
-#: g10/g10.c:337
+#: g10/g10.c:347
msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
-#: g10/g10.c:341
+#: g10/g10.c:351
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opГУes] [arquivos] (-h para ajuda)"
-#: g10/g10.c:344
+# em cima, "check" estА como "conferir"
+#: g10/g10.c:354
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
"default operation depends on the input data\n"
msgstr ""
"Sintaxe: gpg [opГУes] [arquivos]\n"
-"assina, verifica, codifica ou decodifica\n"
+"assina, verifica, criptografa ou descriptografa\n"
"a operaГЦo padrЦo depende dos dados de entrada\n"
-#: g10/g10.c:349
+#: g10/g10.c:359
msgid ""
"\n"
"Supported algorithms:\n"
@@ -665,169 +638,170 @@ msgstr ""
"\n"
"Algoritmos suportados:\n"
-#: g10/g10.c:423
+#: g10/g10.c:433
msgid "usage: gpg [options] "
msgstr "uso: gpg [opГУes] "
-#: g10/g10.c:463
+#: g10/g10.c:473
msgid "conflicting commands\n"
msgstr "comandos conflitantes\n"
-#: g10/g10.c:595
+#: g10/g10.c:605
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: arquivo de opГУes padrЦo `%s' inexistente\n"
-#: g10/g10.c:599
+#: g10/g10.c:609
#, c-format
msgid "option file `%s': %s\n"
msgstr "arquivo de opГУes `%s': %s\n"
-#: g10/g10.c:606
+#: g10/g10.c:616
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo opГУes de `%s'\n"
-#: g10/g10.c:755
+#: g10/g10.c:782
#, c-format
msgid "%s is not a valid character set\n"
-msgstr "%s nЦo И um mapa de caracteres vАlido\n"
+msgstr "%s nЦo И um conjunto de caracteres vАlido\n"
-#: g10/g10.c:799 g10/g10.c:811
+#: g10/g10.c:827 g10/g10.c:839
msgid "selected cipher algorithm is invalid\n"
-msgstr "algoritmo de criptografia selecionado nЦo И vАlido\n"
+msgstr "o algoritmo de criptografia selecionado nЦo И vАlido\n"
-#: g10/g10.c:805 g10/g10.c:817
+#: g10/g10.c:833 g10/g10.c:845
msgid "selected digest algorithm is invalid\n"
-msgstr "algoritmo de \"digest\" selecionado nЦo И vАlido\n"
+msgstr "o algoritmo de \"digest\" selecionado nЦo И vАlido\n"
-#: g10/g10.c:821
+#: g10/g10.c:849
msgid "the given policy URL is invalid\n"
msgstr ""
-#: g10/g10.c:824
+#: g10/g10.c:852
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
-msgstr "algoritmo de compressЦo deve estar na faixa %d..%d\n"
+msgstr "o algoritmo de compressЦo deve estar na faixa %d..%d\n"
-#: g10/g10.c:826
+#: g10/g10.c:854
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
-#: g10/g10.c:828
+#: g10/g10.c:856
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
-#: g10/g10.c:830
+#: g10/g10.c:858
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth deve estar na faixa 1 a 255\n"
-#: g10/g10.c:833
+#: g10/g10.c:861
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: o modo S2K simples (0) nЦo И recomendАvel\n"
-#: g10/g10.c:837
+#: g10/g10.c:865
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K invАlido: deve ser 0, 1 ou 3\n"
-#: g10/g10.c:914
+#: g10/g10.c:942
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
-msgstr "falha ao inicializar o banco de dados de confianГa: %s\n"
+msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
-#: g10/g10.c:920
+#: g10/g10.c:948
msgid "--store [filename]"
msgstr "--store [nome_do_arquivo]"
-#: g10/g10.c:927
+#: g10/g10.c:955
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_arquivo]"
-#: g10/g10.c:935
+#: g10/g10.c:963
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_arquivo]"
-#: g10/g10.c:948
+#: g10/g10.c:976
msgid "--sign [filename]"
msgstr "--sign [nome_do_arquivo]"
-#: g10/g10.c:961
+#: g10/g10.c:989
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_arquivo]"
-#: g10/g10.c:975
+#: g10/g10.c:1003
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_arquivo]"
-#: g10/g10.c:987
+#: g10/g10.c:1015
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_arquivo]"
-#: g10/g10.c:996
+#: g10/g10.c:1024
msgid "--edit-key username [commands]"
msgstr "--edit-key nome_do_usuАrio [comandos]"
-#: g10/g10.c:1010
+#: g10/g10.c:1038
msgid "--delete-secret-key username"
msgstr "--delete-secret-key nome_do_usuАrio"
-#: g10/g10.c:1013
+#: g10/g10.c:1041
msgid "--delete-key username"
msgstr "--delete-key nome_do_usuАrio"
-#: g10/encode.c:231 g10/g10.c:1036 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1064 g10/sign.c:366
#, c-format
msgid "can't open %s: %s\n"
msgstr "impossМvel abrir %s: %s\n"
-#: g10/g10.c:1047
+#: g10/g10.c:1075
msgid "-k[v][v][v][c] [userid] [keyring]"
-msgstr "-k[v][v][v][c] [id_do_usuАrio] [anel_de_chaves]"
+msgstr "-k[v][v][v][c] [id_do_usuАrio] [chaveiro]"
-#: g10/g10.c:1106
+#: g10/g10.c:1134
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
-#: g10/g10.c:1114
+#: g10/g10.c:1142
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "criaГЦo de armadura falhou: %s\n"
-#: g10/g10.c:1180
+# "hash" poderia ser "espalhamento", mas nЦo fica claro
+#: g10/g10.c:1208
#, c-format
msgid "invalid hash algorithm `%s'\n"
-msgstr "algoritmo de distribuiГЦo invАlido `%s'\n"
+msgstr "algoritmo de hash invАlido `%s'\n"
-#: g10/g10.c:1255
+#: g10/g10.c:1283
msgid "[filename]"
msgstr "[nome_do_arquivo]"
-#: g10/g10.c:1259
+#: g10/g10.c:1287
msgid "Go ahead and type your message ...\n"
msgstr "VА em frente e digite sua mensagem ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1262 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1290 g10/verify.c:66
#, c-format
msgid "can't open `%s'\n"
msgstr "impossМvel abrir `%s'\n"
-#: g10/g10.c:1429
+#: g10/g10.c:1457
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
-#: g10/g10.c:1435
+#: g10/g10.c:1463
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
msgstr ""
-#: g10/g10.c:1441
+#: g10/g10.c:1469
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
-#: g10/g10.c:1449
+#: g10/g10.c:1477
msgid "a notation value must not use any control characters\n"
msgstr ""
@@ -849,18 +823,16 @@ msgid "invalid clearsig header\n"
msgstr "cabeГalho de assinatura em texto puro invАlido\n"
#: g10/armor.c:389
-#, fuzzy
msgid "nested clear text signatures\n"
-msgstr "|[arquivo]|faz uma assinatura em texto puro"
+msgstr "assinaturas em texto puro aninhadas\n"
#: g10/armor.c:500
msgid "invalid dash escaped line: "
msgstr "linha com hМfen invАlida: "
#: g10/armor.c:512
-#, fuzzy
msgid "unexpected armor:"
-msgstr "Dados inesperados"
+msgstr "armadura inesperada:"
#: g10/armor.c:629
#, c-format
@@ -893,19 +865,20 @@ msgid "error in trailer line\n"
msgstr "erro na linha \"trailer\"\n"
#: g10/armor.c:1001
-#, fuzzy
msgid "no valid OpenPGP data found.\n"
-msgstr "nenum dado RFC1991 ou OpenPGP vАlido encontrado.\n"
+msgstr "nenhum dado OpenPGP vАlido encontrado.\n"
#: g10/armor.c:1005
#, c-format
msgid "invalid armor: line longer than %d characters\n"
-msgstr ""
+msgstr "armadura invАlida: linha maior que %d caracteres\n"
#: g10/armor.c:1009
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
+"caracter \"quoted printable\" na armadura - provavelmente um MTA com bugs "
+"foi usado\n"
#: g10/pkclist.c:137
#, c-format
@@ -945,13 +918,14 @@ msgstr " m = volta ao menu principal\n"
#: g10/pkclist.c:158
msgid " q = quit\n"
-msgstr ""
+msgstr " q = sai\n"
+# ???
#. a string with valid answers
#: g10/pkclist.c:163
#, fuzzy
msgid "sSmMqQ"
-msgstr "iImMqQ"
+msgstr "sSmMqQ"
#: g10/pkclist.c:167
msgid "Your decision? "
@@ -968,14 +942,14 @@ msgid ""
"\n"
msgstr ""
"NЦo foi possМvel encontrar uma rota de confianГa vАlida para a chave.\n"
-"Vamos ver se И possМvel designar alguns valores de confianГa perdidos.\n"
+"Vamos ver se И possМvel designar alguns valores de confianГa ausentes.\n"
"\n"
#: g10/pkclist.c:260
msgid ""
"No path leading to one of our keys found.\n"
"\n"
-msgstr "Nenhuma rota que leva a uma de nossas chaves encontrada.\n"
+msgstr "Nenhuma rota encontrada que leve a uma de nossas chaves.\n"
#: g10/pkclist.c:262
msgid ""
@@ -1000,12 +974,12 @@ msgstr "chave %08lX: a chave foi revogada!\n"
#: g10/pkclist.c:287 g10/pkclist.c:297 g10/pkclist.c:403
msgid "Use this key anyway? "
-msgstr "Usa esta chave de qualquer modo?"
+msgstr "Usa esta chave de qualquer modo? "
#: g10/pkclist.c:291
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: subkey has been revoked!\n"
-msgstr "chave %08lX: a chave foi revogada!\n"
+msgstr "chave %08lX: a subchave foi revogada!\n"
#: g10/pkclist.c:321
#, c-format
@@ -1023,13 +997,13 @@ msgid "%08lX: We do NOT trust this key\n"
msgstr "%08lX: NСs NцO confiamos nesta chave\n"
#: g10/pkclist.c:347
-#, fuzzy, c-format
+#, c-format
msgid ""
"%08lX: It is not sure that this key really belongs to the owner\n"
"but it is accepted anyway\n"
msgstr ""
-"%08lX: NЦo se tem certeza de que esta chave realmente pertence ao dono\n"
-"mas И aceitada de qualquer modo\n"
+"%08lX: NЦo se tem certeza de que esta chave realmente pertence ao dono,\n"
+"mas И aceita de qualquer modo\n"
#: g10/pkclist.c:353
msgid "This key probably belongs to the owner\n"
@@ -1037,7 +1011,7 @@ msgstr "Esta chave provavelmente pertence ao dono\n"
#: g10/pkclist.c:358
msgid "This key belongs to us\n"
-msgstr "Esta chave pertence a nСs (nСs temos a chave secreta)\n"
+msgstr "Esta chave pertence a nСs\n"
#: g10/pkclist.c:398
msgid ""
@@ -1064,9 +1038,8 @@ msgid " This could mean that the signature is forgery.\n"
msgstr " Isto pode significar que a assinatura И falsificada.\n"
#: g10/pkclist.c:459
-#, fuzzy
msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
+msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
#: g10/pkclist.c:480
msgid "Note: This key has expired!\n"
@@ -1092,7 +1065,9 @@ msgstr " A assinatura И provavelmente uma FALSIFICAгцO.\n"
#: g10/pkclist.c:513
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "AVISO: Esta chave nЦo estА certificada com assinaturas confiАveis!\n"
+msgstr ""
+"AVISO: Esta chave nЦo estА certificada com assinaturas suficientemente\n"
+" confiАveis!\n"
#: g10/pkclist.c:516
msgid " It is not certain that the signature belongs to the owner.\n"
@@ -1118,7 +1093,7 @@ msgstr ""
#: g10/pkclist.c:616
msgid "Enter the user ID: "
-msgstr "Digite o identificador de usuАrio:"
+msgstr "Digite o identificador de usuАrio: "
#: g10/pkclist.c:627
msgid "No such user ID.\n"
@@ -1127,7 +1102,7 @@ msgstr "Identificador de usuАrio inexistente.\n"
#: g10/pkclist.c:673
#, c-format
msgid "%s: error checking key: %s\n"
-msgstr "%s: erro verificando chave: %s\n"
+msgstr "%s: erro na verificaГЦo da chave: %s\n"
#: g10/pkclist.c:711
msgid "no valid addressees\n"
@@ -1137,6 +1112,7 @@ msgstr "nenhum endereГo vАlido\n"
msgid "writing self signature\n"
msgstr "escrevendo auto-assinatura\n"
+# key binding ???
#: g10/keygen.c:160
msgid "writing key binding signature\n"
msgstr "escrevendo assinatura ligada a uma chave\n"
@@ -1175,9 +1151,8 @@ msgid "Your selection? "
msgstr "Sua opГЦo? "
#: g10/keygen.c:409
-#, fuzzy
msgid "Do you really want to create a sign and encrypt key? "
-msgstr "VocЙ realmente quer deletar as chaves selecionadas? "
+msgstr "VocЙ realmente quer criar uma chave para assinatura e criptografia? "
#: g10/keygen.c:430
msgid "Invalid selection.\n"
@@ -1217,9 +1192,9 @@ msgstr "tamanho muito pequeno; 768 И o valor mМnimo permitido.\n"
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
#: g10/keygen.c:466
-#, fuzzy, c-format
+#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "tamanho muito pequeno; 768 И o valor mМnimo permitido.\n"
+msgstr "tamanho muito grande; %d И o valor mАximo permitido.\n"
#: g10/keygen.c:471
msgid ""
@@ -1239,7 +1214,7 @@ msgid ""
"vulnerable to attacks!\n"
msgstr ""
"Tudo bem, mas tenha em mente que a radiaГЦo de seu monitor e teclado tambИm "
-"И vulnerАvel a ataques!\n"
+"sЦo vulnerАveis a ataques!\n"
#: g10/keygen.c:483
msgid "Do you really need such a large keysize? "
@@ -1303,8 +1278,8 @@ msgid ""
"\n"
msgstr ""
"\n"
-"VocЙ precisa de um identificador de usuАrio para identificar sua chave; o\n"
-"programa constrСi o identificador a partir do Nome Completo, ComentАrio e\n"
+"VocЙ precisa de uma identificaГЦo de usuАrio para identificar sua chave; o\n"
+"programa constrСi a identificaГЦo a partir do Nome Completo, ComentАrio e\n"
"EndereГo EletrТnico desta forma:\n"
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
"\n"
@@ -1319,7 +1294,7 @@ msgstr "Caractere invАlido no nome\n"
#: g10/keygen.c:612
msgid "Name may not start with a digit\n"
-msgstr "O nome nЦo deve comeГar com um dМgito\n"
+msgstr "O nome nЦo pode comeГar com um dМgito\n"
#: g10/keygen.c:614
msgid "Name must be at least 5 characters long\n"
@@ -1344,7 +1319,7 @@ msgstr "Caractere invАlido no comentАrio\n"
#: g10/keygen.c:669
#, c-format
msgid "You are using the `%s' character set.\n"
-msgstr ""
+msgstr "VocЙ estА usando o conjunto de caracteres `%s'.\n"
#: g10/keygen.c:675
#, c-format
@@ -1353,7 +1328,7 @@ msgid ""
" \"%s\"\n"
"\n"
msgstr ""
-"VocЙ selecionou este identificador de usuАrio:\n"
+"VocЙ selecionou esta identificaГЦo de usuАrio:\n"
" \"%s\"\n"
"\n"
@@ -1390,7 +1365,6 @@ msgstr ""
"\n"
#: g10/keygen.c:775
-#, fuzzy
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"
@@ -1398,10 +1372,8 @@ msgid ""
"generator a better chance to gain enough entropy.\n"
msgstr ""
"Precisamos gerar muitos bytes aleatСrios. и uma boa idИia realizar outra\n"
-"atividade (trabalhar em outra janela, mover o mouse, usar a rede e os "
-"disco)\n"
-"durante a geraГЦo dos nЗmeros primos; isso dА ao gerador de nЗmeros "
-"aleatСrios\n"
+"atividade (digitar no teclado, mover o mouse, usar os discos) durante a\n"
+"geraГЦo dos nЗmeros primos; isso dА ao gerador de nЗmeros aleatСrios\n"
"uma chance melhor de conseguir entropia suficiente.\n"
#: g10/keygen.c:845
@@ -1413,7 +1385,8 @@ msgid "DSA keypair will have 1024 bits.\n"
msgstr "O par de chaves DSA terА 1024 bits.\n"
#: g10/keygen.c:859
-msgid "Key generation cancelled.\n"
+#, fuzzy
+msgid "Key generation canceled.\n"
msgstr "GeraГЦo de chaves cancelada.\n"
#: g10/keygen.c:869
@@ -1431,14 +1404,12 @@ msgid "public and secret key created and signed.\n"
msgstr "chaves pЗblica e privada criadas e assinadas.\n"
#: g10/keygen.c:949
-#, fuzzy
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"
msgstr ""
"Note que esta chave nЦo pode ser usada para criptografia. VocЙ pode usar\n"
-"o comando \"--add-key\" para gerar uma chave secundАria para esse "
-"propСsito.\n"
+"o comando \"--edit-key\" para gerar uma chave secundАria para esse fim.\n"
#: g10/keygen.c:963 g10/keygen.c:1062
#, c-format
@@ -1446,18 +1417,20 @@ msgid "Key generation failed: %s\n"
msgstr "A geraГЦo de chaves falhou: %s\n"
#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:105
-#, fuzzy, c-format
+#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
-"chave pЗblica criada no futuro (viagem no tempo ou problema no relСgio)\n"
+"a chave foi criada %lu segundos no futuro\n"
+"(viagem no tempo ou problema no relСgio)\n"
#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:107
-#, fuzzy, c-format
+#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
-"chave pЗblica criada no futuro (viagem no tempo ou problema no relСgio)\n"
+"a chave foi criada %lu segundos no futuro\n"
+"(viagem no tempo ou problema no relСgio)\n"
#: g10/keygen.c:1040
msgid "Really create? "
@@ -1472,7 +1445,7 @@ msgstr "%s: impossМvel abrir: %s\n"
#: g10/encode.c:113
#, c-format
msgid "error creating passphrase: %s\n"
-msgstr "erro criando frase secreta: %s\n"
+msgstr "erro na criaГЦo da frase secreta: %s\n"
#: g10/encode.c:167 g10/encode.c:287
#, c-format
@@ -1484,25 +1457,25 @@ msgstr "%s: AVISO: arquivo vazio\n"
msgid "reading from `%s'\n"
msgstr "lendo de `%s'\n"
-#: g10/encode.c:417
-#, fuzzy, c-format
+#: g10/encode.c:431
+#, c-format
msgid "%s/%s encrypted for: %s\n"
-msgstr "%s codificado para: %s\n"
+msgstr "%s/%s criptografado para: %s\n"
#: g10/export.c:147
-#, fuzzy, c-format
+#, c-format
msgid "%s: user not found: %s\n"
-msgstr "%s: usuАrio nЦo encontrado\n"
+msgstr "%s: usuАrio nЦo encontrado: %s\n"
#: g10/export.c:156
-#, fuzzy, c-format
+#, c-format
msgid "certificate read problem: %s\n"
-msgstr "erro de leitura do usuАrio `%s': %s\n"
+msgstr "erro de leitura do certificado: %s\n"
#: g10/export.c:165
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "chave %08lX: chave secreta sem chave pЗblica - ignorada\n"
+msgstr "chave %08lX: nЦo И uma chave rfc2440 - ignorada\n"
#: g10/export.c:203
msgid "WARNING: nothing exported\n"
@@ -1522,9 +1495,9 @@ 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/import.c:116
-#, fuzzy, c-format
+#, c-format
msgid "can't open `%s': %s\n"
-msgstr "impossМvel abrir %s: %s\n"
+msgstr "impossМvel abrir `%s': %s\n"
#: g10/import.c:160
#, c-format
@@ -1537,9 +1510,9 @@ msgid "%lu keys so far processed\n"
msgstr "%lu chaves processadas atИ agora\n"
#: g10/import.c:172
-#, fuzzy, c-format
+#, c-format
msgid "error reading `%s': %s\n"
-msgstr "erro lendo registro de chave: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
#: g10/import.c:175
#, c-format
@@ -1617,7 +1590,7 @@ msgstr "chave %08lX: chave pЗblica nЦo encontrada: %s\n"
#: g10/import.c:372
msgid "no default public keyring\n"
-msgstr "sem anel de chaves pЗblico padrЦo\n"
+msgstr "sem chaveiro pЗblico padrЦo\n"
#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559
#, c-format
@@ -1627,12 +1600,12 @@ msgstr "escrevendo para `%s'\n"
#: g10/import.c:379 g10/import.c:435 g10/import.c:544 g10/import.c:645
#, fuzzy, c-format
msgid "can't lock keyring `%s': %s\n"
-msgstr "impossМvel bloquear anel de chaves pЗblico: %s\n"
+msgstr "impossМvel bloquear chaveiro `%s': %s\n"
#: g10/import.c:382 g10/import.c:438 g10/import.c:547 g10/import.c:648
-#, fuzzy, c-format
+#, c-format
msgid "error writing keyring `%s': %s\n"
-msgstr "%s: erro escrevendo registro de versЦo: %s\n"
+msgstr "%s: erro na escrita do chaveiro `%s': %s\n"
#: g10/import.c:387
#, c-format
@@ -1698,7 +1671,7 @@ msgstr "chave %08lX: chave secreta importada\n"
#: g10/import.c:556
#, c-format
msgid "key %08lX: already in secret keyring\n"
-msgstr "chave %08lX: jА no anel de chaves secreto\n"
+msgstr "chave %08lX: jА existe no chaveiro secreto\n"
#: g10/import.c:561
#, c-format
@@ -1738,14 +1711,14 @@ msgid "key %08lX: invalid self-signature\n"
msgstr "chave %08lX: auto-assinatura invАlida\n"
#: g10/import.c:709
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: no subkey for key binding\n"
-msgstr "chave %08lX.%lu: LigaГЦo de subchave vАlida\n"
+msgstr "chave %08lX: sem subchave para ligaГЦo de chaves\n"
#: g10/import.c:718
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: invalid subkey binding\n"
-msgstr "chave %08lX.%lu: LigaГЦo de subchave invАlida: %s\n"
+msgstr "chave %08lX: ligaГЦo de subchave invАlida\n"
#: g10/import.c:750
#, c-format
@@ -1753,33 +1726,33 @@ msgid "key %08lX: skipped userid '"
msgstr "chave %08lX: id de usuАrio ignorado '"
#: g10/import.c:773
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: skipped subkey\n"
-msgstr "chave %08lX: 1 nova subchave\n"
+msgstr "chave %08lX: subchave ignorada\n"
#. here we violate the rfc a bit by still allowing
#. * 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:798
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
-msgstr "chave %08lX: certificado de revogaГЦo no local errado - ignorado\n"
+msgstr "chave %08lX: assinatura nЦo exportАvel (classe %02x) - ignorada\n"
#: g10/import.c:807
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
-msgstr "chave %08lX: certificado de revogaГЦo no local errado - ignorado\n"
+msgstr "chave %08lX: certificado de revogaГЦo no local errado - ignorada\n"
#: g10/import.c:815
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
-msgstr "chave %08lX: certificado de revogaГЦo invАlido: %s - ignorado\n"
+msgstr "chave %08lX: certificado de revogaГЦo invАlido: %s - ignorada\n"
#: g10/import.c:915
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
-msgstr ""
+msgstr "chave %08lX: detectado ID de usuАrio duplicado - unido\n"
#: g10/import.c:966
#, c-format
@@ -1798,7 +1771,7 @@ msgstr "%s: usuАrio nЦo encontrado\n"
#: g10/keyedit.c:153
msgid "[revocation]"
-msgstr ""
+msgstr "[revogaГЦo]"
#: g10/keyedit.c:154
msgid "[self-signature]"
@@ -1824,12 +1797,12 @@ msgstr "%d assinaturas nЦo verificadas por falta de chaves\n"
#: g10/keyedit.c:226
msgid "1 signature not checked due to an error\n"
-msgstr "1 assinatura nЦo checada por causa de um erro\n"
+msgstr "1 assinatura nЦo checada devido a um erro\n"
#: g10/keyedit.c:228
#, c-format
msgid "%d signatures not checked due to errors\n"
-msgstr "%d assinaturas nЦo verificadas por causa de erros\n"
+msgstr "%d assinaturas nЦo verificadas devido a erros\n"
#: g10/keyedit.c:230
msgid "1 user id without valid self-signature detected\n"
@@ -1865,12 +1838,14 @@ msgid ""
"The signature will be marked as non-exportable.\n"
"\n"
msgstr ""
+"A assinatura serА marcada como nЦo-exportАvel.\n"
+"\n"
#: g10/keyedit.c:343
msgid "Really sign? "
msgstr "Realmente assinar? "
-#: g10/keyedit.c:369 g10/keyedit.c:1779 g10/keyedit.c:1828 g10/sign.c:128
+#: g10/keyedit.c:369 g10/keyedit.c:1790 g10/keyedit.c:1839 g10/sign.c:128
#, c-format
msgid "signing failed: %s\n"
msgstr "assinatura falhou: %s\n"
@@ -1938,7 +1913,7 @@ msgstr "mostra esta ajuda"
#: g10/keyedit.c:564
msgid "fpr"
-msgstr ""
+msgstr "imp"
#: g10/keyedit.c:564
msgid "show fingerprint"
@@ -1950,15 +1925,16 @@ msgstr "lista"
#: g10/keyedit.c:565
msgid "list key and user ids"
-msgstr "lista chave e identificadores de usuАrios"
+msgstr "lista chave e identificaГУes de usuАrios"
+# ???
#: g10/keyedit.c:566
msgid "l"
-msgstr ""
+msgstr "l"
#: g10/keyedit.c:567
msgid "uid"
-msgstr ""
+msgstr "uid"
#: g10/keyedit.c:567
msgid "select user id N"
@@ -1980,9 +1956,10 @@ msgstr "verifica"
msgid "list signatures"
msgstr "lista assinaturas"
+# ???
#: g10/keyedit.c:570
msgid "c"
-msgstr "v"
+msgstr "c"
#: g10/keyedit.c:571
msgid "sign"
@@ -1992,19 +1969,19 @@ msgstr "assina"
msgid "sign the key"
msgstr "assina a chave"
+# ???
#: g10/keyedit.c:572
msgid "s"
-msgstr "a"
+msgstr "s"
#: g10/keyedit.c:573
#, fuzzy
msgid "lsign"
-msgstr "assina"
+msgstr "lassina"
#: g10/keyedit.c:573
-#, fuzzy
msgid "sign the key locally"
-msgstr "assina a chave"
+msgstr "assina a chave localmente"
#: g10/keyedit.c:574
msgid "debug"
@@ -2024,7 +2001,7 @@ msgstr ""
#: g10/keyedit.c:576
msgid "delete user id"
-msgstr "deleta id de usuАrio"
+msgstr "remove id de usuАrio"
#: g10/keyedit.c:577
msgid "addkey"
@@ -2040,12 +2017,12 @@ msgstr ""
#: g10/keyedit.c:578
msgid "delete a secondary key"
-msgstr "deleta uma chave secundАria"
+msgstr "remove uma chave secundАria"
#: g10/keyedit.c:579
#, fuzzy
msgid "delsig"
-msgstr "assina"
+msgstr "lassina"
#: g10/keyedit.c:579
#, fuzzy
@@ -2058,15 +2035,15 @@ msgstr "expira"
#: g10/keyedit.c:580
msgid "change the expire date"
-msgstr "muda a data em que a chave expira"
+msgstr "muda a data de expiraГЦo"
#: g10/keyedit.c:581
msgid "toggle"
-msgstr "comuta"
+msgstr "alterna"
#: g10/keyedit.c:581
msgid "toggle between secret and public key listing"
-msgstr "comuta entre listagem de chave secreta e pЗblica"
+msgstr "alterna entre listagem de chave secreta e pЗblica"
#: g10/keyedit.c:583
msgid "t"
@@ -2099,39 +2076,36 @@ msgstr "muda os valores de confianГa"
#: g10/keyedit.c:587
#, fuzzy
msgid "revsig"
-msgstr "assina"
+msgstr "revsig"
#: g10/keyedit.c:587
-#, fuzzy
msgid "revoke signatures"
-msgstr "forГa assinaturas v3"
+msgstr "revoga assinaturas"
#: g10/keyedit.c:588
#, fuzzy
msgid "revkey"
-msgstr "chave"
+msgstr "revkey"
#: g10/keyedit.c:588
-#, fuzzy
msgid "revoke a secondary key"
-msgstr "deleta uma chave secundАria"
+msgstr "revoga uma chave secundАria"
#: g10/keyedit.c:607
msgid "can't do that in batchmode\n"
-msgstr "impossМvel fazer isso em modo de processo por lotes\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:636
msgid "Secret key is available.\n"
-msgstr "Chave secreta disponМvel\n"
+msgstr "Chave secreta disponМvel.\n"
#: g10/keyedit.c:665
msgid "Command> "
msgstr "Comando> "
#: g10/keyedit.c:692
-#, fuzzy
msgid "Need the secret key to do this.\n"
msgstr "A chave secreta И necessАria para fazer isto.\n"
@@ -2155,12 +2129,12 @@ msgstr "atualizaГЦo da chave secreta falhou: %s\n"
#: g10/keyedit.c:741
msgid "Key not changed so no update needed.\n"
-msgstr "Chave sem mudanГas, nenhuma atualizaГЦo И necessАria.\n"
+msgstr "Chave nЦo alterada, nenhuma atualizaГЦo И necessАria.\n"
#: g10/keyedit.c:744 g10/keyedit.c:803
-#, fuzzy, c-format
+#, c-format
msgid "update of trustdb failed: %s\n"
-msgstr "atualizaГЦo da confianГa falhou: %s\n"
+msgstr "atualizaГЦo do banco de dados de confiabilidade falhou: %s\n"
#: g10/keyedit.c:777
msgid "Really sign all user ids? "
@@ -2176,7 +2150,7 @@ msgstr "VocЙ precisa selecionar pelo menos um id de usuАrio.\n"
#: g10/keyedit.c:816
msgid "You can't delete the last user id!\n"
-msgstr "VocЙ nЦo pode deletar o Зltimo id de usuАrio!\n"
+msgstr "VocЙ nЦo pode remover o Зltimo id de usuАrio!\n"
#: g10/keyedit.c:819
msgid "Really remove all selected user ids? "
@@ -2186,130 +2160,132 @@ msgstr "Realmente remover todos os ids de usuАrio selecionados? "
msgid "Really remove this user id? "
msgstr "Realmente remover este id de usuАrio? "
-#: g10/keyedit.c:856 g10/keyedit.c:878
+#: g10/keyedit.c:858 g10/keyedit.c:880
msgid "You must select at least one key.\n"
msgstr "VocЙ deve selecionar pelo menos uma chave.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:862
msgid "Do you really want to delete the selected keys? "
-msgstr "VocЙ realmente quer deletar as chaves selecionadas? "
+msgstr "VocЙ realmente quer remover as chaves selecionadas? "
-#: g10/keyedit.c:861
+#: g10/keyedit.c:863
msgid "Do you really want to delete this key? "
-msgstr "VocЙ realmente quer deletar esta chave? "
+msgstr "VocЙ realmente quer remover esta chave? "
-#: g10/keyedit.c:882
-#, fuzzy
+#: g10/keyedit.c:884
msgid "Do you really want to revoke the selected keys? "
-msgstr "VocЙ realmente quer deletar as chaves selecionadas? "
+msgstr "VocЙ realmente quer revogar as chaves selecionadas? "
-#: g10/keyedit.c:883
-#, fuzzy
+#: g10/keyedit.c:885
msgid "Do you really want to revoke this key? "
-msgstr "VocЙ realmente quer deletar esta chave? "
+msgstr "VocЙ realmente quer revogar esta chave? "
-#: g10/keyedit.c:937
+# help ou ajuda ???
+#: g10/keyedit.c:939
msgid "Invalid command (try \"help\")\n"
-msgstr "Comando invАlido (tente \"ajuda\")\n"
+msgstr "Comando invАlido (tente \"help\")\n"
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1294
msgid "Delete this good signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1298
msgid "Delete this invalid signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:1297
+#: g10/keyedit.c:1302
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:1308
#, fuzzy
msgid "Really delete this self-signature? (y/N)"
-msgstr "gera um certificado de revogaГЦo"
+msgstr "Realmente gerar os certificados de revogaГЦo? (s/N)"
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1322
#, fuzzy, c-format
msgid "Deleted %d signature.\n"
msgstr "%d assinaturas incorretas\n"
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1323
#, fuzzy, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d assinaturas incorretas\n"
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1326
#, fuzzy
msgid "Nothing deleted.\n"
msgstr "AVISO: nada exportado\n"
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1395
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor remova as seleГУes das chaves secretas.\n"
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1401
msgid "Please select at most one secondary key.\n"
msgstr "Por favor selecione no mАximo uma chave secundАria.\n"
-#: g10/keyedit.c:1394
-msgid "Changing exiration time for a secondary key.\n"
-msgstr "Modificando data de expiraГЦo para a chave secundАria.\n"
+#: g10/keyedit.c:1405
+#, fuzzy
+msgid "Changing expiration time for a secondary key.\n"
+msgstr "Modificando a data de expiraГЦo para a chave secundАria.\n"
-#: g10/keyedit.c:1396
-msgid "Changing exiration time for the primary key.\n"
-msgstr "Modificando data de expiraГЦo para a chave primАria.\n"
+#: g10/keyedit.c:1407
+#, fuzzy
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Modificando a data de expiraГЦo para a chave primАria.\n"
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1448
msgid "You can't change the expiration date of a v3 key\n"
msgstr "VocЙ nЦo pode modificar a data de expiraГЦo de uma chave v3\n"
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1464
msgid "No corresponding signature in secret ring\n"
-msgstr "Nenhuma assinatura correspondente no anel de chaves secreto\n"
+msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1524
#, c-format
msgid "No user id with index %d\n"
msgstr "Nenhum id de usuАrio com Мndice %d\n"
-#: g10/keyedit.c:1559
+#: g10/keyedit.c:1570
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Nenhuma chave secundАria com Мndice %d\n"
-#: g10/keyedit.c:1657
-#, fuzzy
+#: g10/keyedit.c:1668
msgid "user ID: \""
msgstr "Digite o identificador de usuАrio:"
-#: g10/keyedit.c:1660
-#, fuzzy, c-format
+#: g10/keyedit.c:1671
+#, c-format
msgid ""
"\"\n"
"signed with your key %08lX at %s\n"
-msgstr "Nada para assinar com a chave %08lX\n"
+msgstr ""
+"\"\n"
+"assinado com sua chave %08lX em %s\n"
-#: g10/keyedit.c:1664
-#, fuzzy
+#: g10/keyedit.c:1675
msgid "Create a revocation certificate for this signature? (y/N)"
-msgstr "gera um certificado de revogaГЦo"
+msgstr "Gerar um certificado de revogaГЦo para esta assinatura? (s/N)"
-#: g10/keyedit.c:1744
-#, fuzzy
+#: g10/keyedit.c:1755
msgid "Really create the revocation certificates? (y/N)"
-msgstr "gera um certificado de revogaГЦo"
+msgstr "Realmente gerar os certificados de revogaГЦo? (s/N)"
-#: g10/keyedit.c:1767
-#, fuzzy
+#: g10/keyedit.c:1778
msgid "no secret key\n"
-msgstr "Chave secreta incorreta"
+msgstr "nenhuma chave secreta\n"
#: g10/mainproc.c:184
-#, fuzzy, c-format
+#, c-format
msgid "public key is %08lX\n"
-msgstr "Chave pЗblica nЦo encontrada"
+msgstr "a chave pЗblica И %08lX\n"
#: g10/mainproc.c:212
-#, fuzzy
msgid "public key encrypted data: good DEK\n"
-msgstr "dados codificados com chave pЗblica: DEK bom\n"
+msgstr "dados criptografados com chave pЗblica: DEK vАlido\n"
#. fixme: defer this message until we have parsed all packets of
#. * this type - do this by building a list of keys with their stati
@@ -2318,20 +2294,20 @@ msgstr "dados codificados com chave pЗblica: DEK bom\n"
#: g10/mainproc.c:219
#, c-format
msgid "public key decryption failed: %s\n"
-msgstr "decodificaГЦo de chave pЗblica falhou: %s\n"
+msgstr "descriptografia de chave pЗblica falhou: %s\n"
#: g10/mainproc.c:247
msgid "decryption okay\n"
-msgstr "decodificaГЦo correta\n"
+msgstr "descriptografia correta\n"
#: g10/mainproc.c:252
msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr ""
+msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
#: g10/mainproc.c:257
#, c-format
msgid "decryption failed: %s\n"
-msgstr "decodifiaГЦo falhou: %s\n"
+msgstr "descriptografia falhou: %s\n"
#: g10/mainproc.c:275
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
@@ -2345,7 +2321,7 @@ msgstr "nome de arquivo original='%.*s'\n"
#: g10/mainproc.c:505 g10/mainproc.c:514
#, fuzzy
msgid "WARNING: invalid notation data found\n"
-msgstr "nenum dado RFC1991 ou OpenPGP vАlido encontrado.\n"
+msgstr "nenhum dado OpenPGP vАlido encontrado.\n"
#: g10/mainproc.c:517
msgid "Notation: "
@@ -2357,12 +2333,13 @@ msgstr ""
#: g10/mainproc.c:929
msgid "signature verification suppressed\n"
-msgstr "verifiaГЦo de assinatura suprimida\n"
+msgstr "verificaГЦo de assinatura suprimida\n"
+# XXX Verificar
#: g10/mainproc.c:935
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
-msgstr "Assinatura feita %.*s usando %s ID da chave %08lX\n"
+msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
#. just in case that we have no userid
#: g10/mainproc.c:961 g10/mainproc.c:972
@@ -2371,12 +2348,11 @@ msgstr "Assinatura INCORRETA de \""
#: g10/mainproc.c:962 g10/mainproc.c:973
msgid "Good signature from \""
-msgstr "Assinatura correta de\""
+msgstr "Assinatura correta de \""
#: g10/mainproc.c:964
-#, fuzzy
msgid " aka \""
-msgstr " importados: %lu"
+msgstr " ou \""
#: g10/mainproc.c:1015
#, c-format
@@ -2397,13 +2373,12 @@ msgid "can't disable core dumps: %s\n"
msgstr "impossМvel desabilitar core dumps: %s\n"
#: g10/misc.c:96
-#, fuzzy
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um arquivo core!\n"
#: g10/misc.c:203
msgid "Experimental algorithms should not be used!\n"
-msgstr ""
+msgstr "Algoritmos experimentais nЦo devem ser usados!\n"
#: g10/misc.c:217
msgid ""
@@ -2416,6 +2391,8 @@ msgstr ""
#: g10/misc.c:239
msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
msgstr ""
+"este algoritmo de criptografia И depreciado; por favor use algum\n"
+"algoritmo padrЦo!\n"
#: g10/parse-packet.c:112
#, c-format
@@ -2425,7 +2402,7 @@ msgstr "impossМvel manipular algoritmo de chave pЗblica %d\n"
#: g10/parse-packet.c:931
#, c-format
msgid "subpacket of type %d has critical bit set\n"
-msgstr ""
+msgstr "subpacote de tipo %d tem bit crМtico ligado\n"
#: g10/passphrase.c:157
msgid ""
@@ -2434,24 +2411,24 @@ msgid ""
"user: \""
msgstr ""
"\n"
-"VocЙ precisa de uma frase para desbloquear a chave secreta do\n"
+"VocЙ precisa de uma frase secreta para desbloquear a chave secreta do\n"
"usuАrio: \""
#: g10/passphrase.c:166
#, fuzzy, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
-msgstr "(chave %u-bit/%s, ID %08lX, criada em %s)\n"
+msgstr "chave de %u-bit/%s, ID %08lX, criada em %s\n"
#: g10/passphrase.c:171
#, c-format
msgid " (main key ID %08lX)"
-msgstr ""
+msgstr " (ID principal da chave %08lX)"
-#: g10/passphrase.c:190
+#: g10/passphrase.c:192
msgid "Enter passphrase: "
msgstr "Digite a frase secreta: "
-#: g10/passphrase.c:194
+#: g10/passphrase.c:196
msgid "Repeat passphrase: "
msgstr "Repita a frase secreta: "
@@ -2478,9 +2455,8 @@ msgid "anonymous receiver; trying secret key %08lX ...\n"
msgstr "destinatАrio anТnimo; tentando chave secreta %08lX ...\n"
#: g10/pubkey-enc.c:85
-#, fuzzy
msgid "okay, we are the anonymous recipient.\n"
-msgstr "correto, nСs somos o destinatАrio anТnimo.\n"
+msgstr "certo, nСs somos o destinatАrio anТnimo.\n"
#: g10/pubkey-enc.c:137
msgid "old encoding of the DEK is not supported\n"
@@ -2503,11 +2479,11 @@ msgstr "Frase secreta invАlida; por favor tente novamente ...\n"
#: g10/seckey-cert.c:227
msgid "WARNING: Weak key detected - please change passphrase again.\n"
msgstr ""
-"AVISO: Chave fraca detectada - por favor mude a frase secreta novamente\n"
+"AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
#: g10/sig-check.c:187
msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr ""
+msgstr "assumindo MDC incorreto devido a um bit crМtico desconhecido\n"
#: g10/sig-check.c:283
msgid ""
@@ -2516,14 +2492,14 @@ msgstr ""
"esta И uma chave ElGamal gerada pelo PGP que NцO И segura para assinaturas!\n"
#: g10/sig-check.c:291
-#, fuzzy, c-format
+#, c-format
msgid "public key is %lu second newer than the signature\n"
-msgstr "lid %lu: id de usuАrio sem assinatura\n"
+msgstr "a chave pЗblica И %lu segundo mais nova que a assinatura\n"
#: g10/sig-check.c:292
-#, fuzzy, c-format
+#, c-format
msgid "public key is %lu seconds newer than the signature\n"
-msgstr "lid %lu: id de usuАrio sem assinatura\n"
+msgstr "a chave pЗblica И %lu segundos mais nova que a assinatura\n"
#: g10/sig-check.c:308
#, c-format
@@ -2532,7 +2508,7 @@ msgstr "NOTA: chave de assinatura expirou %s\n"
#: g10/sig-check.c:365
msgid "assuming bad signature due to an unknown critical bit\n"
-msgstr ""
+msgstr "assumindo assinatura incorreta devido a um bit crМtico desconhecido\n"
#: g10/sign.c:132
#, c-format
@@ -2556,27 +2532,26 @@ msgstr "AVISO: `%s' И um arquivo vazio\n"
#: g10/textfilter.c:128
#, c-format
msgid "can't handle text lines longer than %d characters\n"
-msgstr ""
+msgstr "impossМvel manejar linhas de texto maiores que %d caracteres\n"
#: g10/textfilter.c:197
#, c-format
msgid "input line longer than %d characters\n"
-msgstr ""
+msgstr "linha de entrada maior que %d caracteres\n"
#: g10/tdbio.c:116 g10/tdbio.c:1505
-#, fuzzy, c-format
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "banco de dados de confianГa rec %lu: lseek falhou: %s\n"
+msgstr "banco de dados de confiabilidade rec %lu: lseek falhou: %s\n"
#: g10/tdbio.c:122 g10/tdbio.c:1512
-#, fuzzy, c-format
+#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
-msgstr "banco de dados de confianГa rec %lu: escrita falhou (n=%d): %s\n"
+msgstr "banco de dados de confiabilidade rec %lu: escrita falhou (n=%d): %s\n"
#: g10/tdbio.c:232
-#, fuzzy
msgid "trustdb transaction too large\n"
-msgstr "transaГЦo de banco de dados de confianГa muito grande\n"
+msgstr "transaГЦo de banco de dados de confiabilidade muito grande\n"
#: g10/tdbio.c:424
#, c-format
@@ -2604,9 +2579,9 @@ msgid "%s: can't create: %s\n"
msgstr "%s: impossМvel criar: %s\n"
#: g10/tdbio.c:472 g10/tdbio.c:521
-#, fuzzy, c-format
+#, c-format
msgid "%s: can't create lock\n"
-msgstr "%s: impossМvel criar: %s\n"
+msgstr "%s: impossМvel criar trava\n"
#: g10/tdbio.c:486
#, c-format
@@ -2614,24 +2589,24 @@ msgid "%s: failed to create version record: %s"
msgstr "%s: falha ao criar registro de versЦo: %s"
#: g10/tdbio.c:490
-#, fuzzy, c-format
+#, c-format
msgid "%s: invalid trustdb created\n"
-msgstr "%s: banco de dados de confianГa invАlido criado\n"
+msgstr "%s: banco de dados de confiabilidade invАlido criado\n"
#: g10/tdbio.c:493
-#, fuzzy, c-format
+#, c-format
msgid "%s: trustdb created\n"
-msgstr "%s: banco de dados de confianГa criado\n"
+msgstr "%s: banco de dados de confiabilidade criado\n"
#: g10/tdbio.c:530
-#, fuzzy, c-format
+#, c-format
msgid "%s: invalid trustdb\n"
-msgstr "%s: banco de dados de confianГa invАlido\n"
+msgstr "%s: banco de dados de confiabilidade invАlido\n"
#: g10/tdbio.c:563
#, c-format
msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: falha ao criar tabela \"hash\": %s\n"
+msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
#: g10/tdbio.c:571
#, c-format
@@ -2652,17 +2627,17 @@ msgstr "%s: erro escrevendo registro de versЦo: %s\n"
#: g10/tdbio.c:1132
#, c-format
msgid "trustdb: lseek failed: %s\n"
-msgstr "banco de dados de confianГa: lseek falhou: %s\n"
+msgstr "banco de dados de confiabilidade: lseek falhou: %s\n"
#: g10/tdbio.c:1140
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "banco de dados de confianГa: leitura falhou (n=%d): %s\n"
+msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
#: g10/tdbio.c:1161
#, c-format
msgid "%s: not a trustdb file\n"
-msgstr "%s: nЦo И um banco de dados de confianГa\n"
+msgstr "%s: nЦo И um banco de dados de confiabilidade\n"
#: g10/tdbio.c:1177
#, c-format
@@ -2680,7 +2655,7 @@ msgid "%s: error reading free record: %s\n"
msgstr "%s: erro lendo registro livre: %s\n"
#: g10/tdbio.c:1479
-#, fuzzy, c-format
+#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: erro escrevendo registro de diretСrio: %s\n"
@@ -2696,15 +2671,15 @@ msgstr "%s: falha ao anexar um registro: %s\n"
#: g10/tdbio.c:1630
#, fuzzy
-msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
msgstr ""
-"O banco de dados de confianГa estА danificado; por favor rode\n"
+"O banco de dados de confiabilidade estА danificado; por favor rode\n"
"\"gpgm --fix-trust-db\".\n"
#: g10/trustdb.c:163
-#, fuzzy, c-format
+#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "registro de confianГa %lu, tipo req %d: leitura falhou: %s\n"
+msgstr "registro de confianГa %lu, tipo req %d: falha na leitura: %s\n"
#: g10/trustdb.c:178
#, c-format
@@ -2717,17 +2692,17 @@ msgid "trust record %lu: delete failed: %s\n"
msgstr "registro de confianГa %lu: remoГЦo falhou: %s\n"
#: g10/trustdb.c:206
-#, fuzzy, c-format
+#, c-format
msgid "trustdb: sync failed: %s\n"
-msgstr "banco de dados de confianГa: sincronizaГЦo falhou: %s\n"
+msgstr "banco de dados de confiabilidade: sincronizaГЦo falhou: %s\n"
#: g10/trustdb.c:386
-#, fuzzy, c-format
+#, c-format
msgid "error reading dir record for LID %lu: %s\n"
msgstr "erro lendo registro de diretСrio para LID %lu: %s\n"
#: g10/trustdb.c:393
-#, fuzzy, c-format
+#, c-format
msgid "lid %lu: expected dir record, got type %d\n"
msgstr "lid %lu: registro de diretСrio esperado, tipo %d recebido\n"
@@ -2759,12 +2734,13 @@ msgstr "chave %08lX: chave secreta sem chave pЗblica - ignorada\n"
#: g10/trustdb.c:525
#, c-format
msgid "key %08lX: secret and public key don't match\n"
-msgstr "chave %08lX: chaves secreta e pЗblica nЦo combinam\n"
+msgstr "chave %08lX: chaves secreta e pЗblica nЦo sЦo correspondentes\n"
#: g10/trustdb.c:535
#, c-format
msgid "key %08lX: can't put it into the trustdb\n"
-msgstr "chave %08lX: impossМvel colocА-la no banco de dados de confianГa\n"
+msgstr ""
+"chave %08lX: impossМvel colocА-la no banco de dados de confiabilidade\n"
#: g10/trustdb.c:541
#, c-format
@@ -2772,14 +2748,14 @@ msgid "key %08lX: query record failed\n"
msgstr "chave %08lX: pedido de registro falhou\n"
#: g10/trustdb.c:550
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: already in trusted key table\n"
-msgstr "chave %08lX: jА estА na tabela de chaves secretas\n"
+msgstr "chave %08lX: jА estА na tabela de chaves confiАveis\n"
#: g10/trustdb.c:553
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: accepted as trusted key.\n"
-msgstr "chave %08lX: aceita como chave secreta.\n"
+msgstr "chave %08lX: aceita como chave confiАvel.\n"
#: g10/trustdb.c:561
#, c-format
@@ -2787,25 +2763,25 @@ msgid "enumerate secret keys failed: %s\n"
msgstr "enumeraГЦo de chaves secretas falhou: %s\n"
#: g10/trustdb.c:851
-#, fuzzy, c-format
+#, c-format
msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
msgstr ""
-"NOTA: assinatura rec %lu[%d] em lista de sugestУes de %lu mas marcada\n"
-"como verificada\n"
+"NOTA: assinatura rec %lu[%d] estА na lista de sugestУes de %lu mas estА\n"
+" marcada como verificada\n"
#: g10/trustdb.c:855
-#, fuzzy, c-format
+#, c-format
msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n"
msgstr ""
-"NOTA: assinatura rec %lu[%d] em lista de sugestУes de %lu mas nЦo\n"
-"marcada\n"
+"NOTA: assinatura rec %lu[%d] estА na lista de sugestУes de %lu mas nЦo estА\n"
+" marcada\n"
#. we need the dir record
#: g10/trustdb.c:862
#, c-format
msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n"
msgstr ""
-"assinatura rec %lu[%d] em lista de sugestУes de %lu nЦo aponta para\n"
+"assinatura rec %lu[%d] na lista de sugestУes de %lu nЦo aponta para\n"
"um registro de diretСrio\n"
#: g10/trustdb.c:868
@@ -2849,7 +2825,7 @@ msgstr ""
#: g10/trustdb.c:988
#, c-format
msgid "lid %lu does not have a key\n"
-msgstr "lid %lu nЦo tem uma chave\n"
+msgstr "lid %lu nЦo tem chave\n"
#: g10/trustdb.c:998
#, c-format
@@ -2897,6 +2873,7 @@ msgstr "Auto-assinatura invАlida"
#: g10/trustdb.c:1403
msgid "Valid user ID revocation skipped due to a newer self signature\n"
msgstr ""
+"RevogaГЦo vАlida de ID de usuАrio ignorada devido a nova auto-assinatura\n"
#: g10/trustdb.c:1410
msgid "Valid user ID revocation\n"
@@ -2906,9 +2883,10 @@ msgstr "RevogaГЦo de ID de usuАrio vАlida\n"
msgid "Invalid user ID revocation"
msgstr "RevogaГЦo de ID de usuАrio invАlida"
+# muitas ou demais ???
#: g10/trustdb.c:1512
msgid "Too many preferences"
-msgstr "Muitas preferЙncias"
+msgstr "PreferЙncias demais"
#: g10/trustdb.c:1526
msgid "Too many preference items"
@@ -2919,14 +2897,12 @@ msgid "WARNING: can't yet handle long pref records\n"
msgstr "AVISO: ainda И impossМvel manipular registros de preferЙncias longos\n"
#: g10/trustdb.c:1654
-#, fuzzy
msgid "duplicated certificate - deleted"
-msgstr "Certificado duplicado - deletado"
+msgstr "certificado duplicado - removido"
#: g10/trustdb.c:1692
-#, fuzzy
msgid "public key not anymore available"
-msgstr "Chave secreta nЦo disponМvel"
+msgstr "a chave pЗblica nЦo estА mais disponМvel"
#: g10/trustdb.c:1702 g10/trustdb.c:1791
msgid "Invalid certificate revocation"
@@ -2936,11 +2912,12 @@ msgstr "Certificado de revogaГЦo invАlido"
msgid "Invalid certificate"
msgstr "Certificado invАlido"
+# trauzir sombra ???
#: g10/trustdb.c:1720
#, c-format
msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
msgstr ""
-"uid %08lX.%lu/%02X%02X: tem diretСrio sombra %lu mas ainda nЦo estА\n"
+"uid %08lX.%lu/%02X%02X: tem diretСrio \"shadow\" %lu mas ainda nЦo estА\n"
"marcado\n"
#: g10/trustdb.c:1734
@@ -3038,7 +3015,7 @@ msgid "%s: okay\n"
msgstr "%s: correto\n"
#: g10/trustdb.c:2632
-#, fuzzy, c-format
+#, c-format
msgid "lid %lu: dir record w/o key - skipped\n"
msgstr "lid %lu: registro de diretСrio sem chave - ignorado\n"
@@ -3065,7 +3042,7 @@ msgstr "chave %08lX: inserГЦo de registro de confianГa falhou: %s\n"
#: g10/trustdb.c:2754
#, c-format
msgid "key %08lX.%lu: inserted into trustdb\n"
-msgstr "chave %08lX.%lu: inserida no banco de dados de confianГa\n"
+msgstr "chave %08lX.%lu: inserida no banco de dados de confiabilidade\n"
#: g10/trustdb.c:2762
#, c-format
@@ -3084,39 +3061,39 @@ msgid "key %08lX.%lu: trust check failed: %s\n"
msgstr "chave %08lX.%lu: verificaГЦo de confianГa falhou: %s\n"
#: g10/trustdb.c:2881
-#, fuzzy, c-format
+#, c-format
msgid "user '%s' not found: %s\n"
msgstr "usuАrio `%s' nЦo encontrado: %s\n"
#: g10/trustdb.c:2883
-#, fuzzy, c-format
+#, c-format
msgid "problem finding '%s' in trustdb: %s\n"
-msgstr "problemas encontrando `%s' no banco de dados de confianГa: %s\n"
+msgstr "problemas na procura de `%s' no banco de dados de confiabilidade: %s\n"
#: g10/trustdb.c:2886
-#, fuzzy, c-format
+#, c-format
msgid "user '%s' not in trustdb - inserting\n"
msgstr ""
-"usuАrio `%s' nЦo encontrado no banco de dados de confianГa - inserindo\n"
+"usuАrio `%s' nЦo encontrado no banco de dados de confiabilidade - inserindo\n"
#: g10/trustdb.c:2889
-#, fuzzy, c-format
+#, c-format
msgid "failed to put '%s' into trustdb: %s\n"
-msgstr "falha ao colocar `%s' no banco de dados de confianГa: %s\n"
+msgstr "falha ao colocar `%s' no banco de dados de confiabilidade: %s\n"
#: g10/ringedit.c:316
#, c-format
msgid "%s: can't create keyring: %s\n"
-msgstr "%s: impossМvel criar anel de chaves: %s\n"
+msgstr "%s: impossМvel criar chaveiro: %s\n"
#: g10/ringedit.c:333 g10/ringedit.c:1349
#, c-format
msgid "%s: keyring created\n"
-msgstr "%s: anel de chaves criado\n"
+msgstr "%s: chaveiro criado\n"
#: g10/ringedit.c:1526
msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "AVISO: 2 arquivos com informaГУes confidenciais existem.\n"
+msgstr "AVISO: existem 2 arquivos com informaГУes confidenciais.\n"
#: g10/ringedit.c:1527
#, c-format
@@ -3135,6 +3112,8 @@ msgstr "Por favor conserte este possМvel furo de seguranГa\n"
#: g10/skclist.c:88 g10/skclist.c:125
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
+"a chave nЦo estА marcada como insegura - impossМvel usА-la com o pseudo "
+"RNG!\n"
#: g10/skclist.c:113
#, c-format
@@ -3154,7 +3133,7 @@ msgstr ""
#: g10/openfile.c:65
#, c-format
msgid "File `%s' exists. "
-msgstr "Arquivo `%s' existe. "
+msgstr "Arquivo `%s' jА existe. "
#: g10/openfile.c:67
msgid "Overwrite (y/N)? "
@@ -3167,7 +3146,7 @@ msgstr ""
#: g10/openfile.c:122
msgid "writing to stdout\n"
-msgstr "escrevendo para \"stdout\"\n"
+msgstr "escrevendo em \"stdout\"\n"
#: g10/openfile.c:181
#, c-format
@@ -3182,19 +3161,18 @@ msgstr "%s: novo arquivo de opГУes criado\n"
#: g10/encr-data.c:66
#, c-format
msgid "%s encrypted data\n"
-msgstr "dados codificados com\n"
+msgstr "dados criptografados com %s\n"
#: g10/encr-data.c:68
#, c-format
msgid "encrypted with unknown algorithm %d\n"
-msgstr "codificado com algoritmo desconhecido %d\n"
+msgstr "criptografado com algoritmo desconhecido %d\n"
#: g10/encr-data.c:85
-#, fuzzy
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
-"AVISO: A mensagem foi codificada com uma chave fraca na criptografia\n"
+"AVISO: A mensagem foi criptografada com uma chave fraca na criptografia\n"
"simИtrica.\n"
#: g10/seskey.c:52
@@ -3206,7 +3184,7 @@ msgstr "chave fraca criada - tentando novamente\n"
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"impossМvel evitar chave fraca para criptografia simИtrica;\n"
-"tentado %d vezes!\n"
+"tentadas %d vezes!\n"
#. begin of list
#: g10/helptext.c:48
@@ -3310,45 +3288,47 @@ msgid "keyedit.delsig.valid"
msgstr ""
#: g10/helptext.c:181
+msgid "keyedit.delsig.unknown"
+msgstr ""
+
+#: g10/helptext.c:187
msgid "keyedit.delsig.invalid"
msgstr ""
-#: g10/helptext.c:186
+#: g10/helptext.c:191
msgid "keyedit.delsig.selfsig"
msgstr ""
-#: g10/helptext.c:195
+#: g10/helptext.c:200
msgid "passphrase.enter"
msgstr ""
-#: g10/helptext.c:202
+#: g10/helptext.c:207
msgid "passphrase.repeat"
msgstr ""
-#: g10/helptext.c:206
+#: g10/helptext.c:211
msgid "detached_signature.filename"
msgstr ""
-#: g10/helptext.c:210
+#: g10/helptext.c:215
msgid "openfile.overwrite.okay"
msgstr ""
-#: g10/helptext.c:224
+#: g10/helptext.c:229
msgid "No help available"
msgstr "Nenhuma ajuda disponМvel"
-#: g10/helptext.c:236
+#: g10/helptext.c:241
#, c-format
msgid "No help available for `%s'"
msgstr "Nenhuma ajuda disponМvel para `%s'"
-#, fuzzy
#~ msgid "can't lock keyring `%': %s\n"
-#~ msgstr "impossМvel bloquear anel de chaves pЗblico: %s\n"
+#~ msgstr "impossМvel bloquear chaveiro `%': %s\n"
-#, fuzzy
#~ msgid "error writing keyring `%': %s\n"
-#~ msgstr "%s: erro escrevendo registro de versЦo: %s\n"
+#~ msgstr "erro na escrita do chaveiro `%': %s\n"
#~ msgid "can't open file: %s\n"
#~ msgstr "impossМvel abrir arquivo: %s\n"
@@ -3357,7 +3337,7 @@ msgstr "Nenhuma ajuda disponМvel para `%s'"
#~ msgstr "erro de leitura: %s\n"
#~ msgid "can't write to keyring: %s\n"
-#~ msgstr "impossМvel escrever para o anel de chaves: %s\n"
+#~ msgstr "impossМvel escrever para o chaveiro: %s\n"
#~ msgid "writing keyblock\n"
#~ msgstr "escrevendo bloco de chaves\n"
@@ -3366,10 +3346,10 @@ msgstr "Nenhuma ajuda disponМvel para `%s'"
#~ msgstr "impossМvel escrever bloco de chaves: %s\n"
#~ msgid "can't lock secret keyring: %s\n"
-#~ msgstr "impossМvel bloquear anel de chaves secreto: %s\n"
+#~ msgstr "impossМvel bloquear chaveiro secreto: %s\n"
#~ msgid "can't write keyring: %s\n"
-#~ msgstr "impossМvel escrever anel de chaves: %s\n"
+#~ msgstr "impossМvel escrever chaveiro: %s\n"
#, fuzzy
#~ msgid "encrypted message is valid\n"
@@ -3431,7 +3411,7 @@ msgstr "Nenhuma ajuda disponМvel para `%s'"
#, fuzzy
#~ msgid "user '%s' not in trustdb\n"
-#~ msgstr "usuАrio `%s' nЦo estА no banco de dados de confianГa\n"
+#~ msgstr "usuАrio `%s' nЦo estА no banco de dados de confiabilidade\n"
#~ msgid ""
#~ "# List of assigned trustvalues, created %s\n"
@@ -3457,13 +3437,14 @@ msgstr "Nenhuma ajuda disponМvel para `%s'"
#~ msgid "key not in trustdb, searching ring.\n"
#~ msgstr ""
-#~ "chave nЦo encontrada no banco de dados de confianГa, procurando no anel\n"
+#~ "chave nЦo encontrada no banco de dados de confiabilidade, procurando no "
+#~ "chaveiro\n"
#~ msgid "key not in ring: %s\n"
-#~ msgstr "chave nЦo encontrada no anel: %s\n"
+#~ msgstr "chave nЦo encontrada no chaveiro: %s\n"
#~ msgid "Oops: key is now in trustdb???\n"
-#~ msgstr "Oops: agora a chave estА no banco de dados de confianГa???\n"
+#~ msgstr "Oops: agora a chave estА no banco de dados de confiabilidade???\n"
#~ msgid "insert trust record failed: %s\n"
#~ msgstr "inserГЦo de registro de confianГa falhou: %s\n"
diff --git a/po/ru.po b/po/ru.po
index ab0f2fa3f..611b9a121 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: 1999-06-08 21:26+0200\n"
+"POT-Creation-Date: 1999-06-26 11:22+0200\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-01-26 22:08:36+0100\n"
"From: Gregory Steuck <steuck@iname.com>\n"
@@ -330,7 +330,7 @@ msgstr ""
"Недостаточно случайных данных. Пожалуйста, поделайте что-нибудь, чтобы\n"
"ОС могла набрать дополнительные случайные числа! (нужно еще %d байт)\n"
-#: g10/g10.c:169
+#: g10/g10.c:174
msgid ""
"@Commands:\n"
" "
@@ -338,136 +338,136 @@ msgstr ""
"@Команды:\n"
" "
-#: g10/g10.c:171
+#: g10/g10.c:176
#, fuzzy
msgid "|[file]|make a signature"
msgstr "|[файл]|создать подпись"
-#: g10/g10.c:172
+#: g10/g10.c:177
#, fuzzy
msgid "|[file]|make a clear text signature"
msgstr "|[файл]|создать текстовую подпись"
-#: g10/g10.c:173
+#: g10/g10.c:178
msgid "make a detached signature"
msgstr "создать отдельную подпись"
-#: g10/g10.c:174
+#: g10/g10.c:179
msgid "encrypt data"
msgstr "зашифровать данные"
-#: g10/g10.c:175
+#: g10/g10.c:180
msgid "encryption only with symmetric cipher"
msgstr "зашифровать симметричным алгоритмом"
-#: g10/g10.c:176
+#: g10/g10.c:181
msgid "store only"
msgstr "только сохранить"
-#: g10/g10.c:177
+#: g10/g10.c:182
msgid "decrypt data (default)"
msgstr "расшифровать данные (по умолчанию)"
-#: g10/g10.c:178
+#: g10/g10.c:183
msgid "verify a signature"
msgstr "проверить подпись"
-#: g10/g10.c:179
+#: g10/g10.c:184
msgid "list keys"
msgstr "список ключей"
-#: g10/g10.c:181
+#: g10/g10.c:186
msgid "list keys and signatures"
msgstr "список ключей и подписей"
-#: g10/g10.c:182
+#: g10/g10.c:187
msgid "check key signatures"
msgstr "проверить подпись на ключе"
-#: g10/g10.c:183
+#: g10/g10.c:188
msgid "list keys and fingerprints"
msgstr "список ключей с их \"отпечатками пальцев\""
-#: g10/g10.c:184
+#: g10/g10.c:189
msgid "list secret keys"
msgstr "список секретных ключей"
-#: g10/g10.c:185
+#: g10/g10.c:190
msgid "generate a new key pair"
msgstr "сгенерировать новую пару ключей (открытый и секретный)"
-#: g10/g10.c:186
+#: g10/g10.c:191
msgid "remove key from the public keyring"
msgstr "удалить ключ со связки"
-#: g10/g10.c:187
+#: g10/g10.c:192
msgid "sign or edit a key"
msgstr "подписать или редактировать ключ"
-#: g10/g10.c:188
+#: g10/g10.c:193
msgid "generate a revocation certificate"
msgstr "сгенерировать отзывающий сертификат"
-#: g10/g10.c:189
+#: g10/g10.c:194
msgid "export keys"
msgstr "экспортировать ключи"
-#: g10/g10.c:190
+#: g10/g10.c:195
msgid "export keys to a key server"
msgstr ""
-#: g10/g10.c:191
+#: g10/g10.c:196
msgid "import keys from a key server"
msgstr ""
-#: g10/g10.c:194
+#: g10/g10.c:199
msgid "import/merge keys"
msgstr "импортировать/добавить ключи"
-#: g10/g10.c:196
+#: g10/g10.c:201
msgid "list only the sequence of packets"
msgstr "напечатать только последовательность пакетов"
-#: g10/g10.c:198
+#: g10/g10.c:203
#, fuzzy
msgid "export the ownertrust values"
msgstr "экспортировать параметры доверия\n"
-#: g10/g10.c:200
+#: g10/g10.c:205
#, fuzzy
msgid "import ownertrust values"
msgstr "импортировать параметры доверия\n"
-#: g10/g10.c:202
+#: g10/g10.c:207
#, fuzzy
msgid "|[NAMES]|update the trust database"
msgstr "|[ИМЕНА]|проверить базу данных доверия"
-#: g10/g10.c:204
+#: g10/g10.c:209
msgid "|[NAMES]|check the trust database"
msgstr "|[ИМЕНА]|проверить базу данных доверия"
-#: g10/g10.c:205
+#: g10/g10.c:210
msgid "fix a corrupted trust database"
msgstr "исправить разрушенную базу данных доверия"
-#: g10/g10.c:206
+#: g10/g10.c:211
msgid "De-Armor a file or stdin"
msgstr "Декодировать stdin или файл из ASCII-представления"
-#: g10/g10.c:207
+#: g10/g10.c:212
msgid "En-Armor a file or stdin"
msgstr "Закодировать stdin или файл в ASCII-представление"
-#: g10/g10.c:208
+#: g10/g10.c:213
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|напечатать дайджест сообщения"
-#: g10/g10.c:209
+#: g10/g10.c:214
msgid "print all message digests"
msgstr "напечатать все дайджесты сообщения"
-#: g10/g10.c:215
+#: g10/g10.c:220
msgid ""
"@\n"
"Options:\n"
@@ -477,161 +477,169 @@ msgstr ""
"Параметры:\n"
" "
-#: g10/g10.c:217
+#: g10/g10.c:222
msgid "create ascii armored output"
msgstr "вывод в ASCII-представлении"
-#: g10/g10.c:218
+#: g10/g10.c:223
#, fuzzy
msgid "|NAME|encrypt for NAME"
msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ"
-#: g10/g10.c:222
+#: g10/g10.c:227
msgid "use this user-id to sign or decrypt"
msgstr ""
"использовать указанный идентификатор пользователя для подписи или расшифровки"
-#: g10/g10.c:223
+#: g10/g10.c:228
msgid "|N|set compress level N (0 disables)"
msgstr "|N|установить уровень сжатия (0 - не сжимать)"
-#: g10/g10.c:225
+#: g10/g10.c:230
msgid "use canonical text mode"
msgstr "использовать канонический текстовый режим"
-#: g10/g10.c:226
+#: g10/g10.c:231
msgid "use as output file"
msgstr "использовать в качестве выходного файла"
-#: g10/g10.c:227
+#: g10/g10.c:232
msgid "verbose"
msgstr "многословный"
-#: g10/g10.c:228
+#: g10/g10.c:233
msgid "be somewhat more quiet"
msgstr ""
-#: g10/g10.c:229
+#: g10/g10.c:234
+msgid "don't use the terminal at all"
+msgstr ""
+
+#: g10/g10.c:235
#, fuzzy
msgid "force v3 signatures"
msgstr "проверить подпись на ключе"
-#: g10/g10.c:230
+#: g10/g10.c:236
#, fuzzy
msgid "always use a MDC for encryption"
msgstr "использовать указанный идентификатор пользователя для шифрования"
-#: g10/g10.c:231
+#: g10/g10.c:237
msgid "do not make any changes"
msgstr "Keine wirklichen дnderungen durchfЭhren"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:233
+#: g10/g10.c:239
msgid "batch mode: never ask"
msgstr "пакетный режим: ничего не спрашивать"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "assume yes on most questions"
msgstr "отвечать \"да\" на большинство вопросов"
-#: g10/g10.c:235
+#: g10/g10.c:241
msgid "assume no on most questions"
msgstr "отвечать \"нет\" на большинство вопросов"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "add this keyring to the list of keyrings"
msgstr "добавить эту связку к списку связок ключей"
-#: g10/g10.c:237
+#: g10/g10.c:243
msgid "add this secret keyring to the list"
msgstr "добавить эту секретную связку к списку связок ключей"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|NAME|use NAME as default secret key"
msgstr "|ИМЯ|использовать ИМЯ в качестве секретного ключа по умолчанию"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "|HOST|use this keyserver to lookup keys"
msgstr ""
-#: g10/g10.c:240
+#: g10/g10.c:246
#, fuzzy
msgid "|NAME|set terminal charset to NAME"
msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ"
-#: g10/g10.c:241
+#: g10/g10.c:247
msgid "read options from file"
msgstr "читать параметры из файла"
-#: g10/g10.c:243
+#: g10/g10.c:249
msgid "set debugging flags"
msgstr "установить отладочные флаги"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "enable full debugging"
msgstr "разрешить всю отладку"
-#: g10/g10.c:245
+#: g10/g10.c:251
msgid "|FD|write status info to this FD"
msgstr "|FD| записывать информацию о состоянии в дескриптор (FD)"
-#: g10/g10.c:246
+#: g10/g10.c:252
msgid "do not write comment packets"
msgstr "не писать пакеты с комментариями"
-#: g10/g10.c:247
+#: g10/g10.c:253
msgid "(default is 1)"
msgstr "(по умолчанию 1)"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid "(default is 3)"
msgstr "(по умолчанию 3)"
-#: g10/g10.c:250
+#: g10/g10.c:256
#, fuzzy
msgid "|FILE|load extension module FILE"
msgstr "|ФАЙЛ|загрузить ФАЙЛ с расширяющими модулями"
-#: g10/g10.c:251
+#: g10/g10.c:257
msgid "emulate the mode described in RFC1991"
msgstr "эмулировать режим описанный в RFC1991"
-#: g10/g10.c:252
+#: g10/g10.c:258
+msgid "set all packet, cipher and digest options to OpenPGP behavior"
+msgstr ""
+
+#: g10/g10.c:259
#, fuzzy
msgid "|N|use passphrase mode N"
msgstr "|N|использовать ключевую фразу режима N\n"
-#: g10/g10.c:254
+#: g10/g10.c:261
#, fuzzy
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|ИМЯ|использовать хэш-алгоритм ИМЯ для ключевых фраз"
-#: g10/g10.c:256
+#: g10/g10.c:263
#, fuzzy
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ для ключевых фраз"
-#: g10/g10.c:257
+#: g10/g10.c:264
msgid "|NAME|use cipher algorithm NAME"
msgstr "|ИМЯ|использовать шифровальный алгоритмом ИМЯ"
-#: g10/g10.c:258
+#: g10/g10.c:265
msgid "|NAME|use message digest algorithm NAME"
msgstr "|ИМЯ|использовать хэш-алгоритм ИМЯ"
-#: g10/g10.c:259
+#: g10/g10.c:266
msgid "|N|use compress algorithm N"
msgstr "|N|использовать алгоритм сжатия N"
-#: g10/g10.c:260
+#: g10/g10.c:267
msgid "throw keyid field of encrypted packets"
msgstr "выбрасывать поле keyid у зашифрованных пакетов"
-#: g10/g10.c:261
+#: g10/g10.c:268
msgid "|NAME=VALUE|use this notation data"
msgstr ""
-#: g10/g10.c:263
+#: g10/g10.c:270
#, fuzzy
msgid ""
"@\n"
@@ -652,17 +660,17 @@ msgstr ""
" --list-keys [names] показать список ключей\n"
" --fingerprint [names] показать \"отпечатки пальцев\" ключей\n"
-#: g10/g10.c:337
+#: g10/g10.c:347
msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
msgstr ""
"Пожалуйста, отправляйте сообщения об ошибках по адресу "
"<gnupg-bugs@gnu.org>.\n"
-#: g10/g10.c:341
+#: g10/g10.c:351
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Использование: gpg [параметры] [файлы] (-h для помощи)"
-#: g10/g10.c:344
+#: g10/g10.c:354
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -672,7 +680,7 @@ msgstr ""
"подписывает, проверяет подписи, шифрует или расшифровывает\n"
"режим работы зависит от входных данных\n"
-#: g10/g10.c:349
+#: g10/g10.c:359
msgid ""
"\n"
"Supported algorithms:\n"
@@ -680,171 +688,171 @@ msgstr ""
"\n"
"Поддерживаемые алгоритмы:\n"
-#: g10/g10.c:423
+#: g10/g10.c:433
msgid "usage: gpg [options] "
msgstr "Использование: gpg [параметры] "
-#: g10/g10.c:463
+#: g10/g10.c:473
msgid "conflicting commands\n"
msgstr "WidersprЭchliche Kommandos\n"
-#: g10/g10.c:595
+#: g10/g10.c:605
#, fuzzy, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "замечание: файл параметров по умолчанию `%s' отсутствует\n"
-#: g10/g10.c:599
+#: g10/g10.c:609
#, c-format
msgid "option file `%s': %s\n"
msgstr "файл параметров `%s': %s\n"
-#: g10/g10.c:606
+#: g10/g10.c:616
#, c-format
msgid "reading options from `%s'\n"
msgstr "читаются параметры из `%s'\n"
-#: g10/g10.c:755
+#: g10/g10.c:782
#, fuzzy, c-format
msgid "%s is not a valid character set\n"
msgstr "Недопустимый символ в комментарии.\n"
-#: g10/g10.c:799 g10/g10.c:811
+#: g10/g10.c:827 g10/g10.c:839
msgid "selected cipher algorithm is invalid\n"
msgstr "выбран недопустимый алгоритм шифрования\n"
-#: g10/g10.c:805 g10/g10.c:817
+#: g10/g10.c:833 g10/g10.c:845
msgid "selected digest algorithm is invalid\n"
msgstr "выбран недопустимый дайджест-алгоритм\n"
-#: g10/g10.c:821
+#: g10/g10.c:849
msgid "the given policy URL is invalid\n"
msgstr ""
-#: g10/g10.c:824
+#: g10/g10.c:852
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "алгоритм упаковки может иметь значения от %d до %d\n"
-#: g10/g10.c:826
+#: g10/g10.c:854
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed должен быть больше 0\n"
-#: g10/g10.c:828
+#: g10/g10.c:856
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed должен быть больше 1\n"
-#: g10/g10.c:830
+#: g10/g10.c:858
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr ""
-#: g10/g10.c:833
+#: g10/g10.c:861
#, fuzzy
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "замечание: простой S2K режим (0) очень не рекомендуется\n"
-#: g10/g10.c:837
+#: g10/g10.c:865
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "недопустимый режим S2K: должен быть 0, 1 или 3\n"
-#: g10/g10.c:914
+#: g10/g10.c:942
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Ошибка инициализации базы данных доверия: %s\n"
-#: g10/g10.c:920
+#: g10/g10.c:948
msgid "--store [filename]"
msgstr "--store [имя файла]"
-#: g10/g10.c:927
+#: g10/g10.c:955
msgid "--symmetric [filename]"
msgstr "--symmetric [имя файла]"
-#: g10/g10.c:935
+#: g10/g10.c:963
msgid "--encrypt [filename]"
msgstr "--encrypt [имя файла]"
-#: g10/g10.c:948
+#: g10/g10.c:976
msgid "--sign [filename]"
msgstr "--sign [имя файла]"
-#: g10/g10.c:961
+#: g10/g10.c:989
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [имя файла]"
-#: g10/g10.c:975
+#: g10/g10.c:1003
msgid "--clearsign [filename]"
msgstr "--clearsign [имя файла]"
-#: g10/g10.c:987
+#: g10/g10.c:1015
msgid "--decrypt [filename]"
msgstr "--decrypt [имя файла]"
-#: g10/g10.c:996
+#: g10/g10.c:1024
#, fuzzy
msgid "--edit-key username [commands]"
msgstr "--edit-key имя-пользователя"
-#: g10/g10.c:1010
+#: g10/g10.c:1038
msgid "--delete-secret-key username"
msgstr "--delete-secret-key имя-пользователя"
-#: g10/g10.c:1013
+#: g10/g10.c:1041
msgid "--delete-key username"
msgstr "--delete-key имя-пользователя"
-#: g10/encode.c:231 g10/g10.c:1036 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1064 g10/sign.c:366
#, c-format
msgid "can't open %s: %s\n"
msgstr "невозможно открыть файл `%s': %s\n"
-#: g10/g10.c:1047
+#: g10/g10.c:1075
msgid "-k[v][v][v][c] [userid] [keyring]"
msgstr "-k[v][v][v][c] [идентификатор пользователя] [связка ключей]"
-#: g10/g10.c:1106
+#: g10/g10.c:1134
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ошибка декодирования: %s\n"
-#: g10/g10.c:1114
+#: g10/g10.c:1142
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ошибка кодирования: %s\n"
-#: g10/g10.c:1180
+#: g10/g10.c:1208
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "недопустимый хэш-алгоритм `%s'\n"
-#: g10/g10.c:1255
+#: g10/g10.c:1283
msgid "[filename]"
msgstr "[имя файла]"
-#: g10/g10.c:1259
+#: g10/g10.c:1287
msgid "Go ahead and type your message ...\n"
msgstr ""
-#: g10/decrypt.c:59 g10/g10.c:1262 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1290 g10/verify.c:66
#, c-format
msgid "can't open `%s'\n"
msgstr "невозможно открыть файл `%s'\n"
-#: g10/g10.c:1429
+#: g10/g10.c:1457
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
-#: g10/g10.c:1435
+#: g10/g10.c:1463
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
msgstr ""
-#: g10/g10.c:1441
+#: g10/g10.c:1469
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
-#: g10/g10.c:1449
+#: g10/g10.c:1477
msgid "a notation value must not use any control characters\n"
msgstr ""
@@ -1432,7 +1440,7 @@ msgstr "Ключевая пара DSA будет иметь длину 1024 бита.\n"
#: g10/keygen.c:859
#, fuzzy
-msgid "Key generation cancelled.\n"
+msgid "Key generation canceled.\n"
msgstr "Генерация ключа отменена: %s\n"
#: g10/keygen.c:869
@@ -1507,7 +1515,7 @@ msgstr "%s: предупреждение: пустой файл.\n"
msgid "reading from `%s'\n"
msgstr "Читается из `%s'\n"
-#: g10/encode.c:417
+#: g10/encode.c:431
#, fuzzy, c-format
msgid "%s/%s encrypted for: %s\n"
msgstr "%s зашифровано для: %s\n"
@@ -1899,7 +1907,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Действительно подписать? "
-#: g10/keyedit.c:369 g10/keyedit.c:1779 g10/keyedit.c:1828 g10/sign.c:128
+#: g10/keyedit.c:369 g10/keyedit.c:1790 g10/keyedit.c:1839 g10/sign.c:128
#, fuzzy, c-format
msgid "signing failed: %s\n"
msgstr "ошибка подписывания: %s\n"
@@ -2229,120 +2237,125 @@ msgstr "Действительно удалить все выбранные идентификаторы пользователя? "
msgid "Really remove this user id? "
msgstr "Действительно удалить этот идентификатор пользователя? "
-#: g10/keyedit.c:856 g10/keyedit.c:878
+#: g10/keyedit.c:858 g10/keyedit.c:880
msgid "You must select at least one key.\n"
msgstr "Вы должны выбрать хотя бы один ключ.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:862
#, fuzzy
msgid "Do you really want to delete the selected keys? "
msgstr "Вы действительно хотите удалить выбранные ключи? "
-#: g10/keyedit.c:861
+#: g10/keyedit.c:863
#, fuzzy
msgid "Do you really want to delete this key? "
msgstr "Вы действительно хотите удалить этот ключ? "
-#: g10/keyedit.c:882
+#: g10/keyedit.c:884
#, fuzzy
msgid "Do you really want to revoke the selected keys? "
msgstr "Вы действительно хотите удалить выбранные ключи? "
-#: g10/keyedit.c:883
+#: g10/keyedit.c:885
#, fuzzy
msgid "Do you really want to revoke this key? "
msgstr "Вы действительно хотите удалить этот ключ? "
-#: g10/keyedit.c:937
+#: g10/keyedit.c:939
msgid "Invalid command (try \"help\")\n"
msgstr "Недопустимая команда (попробуйте \"help\")\n"
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1294
msgid "Delete this good signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1298
msgid "Delete this invalid signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:1297
+#: g10/keyedit.c:1302
+#, fuzzy
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "сгенерировать отзывающий сертификат"
+
+#: g10/keyedit.c:1308
#, fuzzy
msgid "Really delete this self-signature? (y/N)"
msgstr "сгенерировать отзывающий сертификат"
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1322
#, fuzzy, c-format
msgid "Deleted %d signature.\n"
msgstr "%d плохих подписей\n"
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1323
#, fuzzy, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d плохих подписей\n"
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1326
#, fuzzy
msgid "Nothing deleted.\n"
msgstr "ВНИМАНИЕ: Используется ключ к которому нет доверия!\n"
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1395
msgid "Please remove selections from the secret keys.\n"
msgstr ""
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1401
#, fuzzy
msgid "Please select at most one secondary key.\n"
msgstr "Вы должны выбрать хотя бы один ключ.\n"
-#: g10/keyedit.c:1394
-msgid "Changing exiration time for a secondary key.\n"
+#: g10/keyedit.c:1405
+msgid "Changing expiration time for a secondary key.\n"
msgstr ""
-#: g10/keyedit.c:1396
-msgid "Changing exiration time for the primary key.\n"
+#: g10/keyedit.c:1407
+msgid "Changing expiration time for the primary key.\n"
msgstr ""
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1448
msgid "You can't change the expiration date of a v3 key\n"
msgstr ""
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1464
msgid "No corresponding signature in secret ring\n"
msgstr ""
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1524
#, c-format
msgid "No user id with index %d\n"
msgstr "Нет идентификатора пользователя с индексом %d\n"
-#: g10/keyedit.c:1559
+#: g10/keyedit.c:1570
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Нет дополнительного ключа с индексом %d\n"
-#: g10/keyedit.c:1657
+#: g10/keyedit.c:1668
#, fuzzy
msgid "user ID: \""
msgstr "Введите идентификатор пользователя: "
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1671
#, fuzzy, c-format
msgid ""
"\"\n"
"signed with your key %08lX at %s\n"
msgstr "Нечего подписывать ключам %08lX\n"
-#: g10/keyedit.c:1664
+#: g10/keyedit.c:1675
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N)"
msgstr "сгенерировать отзывающий сертификат"
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1755
#, fuzzy
msgid "Really create the revocation certificates? (y/N)"
msgstr "сгенерировать отзывающий сертификат"
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1778
#, fuzzy
msgid "no secret key\n"
msgstr "Плохой секретный ключ"
@@ -2493,12 +2506,12 @@ msgstr "(%u-бит %s ключ, ID %08lX, создан %s)\n"
msgid " (main key ID %08lX)"
msgstr ""
-#: g10/passphrase.c:190
+#: g10/passphrase.c:192
#, fuzzy
msgid "Enter passphrase: "
msgstr "Введите ключевую фразу: %s\n"
-#: g10/passphrase.c:194
+#: g10/passphrase.c:196
#, fuzzy
msgid "Repeat passphrase: "
msgstr "Повторите ключевую фразу: %s\n"
@@ -2744,7 +2757,7 @@ msgstr ""
#: g10/tdbio.c:1630
#, fuzzy
-msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
msgstr "База данных доверия разрушена: запустите \"gpgm --fix-trust-db\".\n"
#: g10/trustdb.c:163
@@ -3354,17 +3367,21 @@ msgid "keyedit.delsig.valid"
msgstr ""
#: g10/helptext.c:181
+msgid "keyedit.delsig.unknown"
+msgstr ""
+
+#: g10/helptext.c:187
msgid "keyedit.delsig.invalid"
msgstr ""
-#: g10/helptext.c:186
+#: g10/helptext.c:191
msgid "keyedit.delsig.selfsig"
msgstr ""
# ################################
# ####### Help msgids ############
# ################################
-#: g10/helptext.c:195
+#: g10/helptext.c:200
msgid "passphrase.enter"
msgstr ""
"Bitte geben Sie die \"Passhrase\" ein; dies ist ein geheimer Satz der aus\n"
@@ -3379,27 +3396,27 @@ msgstr ""
"werden,\n"
"sind i.d.R. eine gute Wahl"
-#: g10/helptext.c:202
+#: g10/helptext.c:207
msgid "passphrase.repeat"
msgstr ""
"Um sicher zu gehen, daъ Sie sich bei der Eingabe der \"Passphrase\" nicht\n"
"vertippt haben, geben Sie diese bitte nochmal ein. Nur wenn beide Eingaben\n"
"Эbereinstimmen, wird die \"Passphrase\" akzeptiert."
-#: g10/helptext.c:206
+#: g10/helptext.c:211
#, fuzzy
msgid "detached_signature.filename"
msgstr "имя файла для отдельной подписи"
-#: g10/helptext.c:210
+#: g10/helptext.c:215
msgid "openfile.overwrite.okay"
msgstr "Вы желаете перезаписать файл (возможна потеря данных)"
-#: g10/helptext.c:224
+#: g10/helptext.c:229
msgid "No help available"
msgstr "Помощь отсутствует."
-#: g10/helptext.c:236
+#: g10/helptext.c:241
#, c-format
msgid "No help available for `%s'"
msgstr "Помощь для `%s' отсутствует."
diff --git a/util/ChangeLog b/util/ChangeLog
index c11e42947..3435472c5 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,16 @@
+Sat Jun 26 12:15:59 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+
+ * dotlock.c (create_dotlock): s/uts/utsbuf/ cause there an Amdahl
+ system with the name UTS (Dave Dykstra).
+
+ * secmem.c (DEFAULT_POOLSIZE): Doubled the size.
+
+Fri Jun 18 00:18:02 CEST 1999 Michael Roth <mroth@nessie.de>
+
+ * iobuf.c: file_filter() Detection of EOF on terminals
+ improved/fixed (see Bug #21).
+
Mon Jun 14 21:18:54 CEST 1999 Michael Roth <mroth@nessie.de>
* ttyio.c: tty_no_terminal() new.
diff --git a/util/dotlock.c b/util/dotlock.c
index 18841ec56..644cf8e3a 100644
--- a/util/dotlock.c
+++ b/util/dotlock.c
@@ -74,7 +74,7 @@ create_dotlock( const char *file_to_lock )
int fd = -1;
char pidstr[16];
#ifndef HAVE_DOSISH_SYSTEM
- struct utsname uts;
+ struct utsname utsbuf;
#endif
const char *nodename;
const char *dirpart;
@@ -93,10 +93,10 @@ create_dotlock( const char *file_to_lock )
/* fixme: add the hostname to the second line (FQDN or IP addr?) */
/* create a temporary file */
- if( uname( &uts ) )
+ if( uname( &utsbuf ) )
nodename = "unknown";
else
- nodename = uts.nodename;
+ nodename = utsbuf.nodename;
if( !(dirpart = strrchr( file_to_lock, '/' )) ) {
dirpart = ".";
diff --git a/util/iobuf.c b/util/iobuf.c
index e5379d9ce..31dabace0 100644
--- a/util/iobuf.c
+++ b/util/iobuf.c
@@ -92,16 +92,22 @@ file_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
if( control == IOBUFCTRL_UNDERFLOW ) {
assert( size ); /* need a buffer */
- clearerr( fp );
- nbytes = fread( buf, 1, size, fp );
- if( feof(fp) && !nbytes )
- rc = -1; /* okay: we can return EOF now. */
- else if( ferror(fp) && errno != EPIPE ) {
- log_error("%s: read error: %s\n",
- a->fname, strerror(errno));
- rc = G10ERR_READ_FILE;
+ if ( feof(fp)) { /* On terminals you could easiely read as many EOFs as you call */
+ rc = -1; /* fread() or fgetc() repeatly. Every call will block until you press */
+ *ret_len = 0; /* CTRL-D. So we catch this case before we call fread() again. */
+ }
+ else {
+ clearerr( fp );
+ nbytes = fread( buf, 1, size, fp );
+ if( feof(fp) && !nbytes )
+ rc = -1; /* okay: we can return EOF now. */
+ else if( ferror(fp) && errno != EPIPE ) {
+ log_error("%s: read error: %s\n",
+ a->fname, strerror(errno));
+ rc = G10ERR_READ_FILE;
+ }
+ *ret_len = nbytes;
}
- *ret_len = nbytes;
}
else if( control == IOBUFCTRL_FLUSH ) {
if( size ) {
diff --git a/util/secmem.c b/util/secmem.c
index f48b0edb0..8f7c428e4 100644
--- a/util/secmem.c
+++ b/util/secmem.c
@@ -40,7 +40,7 @@
#define MAP_ANONYMOUS MAP_ANON
#endif
-#define DEFAULT_POOLSIZE 8196
+#define DEFAULT_POOLSIZE 16384
typedef struct memblock_struct MEMBLOCK;
struct memblock_struct {
@@ -184,7 +184,7 @@ init_pool( size_t n)
static void
compress_pool(void)
{
-
+ /* fixme: we really should do this */
}
void
@@ -290,6 +290,7 @@ secmem_malloc( size_t size )
max_alloced = cur_alloced;
if( cur_blocks > max_blocks )
max_blocks = cur_blocks;
+
return &mb->u.aligned.c;
}