summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>1999-08-30 20:48:57 +0200
committerWerner Koch <wk@gnupg.org>1999-08-30 20:48:57 +0200
commitc2c397bedfe748472a3d1045f24a79a062e7fa5e (patch)
tree2b0613d28783e42e76908d848167f0244dcbeb88
parentSee ChangeLog: Wed Aug 4 10:34:46 CEST 1999 Werner Koch (diff)
downloadgnupg2-c2c397bedfe748472a3d1045f24a79a062e7fa5e.tar.xz
gnupg2-c2c397bedfe748472a3d1045f24a79a062e7fa5e.zip
See ChangeLog: Mon Aug 30 20:38:33 CEST 1999 Werner Koch
-rw-r--r--ChangeLog5
-rw-r--r--THANKS2
-rw-r--r--THOUGHTS6
-rw-r--r--TODO8
-rw-r--r--VERSION2
-rw-r--r--cipher/ChangeLog6
-rw-r--r--cipher/cipher.c2
-rw-r--r--configure.in16
-rw-r--r--debian/changelog24
-rw-r--r--debian/copyright2
-rw-r--r--debian/rules11
-rw-r--r--g10/ChangeLog16
-rw-r--r--g10/helptext.c165
-rw-r--r--g10/import.c6
-rw-r--r--g10/misc.c2
-rw-r--r--g10/signal.c4
-rw-r--r--mpi/ChangeLog5
-rw-r--r--mpi/config.links10
-rw-r--r--po/ChangeLog10
-rw-r--r--po/de.po623
-rw-r--r--po/es_ES.po180
-rw-r--r--po/fr.po613
-rw-r--r--po/it.po505
-rw-r--r--po/pl.po410
-rw-r--r--po/pt_BR.po574
-rw-r--r--po/ru.po251
-rw-r--r--util/ChangeLog10
-rw-r--r--util/dotlock.c1
-rw-r--r--util/miscutil.c26
-rw-r--r--util/secmem.c2
30 files changed, 2106 insertions, 1391 deletions
diff --git a/ChangeLog b/ChangeLog
index 51ae522a3..760f312dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 30 20:38:33 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+
+ * configure.in: Some support for DJGPP (Mark Elbrecht)
+
Wed Aug 4 10:34:46 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
diff --git a/THANKS b/THANKS
index c078d197c..3dd122eee 100644
--- a/THANKS
+++ b/THANKS
@@ -26,6 +26,7 @@ Ernst Molitor ernst.molitor@uni-bonn.de
Fabio Coatti cova@felix.unife.it
Felix von Leitner leitner@amdiv.de
Frank Heckenbach heckenb@mi.uni-erlangen.de
+Frank Stajano frank.stajano@cl.cam.ac.uk
Gaël Quéri gqueri@mail.dotcom.fr
Greg Louis glouis@dynamicro.on.ca
Greg Troxel gdt@ir.bbn.com
@@ -52,6 +53,7 @@ Kazu Yamamoto kazu@iijlab.net
Lars Kellogg-Stedman lars@bu.edu
Marco d'Itri md@linux.it
Mark Adler madler@alumni.caltech.edu
+Mark Elbrecht snowball3@bigfoot.com
Markus Friedl Markus.Friedl@informatik.uni-erlangen.de
Martin Kahlert martin.kahlert@provi.de
Martin Schulte schulte@thp.uni-koeln.de
diff --git a/THOUGHTS b/THOUGHTS
index 586eea1f6..b073b5ff2 100644
--- a/THOUGHTS
+++ b/THOUGHTS
@@ -216,6 +216,12 @@ of the existing key servers (I think they bail out on some rfc2440
packet formats).
+DJGPP
+=====
+Don't use symlinks but try to do the preprocessing in the config-links script.
+DJPGG has problems to distinguish betwen .s and .S becaus the FAT filesystem
+is not case sensitive (Mark Elbrecht).
+
Special procmail addresses
==========================
diff --git a/TODO b/TODO
index bbd499535..dfb71b4fe 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,12 @@
+ * use-emmbeded-filename ist nicht dokumentiert.
+
+ * --disable-asm should still assemble _udiv_qrnnd when needed
+
+ * Skip RO keyrings when importing a key.
+
+ * help the translaters to catch changes made to helptext.c
+ and tell that, that they have to translate those strings.
Scheduled for 1.1
-----------------
diff --git a/VERSION b/VERSION
index 56f315114..642efaa8f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.10
+0.9.10a
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index 5c6f4a5e8..6c84bf5ab 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug 30 20:38:33 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+
+ * cipher.c (do_cbc_encrypt): Fixed serious bug occuring when not using
+ in place encryption. Pointed out by Frank Stajano.
+
Mon Jul 26 09:34:46 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
diff --git a/cipher/cipher.c b/cipher/cipher.c
index 4a0e683d9..990671fc5 100644
--- a/cipher/cipher.c
+++ b/cipher/cipher.c
@@ -443,7 +443,7 @@ do_cbc_encrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nblocks )
* 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++;
+ outbuf[i] = inbuf[i] ^ *ivp++;
(*c->encrypt)( &c->context.c, outbuf, outbuf );
memcpy(c->iv, outbuf, blocksize );
inbuf += c->blocksize;
diff --git a/configure.in b/configure.in
index fcf9916a5..eee8c76d6 100644
--- a/configure.in
+++ b/configure.in
@@ -201,6 +201,15 @@ case "${target}" in
try_gdbm="no"
;;
+ i*86-*-msdosdjgpp*)
+ # DOS with the DJGPP environment
+ ac_cv_have_dev_random=no
+ AC_DEFINE(HAVE_DRIVE_LETTERS)
+ AC_DEFINE(HAVE_DOSISH_SYSTEM)
+ try_gettext="no"
+ try_gdbm="no"
+ ;;
+
*-*-hpux*)
if test -z "$GCC" ; then
CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE"
@@ -238,6 +247,10 @@ case "${target}" in
*-linux*)
PRINTABLE_OS_NAME="GNU/Linux"
;;
+ i*86-*-msdosdjgpp*)
+ PRINTABLE_OS_NAME="MSDOS/DJGPP"
+ try_dynload=no
+ ;;
*)
PRINTABLE_OS_NAME=`uname -s || echo "Unknown"`
;;
@@ -478,6 +491,9 @@ if test "$use_static_rnd" = default; then
m68k-atari-mint)
static_modules="$static_modules rndatari"
;;
+ i*86-*-msdosdjgpp*)
+ static_modules="$static_modules"
+ ;;
*)
static_modules="$static_modules rndunix"
print_egd_notice=yes
diff --git a/debian/changelog b/debian/changelog
index 903c23012..432779c08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+gnupg (0.9.10-2) unstable; urgency=low
+
+ * debian/rules (binary-arch): install lspgpot. Requested by Kai
+ Henningsen <kai@khms.westfalen.de>. [#42288]
+ * debian/rules (binary-arch): correct the path where modules are looked
+ for. Reported by Karl M. Hegbloom <karlheg@odin.cc.pdx.edu>. [#40881]
+ * debian/postinst, debian/postrm: under protest, register gpg the
+ package with suidmanager and make it suid by default.
+ [#29780,#32590,#40391]
+
+ -- James Troup <james@nocrew.org> Tue, 10 Aug 1999 00:12:40 +0100
+
+gnupg (0.9.10-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- James Troup <james@nocrew.org> Fri, 6 Aug 1999 01:16:21 +0100
+
+gnupg (0.9.9-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- James Troup <james@nocrew.org> Sun, 25 Jul 1999 01:06:31 +0100
+
gnupg (0.9.8-1) unstable; urgency=low
* New upstream version.
diff --git a/debian/copyright b/debian/copyright
index 0ae272dc6..6c08adfc7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ have some bugs and some features may not work at all.
This package was put together by me, James Troup
<james@nocrew.org>, from the sources, which I obtained from
-ftp://ftp.gnupg.org/pub/gcrypt/gnupg-0.9.8.tar.gz. The changes were
+ftp://ftp.gnupg.org/pub/gcrypt/gnupg-0.9.10.tar.gz. The changes were
minimal, namely:
- adding support for the Debian package maintenance scheme, by adding
diff --git a/debian/rules b/debian/rules
index e10b1929b..3583ed4f7 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-# debian/rules file - for GNUPG (0.9.8)
+# debian/rules file - for GNUPG (0.9.10)
# Based on sample debian/rules file - for GNU Hello (1.3).
# Copyright 1994,1995 by Ian Jackson.
# Copyright 1998 James Troup
@@ -32,11 +32,16 @@ binary-arch: checkroot build # test
$(checkdir)
-rm -rf debian/tmp
install -d debian/tmp/DEBIAN/
- install -m 755 debian/preinst debian/tmp/DEBIAN/preinst
+ install -m 755 debian/preinst debian/postinst debian/postrm debian/tmp/DEBIAN/
$(MAKE) prefix=`pwd`/debian/tmp/usr install
- gzip -9v debian/tmp/usr/man/man1/*
strip debian/tmp/usr/bin/*
+ sed -e "s#../g10/gpg#gpg#" < tools/lspgpot > debian/tmp/usr/bin/lspgpot
+ chmod 755 debian/tmp/usr/bin/lspgpot
strip --strip-unneeded debian/tmp/usr/lib/gnupg/*
+ sed -e "s#/usr/local/#/usr/#" < debian/tmp/usr/man/man1/gpg.1 \
+ > debian/tmp/usr/man/man1/gpg.1.new
+ mv debian/tmp/usr/man/man1/gpg.1.new debian/tmp/usr/man/man1/gpg.1
+ gzip -9v debian/tmp/usr/man/man1/*
install -d debian/tmp/usr/doc/gnupg/
install -m 644 debian/changelog debian/tmp/usr/doc/gnupg/changelog.Debian
install -m 644 debian/README.Debian README NEWS THANKS TODO doc/DETAILS \
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 43d5f0324..329b3a7b1 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,19 @@
+Mon Aug 30 20:38:33 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+
+ * import.c (chk_self_sigs): some s/log_error/log_info/ so that gpg
+ does not return an error if a key has some invalid packets.
+
+ * helptext.c: Fixed some typos and changed the way the
+ translation works. The english text is now the keyword for gettext
+ and not anymore the keyword supplied to the function. Done after
+ some discussion with Walter who thinks this is much easier for the
+ translators.
+
+ * misc.c (disable_core_dumps): Don't do it for DOSish systems.
+
+ * signal.c (signal_name): Bounds check on signum.
+
Wed Aug 4 10:34:18 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
diff --git a/g10/helptext.c b/g10/helptext.c
index df7d4ad4f..d34a3a9ac 100644
--- a/g10/helptext.c
+++ b/g10/helptext.c
@@ -33,8 +33,6 @@
* a key consisting of words and dots. Because the lookup is only
* done in an interactive mode on a user request (when she enters a "?"
* as response to a prompt) we can use a simple search through the list.
- * Translators should use the key as msgid, this is to keep the msgid short
- * and to allow for easy changing of the helptexts.
*
* Mini glossary:
*
@@ -45,182 +43,186 @@ static struct helptexts { const char *key; const char *help; } helptexts[] = {
/* begin of list */
-{ N_("edit_ownertrust.value"),
+{ "edit_ownertrust.value", N_(
"It's up to you to assign a value here; this value will never be exported\n"
"to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
"to do with the (implicitly created) web-of-certificates."
-},
+)},
-{ N_("revoked_key.override"),
+{ "revoked_key.override", N_(
"If you want to use this revoked key anyway, answer \"yes\"."
-},
+)},
-{ N_("untrusted_key.override"),
+{ "untrusted_key.override", N_(
"If you want to use this untrusted key anyway, answer \"yes\"."
-},
+)},
-{ N_("pklist.user_id.enter"),
+{ "pklist.user_id.enter", N_(
"Enter the user id of the addressee to whom you want to send the message."
-},
+)},
-{ N_("keygen.algo"),
+{ "keygen.algo", N_(
"Select the algorithm to use.\n"
+"\n"
"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
"for signatures. This is the suggested algorithm because verification of\n"
"DSA signatures are much faster than those of ElGamal.\n"
-"ElGamal is a algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distunguishs between two flavors of this algorithms: a encrypt only\n"
+"\n"
+"ElGamal is an algorithm which can be used for signatures and encryption.\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt only\n"
"and a sign+encrypt; actually it is the same, but some parameters must be\n"
"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implemenations are not required to understand\n"
+"does this but other OpenPGP implementations are not required to understand\n"
"the signature+encryption flavor.\n"
+"\n"
"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is disabled in this."
-},
+"this is the reason why the encryption only ElGamal key is not available in\n"
+"this menu."
+)},
-{ N_("keygen.algo.elg_se"),
+{ "keygen.algo.elg_se", N_(
"Although these keys are defined in RFC2440 they are not suggested\n"
"because they are not supported by all programs and signatures created\n"
"with them are quite large and very slow to verify."
-},
+)},
-{ N_("keygen.size"),
+{ "keygen.size", N_(
"Enter the size of the key"
-},
+)},
-{ N_("keygen.size.huge.okay"),
+{ "keygen.size.huge.okay", N_(
"Answer \"yes\" or \"no\""
-},
+)},
-{ N_("keygen.size.large.okay"),
+{ "keygen.size.large.okay", N_(
"Answer \"yes\" or \"no\""
-},
+)},
-{ N_("keygen.valid"),
+{ "keygen.valid", N_(
"Enter the required value as shown in the pronpt.\n"
"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
"get a good error response - instead the system tries to interpret\n"
"the given value as an interval."
-},
+)},
-{ N_("keygen.valid.okay"),
+{ "keygen.valid.okay", N_(
"Answer \"yes\" or \"no\""
-},
+)},
-{ N_("keygen.name"),
+{ "keygen.name", N_(
"Enter the name of the key holder"
-},
+)},
-{ N_("keygen.email"),
+{ "keygen.email", N_(
"please enter an optional but highly suggested email address"
-},
+)},
-{ N_("keygen.comment"),
+{ "keygen.comment", N_(
"Please enter an optional comment"
-},
+)},
-{ N_("keygen.userid.cmd"),
+{ "keygen.userid.cmd", N_(
""
"N to change the name.\n"
"C to change the comment.\n"
"E to change the email address.\n"
"O to continue with key generation.\n"
"Q to to quit the key generation."
-},
+)},
-{ N_("keygen.sub.okay"),
+{ "keygen.sub.okay", N_(
"Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-},
+)},
-{ N_("sign_uid.okay"),
+{ "sign_uid.okay", N_(
"Answer \"yes\" or \"no\""
-},
+)},
-{ N_("change_passwd.empty.okay"),
+{ "change_passwd.empty.okay", N_(
"Answer \"yes\" or \"no\""
-},
+)},
-{ N_("keyedit.save.okay"),
+{ "keyedit.save.okay", N_(
"Answer \"yes\" or \"no\""
-},
+)},
-{ N_("keyedit.cancel.okay"),
+{ "keyedit.cancel.okay", N_(
"Answer \"yes\" or \"no\""
-},
+)},
-{ N_("keyedit.sign_all.okay"),
+{ "keyedit.sign_all.okay", N_(
"Answer \"yes\" is you want to sign ALL the user IDs"
-},
+)},
-{ N_("keyedit.remove.uid.okay"),
+{ "keyedit.remove.uid.okay", N_(
"Answer \"yes\" if you really want to delete this user ID.\n"
"All certificates are then also lost!"
-},
+)},
-{ N_("keyedit.remove.subkey.okay"),
+{ "keyedit.remove.subkey.okay", N_(
"Answer \"yes\" if it is okay to delete the subkey"
-},
+)},
-{ N_("keyedit.delsig.valid"),
+{ "keyedit.delsig.valid", N_(
"This is a valid signature on the key; you normally don't want\n"
"to delete this signature may be important to establish a trust\n"
"connection to the key or another key certified by this key."
-},
-{ N_("keyedit.delsig.unknown"),
+)},
+{ "keyedit.delsig.unknown", N_(
"This signature can't be checked because you don't have the\n"
"corresponding key. You should postpone its deletion until you\n"
"know which key was used because this signing key might establish"
"a trust connection through another already certified key."
-},
-{ N_("keyedit.delsig.invalid"),
+)},
+{ "keyedit.delsig.invalid", N_(
"The signature is not valid. It does make sense to remove it from\n"
"your keyring."
-},
-{ N_("keyedit.delsig.selfsig"),
+)},
+{ "keyedit.delsig.selfsig", N_(
"This is a signature which binds the user ID to the key. It is\n"
"usually not a good idea to remove such a signature. Actually\n"
"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."
-},
+)},
-{ N_("passphrase.enter"),
+{ "passphrase.enter", N_(
""
"Please enter the passhrase; this is a secret sentence \n"
" Blurb, blurb,.... "
-},
+)},
-{ N_("passphrase.repeat"),
+{ "passphrase.repeat", N_(
"Please repeat the last passphrase, so you are sure what you typed in."
-},
+)},
-{ N_("detached_signature.filename"),
+{ "detached_signature.filename", N_(
"Give the name fo the file to which the signature applies"
-},
+)},
/* openfile.c (overwrite_filep) */
-{ N_("openfile.overwrite.okay"),
+{ "openfile.overwrite.okay", N_(
"Answer \"yes\" if it is okay to overwrite the file"
-},
+)},
/* openfile.c (ask_outfile_name) */
-{ N_("openfile.askoutname"),
+{ "openfile.askoutname", N_(
"Please enter a new filename. If you just hit RETURN the default\n"
"file (which is shown in brackets) will be used."
-},
+)},
/* end of list */
{ NULL, NULL } };
@@ -234,20 +236,15 @@ display_online_help( const char *keyword )
if( !keyword )
tty_printf(_("No help available") );
else {
- const char *p = _(keyword);
-
- if( strcmp( p, keyword ) )
- tty_printf("%s", p );
- else {
- int i;
-
- for(i=0; (p=helptexts[i].key) && strcmp( p, keyword ); i++ )
- ;
- if( !p || !*helptexts[i].help )
- tty_printf(_("No help available for `%s'"), keyword );
- else
- tty_printf("%s", helptexts[i].help );
- }
+ const char *p;
+ int i;
+
+ for(i=0; (p=helptexts[i].key) && strcmp( p, keyword ); i++ )
+ ;
+ if( !p || !*helptexts[i].help )
+ tty_printf(_("No help available for `%s'"), keyword );
+ else
+ tty_printf("%s", _(helptexts[i].help) );
}
tty_printf("\n");
}
diff --git a/g10/import.c b/g10/import.c
index 9da71fbaf..a46916789 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -714,7 +714,7 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
}
rc = check_key_signature( keyblock, n, NULL);
if( rc ) {
- log_error( rc == G10ERR_PUBKEY_ALGO ?
+ log_info( rc == G10ERR_PUBKEY_ALGO ?
_("key %08lX: unsupported public key algorithm\n"):
_("key %08lX: invalid self-signature\n"),
(ulong)keyid[1]);
@@ -731,14 +731,14 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
n, PKT_SECRET_SUBKEY );
if( !knode ) {
- log_error( _("key %08lX: no subkey for key binding\n"),
+ log_info( _("key %08lX: no subkey for key binding\n"),
(ulong)keyid[1]);
n->flag |= 4; /* delete this */
}
else {
rc = check_key_signature( keyblock, n, NULL);
if( rc ) {
- log_error( rc == G10ERR_PUBKEY_ALGO ?
+ log_info( rc == G10ERR_PUBKEY_ALGO ?
_("key %08lX: unsupported public key algorithm\n"):
_("key %08lX: invalid subkey binding\n"),
(ulong)keyid[1]);
diff --git a/g10/misc.c b/g10/misc.c
index 07d166940..3f18183b5 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -82,6 +82,7 @@ trap_unaligned(void)
void
disable_core_dumps()
{
+ #ifndef HAVE_DOSISH_SYSTEM
#ifdef HAVE_SETRLIMIT
struct rlimit limit;
@@ -94,6 +95,7 @@ disable_core_dumps()
#endif
if( !opt.quiet )
log_info(_("WARNING: program may create a core file!\n"));
+ #endif
}
diff --git a/g10/signal.c b/g10/signal.c
index 29f99c64b..728f4054f 100644
--- a/g10/signal.c
+++ b/g10/signal.c
@@ -41,8 +41,8 @@ static volatile int caught_sigusr1 = 0;
static const char *
signal_name( int signum )
{
- #if SYS_SIGLIST_DECLARED
- return sys_siglist[signum];
+ #if defined(SYS_SIGLIST_DECLARED) && defined(NSIG)
+ return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
#else
static char buf[20];
sprintf(buf, "signal %d", signum );
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 460e08b26..d6cf6e3ee 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 30 20:38:33 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+
+ * config.links: Add case label for DJGPP
+
Wed Jul 14 19:42:08 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
diff --git a/mpi/config.links b/mpi/config.links
index 376d42b71..da44a9122 100644
--- a/mpi/config.links
+++ b/mpi/config.links
@@ -34,6 +34,16 @@ case "${target}" in
cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h
path="i586 i386"
;;
+ i[34]86*-msdosdjgpp*)
+ echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
+ cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h
+ path="i386"
+ ;;
+ i[56]86*-msdosdjgpp*)
+ echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
+ cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h
+ path="i586 i386"
+ ;;
i[34]86*-*-*)
echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h
diff --git a/po/ChangeLog b/po/ChangeLog
index e0b1951b7..e890102cd 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,10 +1,16 @@
-Wed Aug 4 10:34:18 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+Mon Aug 30 20:38:33 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+ * it.po: Updated (Marco).
* de.po: Updated (Walter).
+ * pt_BR-po: Update (Thiago).
+ * fr.po: Updated (Gaël).
-Mon Jul 26 09:34:46 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+Wed Aug 4 10:34:18 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+ * de.po: Updated (Walter).
+
+Mon Jul 26 09:34:46 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
* it.po: Updated (Marco).
diff --git a/po/de.po b/po/de.po
index 9e89fc89a..66a8da08f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,8 +3,8 @@
# Walter Koch <walterk@dip.de>, 1998.
msgid ""
msgstr ""
-"POT-Creation-Date: 1999-08-04 09:56+0200\n"
-"PO-Revision-Date: 1999-08-02 21:56+0200\n"
+"POT-Creation-Date: 1999-08-30 19:40+0200\n"
+"PO-Revision-Date: 1999-08-05 21:56+0200\n"
"Last-Translator: Walter Koch <walterk@mail.dip.de>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,19 +26,27 @@ msgid "(you may have used the wrong program for this task)\n"
msgstr ""
"(möglicherweise haben Sie das falsche Programm für diese Aufgabe benutzt)\n"
-#: util/miscutil.c:254 util/miscutil.c:271
+#: util/miscutil.c:254 util/miscutil.c:283
msgid "yes"
msgstr "ja"
-#: util/miscutil.c:255 util/miscutil.c:273
+#: util/miscutil.c:255 util/miscutil.c:286
msgid "yY"
msgstr "jJyY"
-#: g10/keyedit.c:564 util/miscutil.c:272
+#: util/miscutil.c:256 util/miscutil.c:284
+msgid "no"
+msgstr ""
+
+#: util/miscutil.c:257 util/miscutil.c:287
+msgid "nN"
+msgstr ""
+
+#: g10/keyedit.c:564 util/miscutil.c:285
msgid "quit"
msgstr "quit"
-#: util/miscutil.c:274
+#: util/miscutil.c:288
msgid "qQ"
msgstr "qQ"
@@ -352,7 +360,7 @@ msgstr "Schlüssel nur auf diesem Rechner signieren"
#: g10/g10.c:205
msgid "sign or edit a key"
-msgstr "Unterschreiben oder Bearbeiten eines Schlüssels"
+msgstr "Unterschreiben o. Bearbeiten eines Schlüssels"
#: g10/g10.c:206
msgid "generate a revocation certificate"
@@ -364,11 +372,11 @@ msgstr "Schlüssel exportieren"
#: g10/g10.c:208
msgid "export keys to a key server"
-msgstr "Schlüssel zu einem Schlüsselserver exportieren"
+msgstr "Schlüssel zu einem Schlü.server exportieren"
#: g10/g10.c:209
msgid "import keys from a key server"
-msgstr "Schlüssel von einem Schlüsselserver importieren"
+msgstr "Schlüssel von einem Schlü.server importieren"
#: g10/g10.c:212
msgid "import/merge keys"
@@ -376,7 +384,7 @@ msgstr "Schlüssel importieren/kombinieren"
#: g10/g10.c:214
msgid "list only the sequence of packets"
-msgstr "Lediglich die Struktur der Datenpakete anzeigen"
+msgstr "Lediglich Struktur der Datenpakete anzeigen"
#: g10/g10.c:216
msgid "export the ownertrust values"
@@ -396,7 +404,7 @@ msgstr "|[NAMEN]|Überprüfen der \"Trust\"-Datenbank"
#: g10/g10.c:223
msgid "fix a corrupted trust database"
-msgstr "Reparieren einer beschädigten \"Trust\"-Datenbank"
+msgstr "Reparieren einer beschädigten \"Trust\"-Datenb."
#: g10/g10.c:224
msgid "De-Armor a file or stdin"
@@ -435,6 +443,8 @@ msgstr "|NAME|NAME als voreingestellten Empfänger benutzen"
#: g10/g10.c:238
msgid "use the default key as default recipient"
msgstr ""
+"Den Standardschlüssel als voreingestellten\n"
+"\tEmpfänger benutzen"
#: g10/g10.c:242
msgid "use this user-id to sign or decrypt"
@@ -660,17 +670,17 @@ msgstr "%s ist kein gültiger Zeichensatz.\n"
#: g10/g10.c:892 g10/g10.c:901
#, c-format
msgid "NOTE: %s is not for normal use!\n"
-msgstr ""
+msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
#: g10/g10.c:894
#, c-format
msgid "%s not allowed with %s!\n"
-msgstr ""
+msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
#: g10/g10.c:897
#, c-format
msgid "%s makes no sense with %s!\n"
-msgstr ""
+msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
#: g10/g10.c:916 g10/g10.c:928
msgid "selected cipher algorithm is invalid\n"
@@ -744,7 +754,7 @@ msgstr "--decrypt [Dateiname]"
#: g10/g10.c:1112
msgid "--sign-key user-id"
-msgstr ""
+msgstr "--sign-key User-ID"
#: g10/g10.c:1120
msgid "--lsign-key user-id"
@@ -905,9 +915,8 @@ msgid " Fingerprint:"
msgstr " Fingerabdruck:"
#: g10/pkclist.c:80
-#, fuzzy
msgid "Fingerprint:"
-msgstr "\"Fingerabdruck\" anzeigen"
+msgstr "Fingerabdruck:"
# valid user replies (not including 1..4)
#. a string with valid answers
@@ -1546,7 +1555,7 @@ msgstr "zu viele Einträge im unk-Lager - abgeschaltet\n"
#: g10/getkey.c:1289 g10/getkey.c:1328
msgid "RSA key cannot be used in this version\n"
-msgstr ""
+msgstr "RSA-Schlüssel können in dieser Version nicht verwendet werden\n"
#: g10/getkey.c:1291 g10/getkey.c:1330
msgid "No key for user-id\n"
@@ -2371,20 +2380,20 @@ msgid "public key encrypted data: good DEK\n"
msgstr "Mit öffentlichem Schüssel verschlüsselte Daten: Korrekte DEK\n"
#: g10/mainproc.c:275
-#, fuzzy, c-format
+#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
-msgstr "%u-Bit %s Schlüssel, ID %08lX, erzeugt %s"
+msgstr "verschlüsselt mit %u-Bit %s Schlüssel, ID %08lX, erzeugt %s\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
+# [kw]
#: g10/mainproc.c:285
-#, fuzzy, c-format
+#, c-format
msgid "encrypted with %s key, ID %08lX\n"
-msgstr "Unterschrift vom %.*s, %s Schlüssel ID %08lX\n"
+msgstr "verschlüsselt mit %s Schlüssel, ID %08lX\n"
#: g10/mainproc.c:291
-#, fuzzy
msgid "no secret key for decryption available\n"
-msgstr "Geheimer Schlüssel ist nicht vorhanden"
+msgstr "kein geheimer Schlüssel zur Entschlüsselung vorhanden\n"
#: g10/mainproc.c:300
#, c-format
@@ -2462,20 +2471,20 @@ msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "ungültiges root-Paket in proc_tree() entdeckt\n"
-#: g10/misc.c:93
+#: g10/misc.c:94
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
-#: g10/misc.c:96
+#: g10/misc.c:97
msgid "WARNING: program may create a core file!\n"
msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
-#: g10/misc.c:203
+#: g10/misc.c:205
msgid "Experimental algorithms should not be used!\n"
msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
-#: g10/misc.c:217
+#: g10/misc.c:219
msgid ""
"RSA keys are deprecated; please consider creating a new key and use this key "
"in the future\n"
@@ -2483,7 +2492,7 @@ msgstr ""
"RSA Schlüssel sind nicht erwünscht; bitte denken Sie darüber nach, einen\n"
"neuen Schlüssel zu erzeugen und diesen in Zukunft zu benutzen\n"
-#: g10/misc.c:239
+#: g10/misc.c:241
msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
msgstr ""
"Diese Verschlüsselungsmethode taugt nicht mehr viel; verwenden Sie eine "
@@ -2520,9 +2529,8 @@ msgid " (main key ID %08lX)"
msgstr " (Hauptschlüssel-ID %08lX)"
#: g10/passphrase.c:190
-#, fuzzy
msgid "can't query password in batchmode\n"
-msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
+msgstr "Mantra kann im Batchmodus nicht abgefragt werden\n"
#: g10/passphrase.c:194
msgid "Enter passphrase: "
@@ -3175,223 +3183,369 @@ msgstr ""
"Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schlüssels für "
"sym.Verschlüsselung nicht vermieden werden!\n"
+#: g10/helptext.c:47
+#, fuzzy
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
+"Sie müssen selbt entscheiden, welchen Wert Sie hier eintragen; dieser Wert\n"
+"wird niemals an eine dritte Seite weitergegeben. Wir brauchen diesen Wert,\n"
+"um das \"Netz des Vertrauens\" aufzubauen. Dieses hat nichts mit dem "
+"(implizit\n"
+"erzeugten) \"Netz der Zertifikate\" zu tun.\n"
+
+#: g10/helptext.c:53
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
+msgstr ""
+
+#: g10/helptext.c:57
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr ""
+
+#: g10/helptext.c:61
+msgid ""
+"Enter the user id of the addressee to whom you want to send the message."
+msgstr ""
+
+#: g10/helptext.c:65
+msgid ""
+"Select the algorithm to use.\n"
+"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+"for signatures. This is the suggested algorithm because verification of\n"
+"DSA signatures are much faster than those of ElGamal.\n"
+"ElGamal is an algorithm which can be used for signatures and encryption.\n"
+"OpenPGP distunguishs between two flavors of this algorithms: an encrypt "
+"only\n"
+"and a sign+encrypt; actually it is the same, but some parameters must be\n"
+"selected in a special way to create a safe key for signatures: this program\n"
+"does this but other OpenPGP implementations are not required to understand\n"
+"the signature+encryption flavor.\n"
+"The first (primary) key must always be a key which is capable of signing;\n"
+"this is the reason why the encryption only ElGamal key is not available in\n"
+"this menu."
+msgstr ""
+
+#: g10/helptext.c:82
+msgid ""
+"Although these keys are defined in RFC2440 they are not suggested\n"
+"because they are not supported by all programs and signatures created\n"
+"with them are quite large and very slow to verify."
+msgstr ""
+
+#: g10/helptext.c:89
+#, fuzzy
+msgid "Enter the size of the key"
+msgstr "Geben Sie die User-ID ein: "
+
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:147 g10/helptext.c:152 g10/helptext.c:157
+msgid "Answer \"yes\" or \"no\""
+msgstr ""
+
+#: g10/helptext.c:103
+msgid ""
+"Enter the required value as shown in the pronpt.\n"
+"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
+
+#: g10/helptext.c:115
+msgid "Enter the name of the key holder"
+msgstr ""
+
+#: g10/helptext.c:120
+msgid "please enter an optional but highly suggested email address"
+msgstr ""
+
+#: g10/helptext.c:124
+#, fuzzy
+msgid "Please enter an optional comment"
+msgstr "Bitte geben Sie den Namen der Datendatei ein: "
+
+#: g10/helptext.c:129
+msgid ""
+"N to change the name.\n"
+"C to change the comment.\n"
+"E to change the email address.\n"
+"O to continue with key generation.\n"
+"Q to to quit the key generation."
+msgstr ""
+
+#: g10/helptext.c:138
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr ""
+
+#: g10/helptext.c:161
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
+msgstr ""
+
+#: g10/helptext.c:165
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
+
+#: g10/helptext.c:170
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr ""
+
+#: g10/helptext.c:175
+msgid ""
+"This is a valid signature on the key; you normally don't want\n"
+"to delete this signature may be important to establish a trust\n"
+"connection to the key or another key certified by this key."
+msgstr ""
+
+#: g10/helptext.c:180
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key. You should postpone its deletion until you\n"
+"know which key was used because this signing key might establisha trust "
+"connection through another already certified key."
+msgstr ""
+
+#: g10/helptext.c:186
+msgid ""
+"The signature is not valid. It does make sense to remove it from\n"
+"your keyring."
+msgstr ""
+
+#: g10/helptext.c:190
+msgid ""
+"This is a signature which binds the user ID to the key. It is\n"
+"usually not a good idea to remove such a signature. Actually\n"
+"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."
+msgstr ""
+
+#: g10/helptext.c:199
+msgid ""
+"Please enter the passhrase; this is a secret sentence \n"
+" Blurb, blurb,.... "
+msgstr ""
+
+#: g10/helptext.c:206
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
+msgstr ""
+
+#: g10/helptext.c:210
+msgid "Give the name fo the file to which the signature applies"
+msgstr ""
+
+#: g10/helptext.c:215
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr ""
+
+#: g10/helptext.c:220
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+msgstr ""
+
+#: g10/helptext.c:234
+msgid "No help available"
+msgstr "Keine Hilfe vorhanden."
+
+#: g10/helptext.c:242
+#, c-format
+msgid "No help available for `%s'"
+msgstr "Keine Hilfe für '%s' vorhanden."
+
# "It's up to you to assign a value here; this value will never be exported\n"
# "to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
# "to do with the (implicitly created) web-of-certificates."
-#. begin of list
-#: g10/helptext.c:48
-msgid "edit_ownertrust.value"
-msgstr ""
-"SIE müssen hier einen Wert eingeben. Dieser Wert wird niemals an eine "
-"Dritte\n"
-"weitergegeben (exportiert) werden. Wir brauchen ihn zum Aufbau des\n"
-"\"web-of-trust\", Er hat nichts mit dem (stillschweigend aufgebautem)\n"
-"\"web-of-certificates\" zu tun."
+#~ msgid "edit_ownertrust.value"
+#~ msgstr ""
+#~ "SIE müssen hier einen Wert eingeben. Dieser Wert wird niemals an eine "
+#~ "Dritte\n"
+#~ "weitergegeben (exportiert) werden. Wir brauchen ihn zum Aufbau des\n"
+#~ "\"web-of-trust\", Er hat nichts mit dem (stillschweigend aufgebautem)\n"
+#~ "\"web-of-certificates\" zu tun."
# "If you want to use this revoked key anyway, answer \"yes\"."
-#: g10/helptext.c:54
-msgid "revoked_key.override"
-msgstr ""
-"Wenn Sie diesen widerrufenen Schlüssel trotzdem benutzen wollen,\n"
-"so antworten Sie mit \"ja\" oder schweigen für immer."
+#~ msgid "revoked_key.override"
+#~ msgstr ""
+#~ "Wenn Sie diesen widerrufenen Schlüssel trotzdem benutzen wollen,\n"
+#~ "so antworten Sie mit \"ja\" oder schweigen für immer."
# "If you want to use this untrusted key anyway, answer \"yes\"."
-#: g10/helptext.c:58
-msgid "untrusted_key.override"
-msgstr ""
-"Wenn Sie diesen nichtvertruenswürdigen Schlüssel trotzdem benutzen wollen,\n"
-"so antworten Sie mit \"ja\" oder schweigen Sie für immer."
+#~ msgid "untrusted_key.override"
+#~ msgstr ""
+#~ "Wenn Sie diesen nichtvertruenswürdigen Schlüssel trotzdem benutzen wollen,\n"
+#~ "so antworten Sie mit \"ja\" oder schweigen Sie für immer."
# "Enter the user id of the addresse to whom you want to send the message."
-#: g10/helptext.c:62
-msgid "pklist.user_id.enter"
-msgstr ""
-"Geben Sie die User-ID dessen ein, an den Sie die Botschaft senden wollen."
+#~ msgid "pklist.user_id.enter"
+#~ msgstr ""
+#~ "Geben Sie die User-ID dessen ein, an den Sie die Botschaft senden wollen."
-#: g10/helptext.c:66
-msgid "keygen.algo"
-msgstr ""
-"Wählen Sie die zu verwendende Methode aus.\n"
-"DSA (alias DSS) bedeutet \"digital signature algorithm\" (Digitales\n"
-" Unterschrift-Verfahren). Es kann nur zum Unterschreiben und Beglaubigen\n"
-" benutzt werden. Dies ist das empfohlene Verfahren, da dessen Überprüfung\n"
-" wesentlich schneller abläuft, als die von \"ElGamal\".\n"
-"\n"
-"ElGamal ist ein Verfahren für Unterschrift, Beglaubigung und "
-"Verschlüsselung\n"
-" OpenPGP unterscheidet zwischen zwei Arten von ElGamal: eines nur zum\n"
-" Unterschreiben/Beglaubigen und eines zusätzlich zum Verschlüsseln.\n"
-" Eigentlich sind diese Arten identisch; allerdings müssen einige Parameter\n"
-" auf eine besondere Art gewählt werden, um einen sicheren Schlüssel für\n"
-" Unterschriften zu erzeugen. Dieses Programm macht dies zwar so, aber "
-"andere\n"
-" Programme sind nach OpenPGP-Spezifikation nicht verpflichtet die zweite "
-"Art\n"
-" (die mit zusätzlichem Verschlüsseln) zu verstehen.\n"
-"\n"
-"Der Hauptschlüssel (\"primary Key\") muß auf jeden Fall zum Unterschreiben "
-"fähig\n"
-"sein. Deshalb kann ein Nur-Verschlüssel-ElGamal-Schlüssel dafür nicht\n"
-"verwendet werden.\n"
-"Auch sollte man \"ElGamal in einem v3-Paket\" nicht verwenden, denn solch "
-"ein\n"
-"Schlüssel ist nicht mit anderen Programmen nach der OpenPGP-Spezifikation\n"
-"verträglich."
+#~ msgid "keygen.algo"
+#~ msgstr ""
+#~ "Wählen Sie die zu verwendende Methode aus.\n"
+#~ "DSA (alias DSS) bedeutet \"digital signature algorithm\" (Digitales\n"
+#~ " Unterschrift-Verfahren). Es kann nur zum Unterschreiben und Beglaubigen\n"
+#~ " benutzt werden. Dies ist das empfohlene Verfahren, da dessen Überprüfung\n"
+#~ " wesentlich schneller abläuft, als die von \"ElGamal\".\n"
+#~ "\n"
+#~ "ElGamal ist ein Verfahren für Unterschrift, Beglaubigung und "
+#~ "Verschlüsselung\n"
+#~ " OpenPGP unterscheidet zwischen zwei Arten von ElGamal: eines nur zum\n"
+#~ " Unterschreiben/Beglaubigen und eines zusätzlich zum Verschlüsseln.\n"
+#~ " Eigentlich sind diese Arten identisch; allerdings müssen einige Parameter\n"
+#~ " auf eine besondere Art gewählt werden, um einen sicheren Schlüssel für\n"
+#~ " Unterschriften zu erzeugen. Dieses Programm macht dies zwar so, aber "
+#~ "andere\n"
+#~ " Programme sind nach OpenPGP-Spezifikation nicht verpflichtet die zweite "
+#~ "Art\n"
+#~ " (die mit zusätzlichem Verschlüsseln) zu verstehen.\n"
+#~ "\n"
+#~ "Der Hauptschlüssel (\"primary Key\") muß auf jeden Fall zum Unterschreiben "
+#~ "fähig\n"
+#~ "sein. Deshalb kann ein Nur-Verschlüssel-ElGamal-Schlüssel dafür nicht\n"
+#~ "verwendet werden.\n"
+#~ "Auch sollte man \"ElGamal in einem v3-Paket\" nicht verwenden, denn solch "
+#~ "ein\n"
+#~ "Schlüssel ist nicht mit anderen Programmen nach der OpenPGP-Spezifikation\n"
+#~ "verträglich."
# 0.9.0: Although these keys are defined in RFC2440 they are not suggested\n"
# because they are not supported by all programs and signatures created\n"
# with them are quite large and very slow to verify."
-#: g10/helptext.c:82
-msgid "keygen.algo.elg_se"
-msgstr ""
-"Obwohl diese Schlüssel in RFC 2440 definiert sind, ist ihre Verwendung "
-"nicht\n"
-"empfohlen. Sie werden nämlich nicht von allen Programmen unterstützt.\n"
-"Außerdem sind damit ezeugte Unterschriften recht groß und die Überprüfung\n"
-"ist langsam."
+#~ msgid "keygen.algo.elg_se"
+#~ msgstr ""
+#~ "Obwohl diese Schlüssel in RFC 2440 definiert sind, ist ihre Verwendung "
+#~ "nicht\n"
+#~ "empfohlen. Sie werden nämlich nicht von allen Programmen unterstützt.\n"
+#~ "Außerdem sind damit ezeugte Unterschriften recht groß und die Überprüfung\n"
+#~ "ist langsam."
# "Enter the size of the key"
-#: g10/helptext.c:89
-msgid "keygen.size"
-msgstr ""
-"Wählen Sie die gewünschte Schlüssellänge.\n"
-"\n"
-"Ein langer Schlüssel bietet mehr Sicherheit, kostet aber auch mehr "
-"Rechenzeit.\n"
-"Ein kurzer Schlüssel ist nicht ganz so sicher, wird aber schneller "
-"bearbeitet.\n"
-"1024 Bit ist für den Heimgebrauch ein brauchbarer Wert. Wenn Sie aber z.B. "
-"in\n"
-"Atlanta, Georgia, USA für eine Limonandenfabrik arbeiten, und das Rezept\n"
-"speichern wollen (\"SCHLEMMER!\"), so wären 2048 Bit kein schlechter Wert."
+#~ msgid "keygen.size"
+#~ msgstr ""
+#~ "Wählen Sie die gewünschte Schlüssellänge.\n"
+#~ "\n"
+#~ "Ein langer Schlüssel bietet mehr Sicherheit, kostet aber auch mehr "
+#~ "Rechenzeit.\n"
+#~ "Ein kurzer Schlüssel ist nicht ganz so sicher, wird aber schneller "
+#~ "bearbeitet.\n"
+#~ "1024 Bit ist für den Heimgebrauch ein brauchbarer Wert. Wenn Sie aber z.B. "
+#~ "in\n"
+#~ "Atlanta, Georgia, USA für eine Limonandenfabrik arbeiten, und das Rezept\n"
+#~ "speichern wollen (\"SCHLEMMER!\"), so wären 2048 Bit kein schlechter Wert."
# "Answer \"yes\" or \"no\""
-#: g10/helptext.c:93
-msgid "keygen.size.huge.okay"
-msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
+#~ msgid "keygen.size.huge.okay"
+#~ msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
-#: g10/helptext.c:98
-msgid "keygen.size.large.okay"
-msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
+#~ msgid "keygen.size.large.okay"
+#~ msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
-#: g10/helptext.c:103
-msgid "keygen.valid"
-msgstr "Geben Sie den erforderlichen Wert ein"
+#~ msgid "keygen.valid"
+#~ msgstr "Geben Sie den erforderlichen Wert ein"
-#: g10/helptext.c:110
-msgid "keygen.valid.okay"
-msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
+#~ msgid "keygen.valid.okay"
+#~ msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
# "Enter the name of the key holder"
-#: g10/helptext.c:115
-msgid "keygen.name"
-msgstr "Geben Sie den Namen des Schlüsselinhabers ein"
+#~ msgid "keygen.name"
+#~ msgstr "Geben Sie den Namen des Schlüsselinhabers ein"
# "please enter an optional but highly suggested email address"
-#: g10/helptext.c:120
-msgid "keygen.email"
-msgstr ""
-"Geben Sie eine E-Mail-Adresse ein. Dies ist zwar nicht notwendig,\n"
-"aber empfehlenswert."
+#~ msgid "keygen.email"
+#~ msgstr ""
+#~ "Geben Sie eine E-Mail-Adresse ein. Dies ist zwar nicht notwendig,\n"
+#~ "aber empfehlenswert."
# "Please enter an optional comment"
-#: g10/helptext.c:124
-msgid "keygen.comment"
-msgstr "Geben Sie (bei Bedarf) einen Kommentar ein"
+#~ msgid "keygen.comment"
+#~ msgstr "Geben Sie (bei Bedarf) einen Kommentar ein"
# "N to change the name.\n"
# "C to change the comment.\n"
# "E to change the email address.\n"
# "O to continue with key generation.\n"
# "Q to to quit the key generation."
-#: g10/helptext.c:129
-msgid "keygen.userid.cmd"
-msgstr ""
-"N um den Namen zu ändern.\n"
-"K um den Kommentar zu ändern.\n"
-"E um die E-Mail-Adresse zu ändern.\n"
-"F um mit der Schlüsselerzeugung fortzusetzen.\n"
-"B um die Schlüsselerzeugung abbrechen."
+#~ msgid "keygen.userid.cmd"
+#~ msgstr ""
+#~ "N um den Namen zu ändern.\n"
+#~ "K um den Kommentar zu ändern.\n"
+#~ "E um die E-Mail-Adresse zu ändern.\n"
+#~ "F um mit der Schlüsselerzeugung fortzusetzen.\n"
+#~ "B um die Schlüsselerzeugung abbrechen."
# "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-#: g10/helptext.c:138
-msgid "keygen.sub.okay"
-msgstr ""
-"Geben Sie \"Ja\" (oder nur \"j\") ein, um den Unterschlüssel zu erzeugen."
+#~ msgid "keygen.sub.okay"
+#~ msgstr ""
+#~ "Geben Sie \"Ja\" (oder nur \"j\") ein, um den Unterschlüssel zu erzeugen."
# "Answer \"yes\" or \"no\""
-#: g10/helptext.c:142
-msgid "sign_uid.okay"
-msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
+#~ msgid "sign_uid.okay"
+#~ msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
# "Answer \"yes\" or \"no\""
-#: g10/helptext.c:147
-msgid "change_passwd.empty.okay"
-msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
+#~ msgid "change_passwd.empty.okay"
+#~ msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
# "Answer \"yes\" or \"no\""
-#: g10/helptext.c:152
-msgid "keyedit.save.okay"
-msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
+#~ msgid "keyedit.save.okay"
+#~ msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
-#: g10/helptext.c:157
-msgid "keyedit.cancel.okay"
-msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
+#~ msgid "keyedit.cancel.okay"
+#~ msgstr "Geben Sie \"Ja\" oder \"Nein\" ein"
# "Answer \"yes\" is you want to sign ALL the user IDs"
-#: g10/helptext.c:161
-msgid "keyedit.sign_all.okay"
-msgstr "Geben Sie \"Ja\" (oder nur \"j\") ein, um alle User-IDs zu beglaubigen"
+#~ msgid "keyedit.sign_all.okay"
+#~ msgstr ""
+#~ "Geben Sie \"Ja\" (oder nur \"j\") ein, um alle User-IDs zu beglaubigen"
# "Answer \"yes\" if you really want to delete this user ID.\n"
# "All ceritifcates are then also lost!"
-#: g10/helptext.c:165
-msgid "keyedit.remove.uid.okay"
-msgstr ""
-"Geben Sie \"Ja\" (oder nur \"j\") ein, um diese User-ID zu LÖSCHEN.\n"
-"Alle Zertifikate werden dann auch weg sein!"
+#~ msgid "keyedit.remove.uid.okay"
+#~ msgstr ""
+#~ "Geben Sie \"Ja\" (oder nur \"j\") ein, um diese User-ID zu LÖSCHEN.\n"
+#~ "Alle Zertifikate werden dann auch weg sein!"
# "Answer \"yes\" if it is okay to delete the subkey"
-#: g10/helptext.c:170
-msgid "keyedit.remove.subkey.okay"
-msgstr ""
-"Geben Sie \"Ja\" (oder nur \"j\") ein, um diesen Unterschlüssel zu löschen"
+#~ msgid "keyedit.remove.subkey.okay"
+#~ msgstr ""
+#~ "Geben Sie \"Ja\" (oder nur \"j\") ein, um diesen Unterschlüssel zu löschen"
# ("keyedit.delsig.valid"),
# "This is a valid signature on the key; you normally don't want\n"
# "to delete this signature may be important to establish a trust\n"
# "connection to the key or another key certified by this key."
-#: g10/helptext.c:175
-msgid "keyedit.delsig.valid"
-msgstr ""
-"Dies ist eine gültige Beglaubigung für den Schlüssel. Es ist normalerweise\n"
-"unnötig sie zu löschen. Sie ist möglicherweise sogar notwendig, um einen\n"
-"Trust-Weg zu diesem oder einem durch diesen Schlüssel beglaubigten "
-"Schlüssel\n"
-"herzustellen"
+#~ msgid "keyedit.delsig.valid"
+#~ msgstr ""
+#~ "Dies ist eine gültige Beglaubigung für den Schlüssel. Es ist normalerweise\n"
+#~ "unnötig sie zu löschen. Sie ist möglicherweise sogar notwendig, um einen\n"
+#~ "Trust-Weg zu diesem oder einem durch diesen Schlüssel beglaubigten "
+#~ "Schlüssel\n"
+#~ "herzustellen"
# "This signature can't be checked because you don't have the\n"
# "corresponding key. You should postpone its deletion until you\n"
# "know which key was used because this signing key might establish"
# "a trust connection through another already certified key."
-#: g10/helptext.c:180
-msgid "keyedit.delsig.unknown"
-msgstr ""
-"Diese Beglaubigung kann nicht geprüft werden, da Sie den passenden Sclüssel\n"
-"nicht besitzen. Sie sollten die Löschung der Beglaubigung verschieben, bis\n"
-"sie wissen, welcher Schlüssel verwendet wurde. Denn vielleicht würde genau\n"
-"diese Beglaubigung den \"Trust\"-Weg kompletieren."
+#~ msgid "keyedit.delsig.unknown"
+#~ msgstr ""
+#~ "Diese Beglaubigung kann nicht geprüft werden, da Sie den passenden Sclüssel\n"
+#~ "nicht besitzen. Sie sollten die Löschung der Beglaubigung verschieben, bis\n"
+#~ "sie wissen, welcher Schlüssel verwendet wurde. Denn vielleicht würde genau\n"
+#~ "diese Beglaubigung den \"Trust\"-Weg kompletieren."
# ("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:186
-msgid "keyedit.delsig.invalid"
-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."
+#~ msgid "keyedit.delsig.invalid"
+#~ 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.selfsig")
# "This is a signature which binds the user ID to the key. It is\n"
@@ -3399,66 +3553,54 @@ 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:190
-msgid "keyedit.delsig.selfsig"
-msgstr ""
-"Diese Beglaubigung bindet die User-ID an den Schlüssel. Normalerweise ist\n"
-"es nicht gut, solche Beglaubigungen zu entfernen. Um ehrlich zu sein:\n"
-"Es kann sein, daß GnuPG solche Schlüssel gar nicht mehr benutzen kann.\n"
-"Sie sollten diese Eigenbeglaubigung also nur dann entfernen, wenn sie aus\n"
-"irgendeinem Grund nicht gültig ist und eine zweite Beglaubigung verfügbar "
-"ist."
+#~ msgid "keyedit.delsig.selfsig"
+#~ msgstr ""
+#~ "Diese Beglaubigung bindet die User-ID an den Schlüssel. Normalerweise ist\n"
+#~ "es nicht gut, solche Beglaubigungen zu entfernen. Um ehrlich zu sein:\n"
+#~ "Es kann sein, daß GnuPG solche Schlüssel gar nicht mehr benutzen kann.\n"
+#~ "Sie sollten diese Eigenbeglaubigung also nur dann entfernen, wenn sie aus\n"
+#~ "irgendeinem Grund nicht gültig ist und eine zweite Beglaubigung verfügbar "
+#~ "ist."
# ################################
# ####### Help msgids ############
# ################################
-#: g10/helptext.c:199
-msgid "passphrase.enter"
-msgstr ""
-"Bitte geben Sie das Mantra ein. Dies ist ein geheimer Satz, der aus\n"
-"beliebigen Zeichen bestehen kann. Was Sie eingegeben wird nicht angezeigt.\n"
-"\n"
-"Zur ihrer eigenen Sicherbeit benutzen Sie bitte einen Satz, den sie sich\n"
-"gut merken könne, der aber nicht leicht zu erraten ist; Zitate und andere\n"
-"bekannte Texte sind eine SCHLECHTE Wahl, da diese mit Sicherheit online\n"
-"verfügbar sind und durch entsprechende Programme zum Raten des Mantras\n"
-"benutzt werden. Sätze mit persönlicher Bedeutung, die auch noch durch\n"
-"falsche Groß-/Kleinschreibung und eingestreute Sonderzeichen verändert "
-"werden,\n"
-"sind i.d.R. eine gute Wahl"
-
-#: g10/helptext.c:206
-msgid "passphrase.repeat"
-msgstr ""
-"Um sicher zu gehen, daß Sie sich bei der Eingabe des Mantras nicht\n"
-"vertippt haben, geben Sie diese bitte nochmal ein. Nur wenn beide Eingaben\n"
-"übereinstimmen, wird das Mantra akzeptiert."
+#~ msgid "passphrase.enter"
+#~ msgstr ""
+#~ "Bitte geben Sie das Mantra ein. Dies ist ein geheimer Satz, der aus\n"
+#~ "beliebigen Zeichen bestehen kann. Was Sie eingegeben wird nicht angezeigt.\n"
+#~ "\n"
+#~ "Zur ihrer eigenen Sicherbeit benutzen Sie bitte einen Satz, den sie sich\n"
+#~ "gut merken könne, der aber nicht leicht zu erraten ist; Zitate und andere\n"
+#~ "bekannte Texte sind eine SCHLECHTE Wahl, da diese mit Sicherheit online\n"
+#~ "verfügbar sind und durch entsprechende Programme zum Raten des Mantras\n"
+#~ "benutzt werden. Sätze mit persönlicher Bedeutung, die auch noch durch\n"
+#~ "falsche Groß-/Kleinschreibung und eingestreute Sonderzeichen verändert "
+#~ "werden,\n"
+#~ "sind i.d.R. eine gute Wahl"
+
+#~ msgid "passphrase.repeat"
+#~ msgstr ""
+#~ "Um sicher zu gehen, daß Sie sich bei der Eingabe des Mantras nicht\n"
+#~ "vertippt haben, geben Sie diese bitte nochmal ein. Nur wenn beide Eingaben\n"
+#~ "übereinstimmen, wird das Mantra akzeptiert."
# "Give the name fo the file to which the signature applies"
-#: g10/helptext.c:210
-msgid "detached_signature.filename"
-msgstr ""
-"Geben Sie den Namen der Datei an, zu dem die abgetrennte Unterschrift gehört"
+#~ 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"
-#. openfile.c (overwrite_filep)
-#: g10/helptext.c:215
-msgid "openfile.overwrite.okay"
-msgstr "Geben Sie \"ja\" ein, wenn Sie die Datei überschreiben möchten"
+#~ msgid "openfile.overwrite.okay"
+#~ msgstr "Geben Sie \"ja\" ein, wenn Sie die Datei überschreiben möchten"
-#. openfile.c (ask_outfile_name)
-#: g10/helptext.c:220
-msgid "openfile.askoutname"
-msgstr ""
-
-#: g10/helptext.c:235
-msgid "No help available"
-msgstr "Keine Hilfe vorhanden."
-
-#: g10/helptext.c:247
-#, c-format
-msgid "No help available for `%s'"
-msgstr "Keine Hilfe für '%s' vorhanden."
+# "Please enter a new filename. If you just hit RETURN the default\n"
+# "file (which is shown in brackets) will be used."
+#~ msgid "openfile.askoutname"
+#~ msgstr ""
+#~ "Geben Sie bitte einen neuen Dateinamen ein. Falls Sie nur die\n"
+#~ "Eingabetaste betätigen, wird der (in Klammern angezeigte) Standarddateiname\n"
+#~ "verwendet."
#~ msgid "tdbio_search_sdir failed: %s\n"
#~ msgstr "tdbio_search_sdir fehlgeschlagen: %s\n"
@@ -3726,17 +3868,6 @@ msgstr "Keine Hilfe für '%s' vorhanden."
#~ msgid "edit a key signature"
#~ msgstr "Bearbeiten der Signaturen eines Schlüssels"
-#~ msgid ""
-#~ "It's up to you to assign a value here; this value will never be exported\n"
-#~ "to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
-#~ "to do with the (implicitly created) web-of-certificates.\n"
-#~ msgstr ""
-#~ "Sie müssen selbt entscheiden, welchen Wert Sie hier eintragen; dieser Wert\n"
-#~ "wird niemals an eine dritte Seite weitergegeben. Wir brauchen diesen Wert,\n"
-#~ "um das \"Netz des Vertrauens\" aufzubauen. Dieses hat nichts mit dem "
-#~ "(implizit\n"
-#~ "erzeugten) \"Netz der Zertifikate\" zu tun.\n"
-
#~ msgid "public and secret subkey created.\n"
#~ msgstr "Öffentlicher und geheimer Schlüssel erzeugt.\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 7715be63c..3acdf86d7 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-08-04 09:56+0200\n"
+"POT-Creation-Date: 1999-08-30 19:40+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,19 +34,27 @@ 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:254 util/miscutil.c:271
+#: util/miscutil.c:254 util/miscutil.c:283
msgid "yes"
msgstr "sí"
-#: util/miscutil.c:255 util/miscutil.c:273
+#: util/miscutil.c:255 util/miscutil.c:286
msgid "yY"
msgstr "sS"
-#: g10/keyedit.c:564 util/miscutil.c:272
+#: util/miscutil.c:256 util/miscutil.c:284
+msgid "no"
+msgstr ""
+
+#: util/miscutil.c:257 util/miscutil.c:287
+msgid "nN"
+msgstr ""
+
+#: g10/keyedit.c:564 util/miscutil.c:285
msgid "quit"
msgstr ""
-#: util/miscutil.c:274
+#: util/miscutil.c:288
msgid "qQ"
msgstr ""
@@ -2479,20 +2487,20 @@ msgstr "firma viejo estilo (PGP 2.x)\n"
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
+#: g10/misc.c:94
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "no se pueden desactivar los core dumps: %s\n"
-#: g10/misc.c:96
+#: g10/misc.c:97
msgid "WARNING: program may create a core file!\n"
msgstr "ATENCIÓN: ¡el programa podría crear un fichero core dump!\n"
-#: g10/misc.c:203
+#: g10/misc.c:205
msgid "Experimental algorithms should not be used!\n"
msgstr "¡No se deberían usar algoritmos experimentales!\n"
-#: g10/misc.c:217
+#: g10/misc.c:219
msgid ""
"RSA keys are deprecated; please consider creating a new key and use this key "
"in the future\n"
@@ -2500,7 +2508,7 @@ msgstr ""
"Las claves RSA están en desuso, considere la creación de una nueva clave "
"para futuros usos\n"
-#: g10/misc.c:239
+#: g10/misc.c:241
msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
msgstr ""
"este algoritmo de cifrado está en desuso, considere el uso de uno más "
@@ -3184,142 +3192,168 @@ msgstr ""
"¡imposible evitar clave débil para cifrado simétrico después de %d "
"intentos!\n"
-#. begin of list
-#: g10/helptext.c:48
-msgid "edit_ownertrust.value"
+#: g10/helptext.c:47
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
msgstr ""
-#: g10/helptext.c:54
-msgid "revoked_key.override"
+#: g10/helptext.c:53
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
msgstr ""
-#: g10/helptext.c:58
-msgid "untrusted_key.override"
+#: g10/helptext.c:57
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
msgstr ""
-#: g10/helptext.c:62
-msgid "pklist.user_id.enter"
+#: g10/helptext.c:61
+msgid ""
+"Enter the user id of the addressee to whom you want to send the message."
msgstr ""
-#: g10/helptext.c:66
-msgid "keygen.algo"
+#: g10/helptext.c:65
+msgid ""
+"Select the algorithm to use.\n"
+"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+"for signatures. This is the suggested algorithm because verification of\n"
+"DSA signatures are much faster than those of ElGamal.\n"
+"ElGamal is an algorithm which can be used for signatures and encryption.\n"
+"OpenPGP distunguishs between two flavors of this algorithms: an encrypt "
+"only\n"
+"and a sign+encrypt; actually it is the same, but some parameters must be\n"
+"selected in a special way to create a safe key for signatures: this program\n"
+"does this but other OpenPGP implementations are not required to understand\n"
+"the signature+encryption flavor.\n"
+"The first (primary) key must always be a key which is capable of signing;\n"
+"this is the reason why the encryption only ElGamal key is not available in\n"
+"this menu."
msgstr ""
#: g10/helptext.c:82
-msgid "keygen.algo.elg_se"
+msgid ""
+"Although these keys are defined in RFC2440 they are not suggested\n"
+"because they are not supported by all programs and signatures created\n"
+"with them are quite large and very slow to verify."
msgstr ""
#: g10/helptext.c:89
-msgid "keygen.size"
-msgstr ""
-
-#: g10/helptext.c:93
-msgid "keygen.size.huge.okay"
-msgstr ""
+#, fuzzy
+msgid "Enter the size of the key"
+msgstr "Introduzca el ID de usuario: "
-#: g10/helptext.c:98
-msgid "keygen.size.large.okay"
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:147 g10/helptext.c:152 g10/helptext.c:157
+msgid "Answer \"yes\" or \"no\""
msgstr ""
#: g10/helptext.c:103
-msgid "keygen.valid"
-msgstr ""
-
-#: g10/helptext.c:110
-msgid "keygen.valid.okay"
+msgid ""
+"Enter the required value as shown in the pronpt.\n"
+"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
msgstr ""
#: g10/helptext.c:115
-msgid "keygen.name"
+msgid "Enter the name of the key holder"
msgstr ""
#: g10/helptext.c:120
-msgid "keygen.email"
+msgid "please enter an optional but highly suggested email address"
msgstr ""
#: g10/helptext.c:124
-msgid "keygen.comment"
-msgstr ""
+#, fuzzy
+msgid "Please enter an optional comment"
+msgstr "Introduzca el nombre del fichero de datos: "
#: g10/helptext.c:129
-msgid "keygen.userid.cmd"
+msgid ""
+"N to change the name.\n"
+"C to change the comment.\n"
+"E to change the email address.\n"
+"O to continue with key generation.\n"
+"Q to to quit the key generation."
msgstr ""
#: g10/helptext.c:138
-msgid "keygen.sub.okay"
-msgstr ""
-
-#: g10/helptext.c:142
-msgid "sign_uid.okay"
-msgstr ""
-
-#: g10/helptext.c:147
-msgid "change_passwd.empty.okay"
-msgstr ""
-
-#: g10/helptext.c:152
-msgid "keyedit.save.okay"
-msgstr ""
-
-#: g10/helptext.c:157
-msgid "keyedit.cancel.okay"
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
msgstr ""
#: g10/helptext.c:161
-msgid "keyedit.sign_all.okay"
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
msgstr ""
#: g10/helptext.c:165
-msgid "keyedit.remove.uid.okay"
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
msgstr ""
#: g10/helptext.c:170
-msgid "keyedit.remove.subkey.okay"
+msgid "Answer \"yes\" if it is okay to delete the subkey"
msgstr ""
#: g10/helptext.c:175
-msgid "keyedit.delsig.valid"
+msgid ""
+"This is a valid signature on the key; you normally don't want\n"
+"to delete this signature may be important to establish a trust\n"
+"connection to the key or another key certified by this key."
msgstr ""
#: g10/helptext.c:180
-msgid "keyedit.delsig.unknown"
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key. You should postpone its deletion until you\n"
+"know which key was used because this signing key might establisha trust "
+"connection through another already certified key."
msgstr ""
#: g10/helptext.c:186
-msgid "keyedit.delsig.invalid"
+msgid ""
+"The signature is not valid. It does make sense to remove it from\n"
+"your keyring."
msgstr ""
#: g10/helptext.c:190
-msgid "keyedit.delsig.selfsig"
+msgid ""
+"This is a signature which binds the user ID to the key. It is\n"
+"usually not a good idea to remove such a signature. Actually\n"
+"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."
msgstr ""
#: g10/helptext.c:199
-msgid "passphrase.enter"
+msgid ""
+"Please enter the passhrase; this is a secret sentence \n"
+" Blurb, blurb,.... "
msgstr ""
#: g10/helptext.c:206
-msgid "passphrase.repeat"
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
msgstr ""
#: g10/helptext.c:210
-msgid "detached_signature.filename"
+msgid "Give the name fo the file to which the signature applies"
msgstr ""
-#. openfile.c (overwrite_filep)
#: g10/helptext.c:215
-msgid "openfile.overwrite.okay"
+msgid "Answer \"yes\" if it is okay to overwrite the file"
msgstr ""
-#. openfile.c (ask_outfile_name)
#: g10/helptext.c:220
-msgid "openfile.askoutname"
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
msgstr ""
-#: g10/helptext.c:235
+#: g10/helptext.c:234
msgid "No help available"
msgstr "Ayuda no disponible"
-#: g10/helptext.c:247
+#: g10/helptext.c:242
#, c-format
msgid "No help available for `%s'"
msgstr "Ayuda no disponible para `%s'"
diff --git a/po/fr.po b/po/fr.po
index 8b4712c0f..09f0932e0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,11 +4,11 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gnupg 0.9.7\n"
-"POT-Creation-Date: 1999-08-04 09:56+0200\n"
-"PO-Revision-Date: 1999-05-24 21:48+02:00\n"
+"Project-Id-Version: gnupg 1.0\n"
+"POT-Creation-Date: 1999-08-30 19:40+0200\n"
+"PO-Revision-Date: 1999-08-08 04:01+02:00\n"
"Last-Translator: Gaël Quéri <gqueri@mail.dotcom.fr>\n"
-"Language-Team: French <traduc@Linux.EU.ORG>\n"
+"Language-Team: French <traduc@traduc.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
@@ -27,22 +27,29 @@ msgstr ""
msgid "(you may have used the wrong program for this task)\n"
msgstr "(vous avez peut-être utilisé le mauvais programme pour cette tache)\n"
-#: util/miscutil.c:254 util/miscutil.c:271
+#: util/miscutil.c:254 util/miscutil.c:283
msgid "yes"
msgstr "oui"
-#: util/miscutil.c:255 util/miscutil.c:273
+#: util/miscutil.c:255 util/miscutil.c:286
msgid "yY"
msgstr "oO"
-#: g10/keyedit.c:564 util/miscutil.c:272
+#: util/miscutil.c:256 util/miscutil.c:284
+msgid "no"
+msgstr ""
+
+#: util/miscutil.c:257 util/miscutil.c:287
+msgid "nN"
+msgstr ""
+
+#: g10/keyedit.c:564 util/miscutil.c:285
msgid "quit"
msgstr "quitter"
-#: util/miscutil.c:274
-#, fuzzy
+#: util/miscutil.c:288
msgid "qQ"
-msgstr "q"
+msgstr "qQ"
#: util/errors.c:54
msgid "general error"
@@ -345,14 +352,12 @@ msgid "remove key from the public keyring"
msgstr "enlever la clé du porte-clés public"
#: g10/g10.c:203
-#, fuzzy
msgid "sign a key"
-msgstr "signer la clé"
+msgstr "signer une clé"
#: g10/g10.c:204
-#, fuzzy
msgid "sign a key locally"
-msgstr "signer la clé localement"
+msgstr "signer une clé localement"
#: g10/g10.c:205
msgid "sign or edit a key"
@@ -392,9 +397,8 @@ msgstr "importer les indices de confiance"
#
#: g10/g10.c:220
-#, fuzzy
msgid "update the trust database"
-msgstr "|[NOMS]|mettre la base de confiance à jour"
+msgstr "mettre la base de confiance à jour"
#: g10/g10.c:222
msgid "|[NAMES]|check the trust database"
@@ -435,13 +439,12 @@ msgid "|NAME|encrypt for NAME"
msgstr "|NOM|chiffrer pour NOM"
#: g10/g10.c:236
-#, fuzzy
msgid "|NAME|use NAME as default recipient"
-msgstr "|NOM|utiliser NOM comme clé secrète par défaut"
+msgstr "|NOM|utiliser NOM comme récipient par défaut"
#: g10/g10.c:238
msgid "use the default key as default recipient"
-msgstr ""
+msgstr "utiliser la clé par déf. comme récipient"
#: g10/g10.c:242
msgid "use this user-id to sign or decrypt"
@@ -469,7 +472,7 @@ msgstr "devenir beaucoup plus silencieux"
#: g10/g10.c:249
msgid "don't use the terminal at all"
-msgstr ""
+msgstr "ne pas utiliser du tout le terminal"
#
#: g10/g10.c:250
@@ -499,7 +502,7 @@ msgstr "répondre non à la plupart des questions"
#: g10/g10.c:257
msgid "add this keyring to the list of keyrings"
-msgstr "ajouter ce porte-clés à la liste des porte-clés"
+msgstr "ajouter ce porte-clés à la liste"
#: g10/g10.c:258
msgid "add this secret keyring to the list"
@@ -555,7 +558,7 @@ msgstr "imiter le mode décrit dans la RFC1991"
#: g10/g10.c:273
msgid "set all packet, cipher and digest options to OpenPGP behavior"
-msgstr ""
+msgstr "utiliser le comportement défini par OpenPGP"
# FIXMOI : faudra trouver mieux ...
#: g10/g10.c:274
@@ -584,11 +587,11 @@ msgstr "|N|utiliser l'algorithme de compression N"
#: g10/g10.c:282
msgid "throw keyid field of encrypted packets"
-msgstr "supprimer l'identification des paquets chiffrés"
+msgstr "supprimer l'ident. des paquets chiffrés"
#: g10/g10.c:283
msgid "|NAME=VALUE|use this notation data"
-msgstr ""
+msgstr "|NOM=VALEUR|utiliser ces données de notation"
#: g10/g10.c:285
msgid ""
@@ -634,7 +637,7 @@ msgid ""
"Supported algorithms:\n"
msgstr ""
"\n"
-"Algorithmes supportés:\n"
+"Algorithmes supportés :\n"
#: g10/g10.c:456
msgid "usage: gpg [options] "
@@ -667,17 +670,17 @@ msgstr "%s n'est pas une table de caractères valide\n"
#: g10/g10.c:892 g10/g10.c:901
#, c-format
msgid "NOTE: %s is not for normal use!\n"
-msgstr ""
+msgstr "NOTE : %s n'est pas pour une utilisation normale !\n"
#: g10/g10.c:894
#, c-format
msgid "%s not allowed with %s!\n"
-msgstr ""
+msgstr "%s n'est pas permis avec %s !\n"
#: g10/g10.c:897
#, c-format
msgid "%s makes no sense with %s!\n"
-msgstr ""
+msgstr "%s n'a aucun sens avec %s !\n"
#: g10/g10.c:916 g10/g10.c:928
msgid "selected cipher algorithm is invalid\n"
@@ -689,7 +692,7 @@ msgstr "la fonction de hachage sélectionnée est invalide\n"
#: g10/g10.c:938
msgid "the given policy URL is invalid\n"
-msgstr ""
+msgstr "l'URL de politique donnée est invalide\n"
#: g10/g10.c:941
#, c-format
@@ -751,25 +754,21 @@ msgstr "--decrypt [nom du fichier]"
#: g10/g10.c:1112
msgid "--sign-key user-id"
-msgstr ""
+msgstr "--sign-key utilisateur"
#: g10/g10.c:1120
-#, fuzzy
msgid "--lsign-key user-id"
-msgstr "--delete-key utilisateur"
+msgstr "--lsign-key utilisateur"
#: g10/g10.c:1128
-#, fuzzy
msgid "--edit-key user-id [commands]"
msgstr "--edit-key utilisateur [commandes]"
#: g10/g10.c:1144
-#, fuzzy
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key utilisateur"
#: g10/g10.c:1147
-#, fuzzy
msgid "--delete-key user-id"
msgstr "--delete-key utilisateur"
@@ -779,7 +778,6 @@ msgid "can't open %s: %s\n"
msgstr "ne peut ouvrir %s: %s\n"
#: g10/g10.c:1182
-#, fuzzy
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]"
@@ -815,20 +813,27 @@ msgstr "ne peut ouvrir `%s'\n"
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
+"le premier caractère du nom d'une notation doit être un lettre ou un trait\n"
+"de soulignement\n"
#: g10/g10.c:1582
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
msgstr ""
+"le nom d'une notation ne doit comporter que des lettres, des chiffres, \n"
+"des points ou des traits de soulignement et doit se terminer par un signe "
+"égal\n"
#: g10/g10.c:1588
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
+"les points dans le nom d'une notation doivent être entourés d'autes "
+"caractères\n"
#: g10/g10.c:1596
msgid "a notation value must not use any control characters\n"
-msgstr ""
+msgstr "une valeur de notation ne doit utiliser aucun caractère de contrôle\n"
#: g10/armor.c:296
#, c-format
@@ -908,14 +913,12 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
#: g10/pkclist.c:53
-#, fuzzy
msgid " Fingerprint:"
-msgstr " importée : %lu"
+msgstr " Empreinte : %lu"
#: g10/pkclist.c:80
-#, fuzzy
msgid "Fingerprint:"
-msgstr "afficher l'empreinte"
+msgstr "Empreinte :"
#. a string with valid answers
#: g10/pkclist.c:197
@@ -1119,9 +1122,9 @@ msgid "%s: skipped: %s\n"
msgstr "%s : ignoré : %s\n"
#: g10/pkclist.c:702 g10/pkclist.c:852
-#, fuzzy, c-format
+#, c-format
msgid "%s: skipped: public key already present\n"
-msgstr "%s : problème de lecture du bloc de clés : %s\n"
+msgstr "%s : ignoré : clé publique déjà présente\n"
#: g10/pkclist.c:729
msgid ""
@@ -1141,14 +1144,13 @@ msgid "No such user ID.\n"
msgstr "Pas de tel utilisateur.\n"
#: g10/pkclist.c:771
-#, fuzzy
msgid "Public key is disabled.\n"
-msgstr "la clé publique est %08lX\n"
+msgstr "La clé publique est désactivée.\n"
#: g10/pkclist.c:800
-#, fuzzy, c-format
+#, c-format
msgid "unknown default recipient `%s'\n"
-msgstr "NOTE : pas de fichier d'options par défaut `%s'\n"
+msgstr "récipient par défaut `%s' inconnu\n"
#: g10/pkclist.c:833
#, c-format
@@ -1156,9 +1158,9 @@ msgid "%s: error checking key: %s\n"
msgstr "%s : erreur pendant la vérification de la clé : %s\n"
#: g10/pkclist.c:838
-#, fuzzy, c-format
+#, c-format
msgid "%s: skipped: public key is disabled\n"
-msgstr "%s : problème de lecture du bloc de clés : %s\n"
+msgstr "%s : ignoré : la clé publique est désactivée\n"
#: g10/pkclist.c:876
msgid "no valid addressees\n"
@@ -1442,9 +1444,8 @@ msgid "DSA keypair will have 1024 bits.\n"
msgstr "La paire de clés DSA fera 1024 bits.\n"
#: g10/keygen.c:871
-#, fuzzy
msgid "Key generation canceled.\n"
-msgstr "La génération a été annulée.\n"
+msgstr "La génération de clé a été annulée.\n"
#: g10/keygen.c:881
#, c-format
@@ -1550,17 +1551,15 @@ msgstr "trop d'entrées dans le cache unk - désactivé\n"
#: g10/getkey.c:1289 g10/getkey.c:1328
msgid "RSA key cannot be used in this version\n"
-msgstr ""
+msgstr "les clés RSA ne peuvent être utilisées dans cette version\n"
#: g10/getkey.c:1291 g10/getkey.c:1330
-#, fuzzy
msgid "No key for user-id\n"
-msgstr "clé %08lX : pas de nom d'utilisateur\n"
+msgstr "Pas de clé pour cet utilisateur\n"
#: g10/getkey.c:1369 g10/getkey.c:1409
-#, fuzzy
msgid "No user-id for key\n"
-msgstr "pas de clé secrète\n"
+msgstr "Pas d'utilisateur pour cette clé\n"
#: g10/getkey.c:1565 g10/getkey.c:1621
#, c-format
@@ -1796,14 +1795,14 @@ msgid "key %08lX: invalid subkey binding\n"
msgstr "clé %08lX : liaison avec la sous-clé invalide\n"
#: g10/import.c:769
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: accepted non self-signed user-id '"
-msgstr "clé %08lX : utilisateur non pris en compte '"
+msgstr "clé %08lX : utilisateur non signé par lui-même accepté : '"
#: g10/import.c:798
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: skipped user-id '"
-msgstr "clé %08lX : utilisateur non pris en compte '"
+msgstr "clé %08lX : utilisateur non pris en compte : '"
#: g10/import.c:821
#, c-format
@@ -2097,14 +2096,12 @@ msgid "delete a secondary key"
msgstr "enlever une clé secondaire"
#: g10/keyedit.c:584
-#, fuzzy
msgid "delsig"
-msgstr "lsigner"
+msgstr "suppr.sign"
#: g10/keyedit.c:584
-#, fuzzy
msgid "delete signatures"
-msgstr "lister les signatures"
+msgstr "supprimer les signatures"
#: g10/keyedit.c:585
msgid "expire"
@@ -2169,21 +2166,19 @@ msgstr "révoquer une clé secondaire"
#: g10/keyedit.c:594
msgid "disable"
-msgstr ""
+msgstr "désactiver"
#: g10/keyedit.c:594
-#, fuzzy
msgid "disable a key"
-msgstr "mauvaise clé"
+msgstr "désactiver une clé"
#: g10/keyedit.c:595
msgid "enable"
-msgstr ""
+msgstr "activer"
#: g10/keyedit.c:595
-#, fuzzy
msgid "enable a key"
-msgstr "mauvaise clé"
+msgstr "activer une clé"
#: g10/keyedit.c:614
msgid "can't do that in batchmode\n"
@@ -2279,42 +2274,38 @@ msgid "Invalid command (try \"help\")\n"
msgstr "Commande invalide (essayez « help »)\n"
#: g10/keyedit.c:1065
-#, fuzzy
msgid "This key has been disabled"
-msgstr "Note : Cette clé a expiré !\n"
+msgstr "Cette clé a été désactivée"
#: g10/keyedit.c:1336
msgid "Delete this good signature? (y/N/q)"
-msgstr ""
+msgstr "Supprimer cette bonne signature ? (o/N/q)"
#: g10/keyedit.c:1340
msgid "Delete this invalid signature? (y/N/q)"
-msgstr ""
+msgstr "Supprimer cette signature invalide ? (o/N/q)"
#: g10/keyedit.c:1344
-#, fuzzy
msgid "Delete this unknown signature? (y/N/q)"
-msgstr "Faut-il vraiment générer les certificats de révocation ? (o/N)"
+msgstr "Supprimer cette signature inconnue ? (o/N/q)"
#: g10/keyedit.c:1350
-#, fuzzy
msgid "Really delete this self-signature? (y/N)"
-msgstr "Faut-il vraiment générer les certificats de révocation ? (o/N)"
+msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
#: g10/keyedit.c:1364
-#, fuzzy, c-format
+#, c-format
msgid "Deleted %d signature.\n"
-msgstr "%d mauvaises signatures\n"
+msgstr "%d signature supprimée.\n"
#: g10/keyedit.c:1365
-#, fuzzy, c-format
+#, c-format
msgid "Deleted %d signatures.\n"
-msgstr "%d mauvaises signatures\n"
+msgstr "%d signatures supprimées\n"
#: g10/keyedit.c:1368
-#, fuzzy
msgid "Nothing deleted.\n"
-msgstr "ATTENTION : rien n'a été exporté\n"
+msgstr "Rien n'a été supprimé.\n"
#: g10/keyedit.c:1437
msgid "Please remove selections from the secret keys.\n"
@@ -2325,12 +2316,10 @@ msgid "Please select at most one secondary key.\n"
msgstr "Vous devez sélectionner au plus une clé secondaire.\n"
#: g10/keyedit.c:1447
-#, fuzzy
msgid "Changing expiration time for a secondary key.\n"
msgstr "Changer la date d'expiration d'une clé secondaire.\n"
#: g10/keyedit.c:1449
-#, fuzzy
msgid "Changing expiration time for the primary key.\n"
msgstr "Changer la date d'expiration de la clé principale.\n"
@@ -2387,19 +2376,18 @@ msgid "public key encrypted data: good DEK\n"
msgstr "données chiffrées avec la clé publique : bonne clé de chiffrement\n"
#: g10/mainproc.c:275
-#, fuzzy, c-format
+#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
-msgstr "clé de %u bits %s, ID %08lX, créée le %s"
+msgstr "chiffré avec une clé de %u bits %s, ID %08lX, créée le %s\n"
#: g10/mainproc.c:285
-#, fuzzy, c-format
+#, c-format
msgid "encrypted with %s key, ID %08lX\n"
-msgstr "Signature faite %.*s avec une clé %s ID %08lX\n"
+msgstr "chiffré avec une clé %s, %08lX\n"
#: g10/mainproc.c:291
-#, fuzzy
msgid "no secret key for decryption available\n"
-msgstr "la clé secrète n'est pas disponible"
+msgstr "aucune clé secrète n'est disponible pour le déchiffrement\n"
#: g10/mainproc.c:300
#, c-format
@@ -2429,17 +2417,16 @@ msgid "original file name='%.*s'\n"
msgstr "nom de fichier original : '%.*s'\n"
#: g10/mainproc.c:587 g10/mainproc.c:596
-#, fuzzy
msgid "WARNING: invalid notation data found\n"
-msgstr "aucune donnée OpenPGP valide n'a été trouvée.\n"
+msgstr "ATTENTION : des données de notation invalides ont été détectées\n"
#: g10/mainproc.c:599
msgid "Notation: "
-msgstr ""
+msgstr "Notation : "
#: g10/mainproc.c:606
msgid "Policy: "
-msgstr ""
+msgstr "Politique : "
#: g10/mainproc.c:1025
msgid "signature verification suppressed\n"
@@ -2476,20 +2463,20 @@ msgstr "signature d'un ancien style (PGP 2.x)\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "paquet racine invalide détecté dans proc_tree()\n"
-#: g10/misc.c:93
+#: g10/misc.c:94
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "ne peut empêcher la génération de fichiers core : %s\n"
-#: g10/misc.c:96
+#: g10/misc.c:97
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENTION : Le programme peut créer un fichier « core » !\n"
-#: g10/misc.c:203
+#: g10/misc.c:205
msgid "Experimental algorithms should not be used!\n"
msgstr "Les algorithmes expérimentaux ne devraient pas être utilisés !\n"
-#: g10/misc.c:217
+#: g10/misc.c:219
msgid ""
"RSA keys are deprecated; please consider creating a new key and use this key "
"in the future\n"
@@ -2497,7 +2484,7 @@ msgstr ""
"Les clés RSA sont déconseillées : considérez créer une nouvelle clé\n"
"et l'utiliser dans l'avenir\n"
-#: g10/misc.c:239
+#: g10/misc.c:241
msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
msgstr ""
"Cet algorithme de chiffrement est déconseillé ; utilisez-en un\n"
@@ -2534,9 +2521,8 @@ msgid " (main key ID %08lX)"
msgstr " (ID clé principale %08lX)"
#: g10/passphrase.c:190
-#, fuzzy
msgid "can't query password in batchmode\n"
-msgstr "impossible de faire cela en mode automatique\n"
+msgstr "impossible de demander un mot de passe en mode automatique\n"
#: g10/passphrase.c:194
msgid "Enter passphrase: "
@@ -2795,10 +2781,8 @@ msgid "%s: failed to append a record: %s\n"
msgstr "%s : n'a pas pu ajouter un enregistrement : %s\n"
#: g10/tdbio.c:1759
-#, 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"
+msgstr "la base de confiance est corrompue ; exécutez « gpg --fix-trustdb ».\n"
#: g10/trustdb.c:160
#, c-format
@@ -2923,16 +2907,14 @@ msgid "Invalid self-signature"
msgstr "Auto-signature invalide"
#: g10/trustdb.c:1060
-#, fuzzy
msgid "Valid user ID revocation skipped due to a newer self signature"
msgstr ""
"La révocation valide de nom d'utilisateur a été ignorée car l'auto-\n"
-"signature est plus récente\n"
+"signature est plus récente"
#: g10/trustdb.c:1066
-#, fuzzy
msgid "Valid user ID revocation"
-msgstr "Révocation de nom d'utilisateur valide\n"
+msgstr "Révocation de nom d'utilisateur valide"
#: g10/trustdb.c:1071
msgid "Invalid user ID revocation"
@@ -2986,9 +2968,9 @@ msgid "lid %lu: inserted\n"
msgstr "lid %lu : inséré\n"
#: g10/trustdb.c:1652
-#, fuzzy, c-format
+#, c-format
msgid "error reading dir record: %s\n"
-msgstr "%s : erreur pendant la lecture de l'enregistrement libre : %s\n"
+msgstr "erreur pendant la lecture de l'enregistrement de répertoire : %s\n"
#: g10/trustdb.c:1660 g10/trustdb.c:1714
#, c-format
@@ -3154,12 +3136,11 @@ msgstr "Réécrire (o/N)? "
#: g10/openfile.c:97
#, c-format
msgid "%s: unknown suffix\n"
-msgstr ""
+msgstr "%s : suffixe inconnu\n"
#: g10/openfile.c:119
-#, fuzzy
msgid "Enter new filename"
-msgstr "--store [nom du fichier]"
+msgstr "Entrez le nouveau nom de fichier"
#: g10/openfile.c:160
msgid "writing to stdout\n"
@@ -3203,277 +3184,321 @@ msgstr ""
"ne peut éviter une clé faible pour le chiffrement symétrique :\n"
"%d essais ont eu lieu !\n"
-#. begin of list
-#: g10/helptext.c:48
-msgid "edit_ownertrust.value"
+#: g10/helptext.c:47
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
msgstr ""
-"C'est à vous d'assigner une valeur ici ; cette valeur ne sera jamais\n"
-"envoyée à une tierce personne. Nous en avons besoin pour créer le réseau de\n"
-"confiance (web-of-trust) ; cela n'a rien à voir avec le réseau des\n"
-"certificats (créé implicitement)"
-#: g10/helptext.c:54
-msgid "revoked_key.override"
+#: g10/helptext.c:53
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
msgstr ""
-"Si vous voulez utiliser cette clé révoquée quand-même, répondez « oui »."
-#: g10/helptext.c:58
-msgid "untrusted_key.override"
+#: g10/helptext.c:57
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
msgstr ""
-"Si vous voulez utiliser cette clé peu sûre quand-même, répondez « oui »."
-#: g10/helptext.c:62
-msgid "pklist.user_id.enter"
-msgstr "Entrez l'adresse de la personne à qui vous voulez envoyer le message."
+#: g10/helptext.c:61
+msgid ""
+"Enter the user id of the addressee to whom you want to send the message."
+msgstr ""
-#: g10/helptext.c:66
-msgid "keygen.algo"
+#: g10/helptext.c:65
+msgid ""
+"Select the algorithm to use.\n"
+"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+"for signatures. This is the suggested algorithm because verification of\n"
+"DSA signatures are much faster than those of ElGamal.\n"
+"ElGamal is an algorithm which can be used for signatures and encryption.\n"
+"OpenPGP distunguishs between two flavors of this algorithms: an encrypt "
+"only\n"
+"and a sign+encrypt; actually it is the same, but some parameters must be\n"
+"selected in a special way to create a safe key for signatures: this program\n"
+"does this but other OpenPGP implementations are not required to understand\n"
+"the signature+encryption flavor.\n"
+"The first (primary) key must always be a key which is capable of signing;\n"
+"this is the reason why the encryption only ElGamal key is not available in\n"
+"this menu."
msgstr ""
-"Sélectionnez l'algorithme à utiliser.\n"
-"DSA (alias DSS) est l'algorithme de signatures électroniques qui ne peut\n"
-"être utilisé que pour les signatures. C'est l'algorithme recommandé car\n"
-"la vérification des signatures DSA est beaucoup plus rapide que celle des\n"
-"signatures ElGamal.\n"
-"ElGamal est un algorithme pouvant à la fois être utilisé pour les\n"
-"signatures et le chiffrement. OpenPGP en distingue deux sortes :\n"
-"l'une destinée uniquement au chiffrement et l'autre pouvant aussi bien\n"
-"servir aux signatures ; elles sont en fait identiques mais certains\n"
-"paramètres doivent être spécialement choisis pour que la clé génère des\n"
-"signatures sures : ce programme est capable de le faire mais les autres\n"
-"implémentaions de OpenPGP ne sont pas obligées d'accepter cette forme de\n"
-"clé.\n"
-"La première clé (clé principale) doit toujours être capable de signer ;\n"
-"c'est pourquoi la clé ElGamal de chiffrement seul est alors désactivée."
#: g10/helptext.c:82
-msgid "keygen.algo.elg_se"
+msgid ""
+"Although these keys are defined in RFC2440 they are not suggested\n"
+"because they are not supported by all programs and signatures created\n"
+"with them are quite large and very slow to verify."
msgstr ""
-"Bien que ces clés soient définies dans la RFC2440 elles ne sont pas\n"
-"conseillées car tous les programmes ne les supportent pas et les signatures\n"
-"créées avec elles sont plutôt longues et très lentes à vérifier."
#: g10/helptext.c:89
-msgid "keygen.size"
-msgstr "Entrez la taille de la clé"
-
-#: g10/helptext.c:93
-msgid "keygen.size.huge.okay"
-msgstr "Répondez « oui » ou « non »"
+#, fuzzy
+msgid "Enter the size of the key"
+msgstr "Entrez le nom d'utilisateur : "
-#: g10/helptext.c:98
-msgid "keygen.size.large.okay"
-msgstr "Répondez « oui » ou « non »"
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:147 g10/helptext.c:152 g10/helptext.c:157
+msgid "Answer \"yes\" or \"no\""
+msgstr ""
#: g10/helptext.c:103
-msgid "keygen.valid"
-msgstr "Entrez la valeur demandée"
-
-#: g10/helptext.c:110
-msgid "keygen.valid.okay"
-msgstr "Répondez « oui » ou « non »"
+msgid ""
+"Enter the required value as shown in the pronpt.\n"
+"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
#: g10/helptext.c:115
-msgid "keygen.name"
-msgstr "Entrez le nom du propriétaire de la clé"
+msgid "Enter the name of the key holder"
+msgstr ""
#: g10/helptext.c:120
-msgid "keygen.email"
-msgstr "Entrez une adresse e-mail optionnelle mais hautement recommandée"
+msgid "please enter an optional but highly suggested email address"
+msgstr ""
#: g10/helptext.c:124
-msgid "keygen.comment"
-msgstr "Entrez un commentaire optionnel"
+#, fuzzy
+msgid "Please enter an optional comment"
+msgstr "Entrez le nom d'un fichier de données : "
#: g10/helptext.c:129
-msgid "keygen.userid.cmd"
+msgid ""
+"N to change the name.\n"
+"C to change the comment.\n"
+"E to change the email address.\n"
+"O to continue with key generation.\n"
+"Q to to quit the key generation."
msgstr ""
-"N pour changer le nom.\n"
-"C pour changer le commentaire.\n"
-"E pour changer l'adresse e-mail.\n"
-"O pour continuer à générer la clé.\n"
-"Q pour arrêter de générer de clé."
#: g10/helptext.c:138
-msgid "keygen.sub.okay"
-msgstr "Répondez « oui » (ou simplement « o ») pour générer la sous-clé"
-
-#: g10/helptext.c:142
-msgid "sign_uid.okay"
-msgstr "Répondez « oui » ou « non »"
-
-#: g10/helptext.c:147
-msgid "change_passwd.empty.okay"
-msgstr "Répondez « oui » ou « non »"
-
-#: g10/helptext.c:152
-msgid "keyedit.save.okay"
-msgstr "Répondez « oui » ou « non »"
-
-#: g10/helptext.c:157
-msgid "keyedit.cancel.okay"
-msgstr "Répondez « oui » ou « non »"
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr ""
#: g10/helptext.c:161
-msgid "keyedit.sign_all.okay"
-msgstr "Répondez « oui » si vous voulez signer TOUS les noms d'utilisateurs"
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
+msgstr ""
#: g10/helptext.c:165
-msgid "keyedit.remove.uid.okay"
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
msgstr ""
-"Répondez « oui » si vous voulez vraiment supprimer ce nom\n"
-"d'utilisateur. Tous les certificats seront alors perdus en même temps !"
#: g10/helptext.c:170
-msgid "keyedit.remove.subkey.okay"
-msgstr "Entrez « oui » s'il faut vraiment supprimer la sous-clé"
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr ""
#: g10/helptext.c:175
-#, fuzzy
-msgid "keyedit.delsig.valid"
-msgstr "Répondez « oui » si vous voulez signer TOUS les noms d'utilisateurs"
+msgid ""
+"This is a valid signature on the key; you normally don't want\n"
+"to delete this signature may be important to establish a trust\n"
+"connection to the key or another key certified by this key."
+msgstr ""
#: g10/helptext.c:180
-#, fuzzy
-msgid "keyedit.delsig.unknown"
-msgstr "Répondez « oui » si vous voulez signer TOUS les noms d'utilisateurs"
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key. You should postpone its deletion until you\n"
+"know which key was used because this signing key might establisha trust "
+"connection through another already certified key."
+msgstr ""
#: g10/helptext.c:186
-#, fuzzy
-msgid "keyedit.delsig.invalid"
-msgstr "Répondez « oui » si vous voulez signer TOUS les noms d'utilisateurs"
+msgid ""
+"The signature is not valid. It does make sense to remove it from\n"
+"your keyring."
+msgstr ""
#: g10/helptext.c:190
-msgid "keyedit.delsig.selfsig"
+msgid ""
+"This is a signature which binds the user ID to the key. It is\n"
+"usually not a good idea to remove such a signature. Actually\n"
+"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."
msgstr ""
#: g10/helptext.c:199
-msgid "passphrase.enter"
-msgstr ""
-"Entrez le mot de passe ; c'est une phrase secrète \n"
+msgid ""
+"Please enter the passhrase; this is a secret sentence \n"
" Blurb, blurb,.... "
+msgstr ""
#: g10/helptext.c:206
-msgid "passphrase.repeat"
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
msgstr ""
-"Répétez le dernier mot de passe, pour être sûr de ce que vous avez tapé."
#: g10/helptext.c:210
-msgid "detached_signature.filename"
-msgstr "Donnez le nom du fichier auquel la signature se rapporte"
+msgid "Give the name fo the file to which the signature applies"
+msgstr ""
-#. openfile.c (overwrite_filep)
#: g10/helptext.c:215
-msgid "openfile.overwrite.okay"
-msgstr "Entrez « oui » s'il faut vraiment réécrire le fichier"
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr ""
-#. openfile.c (ask_outfile_name)
#: g10/helptext.c:220
-msgid "openfile.askoutname"
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
msgstr ""
-#: g10/helptext.c:235
+#: g10/helptext.c:234
msgid "No help available"
msgstr "Pas d'aide disponible"
-#: g10/helptext.c:247
+#: g10/helptext.c:242
#, c-format
msgid "No help available for `%s'"
msgstr "Pas d'aide disponible pour `%s'"
-#, fuzzy
-#~ msgid "tdbio_search_sdir failed: %s\n"
-#~ msgstr "tdbio_search_dir a échoué : %s\n"
+#~ msgid "edit_ownertrust.value"
+#~ msgstr ""
+#~ "C'est à vous d'assigner une valeur ici ; cette valeur ne sera jamais\n"
+#~ "envoyée à une tierce personne. Nous en avons besoin pour créer le réseau de\n"
+#~ "confiance (web-of-trust) ; cela n'a rien à voir avec le réseau des\n"
+#~ "certificats (créé implicitement)"
-#~ msgid "print all message digests"
-#~ msgstr "écrire toutes les fonctions de hachage"
+#~ msgid "revoked_key.override"
+#~ msgstr ""
+#~ "Si vous voulez utiliser cette clé révoquée quand-même, répondez « oui »."
-#~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
+#~ msgid "untrusted_key.override"
#~ msgstr ""
-#~ "NOTE : l'enregistrement de signature %lu[%d] est dans la liste d'aide\n"
-#~ "de %lu mais marqué comme vérifié\n"
+#~ "Si vous voulez utiliser cette clé peu sûre quand-même, répondez « oui »."
-#~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n"
+#~ msgid "pklist.user_id.enter"
#~ msgstr ""
-#~ "NOTE : l'enregistrement de signature %lu[%d] est dans la liste d'aide\n"
-#~ "de %lu mais n'est pas marqué\n"
+#~ "Entrez l'adresse de la personne à qui vous voulez envoyer le message."
-#~ msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n"
+#~ msgid "keygen.algo"
+#~ msgstr ""
+#~ "Sélectionnez l'algorithme à utiliser.\n"
+#~ "DSA (alias DSS) est l'algorithme de signatures électroniques qui ne peut\n"
+#~ "être utilisé que pour les signatures. C'est l'algorithme recommandé car\n"
+#~ "la vérification des signatures DSA est beaucoup plus rapide que celle des\n"
+#~ "signatures ElGamal.\n"
+#~ "ElGamal est un algorithme pouvant à la fois être utilisé pour les\n"
+#~ "signatures et le chiffrement. OpenPGP en distingue deux sortes :\n"
+#~ "l'une destinée uniquement au chiffrement et l'autre pouvant aussi bien\n"
+#~ "servir aux signatures ; elles sont en fait identiques mais certains\n"
+#~ "paramètres doivent être spécialement choisis pour que la clé génère des\n"
+#~ "signatures sures : ce programme est capable de le faire mais les autres\n"
+#~ "implémentaions de OpenPGP ne sont pas obligées d'accepter cette forme de\n"
+#~ "clé.\n"
+#~ "La première clé (clé principale) doit toujours être capable de signer ;\n"
+#~ "c'est pourquoi la clé ElGamal de chiffrement seul est alors désactivée."
+
+#~ msgid "keygen.algo.elg_se"
#~ msgstr ""
-#~ "l'enregistrement de signature %lu[%d] dans la liste d'aide de %lu\n"
-#~ "ne pointe pas vers un enregistrement de répertoire\n"
+#~ "Bien que ces clés soient définies dans la RFC2440 elles ne sont pas\n"
+#~ "conseillées car tous les programmes ne les supportent pas et les signatures\n"
+#~ "créées avec elles sont plutôt longues et très lentes à vérifier."
-#~ msgid "lid %lu: no primary key\n"
-#~ msgstr "lid %lu : pas de clé primaire\n"
+#~ msgid "keygen.size"
+#~ msgstr "Entrez la taille de la clé"
-#~ msgid "lid %lu: user id not found in keyblock\n"
-#~ msgstr "lid %lu : utilisateur non trouvé dans le bloc de clés\n"
+#~ msgid "keygen.size.huge.okay"
+#~ msgstr "Répondez « oui » ou « non »"
-#~ msgid "lid %lu: user id without signature\n"
-#~ msgstr "lid %lu : utilisateur sans signature\n"
+#~ msgid "keygen.size.large.okay"
+#~ msgstr "Répondez « oui » ou « non »"
-#~ msgid "lid %lu: self-signature in hintlist\n"
-#~ msgstr "lid %lu : auto-signature dans la liste d'aide\n"
+#~ msgid "keygen.valid"
+#~ msgstr ""
+#~ "Entrez la valeur demandée comme indiqué dans le prompteur.\n"
+#~ "On peut entrer une date ISO (AAAA-MM-JJ) mais le résultat d'erreur sera\n"
+#~ "mauvais - le système essaie d'interpréter la valeur donnée comme un\n"
+#~ "intervalle."
-#~ msgid "very strange: no public key\n"
-#~ msgstr "très étrange : pas de clé publique\n"
+#~ msgid "keygen.valid.okay"
+#~ msgstr "Répondez « oui » ou « non »"
-#~ msgid "hintlist %lu[%d] of %lu does not point to a dir record\n"
-#~ msgstr ""
-#~ "la liste d'aide de %lu[%d] de %lu ne pointe pas vers un enregistrement\n"
-#~ "de répertoire\n"
+#~ msgid "keygen.name"
+#~ msgstr "Entrez le nom du propriétaire de la clé"
-#~ msgid "lid %lu does not have a key\n"
-#~ msgstr "la lid %lu n'a pas de clé\n"
+#~ msgid "keygen.email"
+#~ msgstr "Entrez une adresse e-mail optionnelle mais hautement recommandée"
-#~ msgid "lid %lu: can't get keyblock: %s\n"
-#~ msgstr "lid %lu: ne peut obtenir le bloc de clés: %s\n"
+#~ msgid "keygen.comment"
+#~ msgstr "Entrez un commentaire optionnel"
-#~ msgid "Too many preferences"
-#~ msgstr "Trop de préférences"
+#~ msgid "keygen.userid.cmd"
+#~ msgstr ""
+#~ "N pour changer le nom.\n"
+#~ "C pour changer le commentaire.\n"
+#~ "E pour changer l'adresse e-mail.\n"
+#~ "O pour continuer à générer la clé.\n"
+#~ "Q pour arrêter de générer de clé."
-#~ msgid "Too many preference items"
-#~ msgstr "Trop d'items de préférence"
+#~ msgid "keygen.sub.okay"
+#~ msgstr "Répondez « oui » (ou simplement « o ») pour générer la sous-clé"
-#~ msgid "public key not anymore available"
-#~ msgstr "la clé secrète n'est plus disponible"
+#~ msgid "sign_uid.okay"
+#~ msgstr "Répondez « oui » ou « non »"
-#~ msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
-#~ msgstr ""
-#~ "uid %08lX.%lu/%02X%02X : possède une ombre %lu mais n'est pas encore\n"
-#~ "marqué.\n"
+#~ msgid "change_passwd.empty.okay"
+#~ msgstr "Répondez « oui » ou « non »"
-#~ msgid "insert_trust_record: keyblock not found: %s\n"
-#~ msgstr "insert_trust_record : bloc de clés non trouvé : %s\n"
+#~ msgid "keyedit.save.okay"
+#~ msgstr "Répondez « oui » ou « non »"
-#~ msgid "lid %lu: update failed: %s\n"
-#~ msgstr "lid %lu : la mise à jour a échoué: %s\n"
+#~ msgid "keyedit.cancel.okay"
+#~ msgstr "Répondez « oui » ou « non »"
-#~ msgid "lid %lu: updated\n"
-#~ msgstr "lid %lu : mis à jour\n"
+#~ msgid "keyedit.sign_all.okay"
+#~ msgstr "Répondez « oui » si vous voulez signer TOUS les noms d'utilisateurs"
-#~ msgid "lid %lu: okay\n"
-#~ msgstr "lid %lu : OK\n"
+#~ msgid "keyedit.remove.uid.okay"
+#~ msgstr ""
+#~ "Répondez « oui » si vous voulez vraiment supprimer ce nom\n"
+#~ "d'utilisateur. Tous les certificats seront alors perdus en même temps !"
-#~ msgid "%s: keyblock read problem: %s\n"
-#~ msgstr "%s : problème de lecture du bloc de clés : %s\n"
+#~ msgid "keyedit.remove.subkey.okay"
+#~ msgstr "Entrez « oui » s'il faut vraiment supprimer la sous-clé"
-#~ msgid "%s: update failed: %s\n"
-#~ msgstr "%s : la mise à jour a échoué : %s\n"
+#~ msgid "keyedit.delsig.valid"
+#~ msgstr ""
+#~ "C'est une signature valide dans la clé ; vous n'avez pas normalement\n"
+#~ "intérêt à supprimer cette signature car elle peut être importante pour\n"
+#~ "établir une connection de confiance vers la clé ou une autre clé certifiée\n"
+#~ "par celle-là."
-#~ msgid "%s: updated\n"
-#~ msgstr "%s : mis à jour\n"
+#~ msgid "keyedit.delsig.unknown"
+#~ msgstr ""
+#~ "Cette signature ne peut pas être vérifiée parce que vous n'avez pas la\n"
+#~ "clé correspondante. Vous devriez remettre sa supression jusqu'à ce que\n"
+#~ "vous soyez sûr de quelle clé a été utilisée car cette clé de signature\n"
+#~ "peut établir une connection de confiance vers une autre clé déjà certifiée."
-#~ msgid "%s: okay\n"
-#~ msgstr "%s : OK\n"
+#~ msgid "keyedit.delsig.invalid"
+#~ msgstr ""
+#~ "Cette signature n'est pas valide. Vous devriez la supprimer de votre\n"
+#~ "porte-clés."
-#~ msgid "lid %lu: keyblock not found: %s\n"
-#~ msgstr "lid %lu : le bloc de clés n'a pas été trouvé : %s\n"
+#~ msgid "keyedit.delsig.selfsig"
+#~ msgstr ""
+#~ "Cette signature relie le nom d'utilisateur à la clé. Habituellement\n"
+#~ "enlever une telle signature n'est pas une bonne idée. En fait GnuPG peut\n"
+#~ "ne plus être capable d'utiliser cette clé. Donc faites ceci uniquement si\n"
+#~ "cette auto-signature est invalide pour une certaine raison et si une autre\n"
+#~ "est disponible."
-#~ msgid "keyedit.cmd"
-#~ msgstr "Entrez « help » pour voir la liste des commandes."
+#~ msgid "passphrase.enter"
+#~ msgstr ""
+#~ "Entrez le mot de passe ; c'est une phrase secrète \n"
+#~ " Blurb, blurb,.... "
-#~ msgid "can't lock keyring `%': %s\n"
-#~ msgstr "ne peut verrouiller le porte-clés `%' : %s\n"
+#~ msgid "passphrase.repeat"
+#~ msgstr ""
+#~ "Répétez le dernier mot de passe pour être sûr de ce que vous avez tapé."
+
+#~ msgid "detached_signature.filename"
+#~ msgstr "Donnez le nom du fichier auquel la signature se rapporte"
-#~ msgid "error writing keyring `%': %s\n"
-#~ msgstr "erreur durant la lecture du porte-clés `%' : %s\n"
+#~ msgid "openfile.overwrite.okay"
+#~ msgstr "Entrez « oui » s'il faut vraiment réécrire le fichier"
+
+#~ msgid "openfile.askoutname"
+#~ msgstr ""
+#~ "Entrez le nouveau nom de fichier. Si vous tapez simplement ENTRÉE le "
+#~ "fichier\n"
+#~ "par défaut (indiqué entre crochets) sera utilisé."
diff --git a/po/it.po b/po/it.po
index 729a92d8e..56eefc755 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-0.9.7\n"
-"POT-Creation-Date: 1999-08-04 09:56+0200\n"
-"PO-Revision-Date: 1999-07-25 14:36+02:00\n"
+"POT-Creation-Date: 1999-08-30 19:40+0200\n"
+"PO-Revision-Date: 1999-08-17 23:04+02:00\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <it@li.org>\n"
"MIME-Version: 1.0\n"
@@ -25,19 +25,27 @@ msgstr "l'operazione non è possibile senza memoria sicura inizializzata\n"
msgid "(you may have used the wrong program for this task)\n"
msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
-#: util/miscutil.c:254 util/miscutil.c:271
+#: util/miscutil.c:254 util/miscutil.c:283
msgid "yes"
msgstr "sì"
-#: util/miscutil.c:255 util/miscutil.c:273
+#: util/miscutil.c:255 util/miscutil.c:286
msgid "yY"
msgstr "sS"
-#: g10/keyedit.c:564 util/miscutil.c:272
+#: util/miscutil.c:256 util/miscutil.c:284
+msgid "no"
+msgstr ""
+
+#: util/miscutil.c:257 util/miscutil.c:287
+msgid "nN"
+msgstr ""
+
+#: g10/keyedit.c:564 util/miscutil.c:285
msgid "quit"
msgstr "quit"
-#: util/miscutil.c:274
+#: util/miscutil.c:288
msgid "qQ"
msgstr "qQ"
@@ -103,7 +111,7 @@ msgstr "armatura non valida"
#: util/errors.c:69
msgid "no such user id"
-msgstr "l'user ID non esiste"
+msgstr "l'user id non esiste"
#: util/errors.c:70
msgid "secret key not available"
@@ -155,7 +163,7 @@ msgstr "algoritmo di cifratura non implementato"
#: util/errors.c:82
msgid "unknown signature class"
-msgstr "classe della firma sconosciuta."
+msgstr "classe della firma sconosciuta"
#: util/errors.c:83
msgid "trust database error"
@@ -215,7 +223,7 @@ msgstr "chiave debole"
#: util/errors.c:97
msgid "invalid argument"
-msgstr "armatura non valida"
+msgstr "argomento non valido"
#: util/errors.c:98
msgid "bad URI"
@@ -258,6 +266,9 @@ msgid ""
msgstr ""
"Il generatore di numeri casuali è solo un ripiego per fare\n"
"compilare il programma - non è assolutamente un RNG forte!\n"
+"\n"
+"NON USARE ALCUN DATO GENERATO DA QUESTO PROGRAMMA!\n"
+"\n"
#: cipher/rndlinux.c:135
#, c-format
@@ -269,7 +280,7 @@ msgstr ""
"\n"
"Non ci sono abbastanza byte casuali disponibili. Per favore fai qualche\n"
"altra cosa per dare all'OS la possibilità di raccogliere altra entropia!\n"
-"(Servono ancora %d altri byte)\n"
+"(Servono altri %d byte)\n"
#: g10/g10.c:185
msgid ""
@@ -476,15 +487,15 @@ msgstr "non fa cambiamenti"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
#: g10/g10.c:254
msgid "batch mode: never ask"
-msgstr "modo batch: non fare domande"
+msgstr "modo batch: non fa domande"
#: g10/g10.c:255
msgid "assume yes on most questions"
-msgstr "assumi \"sì\" a quasi tutte le domande"
+msgstr "assumi \"sì\" per quasi tutte le domande"
#: g10/g10.c:256
msgid "assume no on most questions"
-msgstr "assumi \"no\" a quasi tutte le domande"
+msgstr "assumi \"no\" per quasi tutte le domande"
#: g10/g10.c:257
msgid "add this keyring to the list of keyrings"
@@ -520,7 +531,7 @@ msgstr "abilita il debugging completo"
#: g10/g10.c:266
msgid "|FD|write status info to this FD"
-msgstr "|FD|scrivi le informazioni di stato su questo fd"
+msgstr "|FD|scrivi le informazioni di stato su questo FD"
#: g10/g10.c:267
msgid "do not write comment packets"
@@ -554,7 +565,7 @@ msgstr "|N|usa il modo N per la passphrase"
#: g10/g10.c:276
msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|NOME|usa l'algoritmo di message digest NOME"
+msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
#: g10/g10.c:278
msgid "|NAME|use cipher algorithm NAME for passphrases"
@@ -606,7 +617,7 @@ msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
#: g10/g10.c:374
msgid "Usage: gpg [options] [files] (-h for help)"
-msgstr "Uso: gpg [opzioni] [file] (-h per l'aiuto)"
+msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
#: g10/g10.c:377
msgid ""
@@ -614,7 +625,7 @@ msgid ""
"sign, check, encrypt or decrypt\n"
"default operation depends on the input data\n"
msgstr ""
-"Sintassi: gpg [opzioni] [file]\n"
+"Sintassi: gpg [opzioni] [files]\n"
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
@@ -628,7 +639,7 @@ msgstr ""
#: g10/g10.c:456
msgid "usage: gpg [options] "
-msgstr "uso: gpg [options] "
+msgstr "uso: gpg [opzioni] "
#: g10/g10.c:509
msgid "conflicting commands\n"
@@ -637,7 +648,7 @@ msgstr "comandi in conflitto\n"
#: g10/g10.c:644
#, c-format
msgid "NOTE: no default option file `%s'\n"
-msgstr "NOTA: manca il file con le opzioni predefinite `%s'\n"
+msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
#: g10/g10.c:648
#, c-format
@@ -657,17 +668,17 @@ msgstr "%s non è un set di caratteri valido\n"
#: g10/g10.c:892 g10/g10.c:901
#, c-format
msgid "NOTE: %s is not for normal use!\n"
-msgstr ""
+msgstr "NOTA: %s normalmente non deve essere usato!\n"
#: g10/g10.c:894
#, c-format
msgid "%s not allowed with %s!\n"
-msgstr ""
+msgstr "Non è permesso usare %s con %s!\n"
#: g10/g10.c:897
#, c-format
msgid "%s makes no sense with %s!\n"
-msgstr ""
+msgstr "Non ha senso usare %s con %s!\n"
#: g10/g10.c:916 g10/g10.c:928
msgid "selected cipher algorithm is invalid\n"
@@ -765,9 +776,8 @@ msgid "can't open %s: %s\n"
msgstr "impossibile aprire `%s': %s\n"
#: g10/g10.c:1182
-#, fuzzy
msgid "-k[v][v][v][c] [user-id] [keyring]"
-msgstr "-k[v][v][v][c] [userid] [portachiavi]"
+msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
#: g10/g10.c:1243
#, c-format
@@ -839,7 +849,7 @@ msgstr "header della firma in chiaro non valido\n"
#: g10/armor.c:389
msgid "nested clear text signatures\n"
-msgstr "firme in chiaro innestate\n"
+msgstr "firme in chiaro annidate\n"
#: g10/armor.c:500
msgid "invalid dash escaped line: "
@@ -886,7 +896,7 @@ msgstr "Non sono stati trovati dati OpenPGP validi.\n"
#: 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"
+msgstr "armatura non valida: linea più lunga di %d caratteri\n"
#: g10/armor.c:1009
msgid ""
@@ -899,12 +909,11 @@ msgstr ""
#. * data is properly aligned with the user ID
#: g10/pkclist.c:53
msgid " Fingerprint:"
-msgstr " Fingerprint:"
+msgstr " Impronta digitale:"
#: g10/pkclist.c:80
-#, fuzzy
msgid "Fingerprint:"
-msgstr "mostra le impronte digitali"
+msgstr "Impronta digitale:"
# valid user replies (not including 1..4)
# [Marco, you can change 'm' and 's' to whatever letters you like]
@@ -1013,8 +1022,7 @@ msgstr "%08lX: la chiave è scaduta\n"
#: g10/pkclist.c:396
#, c-format
msgid "%08lX: no info to calculate a trust probability\n"
-msgstr ""
-"%08lX: mancano informazioni su come calcolare una probabilità di fiducia\n"
+msgstr "%08lX: mancano informazioni per calcolare una probabilità di fiducia\n"
#: g10/pkclist.c:410
#, c-format
@@ -1129,9 +1137,9 @@ msgid "Public key is disabled.\n"
msgstr "La chiave pubblica è disabilitata.\n"
#: g10/pkclist.c:800
-#, fuzzy, c-format
+#, c-format
msgid "unknown default recipient `%s'\n"
-msgstr "destinatario predefinito sconosciuto `s'\n"
+msgstr "destinatario predefinito `%s' sconosciuto\n"
#: g10/pkclist.c:833
#, c-format
@@ -1153,7 +1161,7 @@ msgstr "scrittura della autofirma\n"
#: g10/keygen.c:160
msgid "writing key binding signature\n"
-msgstr "scrittura della autofirma\n"
+msgstr "scrittura della firma di collegamento alla chiave\n"
#: g10/keygen.c:386
msgid "Please select what kind of key you want:\n"
@@ -1215,7 +1223,7 @@ msgstr "Di che dimensioni vuoi la chiave? (1024) "
#: g10/keygen.c:454
msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA permette solo chiavi di dimensioni da 512 a 1024\n"
+msgstr "DSA permette solo chiavi di dimensioni tra 512 e 1024\n"
#: g10/keygen.c:456
msgid "keysize too small; 768 is smallest value allowed.\n"
@@ -1261,7 +1269,7 @@ msgstr "Ti serve davvero una chiave così lunga? "
#: g10/keygen.c:489
#, c-format
msgid "Requested keysize is %u bits\n"
-msgstr "Le dimensioni della chiave richieste sono %u bit\n"
+msgstr "La dimensione richiesta della chiave è %u bit\n"
#: g10/keygen.c:492 g10/keygen.c:496
#, c-format
@@ -1279,7 +1287,8 @@ msgid ""
msgstr ""
"Per favore specifica per quanto la chiave sarà valida.\n"
" 0 = la chiave non scadrà\n"
-" <n>w = la chiave scadrà dopo n giorni\n"
+" <n> = la chiave scadrà dopo n giorni\n"
+" <n>w = la chiave scadrà dopo n settimane\n"
" <n>m = la chiave scadrà dopo n mesi\n"
" <n>y = la chiave scadrà dopo n anni\n"
@@ -1433,7 +1442,7 @@ msgstr "scrittura del certificato pubblico in `%s'\n"
#: g10/keygen.c:882
#, c-format
msgid "writing secret certificate to `%s'\n"
-msgstr "scrittura del certificato privato in `%s'\n"
+msgstr "scrittura del certificato segreto in `%s'\n"
#: g10/keygen.c:959
msgid "public and secret key created and signed.\n"
@@ -1528,17 +1537,15 @@ msgstr "troppe voci nella unk cache - disabilitata\n"
#: g10/getkey.c:1289 g10/getkey.c:1328
msgid "RSA key cannot be used in this version\n"
-msgstr ""
+msgstr "In questa versione non possono essere usate chiavi RSA\n"
#: g10/getkey.c:1291 g10/getkey.c:1330
-#, fuzzy
msgid "No key for user-id\n"
-msgstr "chiave %08lX: nessun user id\n"
+msgstr "Non ci sono chiavi per questo user-id\n"
#: g10/getkey.c:1369 g10/getkey.c:1409
-#, fuzzy
msgid "No user-id for key\n"
-msgstr "manca la chiave segreta\n"
+msgstr "Non ci sono user-id per questa chiave\n"
#: g10/getkey.c:1565 g10/getkey.c:1621
#, c-format
@@ -1573,32 +1580,32 @@ msgstr "Numero totale esaminato: %lu\n"
#: g10/import.c:179
#, c-format
msgid " w/o user IDs: %lu\n"
-msgstr "senza user ID: %lu\n"
+msgstr " senza user ID: %lu\n"
#: g10/import.c:181
#, c-format
msgid " imported: %lu"
-msgstr "importate: %lu"
+msgstr " importate: %lu"
#: g10/import.c:187
#, c-format
msgid " unchanged: %lu\n"
-msgstr "non modificate: %lu\n"
+msgstr " non modificate: %lu\n"
#: g10/import.c:189
#, c-format
msgid " new user IDs: %lu\n"
-msgstr "nuovi user ID: %lu\n"
+msgstr " nuovi user ID: %lu\n"
#: g10/import.c:191
#, c-format
msgid " new subkeys: %lu\n"
-msgstr "nuove subchiavi: %lu\n"
+msgstr " nuove subchiavi: %lu\n"
#: g10/import.c:193
#, c-format
msgid " new signatures: %lu\n"
-msgstr "nuove firme: %lu\n"
+msgstr " nuove firme: %lu\n"
#: g10/import.c:195
#, c-format
@@ -1608,17 +1615,17 @@ msgstr "nuove revoche di chiavi: %lu\n"
#: g10/import.c:197
#, c-format
msgid " secret keys read: %lu\n"
-msgstr "chiavi segrete lette: %lu\n"
+msgstr " chiavi segrete lette: %lu\n"
#: g10/import.c:199
#, c-format
msgid " secret keys imported: %lu\n"
-msgstr "chiavi segrete importate %lu\n"
+msgstr "chiavi segrete importate: %lu\n"
#: g10/import.c:201
#, c-format
msgid " secret keys unchanged: %lu\n"
-msgstr "chiavi segrete non cambiate %lu\n"
+msgstr "chiavi segrete non cambiate: %lu\n"
#: g10/import.c:362 g10/import.c:554
#, c-format
@@ -1772,14 +1779,14 @@ msgid "key %08lX: invalid subkey binding\n"
msgstr "chiave %08lX: legame con la subchiave non valido:\n"
#: g10/import.c:769
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: accepted non self-signed user-id '"
-msgstr "chiave %08lX: accettato l'userid non autofirmato '"
+msgstr "chiave %08lX: accettato l'user-id non autofirmato '"
#: g10/import.c:798
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: skipped user-id '"
-msgstr "chiave %08lX: saltato l'user id '"
+msgstr "chiave %08lX: saltato l'user-id '"
#: g10/import.c:821
#, c-format
@@ -1793,7 +1800,7 @@ msgstr "chiave %08lX: saltata la subchiave\n"
#: g10/import.c:846
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
-msgstr "chiave %08lX: firma non esportabile (chiave %02x) - saltata\n"
+msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
#: g10/import.c:855
#, c-format
@@ -2157,7 +2164,7 @@ msgstr "abilita una chiave"
#: g10/keyedit.c:614
msgid "can't do that in batchmode\n"
-msgstr "impossibile fare questo in batch mode\n"
+msgstr "impossibile fare questo in modo batch\n"
#. check that they match
#. fixme: check that they both match
@@ -2359,7 +2366,7 @@ msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
#: g10/mainproc.c:285
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
-msgstr "Firma fatta con la chiave %s con ID %08lX\n"
+msgstr "Cifrato con la chiave %s con ID %08lX\n"
#: g10/mainproc.c:291
msgid "no secret key for decryption available\n"
@@ -2439,20 +2446,20 @@ msgstr "firma vecchio stile (PGP 2.x)\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
-#: g10/misc.c:93
+#: g10/misc.c:94
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "impossibile disabilitare i core dump: %s\n"
-#: g10/misc.c:96
+#: g10/misc.c:97
msgid "WARNING: program may create a core file!\n"
-msgstr "ATTENZIONE: il programma potrebbe creare un file di core!\n"
+msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
-#: g10/misc.c:203
+#: g10/misc.c:205
msgid "Experimental algorithms should not be used!\n"
msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
-#: g10/misc.c:217
+#: g10/misc.c:219
msgid ""
"RSA keys are deprecated; please consider creating a new key and use this key "
"in the future\n"
@@ -2461,9 +2468,9 @@ msgstr ""
"chiave\n"
"e usarla in futuro\n"
-#: g10/misc.c:239
+#: g10/misc.c:241
msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
-msgstr "questo algoritmo di cifratura è deprecato; usatene uno più standard!\n"
+msgstr "questo algoritmo di cifratura è deprecato; usane uno più standard!\n"
#: g10/parse-packet.c:113
#, c-format
@@ -2497,7 +2504,7 @@ msgstr " (key ID principale %08lX)"
#: g10/passphrase.c:190
msgid "can't query password in batchmode\n"
-msgstr "impossibile chiedere la password in batch mode\n"
+msgstr "impossibile chiedere la password in modo batch\n"
#: g10/passphrase.c:194
msgid "Enter passphrase: "
@@ -2561,7 +2568,7 @@ msgstr ""
#: g10/sig-check.c:199
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"
+msgstr "si suppone un MDC non valido a causa di un bit critico sconosciuto\n"
#: g10/sig-check.c:295
msgid ""
@@ -2587,7 +2594,7 @@ msgstr "NOTA: chiave per firmare scaduta il %s\n"
#: g10/sig-check.c:377
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"
+"si suppone una firma non valida a causa di un bit critico sconosciuto\n"
#: g10/sign.c:132
#, c-format
@@ -2755,7 +2762,7 @@ msgstr "Il trustdb è danneggiato; eseguire \"gpg --fix-trust-db\".\n"
#: g10/trustdb.c:160
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "trust record %lu, req type %d: read fallita: %s\n"
+msgstr "trust record %lu, tipo %d: read fallita: %s\n"
#: g10/trustdb.c:175
#, c-format
@@ -3079,7 +3086,7 @@ msgid ""
"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
"signatures!\n"
msgstr ""
-"%s: questa è una chiave ElGamal generata da PGP che NON è sicura per\n"
+"saltata %s: questa è una chiave ElGamal generata da PGP che NON è sicura per "
"le firme!\n"
#. do not overwrite
@@ -3099,7 +3106,7 @@ msgstr "%s: suffisso sconosciuto\n"
#: g10/openfile.c:119
msgid "Enter new filename"
-msgstr "Inserire il nome del nuovo file"
+msgstr "Inserire il nuovo nome del file"
#: g10/openfile.c:160
msgid "writing to stdout\n"
@@ -3108,7 +3115,7 @@ msgstr "scrivo su stdout\n"
#: g10/openfile.c:219
#, c-format
msgid "assuming signed data in `%s'\n"
-msgstr "presumo che i dati firmati siano in `%s'\n"
+msgstr "suppongo che i dati firmati siano in `%s'\n"
#: g10/openfile.c:269
#, c-format
@@ -3143,145 +3150,319 @@ msgstr ""
"Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
"ho provato %d volte!\n"
-#. begin of list
-#: g10/helptext.c:48
-msgid "edit_ownertrust.value"
-msgstr "edit_ownertrust.value"
+#: g10/helptext.c:47
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
-#: g10/helptext.c:54
-msgid "revoked_key.override"
-msgstr "revoked_key.override"
+#: g10/helptext.c:53
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
+msgstr ""
-#: g10/helptext.c:58
-msgid "untrusted_key.override"
-msgstr "untrusted_key.override"
+#: g10/helptext.c:57
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr ""
-#: g10/helptext.c:62
-msgid "pklist.user_id.enter"
-msgstr "pklist.user_id.enter"
+#: g10/helptext.c:61
+msgid ""
+"Enter the user id of the addressee to whom you want to send the message."
+msgstr ""
-#: g10/helptext.c:66
-msgid "keygen.algo"
-msgstr "keygen.algo"
+#: g10/helptext.c:65
+msgid ""
+"Select the algorithm to use.\n"
+"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+"for signatures. This is the suggested algorithm because verification of\n"
+"DSA signatures are much faster than those of ElGamal.\n"
+"ElGamal is an algorithm which can be used for signatures and encryption.\n"
+"OpenPGP distunguishs between two flavors of this algorithms: an encrypt "
+"only\n"
+"and a sign+encrypt; actually it is the same, but some parameters must be\n"
+"selected in a special way to create a safe key for signatures: this program\n"
+"does this but other OpenPGP implementations are not required to understand\n"
+"the signature+encryption flavor.\n"
+"The first (primary) key must always be a key which is capable of signing;\n"
+"this is the reason why the encryption only ElGamal key is not available in\n"
+"this menu."
+msgstr ""
#: g10/helptext.c:82
-msgid "keygen.algo.elg_se"
-msgstr "keygen.algo.elg_se"
+msgid ""
+"Although these keys are defined in RFC2440 they are not suggested\n"
+"because they are not supported by all programs and signatures created\n"
+"with them are quite large and very slow to verify."
+msgstr ""
#: g10/helptext.c:89
-msgid "keygen.size"
-msgstr "keygen.size"
-
-#: g10/helptext.c:93
-msgid "keygen.size.huge.okay"
-msgstr "keygen.size.huge.okay"
+#, fuzzy
+msgid "Enter the size of the key"
+msgstr "Inserisci l'user ID: "
-#: g10/helptext.c:98
-msgid "keygen.size.large.okay"
-msgstr "keygen.size.large.okay"
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:147 g10/helptext.c:152 g10/helptext.c:157
+msgid "Answer \"yes\" or \"no\""
+msgstr ""
#: g10/helptext.c:103
-msgid "keygen.valid"
-msgstr "keygen.valid"
-
-#: g10/helptext.c:110
-msgid "keygen.valid.okay"
-msgstr "keygen.valid.okay"
+msgid ""
+"Enter the required value as shown in the pronpt.\n"
+"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
#: g10/helptext.c:115
-msgid "keygen.name"
-msgstr "keygen.name"
+msgid "Enter the name of the key holder"
+msgstr ""
#: g10/helptext.c:120
-msgid "keygen.email"
-msgstr "keygen.email"
+msgid "please enter an optional but highly suggested email address"
+msgstr ""
#: g10/helptext.c:124
-msgid "keygen.comment"
-msgstr "keygen.comment"
+#, fuzzy
+msgid "Please enter an optional comment"
+msgstr "Inserisci il nome del file di dati: "
#: g10/helptext.c:129
-msgid "keygen.userid.cmd"
-msgstr "keygen.userid.cmd"
+msgid ""
+"N to change the name.\n"
+"C to change the comment.\n"
+"E to change the email address.\n"
+"O to continue with key generation.\n"
+"Q to to quit the key generation."
+msgstr ""
#: g10/helptext.c:138
-msgid "keygen.sub.okay"
-msgstr "keygen.sub.okay"
-
-#: g10/helptext.c:142
-msgid "sign_uid.okay"
-msgstr "sign_uid.okay"
-
-#: g10/helptext.c:147
-msgid "change_passwd.empty.okay"
-msgstr "change_passwd.empty.okay"
-
-#: g10/helptext.c:152
-msgid "keyedit.save.okay"
-msgstr "keyedit.save.okay"
-
-#: g10/helptext.c:157
-msgid "keyedit.cancel.okay"
-msgstr "keyedit.cancel.okay"
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr ""
#: g10/helptext.c:161
-msgid "keyedit.sign_all.okay"
-msgstr "keyedit.sign_all.okay"
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
+msgstr ""
#: g10/helptext.c:165
-msgid "keyedit.remove.uid.okay"
-msgstr "keyedit.remove.uid.okay"
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
#: g10/helptext.c:170
-msgid "keyedit.remove.subkey.okay"
-msgstr "keyedit.remove.subkey.okay"
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr ""
#: g10/helptext.c:175
-msgid "keyedit.delsig.valid"
-msgstr "keyedit.delsig.valid"
+msgid ""
+"This is a valid signature on the key; you normally don't want\n"
+"to delete this signature may be important to establish a trust\n"
+"connection to the key or another key certified by this key."
+msgstr ""
#: g10/helptext.c:180
-msgid "keyedit.delsig.unknown"
-msgstr "keyedit.delsig.unknown"
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key. You should postpone its deletion until you\n"
+"know which key was used because this signing key might establisha trust "
+"connection through another already certified key."
+msgstr ""
#: g10/helptext.c:186
-msgid "keyedit.delsig.invalid"
-msgstr "keyedit.delsig.invalid"
+msgid ""
+"The signature is not valid. It does make sense to remove it from\n"
+"your keyring."
+msgstr ""
#: g10/helptext.c:190
-msgid "keyedit.delsig.selfsig"
-msgstr "keyedit.delsig.selfsig<"
+msgid ""
+"This is a signature which binds the user ID to the key. It is\n"
+"usually not a good idea to remove such a signature. Actually\n"
+"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."
+msgstr ""
#: g10/helptext.c:199
-msgid "passphrase.enter"
-msgstr "passphrase.enter"
+msgid ""
+"Please enter the passhrase; this is a secret sentence \n"
+" Blurb, blurb,.... "
+msgstr ""
#: g10/helptext.c:206
-msgid "passphrase.repeat"
-msgstr "passphrase.repeat"
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
+msgstr ""
#: g10/helptext.c:210
-msgid "detached_signature.filename"
-msgstr "detached_signature.filename"
+msgid "Give the name fo the file to which the signature applies"
+msgstr ""
-#. openfile.c (overwrite_filep)
#: g10/helptext.c:215
-msgid "openfile.overwrite.okay"
-msgstr "openfile.overwrite.okay"
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr ""
-#. openfile.c (ask_outfile_name)
#: g10/helptext.c:220
-msgid "openfile.askoutname"
-msgstr "openfile.askoutname"
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+msgstr ""
-#: g10/helptext.c:235
+#: g10/helptext.c:234
msgid "No help available"
msgstr "Non è disponibile un aiuto"
-#: g10/helptext.c:247
+#: g10/helptext.c:242
#, c-format
msgid "No help available for `%s'"
msgstr "Non è disponibile un aiuto per `%s'"
-#~ msgid "tdbio_search_sdir failed: %s\n"
-#~ msgstr "tdbio_search_sdir fallita: %s\n"
+#~ msgid "edit_ownertrust.value"
+#~ msgstr ""
+#~ "È compito tuo assegnare un valore; questo valore non sarà mai esportato a\n"
+#~ "terzi. Ci serve per implementare il web-of-trust; non ha nulla a che fare\n"
+#~ "con il web-of-certificates (creato implicitamente)."
+
+#~ msgid "revoked_key.override"
+#~ msgstr "Se vuoi usare comunque questa chiave revocata, rispondi \"sì\"."
+
+#~ msgid "untrusted_key.override"
+#~ msgstr "Se vuoi usare comunque questa chiave non fidata, rispondi \"sì\"."
+
+#~ msgid "pklist.user_id.enter"
+#~ msgstr ""
+#~ "Inserisci l'user id del destinatario a cui vuoi mandare il messaggio."
+
+#~ msgid "keygen.algo"
+#~ msgstr ""
+#~ "Seleziona l'algoritmo da usare.\n"
+#~ "DSA (alias DSS) è un algoritmo usabile solo per firmare. È l'algoritmo\n"
+#~ "suggerito perché verificare firme DSA è molto più veloce di quelle ElGamal.\n"
+#~ "ElGamal è un algoritmo usabile per firmare e cifrare.\n"
+#~ "OpenPGP distingue tra due versioni di questo algoritmo: una solo per "
+#~ "firmare\n"
+#~ "e una per firmare e cifrare. In realtà è sempre lo stesso, per creare firme\n"
+#~ "sicure per la cifratura occorre scegliere in un modo particolare alcuni\n"
+#~ "parametri: questo programma lo fa ma non è richiesto che altre "
+#~ "implementazioni\n"
+#~ "di OpenPGP capiscano la versione per firmare e cifrare.\n"
+#~ "La prima chiave (primaria) deve sempre essere una chiave in grado di "
+#~ "firmare;\n"
+#~ "questo è il motivo per cui le chiavi ElGamal solo per cifrare sono\n"
+#~ "disabilitate."
+
+#~ msgid "keygen.algo.elg_se"
+#~ msgstr ""
+#~ "Anche se queste chiavi sono definite da RFC2400 non sono suggerite perché "
+#~ "non\n"
+#~ "sono gestite da tutti i programmi e le firme create sono grandi e lunghe da\n"
+#~ "verificare."
+
+#~ msgid "keygen.size"
+#~ msgstr "Inserisci le dimensioni della chiave"
+
+#~ msgid "keygen.size.huge.okay"
+#~ msgstr "Rispondi \"sì\" o \"no\""
+
+#~ msgid "keygen.size.large.okay"
+#~ msgstr "Rispondi \"sì\" o \"no\""
+
+#~ msgid "keygen.valid"
+#~ msgstr ""
+#~ "Inserisci il valore richiesto come indicato dal prompt.\n"
+#~ "È possibile inserire una data in formato ISO (YYYY-MM-DD) ma non avrai un\n"
+#~ "messaggio di errore corretto: il sistema cerca di interpretare il valore\n"
+#~ "dato come un intervallo."
+
+#~ msgid "keygen.valid.okay"
+#~ msgstr "Rispondi \"sì\" o \"no\""
+
+#~ msgid "keygen.name"
+#~ msgstr "Inserisci il nome del proprietario della chiave"
+
+#~ msgid "keygen.email"
+#~ msgstr "Inserisci un indirizzo di email opzionale (ma fortemente suggerito)"
+
+#~ msgid "keygen.comment"
+#~ msgstr "Inserisci un commento opzionale"
+
+#~ msgid "keygen.userid.cmd"
+#~ msgstr ""
+#~ "N per cambiare il nome\n"
+#~ "C per cambiare il commento\n"
+#~ "E per cambiare l'indirizzo di email\n"
+#~ "O per continuare con la generazione della chiave\n"
+#~ "Q per abbandonare il processo di generazione della chiave"
+
+#~ msgid "keygen.sub.okay"
+#~ msgstr "Rispondi \"sì\" (o \"y\") se va bene generare la subchiave."
+
+#~ msgid "sign_uid.okay"
+#~ msgstr "Rispondi \"sì\" o \"no\""
+
+#~ msgid "change_passwd.empty.okay"
+#~ msgstr "Rispondi \"sì\" o \"no\""
+
+#~ msgid "keyedit.save.okay"
+#~ msgstr "Rispondi \"sì\" o \"no\""
+
+#~ msgid "keyedit.cancel.okay"
+#~ msgstr "Rispondi \"sì\" o \"no\""
+
+#~ msgid "keyedit.sign_all.okay"
+#~ msgstr "Rispondi \"sì\" se vuoi firmare TUTTI gli user id."
+
+#~ msgid "keyedit.remove.uid.okay"
+#~ msgstr ""
+#~ "Rispondi \"sì\" se vuoi davvero cancellare questo user id.\n"
+#~ "Tutti i certificati saranno persi!"
+
+#~ msgid "keyedit.remove.subkey.okay"
+#~ msgstr "Rispondi \"sì\" se va bene cancellare la subchiave"
+
+#~ msgid "keyedit.delsig.valid"
+#~ msgstr ""
+#~ "Questa è una firma valida per la chiave. Normalmente non vorresti "
+#~ "cancellare\n"
+#~ "questa firma perchè può essere importante per stabilire una connessione di\n"
+#~ "fiducia alla chiave o a un'altra chiave certificata da questa chiave."
+
+#~ msgid "keyedit.delsig.unknown"
+#~ msgstr ""
+#~ "Questa firma non può essere verificata perchè non hai la chiave "
+#~ "corrispondente.\n"
+#~ "Dovresti rimandare la sua cancellazione finchè non saprai quale chiave è "
+#~ "stata\n"
+#~ "usata perchè questa chiave potrebbe stabilire una connessione di fiducia\n"
+#~ "attraverso una chiave già certificata."
+
+#~ msgid "keyedit.delsig.invalid"
+#~ msgstr "Questa firma non è valida. Ha senso rimuoverla dal tuo portachiavi."
+
+#~ msgid "keyedit.delsig.selfsig"
+#~ msgstr ""
+#~ "Questa è la firma che collega l'user id alla chiave. Solitamente non è una\n"
+#~ "buona idea rimuovere questo tipo di firme. In realtà GnuPG potrebbe non "
+#~ "essere\n"
+#~ "più in grado di usare questa chiave. Quindi fallo solo se questa autofirma "
+#~ "non\n"
+#~ "è valida per qualche ragione e ne è disponibile un'altra."
+
+#~ msgid "passphrase.enter"
+#~ msgstr ""
+#~ "Inserisci la passphrase, cioè una frase segreta.\n"
+#~ "bla, bla, bla..."
+
+#~ msgid "passphrase.repeat"
+#~ msgstr "Ripeti l'ultima passphrase per essere sicuro di cosa hai scritto."
+
+#~ msgid "detached_signature.filename"
+#~ msgstr "Inserisci il nome del file a cui la firma si riferisce."
+
+#~ msgid "openfile.overwrite.okay"
+#~ msgstr "Rispondi \"sì\" se va bene sovrascrivere il file."
+
+#~ msgid "openfile.askoutname"
+#~ msgstr ""
+#~ "Inserisci il nuovo nome del file.\n"
+#~ "Se premi INVIO sarà usato il nome predefinito (quello indicato tra "
+#~ "parentesi)."
diff --git a/po/pl.po b/po/pl.po
index 2df5ed056..2509a484a 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-08-04 09:56+0200\n"
+"POT-Creation-Date: 1999-08-30 19:40+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"
@@ -34,19 +34,27 @@ msgstr "operacja niemo¿liwa do wykonania bez dostêpnej pamiêci bezpiecznej\n"
msgid "(you may have used the wrong program for this task)\n"
msgstr "(prawdopodobnie u¿ywany program jest niew³a¶ciwy dlatego zadania)\n"
-#: util/miscutil.c:254 util/miscutil.c:271
+#: util/miscutil.c:254 util/miscutil.c:283
msgid "yes"
msgstr "tak"
-#: util/miscutil.c:255 util/miscutil.c:273
+#: util/miscutil.c:255 util/miscutil.c:286
msgid "yY"
msgstr "tT"
-#: g10/keyedit.c:564 util/miscutil.c:272
+#: util/miscutil.c:256 util/miscutil.c:284
+msgid "no"
+msgstr ""
+
+#: util/miscutil.c:257 util/miscutil.c:287
+msgid "nN"
+msgstr ""
+
+#: g10/keyedit.c:564 util/miscutil.c:285
msgid "quit"
msgstr "wyj¶cie"
-#: util/miscutil.c:274
+#: util/miscutil.c:288
#, fuzzy
msgid "qQ"
msgstr "w"
@@ -2491,20 +2499,20 @@ msgstr "podpis starego typu (PGP 2.x)\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
-#: g10/misc.c:93
+#: g10/misc.c:94
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "nie mo¿na wy³±czyæ zrzucania pamiêci: %s\n"
-#: g10/misc.c:96
+#: g10/misc.c:97
msgid "WARNING: program may create a core file!\n"
msgstr "OSTRZE¯ENIE: program mo¿e stworzyæ plik zrzutu pamiêci!\n"
-#: g10/misc.c:203
+#: g10/misc.c:205
msgid "Experimental algorithms should not be used!\n"
msgstr "Nie nale¿y u¿ywaæ algorytmów do¶wiadczalnych!\n"
-#: g10/misc.c:217
+#: g10/misc.c:219
msgid ""
"RSA keys are deprecated; please consider creating a new key and use this key "
"in the future\n"
@@ -2512,7 +2520,7 @@ msgstr ""
"Klucze RSA s± odradzane; proszê rozwa¿yæ przej¶cie na inne algorytmy po\n"
"wygenerowaniu odpowiednich kluczy.\n"
-#: g10/misc.c:239
+#: g10/misc.c:241
msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
msgstr ""
"ten algorytm szyfruj±cy jest odradzanym proszê u¿ywaæ bardziej "
@@ -3202,200 +3210,316 @@ msgstr ""
"brak mo¿liwo¶ci generacji dobrego klucza dla szyfru symetrycznego;\n"
"operacja by³a powtarzana %d razy!\n"
-#. begin of list
-#: g10/helptext.c:48
-msgid "edit_ownertrust.value"
-msgstr ""
-"Przypisanie tych warto¶ci nale¿y do Ciebie, nie bêd± one udostêpnione\n"
-"nikomu innemu. S± one u¿ywane do stworzenia sieci zaufania i nie ma\n"
-"to nic wspólnego z tworzon± sieci± certyfikatów."
-
-#: g10/helptext.c:54
-msgid "revoked_key.override"
-msgstr ""
-"Je¶li mimo wszystko chcesz u¿yæ tego uniewa¿nionego klucza, odpowiedz "
-"\"tak\"."
-
-#: g10/helptext.c:58
-msgid "untrusted_key.override"
-msgstr ""
-"Je¶li mimo wszystko chcesz u¿yæ tego klucza, klucza do którego nie masz\n"
-"zaufania, odpowiedz \"tak\"."
-
-#: g10/helptext.c:62
-msgid "pklist.user_id.enter"
-msgstr "Podaj identyfikator u¿ytkownika adresata tych informacji."
-
-#: g10/helptext.c:66
-msgid "keygen.algo"
-msgstr ""
-"Wybór algorytmu:\n"
-"DSA (znany te¿ jako DSS) to Algorytm Podpisu Cyfrowego - u¿ywaæ go mo¿na "
-"tylko\n"
-"do tworzenia cyfrowych podpisów. Jego wybór jest sugerowany poniewa¿\n"
-"sprawdzanie podpisów z³o¿onych algorytmem DSA jest du¿o szybsze ni¿ tych\n"
-"z³o¿onych algorytmem ElGamala.\n"
-"Algorytm ElGamala to algorytm klucza publicznego który nadaje mo¿na "
-"stosowaæ\n"
-"zarówno do szyfrowania jak i do tworzenia podpisów cyfrowych\n"
-"W standardzie OpenPGP algorytm ElGamala wystêpuje w dwóch wersjach:\n"
-"obs³uguj±cej podpisywanie, oraz obs³uguj±cej podpisywanie i szyfrowanie; z\n"
-"technicznego punktu widzenia algorytm dzia³a tak samo, ale pewne "
-"wspó³czynniki\n"
-"musz± byæ dobrane tak aby klucz nadawa³ siê do sk³adania bezpiecznych\n"
-"podpisów. Ten program obs³uguje obie wersje, ale inne implementacje OpenPGP\n"
-"nie musz± rozumieæ obs³ugiwaæ klucza przeznaczonego jednocze¶nie do\n"
-"podpisywania i szyfrowania.\n"
-"G³ówny klucz musi byæ zawsze kluczem s³u¿±cym umo¿liwiaj±cym podpisywanie,\n"
-"dlatego te¿ ten program nie obs³uguje osobnych kluczy ElGamala s³u¿±cych "
-"tylko\n"
-"do szyfrowania."
+#: g10/helptext.c:47
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
+
+#: g10/helptext.c:53
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
+msgstr ""
+
+#: g10/helptext.c:57
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr ""
+
+#: g10/helptext.c:61
+msgid ""
+"Enter the user id of the addressee to whom you want to send the message."
+msgstr ""
+
+#: g10/helptext.c:65
+msgid ""
+"Select the algorithm to use.\n"
+"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+"for signatures. This is the suggested algorithm because verification of\n"
+"DSA signatures are much faster than those of ElGamal.\n"
+"ElGamal is an algorithm which can be used for signatures and encryption.\n"
+"OpenPGP distunguishs between two flavors of this algorithms: an encrypt "
+"only\n"
+"and a sign+encrypt; actually it is the same, but some parameters must be\n"
+"selected in a special way to create a safe key for signatures: this program\n"
+"does this but other OpenPGP implementations are not required to understand\n"
+"the signature+encryption flavor.\n"
+"The first (primary) key must always be a key which is capable of signing;\n"
+"this is the reason why the encryption only ElGamal key is not available in\n"
+"this menu."
+msgstr ""
#: g10/helptext.c:82
-msgid "keygen.algo.elg_se"
+msgid ""
+"Although these keys are defined in RFC2440 they are not suggested\n"
+"because they are not supported by all programs and signatures created\n"
+"with them are quite large and very slow to verify."
msgstr ""
-"Mimo ¿e ten rodzaj kluczy jest zdefiniowany w RFC 2440, wybór takiego "
-"klucza\n"
-"nie jest sugerowany. Nie wszystkie programy taki klucz s± w stanie "
-"obs³u¿yæ,\n"
-"a podpisy z³o¿one za jego pomoc± s± du¿e i ich sprawdzenie zajmuje du¿o "
-"czasu."
#: g10/helptext.c:89
-msgid "keygen.size"
-msgstr "Rozmiar klucza"
-
-#: g10/helptext.c:93
-msgid "keygen.size.huge.okay"
-msgstr "Odpowiedz \"tak\" lub \"nie\""
+#, fuzzy
+msgid "Enter the size of the key"
+msgstr "Wprowad¼ identyfikator u¿ytkownika (user ID): "
-#: g10/helptext.c:98
-msgid "keygen.size.large.okay"
-msgstr "Odpowiedz \"tak\" lub \"nie\""
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:147 g10/helptext.c:152 g10/helptext.c:157
+msgid "Answer \"yes\" or \"no\""
+msgstr ""
#: g10/helptext.c:103
-msgid "keygen.valid"
-msgstr "Podaj ¿±dan± warto¶æ"
-
-#: g10/helptext.c:110
-msgid "keygen.valid.okay"
-msgstr "Odpowiedz \"tak\" lub \"nie\""
+msgid ""
+"Enter the required value as shown in the pronpt.\n"
+"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
#: g10/helptext.c:115
-msgid "keygen.name"
-msgstr "Podaj nazwê (imiê, nazwisko) w³a¶ciciela klucza"
+msgid "Enter the name of the key holder"
+msgstr ""
#: g10/helptext.c:120
-msgid "keygen.email"
-msgstr "Adres e-mail (opcjonalny ale warto go wpisaæ)"
+msgid "please enter an optional but highly suggested email address"
+msgstr ""
#: g10/helptext.c:124
-msgid "keygen.comment"
-msgstr "Komentarz (opcjonalny)"
+#, fuzzy
+msgid "Please enter an optional comment"
+msgstr "Nazwa pliku danych: "
#: g10/helptext.c:129
-msgid "keygen.userid.cmd"
+msgid ""
+"N to change the name.\n"
+"C to change the comment.\n"
+"E to change the email address.\n"
+"O to continue with key generation.\n"
+"Q to to quit the key generation."
msgstr ""
-"I - zmiana imienia lub nazwiska.\n"
-"K - zmiana komentarza.\n"
-"E - zmiana adresu email.\n"
-"D - przej¶cie do w³a¶ciwej generacji klucza.\n"
-"W - wyj¶cie z procedury generacji i z programu."
#: g10/helptext.c:138
-msgid "keygen.sub.okay"
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
msgstr ""
-"Odpowiedz \"tak\" (lub po prostu \"t\") je¶li zgadzasz siê na stworzenie "
-"podklucza."
-
-#: g10/helptext.c:142
-msgid "sign_uid.okay"
-msgstr "Odpowiedz \"tak\" lub \"nie\""
-
-#: g10/helptext.c:147
-msgid "change_passwd.empty.okay"
-msgstr "Odpowiedz \"tak\" lub \"nie\""
-
-#: g10/helptext.c:152
-msgid "keyedit.save.okay"
-msgstr "Odpowiedz \"tak\" lub \"nie\""
-
-#: g10/helptext.c:157
-msgid "keyedit.cancel.okay"
-msgstr "Odpowiedz \"tak\" lub \"nie\""
#: g10/helptext.c:161
-msgid "keyedit.sign_all.okay"
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
msgstr ""
-"Odpowiedz \"tak\" je¶li chcesz podpisaæ wszystkie identyfikatory klucza"
#: g10/helptext.c:165
-msgid "keyedit.remove.uid.okay"
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
msgstr ""
-"Odpowiedz \"tak\" je¶li na pewno chcesz skasowaæ ten identyfikator klucza.\n"
-"Utracisz wszystkie podpisy innych u¿ytkowników z³o¿one na tym "
-"identyfikatorze!"
#: g10/helptext.c:170
-msgid "keyedit.remove.subkey.okay"
-msgstr "Odpowiedz \"tak\" je¶li na pewno chcesz skasowaæ ten podklucz"
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr ""
#: g10/helptext.c:175
-#, fuzzy
-msgid "keyedit.delsig.valid"
+msgid ""
+"This is a valid signature on the key; you normally don't want\n"
+"to delete this signature may be important to establish a trust\n"
+"connection to the key or another key certified by this key."
msgstr ""
-"Odpowiedz \"tak\" je¶li chcesz podpisaæ wszystkie identyfikatory klucza"
#: g10/helptext.c:180
-#, fuzzy
-msgid "keyedit.delsig.unknown"
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key. You should postpone its deletion until you\n"
+"know which key was used because this signing key might establisha trust "
+"connection through another already certified key."
msgstr ""
-"Odpowiedz \"tak\" je¶li chcesz podpisaæ wszystkie identyfikatory klucza"
#: g10/helptext.c:186
-#, fuzzy
-msgid "keyedit.delsig.invalid"
+msgid ""
+"The signature is not valid. It does make sense to remove it from\n"
+"your keyring."
msgstr ""
-"Odpowiedz \"tak\" je¶li chcesz podpisaæ wszystkie identyfikatory klucza"
#: g10/helptext.c:190
-msgid "keyedit.delsig.selfsig"
+msgid ""
+"This is a signature which binds the user ID to the key. It is\n"
+"usually not a good idea to remove such a signature. Actually\n"
+"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."
msgstr ""
#: g10/helptext.c:199
-msgid "passphrase.enter"
+msgid ""
+"Please enter the passhrase; this is a secret sentence \n"
+" Blurb, blurb,.... "
msgstr ""
-"Proszê wprowadziæ wyra¿enie przej¶ciowe (tajne zdanie)\n"
-" Bla, bla, bla ..."
#: g10/helptext.c:206
-msgid "passphrase.repeat"
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
msgstr ""
-"Proszê powtórzyæ podane wyra¿enie przej¶ciowe dla wyeliminowania pomy³ek."
#: g10/helptext.c:210
-msgid "detached_signature.filename"
-msgstr "Nazwa pliku którego dotyczy ten podpis"
+msgid "Give the name fo the file to which the signature applies"
+msgstr ""
-#. openfile.c (overwrite_filep)
#: g10/helptext.c:215
-msgid "openfile.overwrite.okay"
-msgstr "Odpowiedz \"tak\" je¶li na pewno chcesz nadpisaæ ten plik"
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr ""
-#. openfile.c (ask_outfile_name)
#: g10/helptext.c:220
-msgid "openfile.askoutname"
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
msgstr ""
-#: g10/helptext.c:235
+#: g10/helptext.c:234
msgid "No help available"
msgstr "Pomoc niedostêpna"
-#: g10/helptext.c:247
+#: g10/helptext.c:242
#, c-format
msgid "No help available for `%s'"
msgstr "Brak pomocy o '%s'"
+#~ msgid "edit_ownertrust.value"
+#~ msgstr ""
+#~ "Przypisanie tych warto¶ci nale¿y do Ciebie, nie bêd± one udostêpnione\n"
+#~ "nikomu innemu. S± one u¿ywane do stworzenia sieci zaufania i nie ma\n"
+#~ "to nic wspólnego z tworzon± sieci± certyfikatów."
+
+#~ msgid "revoked_key.override"
+#~ msgstr ""
+#~ "Je¶li mimo wszystko chcesz u¿yæ tego uniewa¿nionego klucza, odpowiedz "
+#~ "\"tak\"."
+
+#~ msgid "untrusted_key.override"
+#~ msgstr ""
+#~ "Je¶li mimo wszystko chcesz u¿yæ tego klucza, klucza do którego nie masz\n"
+#~ "zaufania, odpowiedz \"tak\"."
+
+#~ msgid "pklist.user_id.enter"
+#~ msgstr "Podaj identyfikator u¿ytkownika adresata tych informacji."
+
+#~ msgid "keygen.algo"
+#~ msgstr ""
+#~ "Wybór algorytmu:\n"
+#~ "DSA (znany te¿ jako DSS) to Algorytm Podpisu Cyfrowego - u¿ywaæ go mo¿na "
+#~ "tylko\n"
+#~ "do tworzenia cyfrowych podpisów. Jego wybór jest sugerowany poniewa¿\n"
+#~ "sprawdzanie podpisów z³o¿onych algorytmem DSA jest du¿o szybsze ni¿ tych\n"
+#~ "z³o¿onych algorytmem ElGamala.\n"
+#~ "Algorytm ElGamala to algorytm klucza publicznego który nadaje mo¿na "
+#~ "stosowaæ\n"
+#~ "zarówno do szyfrowania jak i do tworzenia podpisów cyfrowych\n"
+#~ "W standardzie OpenPGP algorytm ElGamala wystêpuje w dwóch wersjach:\n"
+#~ "obs³uguj±cej podpisywanie, oraz obs³uguj±cej podpisywanie i szyfrowanie; z\n"
+#~ "technicznego punktu widzenia algorytm dzia³a tak samo, ale pewne "
+#~ "wspó³czynniki\n"
+#~ "musz± byæ dobrane tak aby klucz nadawa³ siê do sk³adania bezpiecznych\n"
+#~ "podpisów. Ten program obs³uguje obie wersje, ale inne implementacje OpenPGP\n"
+#~ "nie musz± rozumieæ obs³ugiwaæ klucza przeznaczonego jednocze¶nie do\n"
+#~ "podpisywania i szyfrowania.\n"
+#~ "G³ówny klucz musi byæ zawsze kluczem s³u¿±cym umo¿liwiaj±cym podpisywanie,\n"
+#~ "dlatego te¿ ten program nie obs³uguje osobnych kluczy ElGamala s³u¿±cych "
+#~ "tylko\n"
+#~ "do szyfrowania."
+
+#~ msgid "keygen.algo.elg_se"
+#~ msgstr ""
+#~ "Mimo ¿e ten rodzaj kluczy jest zdefiniowany w RFC 2440, wybór takiego "
+#~ "klucza\n"
+#~ "nie jest sugerowany. Nie wszystkie programy taki klucz s± w stanie "
+#~ "obs³u¿yæ,\n"
+#~ "a podpisy z³o¿one za jego pomoc± s± du¿e i ich sprawdzenie zajmuje du¿o "
+#~ "czasu."
+
+#~ msgid "keygen.size"
+#~ msgstr "Rozmiar klucza"
+
+#~ msgid "keygen.size.huge.okay"
+#~ msgstr "Odpowiedz \"tak\" lub \"nie\""
+
+#~ msgid "keygen.size.large.okay"
+#~ msgstr "Odpowiedz \"tak\" lub \"nie\""
+
+#~ msgid "keygen.valid"
+#~ msgstr "Podaj ¿±dan± warto¶æ"
+
+#~ msgid "keygen.valid.okay"
+#~ msgstr "Odpowiedz \"tak\" lub \"nie\""
+
+#~ msgid "keygen.name"
+#~ msgstr "Podaj nazwê (imiê, nazwisko) w³a¶ciciela klucza"
+
+#~ msgid "keygen.email"
+#~ msgstr "Adres e-mail (opcjonalny ale warto go wpisaæ)"
+
+#~ msgid "keygen.comment"
+#~ msgstr "Komentarz (opcjonalny)"
+
+#~ msgid "keygen.userid.cmd"
+#~ msgstr ""
+#~ "I - zmiana imienia lub nazwiska.\n"
+#~ "K - zmiana komentarza.\n"
+#~ "E - zmiana adresu email.\n"
+#~ "D - przej¶cie do w³a¶ciwej generacji klucza.\n"
+#~ "W - wyj¶cie z procedury generacji i z programu."
+
+#~ msgid "keygen.sub.okay"
+#~ msgstr ""
+#~ "Odpowiedz \"tak\" (lub po prostu \"t\") je¶li zgadzasz siê na stworzenie "
+#~ "podklucza."
+
+#~ msgid "sign_uid.okay"
+#~ msgstr "Odpowiedz \"tak\" lub \"nie\""
+
+#~ msgid "change_passwd.empty.okay"
+#~ msgstr "Odpowiedz \"tak\" lub \"nie\""
+
+#~ msgid "keyedit.save.okay"
+#~ msgstr "Odpowiedz \"tak\" lub \"nie\""
+
+#~ msgid "keyedit.cancel.okay"
+#~ msgstr "Odpowiedz \"tak\" lub \"nie\""
+
+#~ msgid "keyedit.sign_all.okay"
+#~ msgstr ""
+#~ "Odpowiedz \"tak\" je¶li chcesz podpisaæ wszystkie identyfikatory klucza"
+
+#~ msgid "keyedit.remove.uid.okay"
+#~ msgstr ""
+#~ "Odpowiedz \"tak\" je¶li na pewno chcesz skasowaæ ten identyfikator klucza.\n"
+#~ "Utracisz wszystkie podpisy innych u¿ytkowników z³o¿one na tym "
+#~ "identyfikatorze!"
+
+#~ msgid "keyedit.remove.subkey.okay"
+#~ msgstr "Odpowiedz \"tak\" je¶li na pewno chcesz skasowaæ ten podklucz"
+
+#, fuzzy
+#~ msgid "keyedit.delsig.valid"
+#~ msgstr ""
+#~ "Odpowiedz \"tak\" je¶li chcesz podpisaæ wszystkie identyfikatory klucza"
+
+#, fuzzy
+#~ msgid "keyedit.delsig.unknown"
+#~ msgstr ""
+#~ "Odpowiedz \"tak\" je¶li chcesz podpisaæ wszystkie identyfikatory klucza"
+
+#, fuzzy
+#~ msgid "keyedit.delsig.invalid"
+#~ msgstr ""
+#~ "Odpowiedz \"tak\" je¶li chcesz podpisaæ wszystkie identyfikatory klucza"
+
+#~ msgid "passphrase.enter"
+#~ msgstr ""
+#~ "Proszê wprowadziæ wyra¿enie przej¶ciowe (tajne zdanie)\n"
+#~ " Bla, bla, bla ..."
+
+#~ msgid "passphrase.repeat"
+#~ msgstr ""
+#~ "Proszê powtórzyæ podane wyra¿enie przej¶ciowe dla wyeliminowania pomy³ek."
+
+#~ msgid "detached_signature.filename"
+#~ msgstr "Nazwa pliku którego dotyczy ten podpis"
+
+#~ msgid "openfile.overwrite.okay"
+#~ msgstr "Odpowiedz \"tak\" je¶li na pewno chcesz nadpisaæ ten plik"
+
#, fuzzy
#~ msgid "tdbio_search_sdir failed: %s\n"
#~ msgstr "Procedura tdbio_search_dir nie powiod³a siê: %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 21dfe7804..6c9eadb92 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"POT-Creation-Date: 1999-08-04 09:56+0200\n"
+"POT-Creation-Date: 1999-08-30 19:40+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"
@@ -29,20 +29,29 @@ msgstr "a operação não é possível sem memória segura inicializada\n"
msgid "(you may have used the wrong program for this task)\n"
msgstr "(você pode ter usado o programa errado para esta tarefa)\n"
-#: util/miscutil.c:254 util/miscutil.c:271
+#: util/miscutil.c:254 util/miscutil.c:283
msgid "yes"
msgstr "sim"
-#: util/miscutil.c:255 util/miscutil.c:273
+#: util/miscutil.c:255 util/miscutil.c:286
msgid "yY"
msgstr "sS"
+#: util/miscutil.c:256 util/miscutil.c:284
+msgid "no"
+msgstr ""
+
+#: util/miscutil.c:257 util/miscutil.c:287
+msgid "nN"
+msgstr ""
+
# INICIO MENU
-#: g10/keyedit.c:564 util/miscutil.c:272
+#: g10/keyedit.c:564 util/miscutil.c:285
msgid "quit"
msgstr "sair"
-#: util/miscutil.c:274
+# XXX
+#: util/miscutil.c:288
#, fuzzy
msgid "qQ"
msgstr "s"
@@ -69,7 +78,7 @@ msgstr "algoritmo de \"digest\" desconhecido"
#: util/errors.c:59
msgid "bad public key"
-msgstr "chave pública inválida"
+msgstr "chave pública incorreta"
#: util/errors.c:60
msgid "bad secret key"
@@ -166,9 +175,6 @@ msgstr "algoritmo de criptografia não implementado"
msgid "unknown signature class"
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
msgid "trust database error"
msgstr "erro no banco de dados de confiabilidade"
@@ -268,7 +274,7 @@ msgid ""
"\n"
msgstr ""
"O gerador de números aleatórios é apenas um \"remendo\"\n"
-"para poder compilar - não é de modo algum um bom gerador!\n"
+"para poder funcionar - não é de modo algum um bom gerador!\n"
"\n"
"NÃO USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
"\n"
@@ -295,137 +301,136 @@ msgstr ""
#: g10/g10.c:187
msgid "|[file]|make a signature"
-msgstr "|[arquivo]|faz uma assinatura"
+msgstr "|[arquivo]|fazer uma assinatura"
#: g10/g10.c:188
msgid "|[file]|make a clear text signature"
-msgstr "|[arquivo]|faz uma assinatura em texto puro"
+msgstr "|[arquivo]|fazer uma assinatura em texto puro"
#: g10/g10.c:189
msgid "make a detached signature"
-msgstr "faz uma assinatura separada"
+msgstr "fazer uma assinatura separada"
#: g10/g10.c:190
msgid "encrypt data"
-msgstr "criptografa dados"
+msgstr "criptografar dados"
#: g10/g10.c:191
msgid "encryption only with symmetric cipher"
-msgstr "criptografa apenas com criptografia simétrica"
+msgstr ""
+"criptografar apenas com criptografia\n"
+"simétrica"
#: g10/g10.c:192
msgid "store only"
-msgstr "apenas armazena"
+msgstr "apenas armazenar"
#: g10/g10.c:193
msgid "decrypt data (default)"
-msgstr "descriptografa dados (padrão)"
+msgstr "descriptografar dados (padrão)"
#: g10/g10.c:194
msgid "verify a signature"
-msgstr "verifica uma assinatura"
+msgstr "verificar uma assinatura"
#: g10/g10.c:195
msgid "list keys"
-msgstr "lista as chaves"
+msgstr "listar as chaves"
#: g10/g10.c:197
msgid "list keys and signatures"
-msgstr "lista as chaves e as assinaturas"
+msgstr "listar as chaves e as assinaturas"
#: g10/g10.c:198
msgid "check key signatures"
-msgstr "confere as assinaturas das chaves"
+msgstr "verificar as assinaturas das chaves"
#: g10/g10.c:199
msgid "list keys and fingerprints"
-msgstr "lista as chaves e as impressões digitais"
+msgstr "listar as chaves e as impressões digitais"
#: g10/g10.c:200
msgid "list secret keys"
-msgstr "lista as chaves secretas"
+msgstr "listar as chaves secretas"
#: g10/g10.c:201
msgid "generate a new key pair"
-msgstr "gera um novo par de chaves"
+msgstr "gerar um novo par de chaves"
#: g10/g10.c:202
msgid "remove key from the public keyring"
-msgstr "remove a chave do chaveiro público"
+msgstr "remover a chave do chaveiro público"
#: g10/g10.c:203
-#, fuzzy
msgid "sign a key"
-msgstr "assina a chave"
+msgstr "assinar uma chave"
#: g10/g10.c:204
-#, fuzzy
msgid "sign a key locally"
-msgstr "assina a chave localmente"
+msgstr "assinar uma chave localmente"
#: g10/g10.c:205
msgid "sign or edit a key"
-msgstr "assina ou edita uma chave"
+msgstr "assinar ou editar uma chave"
#: g10/g10.c:206
msgid "generate a revocation certificate"
-msgstr "gera um certificado de revogação"
+msgstr "gerar um certificado de revogação"
#: g10/g10.c:207
msgid "export keys"
-msgstr "exporta as chaves"
+msgstr "exportar chaves"
#: g10/g10.c:208
msgid "export keys to a key server"
-msgstr "exporta chaves para um servidor"
+msgstr "exportar chaves para um servidor"
#: g10/g10.c:209
msgid "import keys from a key server"
-msgstr "importa chaves de um servidor"
+msgstr "importar chaves de um servidor"
#: g10/g10.c:212
msgid "import/merge keys"
-msgstr "importa/funde as chaves"
+msgstr "importar/fundir chaves"
#: g10/g10.c:214
msgid "list only the sequence of packets"
-msgstr "lista apenas as seqüências de pacotes"
+msgstr "listar apenas as seqüências de pacotes"
# ownertrust ???
#: g10/g10.c:216
msgid "export the ownertrust values"
-msgstr "exporta os valores de confiança"
+msgstr "exportar os valores de confiança"
#: g10/g10.c:218
msgid "import ownertrust values"
-msgstr "importa os valores de confiança"
+msgstr "importar os valores de confiança"
#: g10/g10.c:220
-#, fuzzy
msgid "update the trust database"
-msgstr "|[NOMES]|atualiza o banco de dados de confiabilidade"
+msgstr "atualizar o banco de dados de confiabilidade"
#: g10/g10.c:222
msgid "|[NAMES]|check the trust database"
-msgstr "|[NOMES]|confere o banco de dados de confiabilidade"
+msgstr "|[NOMES]|verificar o banco de dados de confiabilidade"
#: g10/g10.c:223
msgid "fix a corrupted trust database"
msgstr ""
-"conserta um banco de dados de confiabilidade\n"
+"consertar um banco de dados de confiabilidade\n"
"danificado"
#: g10/g10.c:224
msgid "De-Armor a file or stdin"
-msgstr "Retira a armadura de um arquivo ou de \"stdin\""
+msgstr "retirar a armadura de um arquivo ou de \"stdin\""
#: g10/g10.c:225
msgid "En-Armor a file or stdin"
-msgstr "Cria armadura para um arquivo ou \"stdin\""
+msgstr "criar armadura para um arquivo ou \"stdin\""
#: g10/g10.c:226
msgid "|algo [files]|print message digests"
-msgstr "|algo [arquivos]|imprime \"digests\" de mensagens"
+msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
#: g10/g10.c:230
msgid ""
@@ -439,38 +444,39 @@ msgstr ""
#: g10/g10.c:232
msgid "create ascii armored output"
-msgstr "cria uma saída com armadura ascii"
+msgstr "criar saída com armadura ascii"
#: g10/g10.c:233
msgid "|NAME|encrypt for NAME"
-msgstr "|NOME|criptografa para NOME"
+msgstr "|NOME|criptografar para NOME"
#: g10/g10.c:236
-#, fuzzy
msgid "|NAME|use NAME as default recipient"
-msgstr "|NOME|usa NOME como chave secreta padrão"
+msgstr "|NOME|usar NOME como destinatário padrão"
#: g10/g10.c:238
msgid "use the default key as default recipient"
-msgstr ""
+msgstr "usar a chave padrão como destinatário padrão"
#: g10/g10.c:242
msgid "use this user-id to sign or decrypt"
msgstr ""
-"usa este identificador de usuário para assinar\n"
-"ou descriptografar"
+"usar este identificador de usuário para\n"
+"assinar ou descriptografar"
#: g10/g10.c:243
msgid "|N|set compress level N (0 disables)"
-msgstr "|N|estabelece nível de compressão N (0 desabilita)"
+msgstr ""
+"|N|estabelecer nível de compressão N\n"
+"(0 desabilita)"
#: g10/g10.c:245
msgid "use canonical text mode"
-msgstr "usa modo de texto canônico"
+msgstr "usar modo de texto canônico"
#: g10/g10.c:246
msgid "use as output file"
-msgstr "usa como arquivo de saída"
+msgstr "usar como arquivo de saída"
#: g10/g10.c:247
msgid "verbose"
@@ -482,11 +488,11 @@ msgstr "ser mais silencioso"
#: g10/g10.c:249
msgid "don't use the terminal at all"
-msgstr ""
+msgstr "nunca usar o terminal"
#: g10/g10.c:250
msgid "force v3 signatures"
-msgstr "força assinaturas v3"
+msgstr "forçar assinaturas v3"
#: g10/g10.c:251
msgid "always use a MDC for encryption"
@@ -511,45 +517,47 @@ msgstr "assumir não para a maioria das perguntas"
#: g10/g10.c:257
msgid "add this keyring to the list of keyrings"
-msgstr "adiciona este chaveiro à lista de chaveiros"
+msgstr "adicionar este chaveiro à lista de chaveiros"
#: g10/g10.c:258
msgid "add this secret keyring to the list"
-msgstr "adiciona este chaveiro secreto à lista"
+msgstr "adicionar este chaveiro secreto à lista"
#: g10/g10.c:259
msgid "|NAME|use NAME as default secret key"
-msgstr "|NOME|usa NOME como chave secreta padrão"
+msgstr "|NOME|usar NOME como chave secreta padrão"
#: g10/g10.c:260
msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|ENDEREÇO|usa este servidor para buscar chaves"
+msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
#: g10/g10.c:261
msgid "|NAME|set terminal charset to NAME"
-msgstr "|NOME|define mapa de caracteres do terminal como NOME"
+msgstr ""
+"|NOME|definir mapa de caracteres do terminal como\n"
+"NOME"
#: g10/g10.c:262
msgid "read options from file"
-msgstr "lê opções do arquivo"
+msgstr "ler opções do arquivo"
#: g10/g10.c:264
msgid "set debugging flags"
-msgstr "define parâmetros de depuração"
+msgstr "definir parâmetros de depuração"
#: g10/g10.c:265
msgid "enable full debugging"
-msgstr "habilita depuração completa"
+msgstr "habilitar depuração completa"
#: g10/g10.c:266
msgid "|FD|write status info to this FD"
msgstr ""
-"|DA|escreve informações de status para o descritor\n"
-"de arquivo DA"
+"|DA|escrever informações de estado para o\n"
+"descritor de arquivo DA"
#: g10/g10.c:267
msgid "do not write comment packets"
-msgstr "não escreve pacotes de comentário"
+msgstr "não escrever pacotes de comentário"
#: g10/g10.c:268
msgid "(default is 1)"
@@ -561,51 +569,56 @@ msgstr "(o padrão é 3)"
#: g10/g10.c:271
msgid "|FILE|load extension module FILE"
-msgstr "|ARQUIVO|carrega módulo de extensão ARQUIVO"
+msgstr "|ARQUIVO|carregar módulo de extensão ARQUIVO"
#: g10/g10.c:272
msgid "emulate the mode described in RFC1991"
-msgstr "emula o modo descrito no RFC1991"
+msgstr "emular o modo descrito no RFC1991"
#: g10/g10.c:273
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr ""
+"configurar todas as opções de pacote,\n"
+"criptografia e \"digest\" para comportamento\n"
+"OpenPGP"
#: g10/g10.c:274
msgid "|N|use passphrase mode N"
-msgstr "|N|usa frase secreta modo N"
+msgstr "|N|usar frase secreta modo N"
#: g10/g10.c:276
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr ""
-"|NOME|usa algoritmo de \"digest\" de mensagens NOME para\n"
-"frases secretas"
+"|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
+"para frases secretas"
#: g10/g10.c:278
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr ""
-"|NOME|usa algoritmo de criptografia NOME para\n"
+"|NOME|usar algoritmo de criptografia NOME para\n"
"frases secretas"
#: g10/g10.c:279
msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NOME|usa algoritmo de criptografia NOME"
+msgstr "|NOME|usar algoritmo de criptografia NOME"
#: g10/g10.c:280
msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NOME|usa algoritmo de \"digest\" de mensagens NOME"
+msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
#: g10/g10.c:281
msgid "|N|use compress algorithm N"
-msgstr "|N|usa algoritmo de compressão N"
+msgstr "|N|usar algoritmo de compressão N"
#: g10/g10.c:282
msgid "throw keyid field of encrypted packets"
-msgstr "elimina o campo keyid dos pacotes criptografados"
+msgstr ""
+"eliminar o campo keyid dos pacotes\n"
+"criptografados"
#: g10/g10.c:283
msgid "|NAME=VALUE|use this notation data"
-msgstr ""
+msgstr "|NOME=VALOR|usar estes dados de notação"
#: g10/g10.c:285
msgid ""
@@ -621,11 +634,11 @@ msgstr ""
"@\n"
"Exemplos:\n"
"\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"
+" -se -r Bob [arquivo] assinar e criptografar para usuário Bob\n"
+" --clearsign [arquivo] criar uma assinatura em texto puro\n"
+" --detach-sign [arquivo] criar uma assinatura separada\n"
+" --list-keys [nomes] mostrar chaves\n"
+" --fingerprint [nomes] mostrar impressões digitais\n"
#: g10/g10.c:370
msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
@@ -635,7 +648,6 @@ msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opções] [arquivos] (-h para ajuda)"
-# em cima, "check" está como "conferir"
#: g10/g10.c:377
msgid ""
"Syntax: gpg [options] [files]\n"
@@ -685,17 +697,17 @@ msgstr "%s não é um conjunto de caracteres válido\n"
#: g10/g10.c:892 g10/g10.c:901
#, c-format
msgid "NOTE: %s is not for normal use!\n"
-msgstr ""
+msgstr "NOTA: %s não é para uso normal!\n"
#: g10/g10.c:894
#, c-format
msgid "%s not allowed with %s!\n"
-msgstr ""
+msgstr "%s não é permitido com %s!\n"
#: g10/g10.c:897
#, c-format
msgid "%s makes no sense with %s!\n"
-msgstr ""
+msgstr "%s não faz sentido com %s!\n"
#: g10/g10.c:916 g10/g10.c:928
msgid "selected cipher algorithm is invalid\n"
@@ -707,7 +719,7 @@ msgstr "o algoritmo de \"digest\" selecionado não é válido\n"
#: g10/g10.c:938
msgid "the given policy URL is invalid\n"
-msgstr ""
+msgstr "a URL de política dada é inválida\n"
#: g10/g10.c:941
#, c-format
@@ -724,7 +736,7 @@ msgstr "marginals-needed deve ser maior que 1\n"
#: g10/g10.c:947
msgid "max-cert-depth must be in range 1 to 255\n"
-msgstr "max-cert-depth deve estar na faixa 1 a 255\n"
+msgstr "max-cert-depth deve estar na entre 1 e 255\n"
#: g10/g10.c:950
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
@@ -769,27 +781,23 @@ msgstr "--decrypt [nome_do_arquivo]"
#: g10/g10.c:1112
msgid "--sign-key user-id"
-msgstr ""
+msgstr "--sign-key id-usuário"
#: g10/g10.c:1120
-#, fuzzy
msgid "--lsign-key user-id"
-msgstr "--delete-key nome_do_usuário"
+msgstr "--lsign-key id-usuário"
#: g10/g10.c:1128
-#, fuzzy
msgid "--edit-key user-id [commands]"
-msgstr "--edit-key nome_do_usuário [comandos]"
+msgstr "--edit-key id-usuário [comandos]"
#: g10/g10.c:1144
-#, fuzzy
msgid "--delete-secret-key user-id"
-msgstr "--delete-secret-key nome_do_usuário"
+msgstr "--delete-secret-key id-usuário"
#: g10/g10.c:1147
-#, fuzzy
msgid "--delete-key user-id"
-msgstr "--delete-key nome_do_usuário"
+msgstr "--delete-key id-usuário"
#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366
#, c-format
@@ -797,9 +805,8 @@ msgid "can't open %s: %s\n"
msgstr "impossível abrir %s: %s\n"
#: g10/g10.c:1182
-#, fuzzy
msgid "-k[v][v][v][c] [user-id] [keyring]"
-msgstr "-k[v][v][v][c] [id_do_usuário] [chaveiro]"
+msgstr "-k[v][v][v][c] [id-usuário] [chaveiro]"
#: g10/g10.c:1243
#, c-format
@@ -834,20 +841,25 @@ msgstr "impossível abrir `%s'\n"
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
+"o primeiro caractere de um nome de notação deve ser uma letra ou um "
+"sublinhado\n"
#: g10/g10.c:1582
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
msgstr ""
+"um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e "
+"terminar com '='\n"
#: g10/g10.c:1588
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
+"pontos em um nome de notação devem estar cercados por outros caracteres\n"
#: g10/g10.c:1596
msgid "a notation value must not use any control characters\n"
-msgstr ""
+msgstr "um valor de notação não deve usar caracteres de controle\n"
#: g10/armor.c:296
#, c-format
@@ -921,20 +933,18 @@ msgstr "armadura inválida: linha maior que %d caracteres\n"
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 "
+"caractere \"quoted printable\" na armadura - provavelmente um MTA com bugs "
"foi usado\n"
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
#: g10/pkclist.c:53
-#, fuzzy
msgid " Fingerprint:"
-msgstr " importados: %lu"
+msgstr " Impressão digital:"
#: g10/pkclist.c:80
-#, fuzzy
msgid "Fingerprint:"
-msgstr "mostra impressão digital"
+msgstr "Impressão digital:"
# ???
#. a string with valid answers
@@ -971,9 +981,9 @@ msgstr ""
"\n"
" 1 = Não sei\n"
" 2 = Eu NÃO confio\n"
-" 3 = Eu confio marginalmente\n"
+" 3 = Eu confio moderadamente\n"
" 4 = Eu confio completamente\n"
-" 5 = Mostrar mais informação\n"
+" s = Mostrar mais informações\n"
#: g10/pkclist.c:222
msgid " m = back to the main menu\n"
@@ -1078,7 +1088,7 @@ msgid ""
msgstr ""
"Não se tem certeza de que esta chave pertence a seu dono.\n"
"Se você *realmente* sabe o que está fazendo, pode responder\n"
-"afirmativamente à próxima pergunta\n"
+"sim à próxima pergunta\n"
"\n"
#: g10/pkclist.c:484 g10/pkclist.c:507
@@ -1135,16 +1145,16 @@ msgid "%s: skipped: %s\n"
msgstr "%s: ignorado: %s\n"
#: g10/pkclist.c:702 g10/pkclist.c:852
-#, fuzzy, c-format
+#, c-format
msgid "%s: skipped: public key already present\n"
-msgstr "%s: erro de leitura de bloco de chaves: %s\n"
+msgstr "%s: ignorado: a chave pública já está presente\n"
#: g10/pkclist.c:729
msgid ""
"You did not specify a user ID. (you may use \"-r\")\n"
"\n"
msgstr ""
-"Você não especificou um ID de usuário. (pode-se usar \"-r\")\n"
+"Você não especificou um identificador de usuário. (pode-se usar \"-r\")\n"
"\n"
#: g10/pkclist.c:739
@@ -1156,14 +1166,13 @@ msgid "No such user ID.\n"
msgstr "Identificador de usuário inexistente.\n"
#: g10/pkclist.c:771
-#, fuzzy
msgid "Public key is disabled.\n"
-msgstr "a chave pública é %08lX\n"
+msgstr "A chave pública está desativada.\n"
#: g10/pkclist.c:800
-#, fuzzy, c-format
+#, c-format
msgid "unknown default recipient `%s'\n"
-msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n"
+msgstr "destinatário padrão desconhecido `%s'\n"
#: g10/pkclist.c:833
#, c-format
@@ -1171,9 +1180,9 @@ msgid "%s: error checking key: %s\n"
msgstr "%s: erro na verificação da chave: %s\n"
#: g10/pkclist.c:838
-#, fuzzy, c-format
+#, c-format
msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: erro de leitura de bloco de chaves: %s\n"
+msgstr "%s: ignorado: a chave pública está desativada\n"
#: g10/pkclist.c:876
msgid "no valid addressees\n"
@@ -1238,7 +1247,7 @@ msgid ""
" highest suggested keysize is 2048 bits\n"
msgstr ""
"Prestes a gerar novo par de chaves %s.\n"
-" tamanho mínimo é 768 bits\n"
+" tamanho mínimo é 768 bits\n"
" tamanho padrão é 1024 bits\n"
" tamanho máximo sugerido é 2048 bits\n"
@@ -1285,7 +1294,7 @@ msgid ""
"vulnerable to attacks!\n"
msgstr ""
"Tudo bem, mas tenha em mente que a radiação de seu monitor e teclado também "
-"são vulneráveis a ataques!\n"
+"é vulnerável a ataques!\n"
#: g10/keygen.c:483
msgid "Do you really need such a large keysize? "
@@ -1405,11 +1414,11 @@ msgstr ""
#: g10/keygen.c:690
msgid "NnCcEeOoQq"
-msgstr "NnCcEeVvSs"
+msgstr "NnCcEeOoSs"
#: g10/keygen.c:700
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
-msgstr "Muda (N)ome, (C)omentário, (E)ndereço ou (V)álido/(S)air? "
+msgstr "Muda (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
#: g10/keygen.c:752
msgid ""
@@ -1431,7 +1440,7 @@ msgid ""
"\n"
msgstr ""
"Você não quer uma frase secreta - provavelmente isto é uma *má* idéia!\n"
-"Vou fazer isso de qualquer modo. Você pode mudar sua frase secreta a\n"
+"Vou continuar assim mesmo. Você pode mudar sua frase secreta a\n"
"qualquer hora, usando este programa com a opção \"--edit-key\".\n"
"\n"
@@ -1456,7 +1465,6 @@ msgid "DSA keypair will have 1024 bits.\n"
msgstr "O par de chaves DSA terá 1024 bits.\n"
#: g10/keygen.c:871
-#, fuzzy
msgid "Key generation canceled.\n"
msgstr "Geração de chaves cancelada.\n"
@@ -1492,7 +1500,7 @@ msgstr "A geração de chaves falhou: %s\n"
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
-"a chave foi criada %lu segundos no futuro\n"
+"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no relógio)\n"
#: g10/keygen.c:1021 g10/sig-check.c:314 g10/sign.c:107
@@ -1554,25 +1562,23 @@ msgstr "AVISO: nada exportado\n"
#: g10/getkey.c:206
msgid "too many entries in pk cache - disabled\n"
-msgstr "entradas demais no cache pk - desabilitado\n"
+msgstr "entradas demais no cache pk - desativado\n"
#: g10/getkey.c:345
msgid "too many entries in unk cache - disabled\n"
-msgstr "entradas demais no cache unk - desabilitado\n"
+msgstr "entradas demais no cache unk - desativado\n"
#: g10/getkey.c:1289 g10/getkey.c:1328
msgid "RSA key cannot be used in this version\n"
-msgstr ""
+msgstr "chave RSA não pode ser usada nesta versão\n"
#: g10/getkey.c:1291 g10/getkey.c:1330
-#, fuzzy
msgid "No key for user-id\n"
-msgstr "chave %08lX: sem id de usuário\n"
+msgstr "Nenhuma chave para identificador de usuário\n"
#: g10/getkey.c:1369 g10/getkey.c:1409
-#, fuzzy
msgid "No user-id for key\n"
-msgstr "nenhuma chave secreta\n"
+msgstr "Nenhum identificador de usuário para chave\n"
#: g10/getkey.c:1565 g10/getkey.c:1621
#, c-format
@@ -1683,14 +1689,14 @@ msgid "writing to `%s'\n"
msgstr "escrevendo para `%s'\n"
#: g10/import.c:402 g10/import.c:460 g10/import.c:569 g10/import.c:670
-#, fuzzy, c-format
+#, c-format
msgid "can't lock keyring `%s': %s\n"
msgstr "impossível bloquear chaveiro `%s': %s\n"
#: g10/import.c:405 g10/import.c:463 g10/import.c:572 g10/import.c:673
#, c-format
msgid "error writing keyring `%s': %s\n"
-msgstr "%s: erro na escrita do chaveiro `%s': %s\n"
+msgstr "erro na escrita do chaveiro `%s': %s\n"
#: g10/import.c:410
#, c-format
@@ -1756,7 +1762,7 @@ msgstr "chave %08lX: chave secreta importada\n"
#: g10/import.c:581
#, c-format
msgid "key %08lX: already in secret keyring\n"
-msgstr "chave %08lX: já existe no chaveiro secreto\n"
+msgstr "chave %08lX: já está no chaveiro secreto\n"
#: g10/import.c:586
#, c-format
@@ -1806,12 +1812,12 @@ msgid "key %08lX: invalid subkey binding\n"
msgstr "chave %08lX: ligação de subchave inválida\n"
#: g10/import.c:769
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: accepted non self-signed user-id '"
-msgstr "chave %08lX: id de usuário ignorado '"
+msgstr "chave %08lX: id de usuário sem auto-assinatura aceito '"
#: g10/import.c:798
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: skipped user-id '"
msgstr "chave %08lX: id de usuário ignorado '"
@@ -1887,7 +1893,7 @@ msgstr "%d assinaturas não verificadas por falta de chaves\n"
#: g10/keyedit.c:227
msgid "1 signature not checked due to an error\n"
-msgstr "1 assinatura não checada devido a um erro\n"
+msgstr "1 assinatura não verificada devido a um erro\n"
#: g10/keyedit.c:229
#, c-format
@@ -1982,10 +1988,12 @@ msgid "quit this menu"
msgstr "sair deste menu"
#: g10/keyedit.c:565
+#, fuzzy
msgid "q"
msgstr "s"
#: g10/keyedit.c:566
+#, fuzzy
msgid "save"
msgstr "gravar"
@@ -1994,6 +2002,7 @@ msgid "save and quit"
msgstr "gravar e sair"
#: g10/keyedit.c:567
+#, fuzzy
msgid "help"
msgstr "ajuda"
@@ -2002,6 +2011,7 @@ msgid "show this help"
msgstr "mostra esta ajuda"
#: g10/keyedit.c:569
+#, fuzzy
msgid "fpr"
msgstr "imp"
@@ -2010,6 +2020,7 @@ msgid "show fingerprint"
msgstr "mostra impressão digital"
#: g10/keyedit.c:570
+#, fuzzy
msgid "list"
msgstr "lista"
@@ -2019,10 +2030,12 @@ msgstr "lista chave e identificações de usuários"
# ???
#: g10/keyedit.c:571
+#, fuzzy
msgid "l"
msgstr "l"
#: g10/keyedit.c:572
+#, fuzzy
msgid "uid"
msgstr "uid"
@@ -2031,6 +2044,7 @@ msgid "select user id N"
msgstr "seleciona id de usuário N"
#: g10/keyedit.c:573
+#, fuzzy
msgid "key"
msgstr "chave"
@@ -2039,6 +2053,7 @@ msgid "select secondary key N"
msgstr "seleciona chave secundária N"
#: g10/keyedit.c:574
+#, fuzzy
msgid "check"
msgstr "verifica"
@@ -2048,10 +2063,12 @@ msgstr "lista assinaturas"
# ???
#: g10/keyedit.c:575
+#, fuzzy
msgid "c"
msgstr "c"
#: g10/keyedit.c:576
+#, fuzzy
msgid "sign"
msgstr "assina"
@@ -2061,6 +2078,7 @@ msgstr "assina a chave"
# ???
#: g10/keyedit.c:577
+#, fuzzy
msgid "s"
msgstr "s"
@@ -2074,6 +2092,7 @@ msgid "sign the key locally"
msgstr "assina a chave localmente"
#: g10/keyedit.c:579
+#, fuzzy
msgid "debug"
msgstr "depura"
@@ -2120,14 +2139,16 @@ msgid "delete signatures"
msgstr "lista assinaturas"
#: g10/keyedit.c:585
+#, fuzzy
msgid "expire"
msgstr "expira"
#: g10/keyedit.c:585
msgid "change the expire date"
-msgstr "muda a data de expiração"
+msgstr "muda a data de validade"
#: g10/keyedit.c:586
+#, fuzzy
msgid "toggle"
msgstr "alterna"
@@ -2136,6 +2157,7 @@ msgid "toggle between secret and public key listing"
msgstr "alterna entre listagem de chave secreta e pública"
#: g10/keyedit.c:588
+#, fuzzy
msgid "t"
msgstr "c"
@@ -2148,6 +2170,7 @@ msgid "list preferences"
msgstr "lista preferências"
#: g10/keyedit.c:590
+#, fuzzy
msgid "passwd"
msgstr "senha"
@@ -2156,6 +2179,7 @@ msgid "change the passphrase"
msgstr "muda a frase secreta"
#: g10/keyedit.c:591
+#, fuzzy
msgid "trust"
msgstr "confianca"
@@ -2186,18 +2210,16 @@ msgid "disable"
msgstr ""
#: g10/keyedit.c:594
-#, fuzzy
msgid "disable a key"
-msgstr "chave incorreta"
+msgstr "desativa uma chave"
#: g10/keyedit.c:595
msgid "enable"
msgstr ""
#: g10/keyedit.c:595
-#, fuzzy
msgid "enable a key"
-msgstr "chave incorreta"
+msgstr "ativa uma chave"
#: g10/keyedit.c:614
msgid "can't do that in batchmode\n"
@@ -2294,41 +2316,38 @@ msgid "Invalid command (try \"help\")\n"
msgstr "Comando inválido (tente \"help\")\n"
#: g10/keyedit.c:1065
-#, fuzzy
msgid "This key has been disabled"
-msgstr "Nota: Esta chave expirou!\n"
+msgstr "Esta chave foi desativada"
#: g10/keyedit.c:1336
msgid "Delete this good signature? (y/N/q)"
-msgstr ""
+msgstr "Deletar esat assinatura válida? (s/N/q)"
#: g10/keyedit.c:1340
msgid "Delete this invalid signature? (y/N/q)"
-msgstr ""
+msgstr "Deletar esta assinatura inválida? (s/N/q)"
#: g10/keyedit.c:1344
msgid "Delete this unknown signature? (y/N/q)"
-msgstr ""
+msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
#: g10/keyedit.c:1350
-#, fuzzy
msgid "Really delete this self-signature? (y/N)"
-msgstr "Realmente gerar os certificados de revogação? (s/N)"
+msgstr "Realmente deletar esta auto-assinatura? (s/N)"
#: g10/keyedit.c:1364
-#, fuzzy, c-format
+#, c-format
msgid "Deleted %d signature.\n"
-msgstr "%d assinaturas incorretas\n"
+msgstr "%d assinatura deletada.\n"
#: g10/keyedit.c:1365
-#, fuzzy, c-format
+#, c-format
msgid "Deleted %d signatures.\n"
-msgstr "%d assinaturas incorretas\n"
+msgstr "%d assinaturas deletadas.\n"
#: g10/keyedit.c:1368
-#, fuzzy
msgid "Nothing deleted.\n"
-msgstr "AVISO: nada exportado\n"
+msgstr "Nada deletado.\n"
#: g10/keyedit.c:1437
msgid "Please remove selections from the secret keys.\n"
@@ -2339,18 +2358,16 @@ msgid "Please select at most one secondary key.\n"
msgstr "Por favor selecione no máximo uma chave secundária.\n"
#: g10/keyedit.c:1447
-#, fuzzy
msgid "Changing expiration time for a secondary key.\n"
-msgstr "Modificando a data de expiração para a chave secundária.\n"
+msgstr "Modificando a data de validade para uma chave secundária.\n"
#: g10/keyedit.c:1449
-#, fuzzy
msgid "Changing expiration time for the primary key.\n"
-msgstr "Modificando a data de expiração para a chave primária.\n"
+msgstr "Modificando a data de validade para uma chave primária.\n"
#: g10/keyedit.c:1490
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"
+msgstr "Você não pode modificar a data de validade de uma chave v3\n"
#: g10/keyedit.c:1506
msgid "No corresponding signature in secret ring\n"
@@ -2368,7 +2385,7 @@ msgstr "Nenhuma chave secundária com índice %d\n"
#: g10/keyedit.c:1710
msgid "user ID: \""
-msgstr "Digite o identificador de usuário:"
+msgstr "ID de usuário:"
#: g10/keyedit.c:1713
#, c-format
@@ -2401,20 +2418,18 @@ msgid "public key encrypted data: good DEK\n"
msgstr "dados criptografados com chave pública: DEK válido\n"
#: g10/mainproc.c:275
-#, fuzzy, c-format
+#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
-msgstr "chave de %u-bit/%s, ID %08lX, criada em %s\n"
+msgstr "criptografado com chave %u-bit %s, ID %08lX, criada em %s\n"
-# XXX Verificar
#: g10/mainproc.c:285
-#, fuzzy, c-format
+#, c-format
msgid "encrypted with %s key, ID %08lX\n"
-msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
+msgstr "criptografado com chave %s, ID %08lX\n"
#: g10/mainproc.c:291
-#, fuzzy
msgid "no secret key for decryption available\n"
-msgstr "chave secreta não disponível"
+msgstr "nenhuma chave secreta para descriptografia disponível\n"
#: g10/mainproc.c:300
#, c-format
@@ -2444,23 +2459,21 @@ msgid "original file name='%.*s'\n"
msgstr "nome de arquivo original='%.*s'\n"
#: g10/mainproc.c:587 g10/mainproc.c:596
-#, fuzzy
msgid "WARNING: invalid notation data found\n"
-msgstr "nenhum dado OpenPGP válido encontrado.\n"
+msgstr "AVISO: dados de notação inválidos encontrados\n"
#: g10/mainproc.c:599
msgid "Notation: "
-msgstr ""
+msgstr "Notação: "
#: g10/mainproc.c:606
msgid "Policy: "
-msgstr ""
+msgstr "Política: "
#: g10/mainproc.c:1025
msgid "signature verification suppressed\n"
msgstr "verificação de assinatura suprimida\n"
-# XXX Verificar
#: g10/mainproc.c:1031
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
@@ -2477,7 +2490,7 @@ msgstr "Assinatura correta de \""
#: g10/mainproc.c:1060
msgid " aka \""
-msgstr " ou \""
+msgstr " ou \""
#: g10/mainproc.c:1115
#, c-format
@@ -2486,26 +2499,26 @@ msgstr "Impossível verificar assinatura: %s\n"
#: g10/mainproc.c:1209
msgid "old style (PGP 2.x) signature\n"
-msgstr "assinatura antiga (PGP2.x)\n"
+msgstr "formato de assinatura antigo (PGP2.x)\n"
#: g10/mainproc.c:1214
msgid "invalid root packet detected in proc_tree()\n"
msgstr "pacote raiz inválido detectado em proc_tree()\n"
-#: g10/misc.c:93
+#: g10/misc.c:94
#, c-format
msgid "can't disable core dumps: %s\n"
-msgstr "impossível desabilitar core dumps: %s\n"
+msgstr "impossível desativar core dumps: %s\n"
-#: g10/misc.c:96
+#: g10/misc.c:97
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um arquivo core!\n"
-#: g10/misc.c:203
+#: g10/misc.c:205
msgid "Experimental algorithms should not be used!\n"
msgstr "Algoritmos experimentais não devem ser usados!\n"
-#: g10/misc.c:217
+#: g10/misc.c:219
msgid ""
"RSA keys are deprecated; please consider creating a new key and use this key "
"in the future\n"
@@ -2513,7 +2526,7 @@ msgstr ""
"Chaves RSA não são recomendáveis; por favor considere criar uma nova chave e "
"usá-la no futuro\n"
-#: g10/misc.c:239
+#: g10/misc.c:241
msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
msgstr ""
"este algoritmo de criptografia é depreciado; por favor use algum\n"
@@ -2527,7 +2540,7 @@ msgstr "impossível manipular algoritmo de chave pública %d\n"
#: g10/parse-packet.c:939
#, c-format
msgid "subpacket of type %d has critical bit set\n"
-msgstr "subpacote de tipo %d tem bit crítico ligado\n"
+msgstr "subpacote do tipo %d tem bit crítico ligado\n"
#: g10/passphrase.c:159
msgid ""
@@ -2540,9 +2553,9 @@ msgstr ""
"usuário: \""
#: g10/passphrase.c:168
-#, fuzzy, c-format
+#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
-msgstr "chave de %u-bit/%s, ID %08lX, criada em %s\n"
+msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
#: g10/passphrase.c:173
#, c-format
@@ -2550,9 +2563,8 @@ msgid " (main key ID %08lX)"
msgstr " (ID principal da chave %08lX)"
#: g10/passphrase.c:190
-#, fuzzy
msgid "can't query password in batchmode\n"
-msgstr "impossível fazer isso em modo não-interativo\n"
+msgstr "impossível pedir senha em modo não-interativo\n"
#: g10/passphrase.c:194
msgid "Enter passphrase: "
@@ -2572,7 +2584,7 @@ msgstr "Por favor digite o nome do arquivo de dados: "
#: g10/plaintext.c:287
msgid "reading stdin ...\n"
-msgstr "lendo \"stdin\" ...\n"
+msgstr "lendo de \"stdin\" ...\n"
#: g10/plaintext.c:360
#, c-format
@@ -2643,7 +2655,7 @@ msgstr "assumindo assinatura incorreta devido a um bit crítico desconhecido\n"
#: g10/sign.c:132
#, c-format
msgid "%s signature from: %s\n"
-msgstr "%s assinatura de: %s\n"
+msgstr "assinatura %s de: %s\n"
#: g10/sign.c:263 g10/sign.c:575
#, c-format
@@ -2662,7 +2674,7 @@ 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 "impossível manejar linhas de texto maiores que %d caracteres\n"
+msgstr "impossível manipular linhas de texto maiores que %d caracteres\n"
#: g10/textfilter.c:197
#, c-format
@@ -2800,11 +2812,10 @@ msgid "%s: failed to append a record: %s\n"
msgstr "%s: falha ao anexar um registro: %s\n"
#: g10/tdbio.c:1759
-#, fuzzy
msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
msgstr ""
"O banco de dados de confiabilidade está danificado; por favor rode\n"
-"\"gpgm --fix-trust-db\".\n"
+"\"gpg --fix-trust-db\".\n"
#: g10/trustdb.c:160
#, c-format
@@ -2814,7 +2825,7 @@ msgstr "registro de confiança %lu, tipo req %d: falha na leitura: %s\n"
#: g10/trustdb.c:175
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
-msgstr "registro de confiança %lu, tipo %d: gravação falhou: %s\n"
+msgstr "registro de confiança %lu, tipo %d: escrita falhou: %s\n"
#: g10/trustdb.c:189
#, c-format
@@ -2854,7 +2865,7 @@ msgstr "get_dir_record: search_record falhou: %s\n"
#: g10/trustdb.c:458
#, c-format
msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "NOTA: chave secreta %08lX NÃO está protegida.\n"
+msgstr "NOTA: a chave secreta %08lX NÃO está protegida.\n"
#: g10/trustdb.c:466
#, c-format
@@ -2926,15 +2937,13 @@ msgid "Invalid self-signature"
msgstr "Auto-assinatura inválida"
#: g10/trustdb.c:1060
-#, fuzzy
msgid "Valid user ID revocation skipped due to a newer self signature"
msgstr ""
-"Revogação válida de ID de usuário ignorada devido a nova auto-assinatura\n"
+"Revogação válida de ID de usuário ignorada devido a nova auto-assinatura"
#: g10/trustdb.c:1066
-#, fuzzy
msgid "Valid user ID revocation"
-msgstr "Revogação de ID de usuário válida\n"
+msgstr "Revogação de ID de usuário válida"
#: g10/trustdb.c:1071
msgid "Invalid user ID revocation"
@@ -2986,9 +2995,9 @@ msgid "lid %lu: inserted\n"
msgstr "lid %lu: inserido\n"
#: g10/trustdb.c:1652
-#, fuzzy, c-format
+#, c-format
msgid "error reading dir record: %s\n"
-msgstr "erro encontrando registro de diretório: %s\n"
+msgstr "erro lendo registro de diretório: %s\n"
#: g10/trustdb.c:1660 g10/trustdb.c:1714
#, c-format
@@ -3057,7 +3066,7 @@ msgstr ""
#: g10/trustdb.c:2248
#, c-format
msgid "key %08lX.%lu: expired at %s\n"
-msgstr "chave %08lX.%lu: expirada em %s\n"
+msgstr "chave %08lX.%lu: expirou em %s\n"
#: g10/trustdb.c:2256
#, c-format
@@ -3150,12 +3159,11 @@ msgstr "Sobrescrever (s/N)? "
#: g10/openfile.c:97
#, c-format
msgid "%s: unknown suffix\n"
-msgstr ""
+msgstr "%s: sufixo desconhecido\n"
#: g10/openfile.c:119
-#, fuzzy
msgid "Enter new filename"
-msgstr "--store [nome_do_arquivo]"
+msgstr "Digite novo nome de arquivo"
#: g10/openfile.c:160
msgid "writing to stdout\n"
@@ -3197,144 +3205,170 @@ 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"
-"tentadas %d vezes!\n"
+"%d tentativas!\n"
-#. begin of list
-#: g10/helptext.c:48
-msgid "edit_ownertrust.value"
+#: g10/helptext.c:47
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
msgstr ""
-#: g10/helptext.c:54
-msgid "revoked_key.override"
+#: g10/helptext.c:53
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
msgstr ""
-#: g10/helptext.c:58
-msgid "untrusted_key.override"
+#: g10/helptext.c:57
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
msgstr ""
-#: g10/helptext.c:62
-msgid "pklist.user_id.enter"
+#: g10/helptext.c:61
+msgid ""
+"Enter the user id of the addressee to whom you want to send the message."
msgstr ""
-#: g10/helptext.c:66
-msgid "keygen.algo"
+#: g10/helptext.c:65
+msgid ""
+"Select the algorithm to use.\n"
+"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+"for signatures. This is the suggested algorithm because verification of\n"
+"DSA signatures are much faster than those of ElGamal.\n"
+"ElGamal is an algorithm which can be used for signatures and encryption.\n"
+"OpenPGP distunguishs between two flavors of this algorithms: an encrypt "
+"only\n"
+"and a sign+encrypt; actually it is the same, but some parameters must be\n"
+"selected in a special way to create a safe key for signatures: this program\n"
+"does this but other OpenPGP implementations are not required to understand\n"
+"the signature+encryption flavor.\n"
+"The first (primary) key must always be a key which is capable of signing;\n"
+"this is the reason why the encryption only ElGamal key is not available in\n"
+"this menu."
msgstr ""
#: g10/helptext.c:82
-msgid "keygen.algo.elg_se"
+msgid ""
+"Although these keys are defined in RFC2440 they are not suggested\n"
+"because they are not supported by all programs and signatures created\n"
+"with them are quite large and very slow to verify."
msgstr ""
#: g10/helptext.c:89
-msgid "keygen.size"
-msgstr ""
-
-#: g10/helptext.c:93
-msgid "keygen.size.huge.okay"
-msgstr ""
+#, fuzzy
+msgid "Enter the size of the key"
+msgstr "Digite o identificador de usuário: "
-#: g10/helptext.c:98
-msgid "keygen.size.large.okay"
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:147 g10/helptext.c:152 g10/helptext.c:157
+msgid "Answer \"yes\" or \"no\""
msgstr ""
#: g10/helptext.c:103
-msgid "keygen.valid"
-msgstr ""
-
-#: g10/helptext.c:110
-msgid "keygen.valid.okay"
+msgid ""
+"Enter the required value as shown in the pronpt.\n"
+"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
msgstr ""
#: g10/helptext.c:115
-msgid "keygen.name"
+msgid "Enter the name of the key holder"
msgstr ""
#: g10/helptext.c:120
-msgid "keygen.email"
+msgid "please enter an optional but highly suggested email address"
msgstr ""
#: g10/helptext.c:124
-msgid "keygen.comment"
-msgstr ""
+#, fuzzy
+msgid "Please enter an optional comment"
+msgstr "Por favor digite o nome do arquivo de dados: "
#: g10/helptext.c:129
-msgid "keygen.userid.cmd"
+msgid ""
+"N to change the name.\n"
+"C to change the comment.\n"
+"E to change the email address.\n"
+"O to continue with key generation.\n"
+"Q to to quit the key generation."
msgstr ""
#: g10/helptext.c:138
-msgid "keygen.sub.okay"
-msgstr ""
-
-#: g10/helptext.c:142
-msgid "sign_uid.okay"
-msgstr ""
-
-#: g10/helptext.c:147
-msgid "change_passwd.empty.okay"
-msgstr ""
-
-#: g10/helptext.c:152
-msgid "keyedit.save.okay"
-msgstr ""
-
-#: g10/helptext.c:157
-msgid "keyedit.cancel.okay"
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
msgstr ""
#: g10/helptext.c:161
-msgid "keyedit.sign_all.okay"
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
msgstr ""
#: g10/helptext.c:165
-msgid "keyedit.remove.uid.okay"
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
msgstr ""
#: g10/helptext.c:170
-msgid "keyedit.remove.subkey.okay"
+msgid "Answer \"yes\" if it is okay to delete the subkey"
msgstr ""
#: g10/helptext.c:175
-msgid "keyedit.delsig.valid"
+msgid ""
+"This is a valid signature on the key; you normally don't want\n"
+"to delete this signature may be important to establish a trust\n"
+"connection to the key or another key certified by this key."
msgstr ""
#: g10/helptext.c:180
-msgid "keyedit.delsig.unknown"
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key. You should postpone its deletion until you\n"
+"know which key was used because this signing key might establisha trust "
+"connection through another already certified key."
msgstr ""
#: g10/helptext.c:186
-msgid "keyedit.delsig.invalid"
+msgid ""
+"The signature is not valid. It does make sense to remove it from\n"
+"your keyring."
msgstr ""
#: g10/helptext.c:190
-msgid "keyedit.delsig.selfsig"
+msgid ""
+"This is a signature which binds the user ID to the key. It is\n"
+"usually not a good idea to remove such a signature. Actually\n"
+"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."
msgstr ""
#: g10/helptext.c:199
-msgid "passphrase.enter"
+msgid ""
+"Please enter the passhrase; this is a secret sentence \n"
+" Blurb, blurb,.... "
msgstr ""
#: g10/helptext.c:206
-msgid "passphrase.repeat"
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
msgstr ""
#: g10/helptext.c:210
-msgid "detached_signature.filename"
+msgid "Give the name fo the file to which the signature applies"
msgstr ""
-#. openfile.c (overwrite_filep)
#: g10/helptext.c:215
-msgid "openfile.overwrite.okay"
+msgid "Answer \"yes\" if it is okay to overwrite the file"
msgstr ""
-#. openfile.c (ask_outfile_name)
#: g10/helptext.c:220
-msgid "openfile.askoutname"
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
msgstr ""
-#: g10/helptext.c:235
+#: g10/helptext.c:234
msgid "No help available"
msgstr "Nenhuma ajuda disponível"
-#: g10/helptext.c:247
+#: g10/helptext.c:242
#, c-format
msgid "No help available for `%s'"
msgstr "Nenhuma ajuda disponível para `%s'"
diff --git a/po/ru.po b/po/ru.po
index 1797d2658..4599d1085 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-08-04 09:56+0200\n"
+"POT-Creation-Date: 1999-08-30 19:40+0200\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-01-26 22:08:36+0100\n"
"From: Gregory Steuck <steuck@iname.com>\n"
@@ -36,19 +36,27 @@ msgstr ""
msgid "(you may have used the wrong program for this task)\n"
msgstr ""
-#: util/miscutil.c:254 util/miscutil.c:271
+#: util/miscutil.c:254 util/miscutil.c:283
msgid "yes"
msgstr "ÄÁ(y)"
-#: util/miscutil.c:255 util/miscutil.c:273
+#: util/miscutil.c:255 util/miscutil.c:286
msgid "yY"
msgstr "yY"
-#: g10/keyedit.c:564 util/miscutil.c:272
+#: util/miscutil.c:256 util/miscutil.c:284
+msgid "no"
+msgstr ""
+
+#: util/miscutil.c:257 util/miscutil.c:287
+msgid "nN"
+msgstr ""
+
+#: g10/keyedit.c:564 util/miscutil.c:285
msgid "quit"
msgstr "×ÙÈÏÄ"
-#: util/miscutil.c:274
+#: util/miscutil.c:288
msgid "qQ"
msgstr ""
@@ -2572,20 +2580,20 @@ msgstr ""
msgid "invalid root packet detected in proc_tree()\n"
msgstr ""
-#: g10/misc.c:93
+#: g10/misc.c:94
#, fuzzy, c-format
msgid "can't disable core dumps: %s\n"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
-#: g10/misc.c:96
+#: g10/misc.c:97
msgid "WARNING: program may create a core file!\n"
msgstr ""
-#: g10/misc.c:203
+#: g10/misc.c:205
msgid "Experimental algorithms should not be used!\n"
msgstr ""
-#: g10/misc.c:217
+#: g10/misc.c:219
msgid ""
"RSA keys are deprecated; please consider creating a new key and use this key "
"in the future\n"
@@ -2593,7 +2601,7 @@ msgstr ""
"ðÏÌØÚÏ×ÁÎÉÅ RSA ËÌÀÞÁÍÉ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ, ÐÏÖÁÌÕÊÓÔÁ, ÐÏÄÕÍÁÊÔÅ Ï ÓÏÚÄÁÎÉÉ\n"
"ÎÏ×ÏÇÏ ËÌÀÞÁ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ÂÕÄÕÝÅÍ\n"
-#: g10/misc.c:239
+#: g10/misc.c:241
msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
msgstr ""
@@ -3282,164 +3290,208 @@ msgstr ""
"ÎÅ ÐÏÌÕÞÁÅÔÓÑ ÉÚÂÅÖÁÔØ ÓÌÁÂÏÇÏ ËÌÀÞÁ × ÓÉÍÍÅÔÒÉÞÎÏÍ ÁÌÇÏÒÉÔÍÅ; ÐÒÏÂÏ×ÁÌÉ %d "
"ÒÁÚ!\n"
-#. begin of list
-#: g10/helptext.c:48
-msgid "edit_ownertrust.value"
+#: g10/helptext.c:47
+#, fuzzy
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
msgstr ""
+"Sie müssen selbt entscheiden, welchen Wert Sie hier eintragen; dieser Wert\n"
+"wird niemals an eine dritte Seite weitergegeben. Wir brauchen diesen Wert,\n"
+"um das \"Netz des Vertrauens\" aufzubauen. Dieses hat nichts mit dem "
+"(implizit\n"
+"erzeugten) \"Netz der Zertifikate\" zu tun.\n"
-#: g10/helptext.c:54
-msgid "revoked_key.override"
+#: g10/helptext.c:53
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
msgstr ""
-#: g10/helptext.c:58
-msgid "untrusted_key.override"
+#: g10/helptext.c:57
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
msgstr ""
-#: g10/helptext.c:62
-msgid "pklist.user_id.enter"
+#: g10/helptext.c:61
+msgid ""
+"Enter the user id of the addressee to whom you want to send the message."
msgstr ""
-#: g10/helptext.c:66
-msgid "keygen.algo"
+#: g10/helptext.c:65
+msgid ""
+"Select the algorithm to use.\n"
+"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+"for signatures. This is the suggested algorithm because verification of\n"
+"DSA signatures are much faster than those of ElGamal.\n"
+"ElGamal is an algorithm which can be used for signatures and encryption.\n"
+"OpenPGP distunguishs between two flavors of this algorithms: an encrypt "
+"only\n"
+"and a sign+encrypt; actually it is the same, but some parameters must be\n"
+"selected in a special way to create a safe key for signatures: this program\n"
+"does this but other OpenPGP implementations are not required to understand\n"
+"the signature+encryption flavor.\n"
+"The first (primary) key must always be a key which is capable of signing;\n"
+"this is the reason why the encryption only ElGamal key is not available in\n"
+"this menu."
msgstr ""
#: g10/helptext.c:82
-msgid "keygen.algo.elg_se"
+msgid ""
+"Although these keys are defined in RFC2440 they are not suggested\n"
+"because they are not supported by all programs and signatures created\n"
+"with them are quite large and very slow to verify."
msgstr ""
#: g10/helptext.c:89
-msgid "keygen.size"
-msgstr ""
-
-#: g10/helptext.c:93
-msgid "keygen.size.huge.okay"
-msgstr ""
+#, fuzzy
+msgid "Enter the size of the key"
+msgstr "÷×ÅÄÉÔÅ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ: "
-#: g10/helptext.c:98
-msgid "keygen.size.large.okay"
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:147 g10/helptext.c:152 g10/helptext.c:157
+msgid "Answer \"yes\" or \"no\""
msgstr ""
#: g10/helptext.c:103
-msgid "keygen.valid"
-msgstr ""
-
-#: g10/helptext.c:110
-msgid "keygen.valid.okay"
+msgid ""
+"Enter the required value as shown in the pronpt.\n"
+"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
msgstr ""
#: g10/helptext.c:115
-msgid "keygen.name"
+msgid "Enter the name of the key holder"
msgstr ""
#: g10/helptext.c:120
-msgid "keygen.email"
+msgid "please enter an optional but highly suggested email address"
msgstr ""
#: g10/helptext.c:124
-msgid "keygen.comment"
-msgstr ""
+#, fuzzy
+msgid "Please enter an optional comment"
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÉÍÑ ÆÁÊÌÁ ÄÁÎÎÙÈ: "
#: g10/helptext.c:129
-msgid "keygen.userid.cmd"
+msgid ""
+"N to change the name.\n"
+"C to change the comment.\n"
+"E to change the email address.\n"
+"O to continue with key generation.\n"
+"Q to to quit the key generation."
msgstr ""
#: g10/helptext.c:138
-msgid "keygen.sub.okay"
-msgstr ""
-
-#: g10/helptext.c:142
-msgid "sign_uid.okay"
-msgstr ""
-
-#: g10/helptext.c:147
-msgid "change_passwd.empty.okay"
-msgstr ""
-
-#: g10/helptext.c:152
-msgid "keyedit.save.okay"
-msgstr ""
-
-#: g10/helptext.c:157
-msgid "keyedit.cancel.okay"
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
msgstr ""
#: g10/helptext.c:161
-msgid "keyedit.sign_all.okay"
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
msgstr ""
#: g10/helptext.c:165
-msgid "keyedit.remove.uid.okay"
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
msgstr ""
#: g10/helptext.c:170
-msgid "keyedit.remove.subkey.okay"
+msgid "Answer \"yes\" if it is okay to delete the subkey"
msgstr ""
#: g10/helptext.c:175
-msgid "keyedit.delsig.valid"
+msgid ""
+"This is a valid signature on the key; you normally don't want\n"
+"to delete this signature may be important to establish a trust\n"
+"connection to the key or another key certified by this key."
msgstr ""
#: g10/helptext.c:180
-msgid "keyedit.delsig.unknown"
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key. You should postpone its deletion until you\n"
+"know which key was used because this signing key might establisha trust "
+"connection through another already certified key."
msgstr ""
#: g10/helptext.c:186
-msgid "keyedit.delsig.invalid"
+msgid ""
+"The signature is not valid. It does make sense to remove it from\n"
+"your keyring."
msgstr ""
#: g10/helptext.c:190
-msgid "keyedit.delsig.selfsig"
+msgid ""
+"This is a signature which binds the user ID to the key. It is\n"
+"usually not a good idea to remove such a signature. Actually\n"
+"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."
msgstr ""
-# ################################
-# ####### Help msgids ############
-# ################################
#: g10/helptext.c:199
-msgid "passphrase.enter"
-msgstr ""
-"Bitte geben Sie die \"Passhrase\" ein; dies ist ein geheimer Satz der aus\n"
-"beliebigen Zeichen bestehen kann. Was Sie eingegeben wird nicht angezeigt.\n"
-"Zur ihrer eigenen Sicherbeit benutzen Sie biite einen Satz, den sie sich\n"
-"gut merken könne, der aber nicht leicht zu raten ist; Zitate und andere\n"
-"bekannte Texte sind eine SCHLECHTE Wahl, da diese mit Sicherheit online\n"
-"verfügbar sind und durch entsprechende Programme zum Raten der "
-"\"Passphrase\"\n"
-"benutzt werden. Sätze mit persönlicher Bedeutung, die auch noch durch\n"
-"falsche Groß-/Kleinschreibung und eingestreute Sonderzeichen verändert "
-"werden,\n"
-"sind i.d.R. eine gute Wahl"
+msgid ""
+"Please enter the passhrase; this is a secret sentence \n"
+" Blurb, blurb,.... "
+msgstr ""
#: g10/helptext.c:206
-msgid "passphrase.repeat"
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
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:210
-#, fuzzy
-msgid "detached_signature.filename"
-msgstr "ÉÍÑ ÆÁÊÌÁ ÄÌÑ ÏÔÄÅÌØÎÏÊ ÐÏÄÐÉÓÉ"
+msgid "Give the name fo the file to which the signature applies"
+msgstr ""
-#. openfile.c (overwrite_filep)
#: g10/helptext.c:215
-msgid "openfile.overwrite.okay"
-msgstr "÷Ù ÖÅÌÁÅÔÅ ÐÅÒÅÚÁÐÉÓÁÔØ ÆÁÊÌ (×ÏÚÍÏÖÎÁ ÐÏÔÅÒÑ ÄÁÎÎÙÈ)"
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr ""
-#. openfile.c (ask_outfile_name)
#: g10/helptext.c:220
-msgid "openfile.askoutname"
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
msgstr ""
-#: g10/helptext.c:235
+#: g10/helptext.c:234
msgid "No help available"
msgstr "ðÏÍÏÝØ ÏÔÓÕÔÓÔ×ÕÅÔ."
-#: g10/helptext.c:247
+#: g10/helptext.c:242
#, c-format
msgid "No help available for `%s'"
msgstr "ðÏÍÏÝØ ÄÌÑ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ."
+# ################################
+# ####### Help msgids ############
+# ################################
+#~ msgid "passphrase.enter"
+#~ msgstr ""
+#~ "Bitte geben Sie die \"Passhrase\" ein; dies ist ein geheimer Satz der aus\n"
+#~ "beliebigen Zeichen bestehen kann. Was Sie eingegeben wird nicht angezeigt.\n"
+#~ "Zur ihrer eigenen Sicherbeit benutzen Sie biite einen Satz, den sie sich\n"
+#~ "gut merken könne, der aber nicht leicht zu raten ist; Zitate und andere\n"
+#~ "bekannte Texte sind eine SCHLECHTE Wahl, da diese mit Sicherheit online\n"
+#~ "verfügbar sind und durch entsprechende Programme zum Raten der "
+#~ "\"Passphrase\"\n"
+#~ "benutzt werden. Sätze mit persönlicher Bedeutung, die auch noch durch\n"
+#~ "falsche Groß-/Kleinschreibung und eingestreute Sonderzeichen verändert "
+#~ "werden,\n"
+#~ "sind i.d.R. eine gute Wahl"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "detached_signature.filename"
+#~ msgstr "ÉÍÑ ÆÁÊÌÁ ÄÌÑ ÏÔÄÅÌØÎÏÊ ÐÏÄÐÉÓÉ"
+
+#~ msgid "openfile.overwrite.okay"
+#~ msgstr "÷Ù ÖÅÌÁÅÔÅ ÐÅÒÅÚÁÐÉÓÁÔØ ÆÁÊÌ (×ÏÚÍÏÖÎÁ ÐÏÔÅÒÑ ÄÁÎÎÙÈ)"
+
#, fuzzy
#~ msgid "tdbio_search_sdir failed: %s\n"
#~ msgstr "ÏÛÉÂËÁ ÄÅËÏÄÉÒÏ×ÁÎÉÑ: %s\n"
@@ -3622,17 +3674,6 @@ msgstr "ðÏÍÏÝØ ÄÌÑ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ."
#~ msgid "edit a key signature"
#~ msgstr "Bearbeiten der Signaturen eines ËÌÀÞs"
-#~ msgid ""
-#~ "It's up to you to assign a value here; this value will never be exported\n"
-#~ "to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
-#~ "to do with the (implicitly created) web-of-certificates.\n"
-#~ msgstr ""
-#~ "Sie müssen selbt entscheiden, welchen Wert Sie hier eintragen; dieser Wert\n"
-#~ "wird niemals an eine dritte Seite weitergegeben. Wir brauchen diesen Wert,\n"
-#~ "um das \"Netz des Vertrauens\" aufzubauen. Dieses hat nichts mit dem "
-#~ "(implizit\n"
-#~ "erzeugten) \"Netz der Zertifikate\" zu tun.\n"
-
#~ msgid "public and secret subkey created.\n"
#~ msgstr "Öffentlicher und privater ËÌÀÞ erzeugt.\n"
diff --git a/util/ChangeLog b/util/ChangeLog
index 0e67818fe..95b06019a 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,13 @@
+Mon Aug 30 20:38:33 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+
+ * secmem.c (pool_okay): declared volatile.
+
+ * miscutil.c (answer_is_yes): Always check for plain "yes".
+ (answer_is_yes_no_quit): Likewise.
+
+ * dotlock.c (create_dotlock): Fixed segv during cleanup.
+
Mon Jul 12 14:55:34 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
diff --git a/util/dotlock.c b/util/dotlock.c
index 644cf8e3a..369a3d42a 100644
--- a/util/dotlock.c
+++ b/util/dotlock.c
@@ -123,6 +123,7 @@ create_dotlock( const char *file_to_lock )
S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR );
} while( fd == -1 && errno == EINTR );
if( fd == -1 ) {
+ all_lockfiles = h->next;
log_error( "failed to create temporary file `%s': %s\n",
h->tname, strerror(errno));
m_free(h->tname);
diff --git a/util/miscutil.c b/util/miscutil.c
index b0a6410e8..2b95d97d6 100644
--- a/util/miscutil.c
+++ b/util/miscutil.c
@@ -253,11 +253,23 @@ answer_is_yes( const char *s )
{
char *long_yes = _("yes");
char *short_yes = _("yY");
+ char *long_no = _("no");
+ char *short_no = _("nN");
if( !stricmp(s, long_yes ) )
return 1;
if( strchr( short_yes, *s ) && !s[1] )
return 1;
+ /* test for no strings to catch ambiguities for the next test */
+ if( !stricmp(s, long_no ) )
+ return 0;
+ if( strchr( short_no, *s ) && !s[1] )
+ return 0;
+ /* test for the english version (for those who are used to type yes) */
+ if( !stricmp(s, "yes" ) )
+ return 1;
+ if( strchr( "yY", *s ) && !s[1] )
+ return 1;
return 0;
}
@@ -269,18 +281,32 @@ int
answer_is_yes_no_quit( const char *s )
{
char *long_yes = _("yes");
+ char *long_no = _("no");
char *long_quit = _("quit");
char *short_yes = _("yY");
+ char *short_no = _("nN");
char *short_quit = _("qQ");
if( !stricmp(s, long_yes ) )
return 1;
+ if( !stricmp(s, long_no ) )
+ return 0;
if( !stricmp(s, long_quit ) )
return -1;
if( strchr( short_yes, *s ) && !s[1] )
return 1;
+ if( strchr( short_no, *s ) && !s[1] )
+ return 0;
if( strchr( short_quit, *s ) && !s[1] )
return -1;
+ if( !stricmp(s, "yes" ) )
+ return 1;
+ if( !stricmp(s, "quit" ) )
+ return -1;
+ if( strchr( "yY", *s ) && !s[1] )
+ return 1;
+ if( strchr( "qQ", *s ) && !s[1] )
+ return -1;
return 0;
}
diff --git a/util/secmem.c b/util/secmem.c
index 35a265408..8796e6faf 100644
--- a/util/secmem.c
+++ b/util/secmem.c
@@ -57,7 +57,7 @@ struct memblock_struct {
static void *pool;
-static int pool_okay;
+static volatile int pool_okay; /* may be checked in an atexit function */
static int pool_is_mmapped;
static size_t poolsize; /* allocated length */
static size_t poollen; /* used length */