diff options
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | TODO | 5 | ||||
| -rw-r--r-- | cipher/md.c | 2 | ||||
| -rw-r--r-- | doc/OpenPGP | 4 | ||||
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/g10.c | 2 | ||||
| -rw-r--r-- | g10/import.c | 6 | ||||
| -rw-r--r-- | g10/packet.h | 7 | ||||
| -rw-r--r-- | g10/parse-packet.c | 5 | ||||
| -rw-r--r-- | g10/sig-check.c | 2 | ||||
| -rw-r--r-- | g10/trustdb.c | 88 | ||||
| -rw-r--r-- | g10/trustdb.h | 1 | ||||
| -rw-r--r-- | mpi/mpiutil.c | 1 | ||||
| -rw-r--r-- | po/de.po | 665 | ||||
| -rw-r--r-- | po/en.po | 660 | ||||
| -rw-r--r-- | po/fr.po | 665 | ||||
| -rw-r--r-- | po/it.po | 668 | ||||
| -rw-r--r-- | util/logger.c | 4 | ||||
| -rw-r--r-- | zlib/Makefile | 42 |
20 files changed, 1680 insertions, 1159 deletions
@@ -12,11 +12,12 @@ Noteworthy changes in version 0.4.1 when changing a passphrase. * doc/OpenPGP talks about OpenPGP compliance, doc/HACKING gives - some hints about the internal structure. + a few hints about the internal structure. - * checked gnupg against the August 1998 draft (07) and I believe - it is in compliance with this document (except one point). + * Checked gnupg against the August 1998 draft (07) and I believe + it is in compliance with this document (except for one point). + * Fixed some bugs in the import merging code. Noteworthy changes in version 0.4.0 ----------------------------------- @@ -5,6 +5,7 @@ errors. Anand Kumria [email protected] Ariel T Glenn [email protected] +Brian Moore [email protected] Brian Warner [email protected] Caskey L. Dickson [email protected] Charles Levert [email protected] @@ -9,7 +9,10 @@ * Why does OpenPGP say: The algorithm byte is included in the checksum of an encoded key, but the actual implementaion does - not do this but works?? + not do this but works - According to Hal Finney, this is a bug + in the specs. + + * fix armor problems (see mails by Brian Moore). * write a tool to extract selected keys from a file. diff --git a/cipher/md.c b/cipher/md.c index a04155235..0ec6d6067 100644 --- a/cipher/md.c +++ b/cipher/md.c @@ -494,7 +494,7 @@ md_stop_debug( MD_HANDLE md ) } #ifdef HAVE_U64_TYPEDEF { /* a kludge to pull in the __muldi3 for Solaris */ - volatile u32 a = (u32)md; + volatile u32 a = (u32)(ulong)md; volatile u32 b = 42; volatile u64 c; c = a * b; diff --git a/doc/OpenPGP b/doc/OpenPGP index 188f0498f..a28f54575 100644 --- a/doc/OpenPGP +++ b/doc/OpenPGP @@ -22,7 +22,7 @@ Compatibility Notes =================== - GNUPG (>0.4) is in compliance with OpenPGP despite these exeptions: + GNUPG (>=0.4.1) is in compliance with OpenPGP despite these exeptions: * (5.1) The critical bit in signature subpackets is currently ignored. This will be fixed soon. @@ -58,6 +58,8 @@ * multi-part armored messages are not supported. MIME should be used instead. + Most of the OPTIONAL stuff is implemented. + diff --git a/g10/ChangeLog b/g10/ChangeLog index 6b2f787fa..38a506d9c 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +Wed Sep 30 10:15:33 1998 Werner Koch ([email protected]) + + * import.c (import_one): Fixed update of wrong keyblock. + Tue Sep 29 08:32:08 1998 me,,, (wk@tobold) * mainproc.c (proc_plaintext): Display note for special filename. @@ -213,7 +213,7 @@ static ARGPARSE_OPTS opts[] = { { oNoComment, "no-comment", 0, N_("do not write comment packets")}, { oCompletesNeeded, "completes-needed", 1, N_("(default is 1)")}, { oMarginalsNeeded, "marginals-needed", 1, N_("(default is 3)")}, - { oLoadExtension, "load-extension" ,2, N_("|file|load extension module")}, + { oLoadExtension, "load-extension" ,2, N_("|FILE|load extension module FILE")}, { oRFC1991, "rfc1991", 0, N_("emulate the mode described in RFC1991")}, { oS2KMode, "s2k-mode", 1, N_("|N|use passphrase mode N")}, { oS2KDigest, "s2k-digest-algo",2, diff --git a/g10/import.c b/g10/import.c index 63d4bf9b2..ccfbccaad 100644 --- a/g10/import.c +++ b/g10/import.c @@ -360,7 +360,7 @@ import_one( const char *fname, KBNODE keyblock ) if( (rc=lock_keyblock( &kbpos )) ) log_error_f(keyblock_resource_name(&kbpos), _("can't lock public keyring: %s\n"), g10_errstr(rc) ); - else if( (rc=update_keyblock( &kbpos, keyblock )) ) + else if( (rc=update_keyblock( &kbpos, keyblock_orig )) ) log_error_f( keyblock_resource_name(&kbpos), _("can't write keyblock: %s\n"), g10_errstr(rc) ); unlock_keyblock( &kbpos ); @@ -398,7 +398,7 @@ import_one( const char *fname, KBNODE keyblock ) (ulong)keyid[1], g10_errstr(rc) ); } else if( mod_key ) - rc = update_trustdb( new_key? pk: pk_orig); + rc = update_trust_record( keyblock_orig ); else rc = clear_trust_checked_flag( new_key? pk : pk_orig ); } @@ -418,7 +418,6 @@ import_secret_one( const char *fname, KBNODE keyblock ) { PKT_secret_key *sk; KBNODE node, uidnode; - KBNODE keyblock_orig = NULL; KBPOS kbpos; u32 keyid[2]; int rc = 0; @@ -477,7 +476,6 @@ import_secret_one( const char *fname, KBNODE keyblock ) log_error_f(fname, _("key %08lX: secret key not found: %s\n"), (ulong)keyid[1], g10_errstr(rc)); - release_kbnode( keyblock_orig ); return rc; } diff --git a/g10/packet.h b/g10/packet.h index 0a4adc5f8..5bb383c86 100644 --- a/g10/packet.h +++ b/g10/packet.h @@ -83,8 +83,13 @@ typedef struct { typedef struct { - u32 keyid[2]; /* 64 bit keyid */ ulong local_id; /* internal use, valid if > 0 */ + struct { + unsigned checked:1; /* signature has been checked */ + unsigned valid:1; /* signature is good (if checked is set) */ + unsigned unknown_critical:1; + } flags; + u32 keyid[2]; /* 64 bit keyid */ u32 timestamp; /* signature made */ byte version; byte sig_class; /* sig classification, append for MD calculation*/ diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 1cd14acfb..41afe5b9a 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -811,6 +811,11 @@ parse_signature( IOBUF inp, int pkttype, unsigned long pktlen, if( is_v4 ) { /*extract required information */ const byte *p; + + /* FIXME: set sig->flags.unknown_critical is there is a + * critical bit set for packets which are not understood + * It does only make sense for hashed data. + */ p = parse_sig_subpkt( sig->hashed_data, SIGSUBPKT_SIG_CREATED, NULL ); if( !p ) log_error("signature packet without timestamp\n"); diff --git a/g10/sig-check.c b/g10/sig-check.c index 5e6873f9d..b983bb42c 100644 --- a/g10/sig-check.c +++ b/g10/sig-check.c @@ -224,6 +224,8 @@ do_check( PKT_public_key *pk, PKT_signature *sig, MD_HANDLE digest ) rc = pubkey_verify( pk->pubkey_algo, result, sig->data, pk->pkey, cmp_help, &ctx ); mpi_free( result ); + sig->flags.checked = 1; + sig->flags.valid = !rc; return rc; } diff --git a/g10/trustdb.c b/g10/trustdb.c index 7bb015844..2ecc2e2bc 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -1879,6 +1879,27 @@ is_algo_in_prefs( ulong lid, int preftype, int algo ) } +static int +get_dir_record( PKT_public_key *pk, TRUSTREC *rec ) +{ + int rc=0; + + if( pk->local_id ) { + if( tdbio_read_record( pk->local_id, rec, RECTYPE_DIR ) ) { + log_error("get_dir_record: read record failed\n"); + rc = G10ERR_TRUSTDB; + } + } + else { /* no local_id: scan the trustdb */ + if( (rc=tdbio_search_dir_bypk( pk, rec )) && rc != -1 ) + log_error("get_dir_record: search_record failed: %s\n", + g10_errstr(rc)); + } + return rc; +} + + + /**************** * This function simply looks for the key in the trustdb * and makes sure that pk->local_id is set to the coreect value. @@ -1890,22 +1911,7 @@ int query_trust_record( PKT_public_key *pk ) { TRUSTREC rec; - int rc=0; - - if( pk->local_id ) { - if( tdbio_read_record( pk->local_id, &rec, RECTYPE_DIR ) ) { - log_error("query_trust_record: read record failed\n"); - return G10ERR_TRUSTDB; - } - } - else { /* no local_id: scan the trustdb */ - if( (rc=tdbio_search_dir_bypk( pk, &rec )) && rc != -1 ) { - log_error("query_trust_record: search_record failed: %s\n", - g10_errstr(rc)); - return rc; - } - } - return rc; + return get_dir_record( pk, &rec ); } @@ -1915,17 +1921,9 @@ clear_trust_checked_flag( PKT_public_key *pk ) TRUSTREC rec; int rc; - if( !pk->local_id ) { - query_trust_record( pk ); - if( !pk->local_id ) - log_bug("clear_trust_checked_flag: Still no LID\n"); - } - - if( (rc=tdbio_read_record( pk->local_id, &rec, RECTYPE_DIR ))) { - log_error("clear_trust_checked_flag: read record failed: %s\n", - g10_errstr(rc)); + rc = get_dir_record( pk, &rec ); + if( rc ) return rc; - } if( !(rec.r.dir.dirflags & DIRF_CHECKED) ) return 0; @@ -1942,6 +1940,44 @@ clear_trust_checked_flag( PKT_public_key *pk ) } + +/**************** + * Update all the info from the public keyblock, the signatures-checked + * flag is reset. The key must already exist in the keydb. + * Note: This function clears all keyblock flags. + */ +int +update_trust_record( KBNODE keyblock ) +{ + PKT_public_key *primary_pk; + KBNODE node; + TRUSTREC drec; + int modified = 0; + int rc = 0; + + clear_kbnode_flags( keyblock ); + node = find_kbnode( keyblock, PKT_PUBLIC_KEY ); + primary_pk = node->pkt->pkt.public_key; + rc = get_dir_record( primary_pk, &drec ); + if( rc ) + return rc; + + + if( drec.r.dir.dirflags & DIRF_CHECKED ) /* <<--- FIXME: remove this! */ + modified = 1; + + if( modified ) { + /* reset the checked flag */ + drec.r.dir.dirflags &= ~DIRF_CHECKED; + rc = tdbio_write_record( &drec ); + if( rc ) + log_error("update_trust_record: write dir record failed: %s\n", + g10_errstr(rc)); + } + + return rc; +} + /**************** * helper function for insert_trust_record() */ diff --git a/g10/trustdb.h b/g10/trustdb.h index 4345a73a7..5c098d646 100644 --- a/g10/trustdb.h +++ b/g10/trustdb.h @@ -58,6 +58,7 @@ int keyid_from_lid( ulong lid, u32 *keyid ); int query_trust_record( PKT_public_key *pk ); int clear_trust_checked_flag( PKT_public_key *pk ); int insert_trust_record( PKT_public_key *pk ); +int update_trust_record( KBNODE keyblock ); int update_ownertrust( ulong lid, unsigned new_trust ); /*-- pkclist.c --*/ diff --git a/mpi/mpiutil.c b/mpi/mpiutil.c index f2f1726c4..5dd65aebe 100644 --- a/mpi/mpiutil.c +++ b/mpi/mpiutil.c @@ -21,6 +21,7 @@ #include <config.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <assert.h> #include "mpi.h" @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 1998-09-18 17:16+0200\n" +"POT-Creation-Date: 1998-09-30 19:01+0200\n" "Content-Type: text/plain; charset=\n" "Date: 1998-01-26 22:08:36+0100\n" "From: Werner Koch <wk@frodo>\n" @@ -12,7 +12,7 @@ msgstr "" "g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c " "g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n" -#: util/secmem.c:226 +#: util/secmem.c:77 msgid "Warning: using insecure memory!\n" msgstr "" "Achtung: Sensible Daten k�nnten auf Platte ausgelagert werden.\n" @@ -57,7 +57,7 @@ msgstr "" "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n" "(Es werden noch %d Byte ben�tigt.)\n" -#: g10/g10.c:143 +#: g10/g10.c:146 msgid "" "@Commands:\n" " " @@ -65,119 +65,119 @@ msgstr "" "@Kommandos:\n" " " -#: g10/g10.c:146 +#: g10/g10.c:149 #, fuzzy msgid "|[file]|make a signature" msgstr "|[FILE]|eine Signatur erzeugen" -#: g10/g10.c:147 +#: g10/g10.c:150 #, fuzzy msgid "|[file]|make a clear text signature" msgstr "|[FILE]|eine Klartextsignatur erzeugen" -#: g10/g10.c:148 +#: g10/g10.c:151 msgid "make a detached signature" msgstr "Eine abgetrennte Signatur erzeugen" -#: g10/g10.c:149 +#: g10/g10.c:152 msgid "encrypt data" msgstr "Daten verschl�sseln" -#: g10/g10.c:150 +#: g10/g10.c:153 msgid "encryption only with symmetric cipher" msgstr "Daten nur symmetrisch verschl�sseln" -#: g10/g10.c:151 +#: g10/g10.c:154 msgid "store only" msgstr "nur speichern" -#: g10/g10.c:152 +#: g10/g10.c:155 msgid "decrypt data (default)" msgstr "Daten entschl�sseln (Voreinstellung)" -#: g10/g10.c:153 +#: g10/g10.c:156 msgid "verify a signature" msgstr "Signatur pr�fen" -#: g10/g10.c:155 +#: g10/g10.c:158 msgid "list keys" msgstr "Liste der Schl�ssel" -#: g10/g10.c:156 +#: g10/g10.c:159 msgid "list keys and signatures" msgstr "Liste der Schl�ssel und ihrer Signaturen" -#: g10/g10.c:157 +#: g10/g10.c:160 msgid "check key signatures" msgstr "Signaturen der Schl�ssel pr�fen" -#: g10/g10.c:158 +#: g10/g10.c:161 msgid "list keys and fingerprints" msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\"" -#: g10/g10.c:159 +#: g10/g10.c:162 msgid "list secret keys" msgstr "Liste der geheimen Schl�ssel" -#: g10/g10.c:161 +#: g10/g10.c:164 msgid "generate a new key pair" msgstr "Ein neues Schl�sselpaar erzeugen" -#: g10/g10.c:163 +#: g10/g10.c:166 msgid "remove key from the public keyring" msgstr "Schl�ssel entfernen" -#: g10/g10.c:165 +#: g10/g10.c:168 msgid "sign or edit a key" msgstr "" -#: g10/g10.c:166 +#: g10/g10.c:169 msgid "generate a revocation certificate" msgstr "Einen Schl�sselwiderruf vornehmen" -#: g10/g10.c:168 +#: g10/g10.c:171 msgid "export keys" msgstr "Schl�ssel exportieren" -#: g10/g10.c:171 +#: g10/g10.c:174 msgid "import/merge keys" msgstr "Schl�ssel importieren/kombinieren" -#: g10/g10.c:172 +#: g10/g10.c:175 msgid "list only the sequence of packets" msgstr "Lediglich die Struktur der Datenpackete anzeigen" -#: g10/g10.c:174 +#: g10/g10.c:177 #, fuzzy msgid "export the ownertrust values" msgstr "Keine \"Owner trust\" Werte ge�ndert.\n" -#: g10/g10.c:175 +#: g10/g10.c:178 #, fuzzy msgid "import ownertrust values" msgstr "Keine \"Owner trust\" Werte ge�ndert.\n" -#: g10/g10.c:176 +#: g10/g10.c:179 msgid "|[NAMES]|check the trust database" msgstr "" -#: g10/g10.c:177 +#: g10/g10.c:180 msgid "De-Armor a file or stdin" msgstr "Datei oder stdin von der ASCII-H�lle befreien" -#: g10/g10.c:178 +#: g10/g10.c:181 msgid "En-Armor a file or stdin" msgstr "Datei oder stdin in eine ASCII-H�lle einpacken" -#: g10/g10.c:179 +#: g10/g10.c:182 msgid "|algo [files]|print message digests" msgstr "|algo [files]|Hashwerte der Dateien ausgeben" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "print all message digests" msgstr "Message-Digests f�r die Eingabedaten ausgeben" -#: g10/g10.c:187 +#: g10/g10.c:190 msgid "" "@\n" "Options:\n" @@ -187,112 +187,129 @@ msgstr "" "Optionen:\n" " " -#: g10/g10.c:189 +#: g10/g10.c:192 msgid "create ascii armored output" msgstr "Ausgabe mit ASCII-H�lle versehen" -#: g10/g10.c:191 +#: g10/g10.c:194 msgid "use this user-id to sign or decrypt" msgstr "Mit dieser User-ID signieren" -#: g10/g10.c:192 +#: g10/g10.c:195 msgid "use this user-id for encryption" msgstr "Verschl�sseln f�r diese User-ID" -#: g10/g10.c:193 +#: g10/g10.c:196 msgid "|N|set compress level N (0 disables)" msgstr "Kompressionsstufe auf N setzen (0 f�r keine Kompression)" -#: g10/g10.c:194 +#: g10/g10.c:197 msgid "use canonical text mode" msgstr "Textmodus benutzen" -#: g10/g10.c:196 +#: g10/g10.c:199 msgid "use as output file" msgstr "dies als Ausgabedatei benutzen" -#: g10/g10.c:197 +#: g10/g10.c:200 msgid "verbose" msgstr "detaillierte Informationen" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:199 +#: g10/g10.c:202 msgid "batch mode: never ask" msgstr "Stapelmodus: Keine Abfragen" -#: g10/g10.c:200 +#: g10/g10.c:203 msgid "assume yes on most questions" msgstr "\"Ja\" als Standardantwort annehmen" -#: g10/g10.c:201 +#: g10/g10.c:204 msgid "assume no on most questions" msgstr "\"Nein\" als Standardantwort annehmen" -#: g10/g10.c:202 +#: g10/g10.c:205 msgid "add this keyring to the list of keyrings" msgstr "Als �ffentlichen Schl�sselring mitbenutzen" -#: g10/g10.c:203 +#: g10/g10.c:206 msgid "add this secret keyring to the list" msgstr "Als geheimen Schl�sselring mitbenutzen" -#: g10/g10.c:204 +#: g10/g10.c:207 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen" -#: g10/g10.c:205 +#: g10/g10.c:208 msgid "read options from file" msgstr "Optionen aus der Datei lesen" -#: g10/g10.c:207 +#: g10/g10.c:210 msgid "set debugging flags" msgstr "Debug-Flags einschalten" -#: g10/g10.c:208 +#: g10/g10.c:211 msgid "enable full debugging" msgstr "Alle Debug-Flags einschalten" -#: g10/g10.c:209 +#: g10/g10.c:212 msgid "|FD|write status info to this FD" msgstr "|FD|Statusinfo auf diesen Dateihandle (\"FD\") ausgeben" -#: g10/g10.c:210 +#: g10/g10.c:213 msgid "do not write comment packets" msgstr "Keine Kommentarpakete schreiben" -#: g10/g10.c:211 +#: g10/g10.c:214 msgid "(default is 1)" msgstr "(voreingestellt ist 1)" -#: g10/g10.c:212 +#: g10/g10.c:215 msgid "(default is 3)" msgstr "(voreingestellt ist 3)" -#: g10/g10.c:213 -msgid "|file|load extension module" +#: g10/g10.c:216 +#, fuzzy +msgid "|FILE|load extension module FILE" msgstr "|FILE|Erweiterungsmodul |FILE| laden" -#: g10/g10.c:214 +#: g10/g10.c:217 msgid "emulate the mode described in RFC1991" msgstr "Den in RFC1991 beschriebenen Modus nachahmen" -#: g10/g10.c:216 +#: g10/g10.c:218 +#, fuzzy +msgid "|N|use passphrase mode N" +msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" + +#: g10/g10.c:220 +#, fuzzy +msgid "|NAME|use message digest algorithm NAME for passphrases" +msgstr "|NAME|Die Hashmethode NAME benutzen" + +#: g10/g10.c:222 +#, fuzzy +msgid "|NAME|use cipher algorithm NAME for passphrases" +msgstr "|NAME|Die Verschl�sslungsmethode NAME benutzen" + +#: g10/g10.c:224 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAME|Die Verschl�sslungsmethode NAME benutzen" -#: g10/g10.c:217 +#: g10/g10.c:225 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAME|Die Hashmethode NAME benutzen" -#: g10/g10.c:218 +#: g10/g10.c:226 msgid "|N|use compress algorithm N" msgstr "|N|Die Kompressionsmethode N benutzen" -#: g10/g10.c:219 +#: g10/g10.c:227 msgid "throw keyid field of encrypted packets" msgstr "" -#: g10/g10.c:227 +#: g10/g10.c:235 +#, fuzzy msgid "" "@\n" "Examples:\n" @@ -301,7 +318,7 @@ msgid "" " --clearsign [file] make a clear text signature\n" " --detach-sign [file] make a detached signature\n" " --list-keys [names] show keys\n" -" --fingerprint [names] show fingerprint\n" +" --fingerprint [names] show fingerprints\n" msgstr "" "@\n" "Beispiele:\n" @@ -312,19 +329,19 @@ msgstr "" " --list-keys [names] Die Schl�ssel anzeigen\n" " --fingerprint [names] Die \"Fingerabdr�cke\" anzeigen\n" -#: g10/g10.c:302 +#: g10/g10.c:310 msgid "Please report bugs to <[email protected]>.\n" msgstr "Berichte �ber Wanzen bitte an <[email protected]>.\n" -#: g10/g10.c:307 +#: g10/g10.c:315 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Aufruf: gpgm [Optionen] [Dateien] (-h f�r Hilfe)" -#: g10/g10.c:309 +#: g10/g10.c:317 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)" -#: g10/g10.c:314 +#: g10/g10.c:322 msgid "" "Syntax: gpgm [options] [files]\n" "GNUPG maintenance utility\n" @@ -332,7 +349,7 @@ msgstr "" "Syntax: gpgm [options] [files]\n" "GNUPG Wartungs-Hilfsprogramm\n" -#: g10/g10.c:317 +#: g10/g10.c:325 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -342,139 +359,147 @@ msgstr "" "Signieren, pr�fen, verschl�sseln, entschl�sseln\n" "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n" -#: g10/g10.c:323 +#: g10/g10.c:331 msgid "" "\n" "Supported algorithms:\n" msgstr "" -#: g10/g10.c:398 +#: g10/g10.c:406 msgid "usage: gpgm [options] " msgstr "Aufruf: gpgm [Optionen] " -#: g10/g10.c:400 +#: g10/g10.c:408 msgid "usage: gpg [options] " msgstr "Aufruf: gpg [Optionen] " -#: g10/g10.c:441 +#: g10/g10.c:449 msgid "conflicting commands\n" msgstr "Widerspr�chliche Kommandos\n" -#: g10/g10.c:547 +#: g10/g10.c:588 #, c-format msgid "note: no default option file '%s'\n" msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n" -#: g10/g10.c:551 +#: g10/g10.c:592 #, c-format msgid "option file '%s': %s\n" msgstr "Optionendatei '%s': %s\n" -#: g10/g10.c:558 +#: g10/g10.c:599 #, c-format msgid "reading options from '%s'\n" msgstr "Optionen werden von '%s' gelesen\n" -#: g10/g10.c:737 +#: g10/g10.c:765 g10/g10.c:777 msgid "selected cipher algorithm is invalid\n" msgstr "Die ausgew�hlte Verschl�sslungsmethode ist ung�ltig\n" -#: g10/g10.c:743 +#: g10/g10.c:771 g10/g10.c:783 msgid "selected digest algorithm is invalid\n" msgstr "Die ausgew�hlte Message-Digest-Methode ist ung�ltig\n" -#: g10/g10.c:746 +#: g10/g10.c:786 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "Die Kompressionsmethode mu� im Bereich %d bis %d liegen\n" -#: g10/g10.c:748 +#: g10/g10.c:788 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed m�ssen gr��er als 0 sein\n" -#: g10/g10.c:750 +#: g10/g10.c:790 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed m�ssen gr��er als 1 sein\n" -#: g10/g10.c:833 +#: g10/g10.c:793 +msgid "note: simple S2K mode (0) is strongly discouraged\n" +msgstr "" + +#: g10/g10.c:797 +msgid "invalid S2K mode; must be 0, 1 or 3\n" +msgstr "" + +#: g10/g10.c:872 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/g10.c:839 +#: g10/g10.c:878 msgid "--store [filename]" msgstr "--store [Dateiname]" -#: g10/g10.c:847 +#: g10/g10.c:886 msgid "--symmetric [filename]" msgstr "--symmetric [Dateiname]" -#: g10/g10.c:855 +#: g10/g10.c:894 msgid "--encrypt [filename]" msgstr "--encrypt [Dateiname]" -#: g10/g10.c:868 +#: g10/g10.c:907 msgid "--sign [filename]" msgstr "--sign [Dateiname]" -#: g10/g10.c:881 +#: g10/g10.c:920 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:895 +#: g10/g10.c:934 msgid "--clearsign [filename]" msgstr "--clearsign [Dateiname]" -#: g10/g10.c:907 +#: g10/g10.c:946 msgid "--decrypt [filename]" msgstr "--decrypt [Dateiname]" -#: g10/g10.c:916 +#: g10/g10.c:955 msgid "--edit-key username" msgstr "--edit-key Benutzername" -#: g10/g10.c:924 +#: g10/g10.c:963 msgid "--delete-secret-key username" msgstr "--delete-secret-key Benutzername" -#: g10/g10.c:927 +#: g10/g10.c:966 msgid "--delete-key username" msgstr "--delete-key Benutzername" -#: g10/encode.c:211 g10/g10.c:950 g10/keylist.c:79 +#: g10/encode.c:213 g10/g10.c:989 g10/keylist.c:79 #, c-format msgid "can't open %s: %s\n" msgstr "Datei '%s' kann nicht ge�ffnet werden: %s\n" -#: g10/g10.c:961 +#: g10/g10.c:1000 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [Benutzername] [Keyring]" -#: g10/g10.c:1016 +#: g10/g10.c:1055 #, c-format msgid "dearmoring failed: %s\n" msgstr "De-Armor fehlgeschlagen: %s\n" -#: g10/g10.c:1024 +#: g10/g10.c:1063 #, c-format msgid "enarmoring failed: %s\n" msgstr "En-Armor fehlgeschlagen: %s\n" -#: g10/g10.c:1085 +#: g10/g10.c:1124 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "Ung�ltige Hashmethode '%s'\n" -#: g10/g10.c:1155 +#: g10/g10.c:1194 msgid "[filename]" msgstr "[Dateiname]" -#: g10/decrypt.c:59 g10/g10.c:1157 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1196 g10/verify.c:66 #, c-format msgid "can't open '%s'\n" msgstr "Datei '%s' kann nicht ge�ffnet werden\n" -#: g10/g10.c:1202 +#: g10/g10.c:1241 msgid "" "RSA keys are deprecated; please consider creating a new key and use this key " "in the future\n" @@ -482,6 +507,66 @@ msgstr "" "RSA Schl�ssel sind nicht erw�nscht; bitte denken Sie dar�ber nach, einen " "neuen Schl�ssel zu erzeugen und diesen in Zukunft zu benutzen\n" +#: g10/armor.c:335 g10/armor.c:375 +msgid "armor header: " +msgstr "" + +#: g10/armor.c:340 +#, fuzzy +msgid "invalid clearsig header\n" +msgstr "Ung�ltiges Zeichen im Namen\n" + +#: g10/armor.c:366 +msgid "invalid armor header: " +msgstr "" + +#: g10/armor.c:440 +#, fuzzy, c-format +msgid "armor: %s\n" +msgstr "Lesefehler: %s\n" + +#: g10/armor.c:484 +msgid "invalid dash escaped line: " +msgstr "" + +#: g10/armor.c:553 +msgid "invalid clear text header: " +msgstr "" + +#: g10/armor.c:783 +#, fuzzy, c-format +msgid "invalid radix64 character %02x skipped\n" +msgstr "Ung�ltiges Zeichen im Namen\n" + +#: g10/armor.c:816 +msgid "premature eof (no CRC)\n" +msgstr "" + +#: g10/armor.c:835 +msgid "premature eof (in CRC)\n" +msgstr "" + +#: g10/armor.c:839 +msgid "malformed CRC\n" +msgstr "" + +#: g10/armor.c:843 +#, c-format +msgid "CRC error; %06lx - %06lx\n" +msgstr "" + +#: g10/armor.c:862 +msgid "premature eof (in Trailer)\n" +msgstr "" + +#: g10/armor.c:866 +msgid "error in trailer line\n" +msgstr "" + +#: g10/armor.c:1120 +msgid "no valid RFC1991 or OpenPGP data found.\n" +msgstr "" + #: g10/pkclist.c:71 #, c-format msgid "" @@ -556,15 +641,15 @@ msgid "" "\n" msgstr "Keine \"Owner trust\" Werte ge�ndert.\n" -#: g10/pkclist.c:189 +#: g10/pkclist.c:190 msgid "revoked_key.override" msgstr "" -#: g10/pkclist.c:190 g10/pkclist.c:277 +#: g10/pkclist.c:191 g10/pkclist.c:281 msgid "Use this key anyway? " msgstr "Den Schl�ssel trotzdem benutzen?" -#: g10/pkclist.c:272 +#: g10/pkclist.c:276 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -575,59 +660,59 @@ msgstr "" "Wenn Sie *wirklich* wissen, was Sie tun, k�nnen Sie die n�chste\n" "Frage mit ja beantworten\n" -#: g10/pkclist.c:276 +#: g10/pkclist.c:280 msgid "untrusted_key.override" msgstr "" -#: g10/pkclist.c:281 +#: g10/pkclist.c:285 msgid "WARNING: Using untrusted key!\n" msgstr "WARNUNG: Ein Schl�ssel ohne gesichertes Vertrauen wird benutzt!\n" -#: g10/pkclist.c:317 +#: g10/pkclist.c:321 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "WARNUNG: Dieser Schl�ssel wurde von seinem Besitzer widerrufen!\n" -#: g10/pkclist.c:318 +#: g10/pkclist.c:322 msgid " This could mean that the signature is forgery.\n" msgstr " Das k�nnte bedeuten, da� die Signatur gef�lscht ist.\n" -#: g10/pkclist.c:339 +#: g10/pkclist.c:343 msgid "Note: This key has expired!\n" msgstr "Hinweis: Dieser Schl�ssel ist verfallen!\n" -#: g10/pkclist.c:346 +#: g10/pkclist.c:350 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "WARNUNG: Dieser Schl�ssel tr�gt keine vertrauensw�rdige Signatur!\n" -#: g10/pkclist.c:348 +#: g10/pkclist.c:352 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Es gibt keinen Hinweis, da� die Signatur wirklich dem vorgeblichen " "Besitzer geh�rt.\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:367 msgid "WARNING: We do NOT trust this key!\n" msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n" -#: g10/pkclist.c:364 +#: g10/pkclist.c:368 msgid " The signature is probably a FORGERY.\n" msgstr " Die Signatur ist wahrscheinlich eine F�LSCHUNG.\n" -#: g10/pkclist.c:371 +#: g10/pkclist.c:375 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "WARNUNG: Dieser Schl�ssel ist nicht durch hinreichend vertrauensw�rdige " "Signaturen zertifiziert!\n" -#: g10/pkclist.c:374 +#: g10/pkclist.c:378 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" " Es ist nicht sicher, da� die Signatur wirklich dem vorgeblichen " "Besitzer geh�rt.\n" -#: g10/pkclist.c:419 +#: g10/pkclist.c:423 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -635,29 +720,29 @@ msgstr "" "Sie gaben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n" "\n" -#: g10/pkclist.c:423 +#: g10/pkclist.c:427 msgid "pklist.user_id.enter" msgstr "" -#: g10/pkclist.c:424 +#: g10/pkclist.c:428 msgid "Enter the user ID: " msgstr "Geben Sie die User-ID ein: " -#: g10/pkclist.c:435 +#: g10/pkclist.c:439 msgid "No such user ID.\n" msgstr "Keine solche User-ID vorhanden.\n" -#: g10/pkclist.c:469 g10/pkclist.c:496 +#: g10/pkclist.c:473 g10/pkclist.c:500 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: �bersprungen: %s\n" -#: g10/pkclist.c:477 +#: g10/pkclist.c:481 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: Fehler beim Pr�fen des Schl�ssels: %s\n" -#: g10/pkclist.c:503 +#: g10/pkclist.c:507 msgid "no valid addressees\n" msgstr "Keine g�ltigen Adressaten\n" @@ -921,7 +1006,7 @@ msgstr "" "Sie ben�tigen eine \"passphrase\", um den geheimen Schl�ssel zu sch�tzen.\n" "\n" -#: g10/keyedit.c:379 g10/keygen.c:694 +#: g10/keyedit.c:377 g10/keygen.c:694 msgid "passphrase not correctly repeated; try again.\n" msgstr "\"passphrase\" nicht richtig wiederholt; noch einmal.\n" @@ -1000,32 +1085,37 @@ msgstr "" msgid "Really create? " msgstr "Ihr Name (\"Vorname Nachname\"): " -#: g10/encode.c:87 +#: g10/encode.c:88 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: kann nicht ge�ffnet werden: %s\n" -#: g10/encode.c:106 +#: g10/encode.c:107 #, c-format msgid "error creating passphrase: %s\n" msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" -#: g10/encode.c:151 g10/encode.c:262 +#: g10/encode.c:152 g10/encode.c:264 #, c-format msgid "%s: warning: empty file\n" msgstr "%s: Achtung: Leere Datei.\n" -#: g10/encode.c:217 +#: g10/encode.c:219 #, c-format msgid "reading from '%s'\n" msgstr "Lesen von '%s'\n" -#: g10/encode.c:390 +#: g10/encode.c:392 #, c-format msgid "%s encrypted for: %s\n" msgstr "%s verschl�sselt f�r: %s\n" -#: g10/import.c:105 g10/trustdb.c:1342 +#: g10/getkey.c:884 +#, c-format +msgid "using secondary key %08lX instead of primary key %08lX\n" +msgstr "" + +#: g10/import.c:105 g10/trustdb.c:1349 #, c-format msgid "can't open file: %s\n" msgstr "Kann die Datei nicht �ffnen: %s\n" @@ -1035,194 +1125,195 @@ msgstr "Kann die Datei nicht �ffnen: %s\n" msgid "skipping block of type %d\n" msgstr "�berspringe den Block vom Typ %d\n" -#: g10/import.c:131 g10/trustdb.c:1420 +#: g10/import.c:131 g10/trustdb.c:1427 #, c-format msgid "read error: %s\n" msgstr "Lesefehler: %s\n" -#: g10/import.c:271 g10/import.c:441 +#: g10/import.c:272 g10/import.c:445 #, c-format msgid "key %08lX: no user id\n" msgstr "Schl�ssel %08lX: Keine User-ID\n" -#: g10/import.c:281 +#: g10/import.c:282 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n" -#: g10/import.c:283 +#: g10/import.c:284 msgid "this may be caused by a missing self-signature\n" msgstr "" -#: g10/import.c:291 g10/import.c:508 +#: g10/import.c:293 g10/import.c:511 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n" -#: g10/import.c:297 +#: g10/import.c:299 msgid "no default public keyring\n" msgstr "Kein voreingestellter �ffentlicher Schl�sselring\n" -#: g10/import.c:301 +#: g10/import.c:303 #, c-format msgid "writing to '%s'\n" msgstr "Schreiben nach '%s'\n" -#: g10/import.c:305 g10/import.c:359 g10/import.c:562 +#: g10/import.c:307 g10/import.c:362 g10/import.c:565 #, c-format msgid "can't lock public keyring: %s\n" msgstr "kann �ffentlichen Schl�sselring nicht sperren: %s\n" -#: g10/import.c:308 +#: g10/import.c:310 #, c-format msgid "can't write to keyring: %s\n" msgstr "kann Schl�sselring nicht schreiben: %s\n" #. we are ready -#: g10/import.c:311 +#: g10/import.c:313 #, c-format msgid "key %08lX: public key imported\n" msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel importiert\n" -#: g10/import.c:320 +#: g10/import.c:322 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "Schl�ssel %08lX: Stimmt nicht mit unserer Kopie �berein\n" -#: g10/import.c:333 g10/import.c:517 +#: g10/import.c:335 g10/import.c:520 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "" -#: g10/import.c:340 g10/import.c:524 +#: g10/import.c:342 g10/import.c:527 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "" -#: g10/import.c:356 g10/import.c:456 g10/import.c:559 +#: g10/import.c:359 g10/import.c:460 g10/import.c:562 msgid "writing keyblock\n" msgstr "schreiben des Schl�sselblocks\n" -#: g10/import.c:362 g10/import.c:565 +#: g10/import.c:365 g10/import.c:568 #, c-format msgid "can't write keyblock: %s\n" msgstr "Der Schl�sselblock kann nicht geschrieben werden: %s\n" -#: g10/import.c:366 +#: g10/import.c:369 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "Schl�ssel %08lX: 1 neue User-ID\n" -#: g10/import.c:369 +#: g10/import.c:372 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "Schl�ssel %08lX: %d neue User-IDs\n" -#: g10/import.c:372 +#: g10/import.c:375 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "Schl�ssel %08lX: 1 neue Signatur\n" -#: g10/import.c:375 +#: g10/import.c:378 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "Schl�ssel %08lX: %d neue Signaturen\n" -#: g10/import.c:378 +#: g10/import.c:381 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "Schl�ssel %08lX: 1 neuer Sekund�rschl�ssel\n" -#: g10/import.c:381 +#: g10/import.c:384 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "Schl�ssel %08lX: %d neue Sekund�rschl�ssel\n" -#: g10/import.c:385 +#: g10/import.c:388 #, c-format msgid "key %08lX: not changed\n" msgstr "Schl�ssel %08lX: Nicht ge�ndert\n" -#: g10/import.c:459 +#: g10/import.c:463 #, c-format msgid "can't lock secret keyring: %s\n" msgstr "kann geheimen Schl�sselring nicht sperren: %s\n" -#: g10/import.c:462 -msgid "can't write keyring\n" -msgstr "kann Schl�sselring nicht schreiben\n" +#: g10/import.c:466 +#, fuzzy, c-format +msgid "can't write keyring: %s\n" +msgstr "kann Schl�sselring nicht schreiben: %s\n" #. we are ready -#: g10/import.c:465 +#: g10/import.c:469 #, c-format msgid "key %08lX: secret key imported\n" msgstr "Schl�ssel %08lX: Privater Schl�ssel importiert\n" #. we can't merge secret keys -#: g10/import.c:468 +#: g10/import.c:472 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "Schl�ssel %08lX: Ist bereits im privaten Schl�sselring\n" -#: g10/import.c:472 +#: g10/import.c:476 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "Schl�ssel %08lX: Privater Schl�ssel nicht gefunden: %s\n" -#: g10/import.c:502 +#: g10/import.c:505 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "Schl�ssel %08lX: Kein �ffentlicher Schl�ssel - der Schl�sselwiderruf kann " "nicht angebracht werden\n" -#: g10/import.c:535 +#: g10/import.c:538 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - zur�ckgewiesen\n" #. we are ready -#: g10/import.c:568 +#: g10/import.c:571 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "Schl�ssel %08lX: Widerruofzertifikat importiert\n" -#: g10/import.c:598 +#: g10/import.c:601 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "Schl�ssel %08lX: Keine User-ID f�r Signatur\n" -#: g10/import.c:605 +#: g10/import.c:608 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "Schl�ssel %08lX: Public-Key-Algorithmus wird nicht unterst�tzt\n" -#: g10/import.c:606 +#: g10/import.c:609 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "Schl�ssel %08lX: Ung�ltige Selbst-Signatur\n" -#: g10/import.c:635 +#: g10/import.c:638 #, c-format msgid "key %08lX: skipped userid '" msgstr "Schl�ssel %08lX: �bergehe User-ID '" -#: g10/import.c:658 +#: g10/import.c:661 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n" -#: g10/import.c:665 +#: g10/import.c:669 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n" -#: g10/import.c:727 +#: g10/import.c:731 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "Schl�ssel %08lX: Widerrufzertifikat hinzugef�gt\n" -#: g10/import.c:790 g10/import.c:826 +#: g10/import.c:794 g10/import.c:830 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "Schl�ssel %08lX: Unser Kopie hat keine Selbst-Signatur\n" @@ -1277,50 +1368,50 @@ msgstr "Schl�ssel %08lX: Ung�ltige Selbst-Signatur\n" msgid "%d user ids without valid self-signatures detected\n" msgstr "" -#: g10/keyedit.c:250 +#: g10/keyedit.c:249 #, fuzzy, c-format msgid "Already signed by key %08lX\n" msgstr "Ist bereits mit Schl�ssel %08lX signiert.\n" -#: g10/keyedit.c:258 +#: g10/keyedit.c:257 #, fuzzy, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Nichts zu signieren.\n" -#: g10/keyedit.c:267 +#: g10/keyedit.c:265 #, fuzzy msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" msgstr "Sind Sie wirklich sicher, da� Sie diesen Schl�ssel signieren wollen:\n" -#: g10/keyedit.c:274 +#: g10/keyedit.c:272 msgid "sign_uid.okay" msgstr "" -#: g10/keyedit.c:274 +#: g10/keyedit.c:272 msgid "Really sign? " msgstr "" -#: g10/keyedit.c:295 +#: g10/keyedit.c:293 #, fuzzy, c-format msgid "signing failed: %s\n" msgstr "En-Armor fehlgeschlagen: %s\n" -#: g10/keyedit.c:346 +#: g10/keyedit.c:344 msgid "This key is not protected.\n" msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n" -#: g10/keyedit.c:349 +#: g10/keyedit.c:347 msgid "Key is protected.\n" msgstr "Schl�ssel ist gesch�tzt.\n" -#: g10/keyedit.c:366 +#: g10/keyedit.c:364 #, c-format msgid "Can't edit this key: %s\n" msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n" -#: g10/keyedit.c:371 +#: g10/keyedit.c:369 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -1328,7 +1419,7 @@ msgstr "" "Geben Sie die neue \"passphrase\" f�r diesen privaten Schl�ssel ein.\n" "\n" -#: g10/keyedit.c:383 +#: g10/keyedit.c:381 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -1337,336 +1428,340 @@ msgstr "" "Idee!\n" "\n" -#: g10/keyedit.c:385 +#: g10/keyedit.c:383 msgid "change_passwd.empty.okay" msgstr "" -#: g10/keyedit.c:386 +#: g10/keyedit.c:384 msgid "Do you really want to do this? " msgstr "M�chten Sie dies wirklich tun? " -#: g10/keyedit.c:441 +#: g10/keyedit.c:439 msgid "quit" msgstr "" -#: g10/keyedit.c:441 +#: g10/keyedit.c:439 msgid "quit this menu" msgstr "" -#: g10/keyedit.c:442 +#: g10/keyedit.c:440 msgid "q" msgstr "" -#: g10/keyedit.c:443 +#: g10/keyedit.c:441 msgid "save" msgstr "" -#: g10/keyedit.c:443 +#: g10/keyedit.c:441 msgid "save and quit" msgstr "" -#: g10/keyedit.c:444 +#: g10/keyedit.c:442 msgid "help" msgstr "" -#: g10/keyedit.c:444 +#: g10/keyedit.c:442 msgid "show this help" msgstr "" -#: g10/keyedit.c:446 +#: g10/keyedit.c:444 msgid "fpr" msgstr "" -#: g10/keyedit.c:446 +#: g10/keyedit.c:444 #, fuzzy msgid "show fingerprint" msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\"" -#: g10/keyedit.c:447 +#: g10/keyedit.c:445 #, fuzzy msgid "list" msgstr "Liste der Schl�ssel" -#: g10/keyedit.c:447 +#: g10/keyedit.c:445 #, fuzzy msgid "list key and user ids" msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\"" -#: g10/keyedit.c:448 +#: g10/keyedit.c:446 msgid "l" msgstr "" -#: g10/keyedit.c:449 +#: g10/keyedit.c:447 msgid "uid" msgstr "" -#: g10/keyedit.c:449 +#: g10/keyedit.c:447 msgid "select user id N" msgstr "" -#: g10/keyedit.c:450 +#: g10/keyedit.c:448 msgid "key" msgstr "" -#: g10/keyedit.c:450 +#: g10/keyedit.c:448 msgid "select secondary key N" msgstr "" -#: g10/keyedit.c:451 +#: g10/keyedit.c:449 msgid "check" msgstr "" -#: g10/keyedit.c:451 +#: g10/keyedit.c:449 #, fuzzy msgid "list signatures" msgstr "Liste der Schl�ssel und ihrer Signaturen" -#: g10/keyedit.c:452 +#: g10/keyedit.c:450 msgid "c" msgstr "" -#: g10/keyedit.c:453 +#: g10/keyedit.c:451 msgid "sign" msgstr "" -#: g10/keyedit.c:453 +#: g10/keyedit.c:451 #, fuzzy msgid "sign the key" msgstr "Signieren? " -#: g10/keyedit.c:454 +#: g10/keyedit.c:452 msgid "s" msgstr "" -#: g10/keyedit.c:455 +#: g10/keyedit.c:453 msgid "debug" msgstr "" -#: g10/keyedit.c:456 +#: g10/keyedit.c:454 msgid "adduid" msgstr "" -#: g10/keyedit.c:456 +#: g10/keyedit.c:454 msgid "add a user id" msgstr "" -#: g10/keyedit.c:457 +#: g10/keyedit.c:455 msgid "deluid" msgstr "" -#: g10/keyedit.c:457 +#: g10/keyedit.c:455 #, fuzzy msgid "delete user id" msgstr "--delete-key Benutzername" -#: g10/keyedit.c:458 +#: g10/keyedit.c:456 msgid "addkey" msgstr "" -#: g10/keyedit.c:458 +#: g10/keyedit.c:456 #, fuzzy msgid "add a secondary key" msgstr "Einen Sekund�rschl�ssel dem Prim�rschl�ssel hinzuf�gen" -#: g10/keyedit.c:459 +#: g10/keyedit.c:457 msgid "delkey" msgstr "" -#: g10/keyedit.c:459 +#: g10/keyedit.c:457 msgid "delete a secondary key" msgstr "" -#: g10/keyedit.c:460 +#: g10/keyedit.c:458 msgid "toggle" msgstr "" -#: g10/keyedit.c:460 +#: g10/keyedit.c:458 msgid "toggle between secret and public key listing" msgstr "" -#: g10/keyedit.c:462 +#: g10/keyedit.c:460 msgid "t" msgstr "" -#: g10/keyedit.c:463 +#: g10/keyedit.c:461 msgid "pref" msgstr "" -#: g10/keyedit.c:463 +#: g10/keyedit.c:461 #, fuzzy msgid "list preferences" msgstr "Liste der geheimen Schl�ssel" -#: g10/keyedit.c:464 +#: g10/keyedit.c:462 msgid "passwd" msgstr "" -#: g10/keyedit.c:464 +#: g10/keyedit.c:462 #, fuzzy msgid "change the passphrase" msgstr "Die \"Passphrase\" des geheimen Schl�ssels �ndern" -#: g10/keyedit.c:465 +#: g10/keyedit.c:463 msgid "trust" msgstr "" -#: g10/keyedit.c:465 +#: g10/keyedit.c:463 msgid "change the ownertrust" msgstr "" -#: g10/keyedit.c:483 +#: g10/keyedit.c:481 msgid "can't do that in batchmode\n" msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n" #. check that they match #. FIXME: check that they both match -#: g10/keyedit.c:506 +#: g10/keyedit.c:504 #, fuzzy msgid "Secret key is available.\n" msgstr "�ffentlicher Schl�ssel ist nicht verf�gbar.\n" -#: g10/keyedit.c:522 +#: g10/keyedit.c:520 msgid "keyedit.cmd" msgstr "Geben Sie bitte \"help\" ein." -#: g10/keyedit.c:522 +#: g10/keyedit.c:520 #, fuzzy msgid "Command> " msgstr "" "@Kommandos:\n" " " -#: g10/keyedit.c:547 +#: g10/keyedit.c:545 #, fuzzy msgid "Need the secret key to to this.\n" msgstr "Als geheimen Schl�sselring mitbenutzen" -#: g10/keyedit.c:566 +#: g10/keyedit.c:564 msgid "keyedit.save.okay" msgstr "" -#: g10/keyedit.c:567 +#: g10/keyedit.c:565 msgid "Save changes? " msgstr "" -#: g10/keyedit.c:569 +#: g10/keyedit.c:567 #, fuzzy msgid "keyedit.cancel.okay" msgstr "Geben Sie bitte \"help\" ein." -#: g10/keyedit.c:570 +#: g10/keyedit.c:568 msgid "Quit without saving? " msgstr "" -#: g10/keyedit.c:580 +#: g10/keyedit.c:578 #, fuzzy, c-format msgid "update failed: %s\n" msgstr "De-Armor fehlgeschlagen: %s\n" -#: g10/keyedit.c:587 +#: g10/keyedit.c:585 #, fuzzy, c-format msgid "update secret failed: %s\n" msgstr "Enschl�sselung fehlgeschlagen: %s\n" -#: g10/keyedit.c:595 +#: g10/keyedit.c:593 msgid "Key not changed so no update needed.\n" msgstr "" -#: g10/keyedit.c:625 +#: g10/keyedit.c:623 msgid "keyedit.sign_all.okay" msgstr "" -#: g10/keyedit.c:626 +#: g10/keyedit.c:624 msgid "Really sign all user ids? " msgstr "" -#: g10/keyedit.c:627 +#: g10/keyedit.c:625 msgid "Hint: Select the user ids to sign\n" msgstr "" -#: g10/keyedit.c:655 +#: g10/keyedit.c:653 msgid "You must select at least one user id.\n" msgstr "" -#: g10/keyedit.c:657 +#: g10/keyedit.c:655 msgid "You can't delete the last user id!\n" msgstr "" -#: g10/keyedit.c:659 +#: g10/keyedit.c:657 msgid "keyedit.remove.uid.okay" msgstr "" -#: g10/keyedit.c:660 +#: g10/keyedit.c:658 #, fuzzy msgid "Really remove all selected user ids? " msgstr "M�chten Sie die ausgew�hlten Signaturen wirklich entfernen? " -#: g10/keyedit.c:661 +#: g10/keyedit.c:659 #, fuzzy msgid "Really remove this user id? " msgstr "Die Signatur entfernen? " -#: g10/keyedit.c:684 +#: g10/keyedit.c:682 msgid "You must select at least one key.\n" msgstr "" -#: g10/keyedit.c:686 +#: g10/keyedit.c:684 msgid "keyedit.remove.subkey.okay" msgstr "" -#: g10/keyedit.c:688 +#: g10/keyedit.c:686 #, fuzzy msgid "Do you really want to delete the selected keys? " msgstr "M�chten Sie die ausgew�hlten Signaturen wirklich entfernen? " -#: g10/keyedit.c:689 +#: g10/keyedit.c:687 #, fuzzy msgid "Do you really want to delete this key? " msgstr "M�chten Sie dies wirklich tun? " -#: g10/keyedit.c:726 +#: g10/keyedit.c:724 msgid "Invalid command (try \"help\")\n" msgstr "" -#: g10/keyedit.c:1106 +#: g10/keyedit.c:1104 #, c-format msgid "No user id with index %d\n" msgstr "" -#: g10/keyedit.c:1151 +#: g10/keyedit.c:1149 #, c-format msgid "No secondary key with index %d\n" msgstr "" -#: g10/mainproc.c:198 +#: g10/mainproc.c:200 #, c-format msgid "public key decryption failed: %s\n" msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n" -#: g10/mainproc.c:228 +#: g10/mainproc.c:230 #, c-format msgid "decryption failed: %s\n" msgstr "Enschl�sselung fehlgeschlagen: %s\n" -#: g10/mainproc.c:842 +#: g10/mainproc.c:247 +msgid "note: sender requested \"for-your-eyes-only\"\n" +msgstr "" + +#: g10/mainproc.c:846 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Signatur am %.*s mit %s Schl�ssel %08lX erzeugt\n" -#: g10/mainproc.c:848 +#: g10/mainproc.c:852 msgid "BAD signature from \"" msgstr "FALSCHE Signatur von \"" -#: g10/mainproc.c:849 +#: g10/mainproc.c:853 msgid "Good signature from \"" msgstr "G�ltige Signatur von \"" -#: g10/mainproc.c:860 +#: g10/mainproc.c:864 #, c-format msgid "Can't check signature: %s\n" msgstr "Signatur kann nicht gepr�ft werden: %s\n" -#: g10/passphrase.c:117 +#: g10/passphrase.c:141 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -1676,7 +1771,7 @@ msgstr "" "Sie ben�tigen eine \"passphrase\", um den geheimen Schl�ssel zu entsperren.\n" "Benutzer: \"" -#: g10/passphrase.c:126 +#: g10/passphrase.c:150 #, c-format msgid "(%u-bit %s key, ID %08lX, created %s)\n" msgstr "(%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s)\n" @@ -1684,7 +1779,7 @@ msgstr "(%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s)\n" # ################################ # ####### Help msgids ############ # ################################ -#: g10/passphrase.c:167 +#: g10/passphrase.c:174 msgid "passphrase.enter" msgstr "" "Bitte geben Sie die \"Passhrase\" ein; dies ist ein geheimer Satz der aus\n" @@ -1699,33 +1794,37 @@ msgstr "" "werden,\n" "sind i.d.R. eine gute Wahl" -#: g10/passphrase.c:167 +#: g10/passphrase.c:174 #, fuzzy msgid "Enter pass phrase: " msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" -#: g10/passphrase.c:170 +#: g10/passphrase.c:177 msgid "passphrase.repeat" msgstr "" "Um sicher zu gehen, da� Sie sich bei der Eingabe der \"Passphrase\" nicht\n" "vertippt haben, geben Sie diese bitte nochmal ein. Nur wenn beide Eingaben\n" "�bereinstimmen, wird die \"Passphrase\" akzeptiert." -#: g10/passphrase.c:171 +#: g10/passphrase.c:178 #, fuzzy msgid "Repeat pass phrase: " msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" -#: g10/plaintext.c:210 +#: g10/plaintext.c:102 +msgid "data not saved; use option \"--output\" to save it\n" +msgstr "" + +#: g10/plaintext.c:214 #, fuzzy msgid "detached_signature.filename" msgstr "Eine abgetrennte Signatur erzeugen" -#: g10/plaintext.c:211 +#: g10/plaintext.c:215 msgid "Please enter name of data file: " msgstr "" -#: g10/plaintext.c:295 +#: g10/plaintext.c:299 #, c-format msgid "can't open signed data '%s'\n" msgstr "kann signierte Datei '%s' nicht �ffnen.\n" @@ -1743,6 +1842,11 @@ msgstr "Ung�ltige \"passphrase\"; versuchen Sie's doch noch einmal ...\n" msgid "Warning: Weak key detected - please change passphrase again.\n" msgstr "" +#: g10/sig-check.c:155 +msgid "" +"this is a PGP generated ElGamal key which is NOT secure for signatures!\n" +msgstr "" + #: g10/sig-check.c:165 msgid "public key created in future (time warp or clock problem)\n" msgstr "" @@ -1754,79 +1858,89 @@ msgstr "" msgid "warning: signature key expired %s\n" msgstr "Achtung: Schl�ssel der Signatur ist verfallen am %s.\n" -#: g10/trustdb.c:316 +#: g10/trustdb.c:318 #, fuzzy, c-format msgid "error reading sigrec: %s\n" msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n" -#: g10/trustdb.c:321 +#: g10/trustdb.c:323 #, c-format msgid "chained sigrec %lu has a wrong owner\n" msgstr "" -#: g10/trustdb.c:364 +#: g10/trustdb.c:370 #, c-format msgid "key %08lX: secret key without public key\n" msgstr "Schl�ssel %08lX: geheimer, aber kein �ffentlicher Schl�ssel.\n" -#: g10/trustdb.c:369 +#: g10/trustdb.c:375 #, c-format msgid "key %08lX: secret and public key don't match\n" msgstr "" "Schl�ssel %08lX: geheimer und �ffentlicher Schl�ssel passen nicht zusammen.\n" -#: g10/trustdb.c:380 +#: g10/trustdb.c:386 #, fuzzy, c-format msgid "key %08lX: can't put it into the trustdb\n" msgstr "Schl�ssel %08lX.%lu: in \"trustdb\" eingef�gt\n" -#: g10/trustdb.c:386 +#: g10/trustdb.c:392 #, fuzzy, c-format msgid "key %08lX: query record failed\n" msgstr "Schl�ssel %08lX: Keine User-ID\n" -#: g10/trustdb.c:395 +#: g10/trustdb.c:401 #, c-format msgid "key %08lX: already in ultikey_table\n" msgstr "Schl�ssel %08lX: bereits in der Tabelle der private Schl�ssel\n" -#: g10/trustdb.c:402 +#: g10/trustdb.c:408 #, fuzzy, c-format msgid "enum_secret_keys failed: %s\n" msgstr "En-Armor fehlgeschlagen: %s\n" -#: g10/trustdb.c:1614 +#: g10/trustdb.c:913 +#, fuzzy, c-format +msgid "key %08lX.%lu, uid %02X%02X: no public key for signature %08lX\n" +msgstr "Schl�ssel %08lX: Keine User-ID f�r Signatur\n" + +#: g10/trustdb.c:920 +#, fuzzy, c-format +msgid "key %08lX.%lu, uid %02X%02X: invalid %ssignature: %s\n" +msgstr "Schl�ssel %08lX: Ung�ltige Selbst-Signatur\n" + +#: g10/trustdb.c:1624 #, fuzzy, c-format msgid "key %08lX: insert trust record failed: %s\n" msgstr "Schl�ssel %08lX.%lu: Vertrauenspr�fung fehlgeschlagen: %s\n" -#: g10/trustdb.c:1618 +#: g10/trustdb.c:1628 #, c-format msgid "key %08lX.%lu: inserted into trustdb\n" msgstr "Schl�ssel %08lX.%lu: in \"trustdb\" eingef�gt\n" -#: g10/trustdb.c:1629 +#: g10/trustdb.c:1639 #, c-format msgid "key %08lX.%lu: created in future (time warp or clock problem)\n" msgstr "" "Schl�ssel %08lX.%lu: wurde in der Zukunft erzeugt (Zeitreise oder Uhren " "stimmen nicht �berein)\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1647 #, c-format msgid "key %08lX.%lu: expired at %s\n" msgstr "Schl�ssel %08lX.%lu: verfallen am %s\n" -#: g10/trustdb.c:1646 +#: g10/trustdb.c:1656 #, c-format msgid "key %08lX.%lu: trust check failed: %s\n" msgstr "Schl�ssel %08lX.%lu: Vertrauenspr�fung fehlgeschlagen: %s\n" -#: g10/status.c:233 +#: g10/status.c:246 msgid "No help available" msgstr "Keine Hilfe vorhanden." -#: g10/status.c:239 +#: g10/status.c:252 #, c-format msgid "No help available for '%s'" msgstr "Keine Hilfe f�r '%s' vorhanden." @@ -1873,6 +1987,9 @@ msgstr "" msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "" +#~ msgid "can't write keyring\n" +#~ msgstr "kann Schl�sselring nicht schreiben\n" + #~ msgid "make a signature on a key in the keyring" #~ msgstr "Schl�ssel signieren" @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 1998-09-18 17:16+0200\n" +"POT-Creation-Date: 1998-09-30 19:01+0200\n" "Content-Type: text/plain; charset=\n" "Date: 1998-08-08 18:07:50+0200\n" "From: Werner Koch <wk@frodo>\n" @@ -13,7 +13,7 @@ msgstr "" "g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c " "g10/pubkey-enc.c\n" -#: util/secmem.c:226 +#: util/secmem.c:77 msgid "Warning: using insecure memory!\n" msgstr "" @@ -46,93 +46,93 @@ msgid "" "the OS a chance to collect more entropy! (Need %d more bytes)\n" msgstr "" -#: g10/g10.c:143 +#: g10/g10.c:146 msgid "" "@Commands:\n" " " msgstr "" -#: g10/g10.c:146 +#: g10/g10.c:149 msgid "|[file]|make a signature" msgstr "" -#: g10/g10.c:147 +#: g10/g10.c:150 msgid "|[file]|make a clear text signature" msgstr "" -#: g10/g10.c:148 +#: g10/g10.c:151 msgid "make a detached signature" msgstr "" -#: g10/g10.c:149 +#: g10/g10.c:152 msgid "encrypt data" msgstr "" -#: g10/g10.c:150 +#: g10/g10.c:153 msgid "encryption only with symmetric cipher" msgstr "" -#: g10/g10.c:151 +#: g10/g10.c:154 msgid "store only" msgstr "" -#: g10/g10.c:152 +#: g10/g10.c:155 msgid "decrypt data (default)" msgstr "" -#: g10/g10.c:153 +#: g10/g10.c:156 msgid "verify a signature" msgstr "" -#: g10/g10.c:155 +#: g10/g10.c:158 msgid "list keys" msgstr "" -#: g10/g10.c:156 +#: g10/g10.c:159 msgid "list keys and signatures" msgstr "" -#: g10/g10.c:157 +#: g10/g10.c:160 msgid "check key signatures" msgstr "" -#: g10/g10.c:158 +#: g10/g10.c:161 msgid "list keys and fingerprints" msgstr "" -#: g10/g10.c:159 +#: g10/g10.c:162 msgid "list secret keys" msgstr "" -#: g10/g10.c:161 +#: g10/g10.c:164 msgid "generate a new key pair" msgstr "" -#: g10/g10.c:163 +#: g10/g10.c:166 msgid "remove key from the public keyring" msgstr "" -#: g10/g10.c:165 +#: g10/g10.c:168 msgid "sign or edit a key" msgstr "" -#: g10/g10.c:166 +#: g10/g10.c:169 msgid "generate a revocation certificate" msgstr "" -#: g10/g10.c:168 +#: g10/g10.c:171 msgid "export keys" msgstr "" -#: g10/g10.c:171 +#: g10/g10.c:174 msgid "import/merge keys" msgstr "" -#: g10/g10.c:172 +#: g10/g10.c:175 msgid "list only the sequence of packets" msgstr "" -#: g10/g10.c:174 +#: g10/g10.c:177 #, fuzzy msgid "export the ownertrust values" msgstr "" @@ -140,7 +140,7 @@ msgstr "" "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." -#: g10/g10.c:175 +#: g10/g10.c:178 #, fuzzy msgid "import ownertrust values" msgstr "" @@ -148,313 +148,392 @@ msgstr "" "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." -#: g10/g10.c:176 +#: g10/g10.c:179 msgid "|[NAMES]|check the trust database" msgstr "" -#: g10/g10.c:177 +#: g10/g10.c:180 msgid "De-Armor a file or stdin" msgstr "" -#: g10/g10.c:178 +#: g10/g10.c:181 msgid "En-Armor a file or stdin" msgstr "" -#: g10/g10.c:179 +#: g10/g10.c:182 msgid "|algo [files]|print message digests" msgstr "" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "print all message digests" msgstr "" -#: g10/g10.c:187 +#: g10/g10.c:190 msgid "" "@\n" "Options:\n" " " msgstr "" -#: g10/g10.c:189 +#: g10/g10.c:192 msgid "create ascii armored output" msgstr "" -#: g10/g10.c:191 +#: g10/g10.c:194 msgid "use this user-id to sign or decrypt" msgstr "" -#: g10/g10.c:192 +#: g10/g10.c:195 msgid "use this user-id for encryption" msgstr "" -#: g10/g10.c:193 +#: g10/g10.c:196 msgid "|N|set compress level N (0 disables)" msgstr "" -#: g10/g10.c:194 +#: g10/g10.c:197 msgid "use canonical text mode" msgstr "" -#: g10/g10.c:196 +#: g10/g10.c:199 msgid "use as output file" msgstr "" -#: g10/g10.c:197 +#: g10/g10.c:200 msgid "verbose" msgstr "" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:199 +#: g10/g10.c:202 msgid "batch mode: never ask" msgstr "" -#: g10/g10.c:200 +#: g10/g10.c:203 msgid "assume yes on most questions" msgstr "" -#: g10/g10.c:201 +#: g10/g10.c:204 msgid "assume no on most questions" msgstr "" -#: g10/g10.c:202 +#: g10/g10.c:205 msgid "add this keyring to the list of keyrings" msgstr "" -#: g10/g10.c:203 +#: g10/g10.c:206 msgid "add this secret keyring to the list" msgstr "" -#: g10/g10.c:204 +#: g10/g10.c:207 msgid "|NAME|use NAME as default secret key" msgstr "" -#: g10/g10.c:205 +#: g10/g10.c:208 msgid "read options from file" msgstr "" -#: g10/g10.c:207 +#: g10/g10.c:210 msgid "set debugging flags" msgstr "" -#: g10/g10.c:208 +#: g10/g10.c:211 msgid "enable full debugging" msgstr "" -#: g10/g10.c:209 +#: g10/g10.c:212 msgid "|FD|write status info to this FD" msgstr "" -#: g10/g10.c:210 +#: g10/g10.c:213 msgid "do not write comment packets" msgstr "" -#: g10/g10.c:211 +#: g10/g10.c:214 msgid "(default is 1)" msgstr "" -#: g10/g10.c:212 +#: g10/g10.c:215 msgid "(default is 3)" msgstr "" -#: g10/g10.c:213 -msgid "|file|load extension module" +#: g10/g10.c:216 +msgid "|FILE|load extension module FILE" msgstr "" -#: g10/g10.c:214 +#: g10/g10.c:217 msgid "emulate the mode described in RFC1991" msgstr "" -#: g10/g10.c:216 +#: g10/g10.c:218 +msgid "|N|use passphrase mode N" +msgstr "" + +#: g10/g10.c:220 +msgid "|NAME|use message digest algorithm NAME for passphrases" +msgstr "" + +#: g10/g10.c:222 +msgid "|NAME|use cipher algorithm NAME for passphrases" +msgstr "" + +#: g10/g10.c:224 msgid "|NAME|use cipher algorithm NAME" msgstr "" -#: g10/g10.c:217 +#: g10/g10.c:225 msgid "|NAME|use message digest algorithm NAME" msgstr "" -#: g10/g10.c:218 +#: g10/g10.c:226 msgid "|N|use compress algorithm N" msgstr "" -#: g10/g10.c:219 +#: g10/g10.c:227 msgid "throw keyid field of encrypted packets" msgstr "" -#: g10/g10.c:227 +#: g10/g10.c:235 msgid "" "@\n" "Examples:\n" "\n" " -se -r Bob [file] sign and encrypt for user Bob\n" -" -sat [file] make a clear text signature\n" -" -sb [file] make a detached signature\n" -" -k [userid] show keys\n" -" -kc [userid] show fingerprint\n" +" --clearsign [file] make a clear text signature\n" +" --detach-sign [file] make a detached signature\n" +" --list-keys [names] show keys\n" +" --fingerprint [names] show fingerprints\n" msgstr "" -#: g10/g10.c:302 +#: g10/g10.c:310 msgid "Please report bugs to <[email protected]>.\n" msgstr "" -#: g10/g10.c:307 +#: g10/g10.c:315 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "" -#: g10/g10.c:309 +#: g10/g10.c:317 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "" -#: g10/g10.c:314 +#: g10/g10.c:322 msgid "" "Syntax: gpgm [options] [files]\n" "GNUPG maintenance utility\n" msgstr "" -#: g10/g10.c:317 +#: g10/g10.c:325 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" "default operation depends on the input data\n" msgstr "" -#: g10/g10.c:323 +#: g10/g10.c:331 msgid "" "\n" "Supported algorithms:\n" msgstr "" -#: g10/g10.c:398 +#: g10/g10.c:406 msgid "usage: gpgm [options] " msgstr "" -#: g10/g10.c:400 +#: g10/g10.c:408 msgid "usage: gpg [options] " msgstr "" -#: g10/g10.c:441 +#: g10/g10.c:449 msgid "conflicting commands\n" msgstr "" -#: g10/g10.c:547 +#: g10/g10.c:588 #, c-format msgid "note: no default option file '%s'\n" msgstr "" -#: g10/g10.c:551 +#: g10/g10.c:592 #, c-format msgid "option file '%s': %s\n" msgstr "" -#: g10/g10.c:558 +#: g10/g10.c:599 #, c-format msgid "reading options from '%s'\n" msgstr "" -#: g10/g10.c:737 +#: g10/g10.c:765 g10/g10.c:777 msgid "selected cipher algorithm is invalid\n" msgstr "" -#: g10/g10.c:743 +#: g10/g10.c:771 g10/g10.c:783 msgid "selected digest algorithm is invalid\n" msgstr "" -#: g10/g10.c:746 +#: g10/g10.c:786 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "" -#: g10/g10.c:748 +#: g10/g10.c:788 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/g10.c:750 +#: g10/g10.c:790 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/g10.c:833 +#: g10/g10.c:793 +msgid "note: simple S2K mode (0) is strongly discouraged\n" +msgstr "" + +#: g10/g10.c:797 +msgid "invalid S2K mode; must be 0, 1 or 3\n" +msgstr "" + +#: g10/g10.c:872 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "" -#: g10/g10.c:839 +#: g10/g10.c:878 msgid "--store [filename]" msgstr "" -#: g10/g10.c:847 +#: g10/g10.c:886 msgid "--symmetric [filename]" msgstr "" -#: g10/g10.c:855 +#: g10/g10.c:894 msgid "--encrypt [filename]" msgstr "" -#: g10/g10.c:868 +#: g10/g10.c:907 msgid "--sign [filename]" msgstr "" -#: g10/g10.c:881 +#: g10/g10.c:920 msgid "--sign --encrypt [filename]" msgstr "" -#: g10/g10.c:895 +#: g10/g10.c:934 msgid "--clearsign [filename]" msgstr "" -#: g10/g10.c:907 +#: g10/g10.c:946 msgid "--decrypt [filename]" msgstr "" -#: g10/g10.c:916 +#: g10/g10.c:955 msgid "--edit-key username" msgstr "" -#: g10/g10.c:924 +#: g10/g10.c:963 msgid "--delete-secret-key username" msgstr "" -#: g10/g10.c:927 +#: g10/g10.c:966 msgid "--delete-key username" msgstr "" -#: g10/encode.c:211 g10/g10.c:950 g10/keylist.c:79 +#: g10/encode.c:213 g10/g10.c:989 g10/keylist.c:79 #, c-format msgid "can't open %s: %s\n" msgstr "" -#: g10/g10.c:961 +#: g10/g10.c:1000 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "" -#: g10/g10.c:1016 +#: g10/g10.c:1055 #, c-format msgid "dearmoring failed: %s\n" msgstr "" -#: g10/g10.c:1024 +#: g10/g10.c:1063 #, c-format msgid "enarmoring failed: %s\n" msgstr "" -#: g10/g10.c:1085 +#: g10/g10.c:1124 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "" -#: g10/g10.c:1155 +#: g10/g10.c:1194 msgid "[filename]" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1157 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1196 g10/verify.c:66 #, c-format msgid "can't open '%s'\n" msgstr "" -#: g10/g10.c:1202 +#: g10/g10.c:1241 msgid "" "RSA keys are deprecated; please consider creating a new key and use this key " "in the future\n" msgstr "" +#: g10/armor.c:335 g10/armor.c:375 +msgid "armor header: " +msgstr "" + +#: g10/armor.c:340 +msgid "invalid clearsig header\n" +msgstr "" + +#: g10/armor.c:366 +msgid "invalid armor header: " +msgstr "" + +#: g10/armor.c:440 +#, c-format +msgid "armor: %s\n" +msgstr "" + +#: g10/armor.c:484 +msgid "invalid dash escaped line: " +msgstr "" + +#: g10/armor.c:553 +msgid "invalid clear text header: " +msgstr "" + +#: g10/armor.c:783 +#, c-format +msgid "invalid radix64 character %02x skipped\n" +msgstr "" + +#: g10/armor.c:816 +msgid "premature eof (no CRC)\n" +msgstr "" + +#: g10/armor.c:835 +msgid "premature eof (in CRC)\n" +msgstr "" + +#: g10/armor.c:839 +msgid "malformed CRC\n" +msgstr "" + +#: g10/armor.c:843 +#, c-format +msgid "CRC error; %06lx - %06lx\n" +msgstr "" + +#: g10/armor.c:862 +msgid "premature eof (in Trailer)\n" +msgstr "" + +#: g10/armor.c:866 +msgid "error in trailer line\n" +msgstr "" + +#: g10/armor.c:1120 +msgid "no valid RFC1991 or OpenPGP data found.\n" +msgstr "" + #: g10/pkclist.c:71 #, c-format msgid "" @@ -512,15 +591,15 @@ msgid "" "\n" msgstr "" -#: g10/pkclist.c:189 +#: g10/pkclist.c:190 msgid "revoked_key.override" msgstr "If you want to use this revoked key anyway, answer \"yes\"." -#: g10/pkclist.c:190 g10/pkclist.c:277 +#: g10/pkclist.c:191 g10/pkclist.c:281 msgid "Use this key anyway? " msgstr "" -#: g10/pkclist.c:272 +#: g10/pkclist.c:276 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -528,82 +607,82 @@ msgid "" "\n" msgstr "" -#: g10/pkclist.c:276 +#: g10/pkclist.c:280 msgid "untrusted_key.override" msgstr "If you want to use this untrusted key anyway, answer \"yes\"." -#: g10/pkclist.c:281 +#: g10/pkclist.c:285 msgid "WARNING: Using untrusted key!\n" msgstr "" -#: g10/pkclist.c:317 +#: g10/pkclist.c:321 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "" -#: g10/pkclist.c:318 +#: g10/pkclist.c:322 msgid " This could mean that the signature is forgery.\n" msgstr "" -#: g10/pkclist.c:339 +#: g10/pkclist.c:343 msgid "Note: This key has expired!\n" msgstr "" -#: g10/pkclist.c:346 +#: g10/pkclist.c:350 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" -#: g10/pkclist.c:348 +#: g10/pkclist.c:352 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" -#: g10/pkclist.c:363 +#: g10/pkclist.c:367 msgid "WARNING: We do NOT trust this key!\n" msgstr "" -#: g10/pkclist.c:364 +#: g10/pkclist.c:368 msgid " The signature is probably a FORGERY.\n" msgstr "" -#: g10/pkclist.c:371 +#: g10/pkclist.c:375 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" -#: g10/pkclist.c:374 +#: g10/pkclist.c:378 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" -#: g10/pkclist.c:419 +#: g10/pkclist.c:423 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" msgstr "" -#: g10/pkclist.c:423 +#: g10/pkclist.c:427 msgid "pklist.user_id.enter" msgstr "" "Enter the user id of the addresse to whom you want to send the message." -#: g10/pkclist.c:424 +#: g10/pkclist.c:428 msgid "Enter the user ID: " msgstr "" -#: g10/pkclist.c:435 +#: g10/pkclist.c:439 msgid "No such user ID.\n" msgstr "" -#: g10/pkclist.c:469 g10/pkclist.c:496 +#: g10/pkclist.c:473 g10/pkclist.c:500 #, c-format msgid "%s: skipped: %s\n" msgstr "" -#: g10/pkclist.c:477 +#: g10/pkclist.c:481 #, c-format msgid "%s: error checking key: %s\n" msgstr "" -#: g10/pkclist.c:503 +#: g10/pkclist.c:507 msgid "no valid addressees\n" msgstr "" @@ -844,7 +923,7 @@ msgid "" "\n" msgstr "" -#: g10/keyedit.c:379 g10/keygen.c:694 +#: g10/keyedit.c:377 g10/keygen.c:694 msgid "passphrase not correctly repeated; try again.\n" msgstr "" @@ -909,32 +988,37 @@ msgstr "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." msgid "Really create? " msgstr "" -#: g10/encode.c:87 +#: g10/encode.c:88 #, c-format msgid "%s: can't open: %s\n" msgstr "" -#: g10/encode.c:106 +#: g10/encode.c:107 #, c-format msgid "error creating passphrase: %s\n" msgstr "" -#: g10/encode.c:151 g10/encode.c:262 +#: g10/encode.c:152 g10/encode.c:264 #, c-format msgid "%s: warning: empty file\n" msgstr "" -#: g10/encode.c:217 +#: g10/encode.c:219 #, c-format msgid "reading from '%s'\n" msgstr "" -#: g10/encode.c:390 +#: g10/encode.c:392 #, c-format msgid "%s encrypted for: %s\n" msgstr "" -#: g10/import.c:105 g10/trustdb.c:1342 +#: g10/getkey.c:884 +#, c-format +msgid "using secondary key %08lX instead of primary key %08lX\n" +msgstr "" + +#: g10/import.c:105 g10/trustdb.c:1349 #, c-format msgid "can't open file: %s\n" msgstr "" @@ -944,192 +1028,193 @@ msgstr "" msgid "skipping block of type %d\n" msgstr "" -#: g10/import.c:131 g10/trustdb.c:1420 +#: g10/import.c:131 g10/trustdb.c:1427 #, c-format msgid "read error: %s\n" msgstr "" -#: g10/import.c:271 g10/import.c:441 +#: g10/import.c:272 g10/import.c:445 #, c-format msgid "key %08lX: no user id\n" msgstr "" -#: g10/import.c:281 +#: g10/import.c:282 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "" -#: g10/import.c:283 +#: g10/import.c:284 msgid "this may be caused by a missing self-signature\n" msgstr "" -#: g10/import.c:291 g10/import.c:508 +#: g10/import.c:293 g10/import.c:511 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "" -#: g10/import.c:297 +#: g10/import.c:299 msgid "no default public keyring\n" msgstr "" -#: g10/import.c:301 +#: g10/import.c:303 #, c-format msgid "writing to '%s'\n" msgstr "" -#: g10/import.c:305 g10/import.c:359 g10/import.c:562 +#: g10/import.c:307 g10/import.c:362 g10/import.c:565 #, c-format msgid "can't lock public keyring: %s\n" msgstr "" -#: g10/import.c:308 +#: g10/import.c:310 #, c-format msgid "can't write to keyring: %s\n" msgstr "" #. we are ready -#: g10/import.c:311 +#: g10/import.c:313 #, c-format msgid "key %08lX: public key imported\n" msgstr "" -#: g10/import.c:320 +#: g10/import.c:322 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "" -#: g10/import.c:333 g10/import.c:517 +#: g10/import.c:335 g10/import.c:520 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "" -#: g10/import.c:340 g10/import.c:524 +#: g10/import.c:342 g10/import.c:527 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "" -#: g10/import.c:356 g10/import.c:456 g10/import.c:559 +#: g10/import.c:359 g10/import.c:460 g10/import.c:562 msgid "writing keyblock\n" msgstr "" -#: g10/import.c:362 g10/import.c:565 +#: g10/import.c:365 g10/import.c:568 #, c-format msgid "can't write keyblock: %s\n" msgstr "" -#: g10/import.c:366 +#: g10/import.c:369 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "" -#: g10/import.c:369 +#: g10/import.c:372 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "" -#: g10/import.c:372 +#: g10/import.c:375 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "" -#: g10/import.c:375 +#: g10/import.c:378 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "" -#: g10/import.c:378 +#: g10/import.c:381 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "" -#: g10/import.c:381 +#: g10/import.c:384 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "" -#: g10/import.c:385 +#: g10/import.c:388 #, c-format msgid "key %08lX: not changed\n" msgstr "" -#: g10/import.c:459 +#: g10/import.c:463 #, c-format msgid "can't lock secret keyring: %s\n" msgstr "" -#: g10/import.c:462 -msgid "can't write keyring\n" +#: g10/import.c:466 +#, c-format +msgid "can't write keyring: %s\n" msgstr "" #. we are ready -#: g10/import.c:465 +#: g10/import.c:469 #, c-format msgid "key %08lX: secret key imported\n" msgstr "" #. we can't merge secret keys -#: g10/import.c:468 +#: g10/import.c:472 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "" -#: g10/import.c:472 +#: g10/import.c:476 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "" -#: g10/import.c:502 +#: g10/import.c:505 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" -#: g10/import.c:535 +#: g10/import.c:538 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "" #. we are ready -#: g10/import.c:568 +#: g10/import.c:571 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "" -#: g10/import.c:598 +#: g10/import.c:601 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "" -#: g10/import.c:605 +#: g10/import.c:608 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "" -#: g10/import.c:606 +#: g10/import.c:609 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "" -#: g10/import.c:635 +#: g10/import.c:638 #, c-format msgid "key %08lX: skipped userid '" msgstr "" -#: g10/import.c:658 +#: g10/import.c:661 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "" -#: g10/import.c:665 +#: g10/import.c:669 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "" -#: g10/import.c:727 +#: g10/import.c:731 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "" -#: g10/import.c:790 g10/import.c:826 +#: g10/import.c:794 g10/import.c:830 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "" @@ -1179,409 +1264,417 @@ msgstr "" msgid "%d user ids without valid self-signatures detected\n" msgstr "" -#: g10/keyedit.c:250 +#: g10/keyedit.c:249 #, c-format msgid "Already signed by key %08lX\n" msgstr "" -#: g10/keyedit.c:258 +#: g10/keyedit.c:257 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "" -#: g10/keyedit.c:267 +#: g10/keyedit.c:265 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" msgstr "" -#: g10/keyedit.c:274 +#: g10/keyedit.c:272 msgid "sign_uid.okay" msgstr "" -#: g10/keyedit.c:274 +#: g10/keyedit.c:272 msgid "Really sign? " msgstr "" -#: g10/keyedit.c:295 +#: g10/keyedit.c:293 #, c-format msgid "signing failed: %s\n" msgstr "" -#: g10/keyedit.c:346 +#: g10/keyedit.c:344 msgid "This key is not protected.\n" msgstr "" -#: g10/keyedit.c:349 +#: g10/keyedit.c:347 msgid "Key is protected.\n" msgstr "" -#: g10/keyedit.c:366 +#: g10/keyedit.c:364 #, c-format msgid "Can't edit this key: %s\n" msgstr "" -#: g10/keyedit.c:371 +#: g10/keyedit.c:369 msgid "" "Enter the new passphrase for this secret key.\n" "\n" msgstr "" -#: g10/keyedit.c:383 +#: g10/keyedit.c:381 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" msgstr "" -#: g10/keyedit.c:385 +#: g10/keyedit.c:383 msgid "change_passwd.empty.okay" msgstr "" -#: g10/keyedit.c:386 +#: g10/keyedit.c:384 msgid "Do you really want to do this? " msgstr "" -#: g10/keyedit.c:441 +#: g10/keyedit.c:439 msgid "quit" msgstr "" -#: g10/keyedit.c:441 +#: g10/keyedit.c:439 msgid "quit this menu" msgstr "" -#: g10/keyedit.c:442 +#: g10/keyedit.c:440 msgid "q" msgstr "" -#: g10/keyedit.c:443 +#: g10/keyedit.c:441 msgid "save" msgstr "" -#: g10/keyedit.c:443 +#: g10/keyedit.c:441 msgid "save and quit" msgstr "" -#: g10/keyedit.c:444 +#: g10/keyedit.c:442 msgid "help" msgstr "" -#: g10/keyedit.c:444 +#: g10/keyedit.c:442 msgid "show this help" msgstr "" -#: g10/keyedit.c:446 +#: g10/keyedit.c:444 msgid "fpr" msgstr "" -#: g10/keyedit.c:446 +#: g10/keyedit.c:444 msgid "show fingerprint" msgstr "" -#: g10/keyedit.c:447 +#: g10/keyedit.c:445 msgid "list" msgstr "" -#: g10/keyedit.c:447 +#: g10/keyedit.c:445 msgid "list key and user ids" msgstr "" -#: g10/keyedit.c:448 +#: g10/keyedit.c:446 msgid "l" msgstr "" -#: g10/keyedit.c:449 +#: g10/keyedit.c:447 msgid "uid" msgstr "" -#: g10/keyedit.c:449 +#: g10/keyedit.c:447 msgid "select user id N" msgstr "" -#: g10/keyedit.c:450 +#: g10/keyedit.c:448 msgid "key" msgstr "" -#: g10/keyedit.c:450 +#: g10/keyedit.c:448 msgid "select secondary key N" msgstr "" -#: g10/keyedit.c:451 +#: g10/keyedit.c:449 msgid "check" msgstr "" -#: g10/keyedit.c:451 +#: g10/keyedit.c:449 msgid "list signatures" msgstr "" -#: g10/keyedit.c:452 +#: g10/keyedit.c:450 msgid "c" msgstr "" -#: g10/keyedit.c:453 +#: g10/keyedit.c:451 msgid "sign" msgstr "" -#: g10/keyedit.c:453 +#: g10/keyedit.c:451 msgid "sign the key" msgstr "" -#: g10/keyedit.c:454 +#: g10/keyedit.c:452 msgid "s" msgstr "" -#: g10/keyedit.c:455 +#: g10/keyedit.c:453 msgid "debug" msgstr "" -#: g10/keyedit.c:456 +#: g10/keyedit.c:454 msgid "adduid" msgstr "" -#: g10/keyedit.c:456 +#: g10/keyedit.c:454 msgid "add a user id" msgstr "" -#: g10/keyedit.c:457 +#: g10/keyedit.c:455 msgid "deluid" msgstr "" -#: g10/keyedit.c:457 +#: g10/keyedit.c:455 msgid "delete user id" msgstr "" -#: g10/keyedit.c:458 +#: g10/keyedit.c:456 msgid "addkey" msgstr "" -#: g10/keyedit.c:458 +#: g10/keyedit.c:456 msgid "add a secondary key" msgstr "" -#: g10/keyedit.c:459 +#: g10/keyedit.c:457 msgid "delkey" msgstr "" -#: g10/keyedit.c:459 +#: g10/keyedit.c:457 msgid "delete a secondary key" msgstr "" -#: g10/keyedit.c:460 +#: g10/keyedit.c:458 msgid "toggle" msgstr "" -#: g10/keyedit.c:460 +#: g10/keyedit.c:458 msgid "toggle between secret and public key listing" msgstr "" -#: g10/keyedit.c:462 +#: g10/keyedit.c:460 msgid "t" msgstr "" -#: g10/keyedit.c:463 +#: g10/keyedit.c:461 msgid "pref" msgstr "" -#: g10/keyedit.c:463 +#: g10/keyedit.c:461 msgid "list preferences" msgstr "" -#: g10/keyedit.c:464 +#: g10/keyedit.c:462 msgid "passwd" msgstr "" -#: g10/keyedit.c:464 +#: g10/keyedit.c:462 msgid "change the passphrase" msgstr "" -#: g10/keyedit.c:465 +#: g10/keyedit.c:463 msgid "trust" msgstr "" -#: g10/keyedit.c:465 +#: g10/keyedit.c:463 msgid "change the ownertrust" msgstr "" -#: g10/keyedit.c:483 +#: g10/keyedit.c:481 msgid "can't do that in batchmode\n" msgstr "" #. check that they match #. FIXME: check that they both match -#: g10/keyedit.c:506 +#: g10/keyedit.c:504 msgid "Secret key is available.\n" msgstr "" -#: g10/keyedit.c:522 +#: g10/keyedit.c:520 msgid "keyedit.cmd" msgstr "Please enter \"help\"." -#: g10/keyedit.c:522 +#: g10/keyedit.c:520 msgid "Command> " msgstr "" -#: g10/keyedit.c:547 +#: g10/keyedit.c:545 msgid "Need the secret key to to this.\n" msgstr "" -#: g10/keyedit.c:566 +#: g10/keyedit.c:564 msgid "keyedit.save.okay" msgstr "" -#: g10/keyedit.c:567 +#: g10/keyedit.c:565 msgid "Save changes? " msgstr "" -#: g10/keyedit.c:569 +#: g10/keyedit.c:567 msgid "keyedit.cancel.okay" msgstr "" -#: g10/keyedit.c:570 +#: g10/keyedit.c:568 msgid "Quit without saving? " msgstr "" -#: g10/keyedit.c:580 +#: g10/keyedit.c:578 #, c-format msgid "update failed: %s\n" msgstr "" -#: g10/keyedit.c:587 +#: g10/keyedit.c:585 #, c-format msgid "update secret failed: %s\n" msgstr "" -#: g10/keyedit.c:595 +#: g10/keyedit.c:593 msgid "Key not changed so no update needed.\n" msgstr "" -#: g10/keyedit.c:625 +#: g10/keyedit.c:623 msgid "keyedit.sign_all.okay" msgstr "" -#: g10/keyedit.c:626 +#: g10/keyedit.c:624 msgid "Really sign all user ids? " msgstr "" -#: g10/keyedit.c:627 +#: g10/keyedit.c:625 msgid "Hint: Select the user ids to sign\n" msgstr "" -#: g10/keyedit.c:655 +#: g10/keyedit.c:653 msgid "You must select at least one user id.\n" msgstr "" -#: g10/keyedit.c:657 +#: g10/keyedit.c:655 msgid "You can't delete the last user id!\n" msgstr "" -#: g10/keyedit.c:659 +#: g10/keyedit.c:657 msgid "keyedit.remove.uid.okay" msgstr "" -#: g10/keyedit.c:660 +#: g10/keyedit.c:658 msgid "Really remove all selected user ids? " msgstr "" -#: g10/keyedit.c:661 +#: g10/keyedit.c:659 msgid "Really remove this user id? " msgstr "" -#: g10/keyedit.c:684 +#: g10/keyedit.c:682 msgid "You must select at least one key.\n" msgstr "" -#: g10/keyedit.c:686 +#: g10/keyedit.c:684 msgid "keyedit.remove.subkey.okay" msgstr "" -#: g10/keyedit.c:688 +#: g10/keyedit.c:686 msgid "Do you really want to delete the selected keys? " msgstr "" -#: g10/keyedit.c:689 +#: g10/keyedit.c:687 msgid "Do you really want to delete this key? " msgstr "" -#: g10/keyedit.c:726 +#: g10/keyedit.c:724 msgid "Invalid command (try \"help\")\n" msgstr "" -#: g10/keyedit.c:1106 +#: g10/keyedit.c:1104 #, c-format msgid "No user id with index %d\n" msgstr "" -#: g10/keyedit.c:1151 +#: g10/keyedit.c:1149 #, c-format msgid "No secondary key with index %d\n" msgstr "" -#: g10/mainproc.c:198 +#: g10/mainproc.c:200 #, c-format msgid "public key decryption failed: %s\n" msgstr "" -#: g10/mainproc.c:228 +#: g10/mainproc.c:230 #, c-format msgid "decryption failed: %s\n" msgstr "" -#: g10/mainproc.c:842 +#: g10/mainproc.c:247 +msgid "note: sender requested \"for-your-eyes-only\"\n" +msgstr "" + +#: g10/mainproc.c:846 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "" -#: g10/mainproc.c:848 +#: g10/mainproc.c:852 msgid "BAD signature from \"" msgstr "" -#: g10/mainproc.c:849 +#: g10/mainproc.c:853 msgid "Good signature from \"" msgstr "" -#: g10/mainproc.c:860 +#: g10/mainproc.c:864 #, c-format msgid "Can't check signature: %s\n" msgstr "" -#: g10/passphrase.c:117 +#: g10/passphrase.c:141 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" "user: \"" msgstr "" -#: g10/passphrase.c:126 +#: g10/passphrase.c:150 #, c-format msgid "(%u-bit %s key, ID %08lX, created %s)\n" msgstr "" -#: g10/passphrase.c:167 +#: g10/passphrase.c:174 msgid "passphrase.enter" msgstr "" "Please enter the passhrase; this is a secret sentence \n" " Blurb, blurb,.... " -#: g10/passphrase.c:167 +#: g10/passphrase.c:174 msgid "Enter pass phrase: " msgstr "" -#: g10/passphrase.c:170 +#: g10/passphrase.c:177 msgid "passphrase.repeat" msgstr "Please repeat the last passphrase, so you are sure what you typed in." -#: g10/passphrase.c:171 +#: g10/passphrase.c:178 msgid "Repeat pass phrase: " msgstr "" -#: g10/plaintext.c:210 +#: g10/plaintext.c:102 +msgid "data not saved; use option \"--output\" to save it\n" +msgstr "" + +#: g10/plaintext.c:214 msgid "detached_signature.filename" msgstr "" -#: g10/plaintext.c:211 +#: g10/plaintext.c:215 msgid "Please enter name of data file: " msgstr "" -#: g10/plaintext.c:295 +#: g10/plaintext.c:299 #, c-format msgid "can't open signed data '%s'\n" msgstr "" @@ -1599,6 +1692,11 @@ msgstr "" msgid "Warning: Weak key detected - please change passphrase again.\n" msgstr "" +#: g10/sig-check.c:155 +msgid "" +"this is a PGP generated ElGamal key which is NOT secure for signatures!\n" +msgstr "" + #: g10/sig-check.c:165 msgid "public key created in future (time warp or clock problem)\n" msgstr "" @@ -1608,76 +1706,86 @@ msgstr "" msgid "warning: signature key expired %s\n" msgstr "" -#: g10/trustdb.c:316 +#: g10/trustdb.c:318 #, c-format msgid "error reading sigrec: %s\n" msgstr "" -#: g10/trustdb.c:321 +#: g10/trustdb.c:323 #, c-format msgid "chained sigrec %lu has a wrong owner\n" msgstr "" -#: g10/trustdb.c:364 +#: g10/trustdb.c:370 #, c-format msgid "key %08lX: secret key without public key\n" msgstr "" -#: g10/trustdb.c:369 +#: g10/trustdb.c:375 #, c-format msgid "key %08lX: secret and public key don't match\n" msgstr "" -#: g10/trustdb.c:380 +#: g10/trustdb.c:386 #, c-format msgid "key %08lX: can't put it into the trustdb\n" msgstr "" -#: g10/trustdb.c:386 +#: g10/trustdb.c:392 #, c-format msgid "key %08lX: query record failed\n" msgstr "" -#: g10/trustdb.c:395 +#: g10/trustdb.c:401 #, c-format msgid "key %08lX: already in ultikey_table\n" msgstr "" -#: g10/trustdb.c:402 +#: g10/trustdb.c:408 #, c-format msgid "enum_secret_keys failed: %s\n" msgstr "" -#: g10/trustdb.c:1614 +#: g10/trustdb.c:913 +#, c-format +msgid "key %08lX.%lu, uid %02X%02X: no public key for signature %08lX\n" +msgstr "" + +#: g10/trustdb.c:920 +#, c-format +msgid "key %08lX.%lu, uid %02X%02X: invalid %ssignature: %s\n" +msgstr "" + +#: g10/trustdb.c:1624 #, c-format msgid "key %08lX: insert trust record failed: %s\n" msgstr "" -#: g10/trustdb.c:1618 +#: g10/trustdb.c:1628 #, c-format msgid "key %08lX.%lu: inserted into trustdb\n" msgstr "" -#: g10/trustdb.c:1629 +#: g10/trustdb.c:1639 #, c-format msgid "key %08lX.%lu: created in future (time warp or clock problem)\n" msgstr "" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1647 #, c-format msgid "key %08lX.%lu: expired at %s\n" msgstr "" -#: g10/trustdb.c:1646 +#: g10/trustdb.c:1656 #, c-format msgid "key %08lX.%lu: trust check failed: %s\n" msgstr "" -#: g10/status.c:233 +#: g10/status.c:246 msgid "No help available" msgstr "" -#: g10/status.c:239 +#: g10/status.c:252 #, c-format msgid "No help available for '%s'" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.4.0\n" -"POT-Creation-Date: 1998-09-18 17:16+0200\n" +"POT-Creation-Date: 1998-09-30 19:01+0200\n" "PO-Revision-Date: 1998-09-17 03:14+0200\n" "Last-Translator: Ga�l Qu�ri <[email protected]>\n" "Language-Team: French <[email protected]>\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=iso8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: util/secmem.c:226 +#: util/secmem.c:77 msgid "Warning: using insecure memory!\n" msgstr "Attention: utilisation de la m�moire non s�re!\n" @@ -55,7 +55,7 @@ msgstr "" "Il n'y a pas assez d'octets al�atoires disponibles. Faites autre chose\n" "pour que l'OS puisse amasser plus d'entropie! (il faut %d octets de plus)\n" -#: g10/g10.c:143 +#: g10/g10.c:146 msgid "" "@Commands:\n" " " @@ -63,115 +63,115 @@ msgstr "" "@Commandes:\n" " " -#: g10/g10.c:146 +#: g10/g10.c:149 msgid "|[file]|make a signature" msgstr "|[fichier]|faire une signature" -#: g10/g10.c:147 +#: g10/g10.c:150 msgid "|[file]|make a clear text signature" msgstr "|[fichier]|faire une signature en texte clair" -#: g10/g10.c:148 +#: g10/g10.c:151 msgid "make a detached signature" msgstr "faire une signature d�tach�e" -#: g10/g10.c:149 +#: g10/g10.c:152 msgid "encrypt data" msgstr "crypter les donn�es" -#: g10/g10.c:150 +#: g10/g10.c:153 msgid "encryption only with symmetric cipher" msgstr "cryptage sym�trique seumement" -#: g10/g10.c:151 +#: g10/g10.c:154 msgid "store only" msgstr "pas d'action" -#: g10/g10.c:152 +#: g10/g10.c:155 msgid "decrypt data (default)" msgstr "d�crypter les donn�es (d�faut)" -#: g10/g10.c:153 +#: g10/g10.c:156 msgid "verify a signature" msgstr "v�rifier une signature" -#: g10/g10.c:155 +#: g10/g10.c:158 msgid "list keys" msgstr "lister les cl�s" -#: g10/g10.c:156 +#: g10/g10.c:159 msgid "list keys and signatures" msgstr "lister les cl�s et les signatures" -#: g10/g10.c:157 +#: g10/g10.c:160 msgid "check key signatures" msgstr "v�rifier les signatures des cl�s" -#: g10/g10.c:158 +#: g10/g10.c:161 msgid "list keys and fingerprints" msgstr "lister les cl�s et les empreintes" -#: g10/g10.c:159 +#: g10/g10.c:162 msgid "list secret keys" msgstr "lister les cl�s secr�tes" -#: g10/g10.c:161 +#: g10/g10.c:164 msgid "generate a new key pair" msgstr "g�n�rer une nouvelle paire de cl�s" -#: g10/g10.c:163 +#: g10/g10.c:166 msgid "remove key from the public keyring" msgstr "enlever la cl� du porte-cl�s public" -#: g10/g10.c:165 +#: g10/g10.c:168 msgid "sign or edit a key" msgstr "signer ou �diter une cl�" -#: g10/g10.c:166 +#: g10/g10.c:169 msgid "generate a revocation certificate" msgstr "g�n�rer un certificat de r�vocation" -#: g10/g10.c:168 +#: g10/g10.c:171 msgid "export keys" msgstr "exporter les cl�s" -#: g10/g10.c:171 +#: g10/g10.c:174 msgid "import/merge keys" msgstr "importer/fusionner les cl�s" -#: g10/g10.c:172 +#: g10/g10.c:175 msgid "list only the sequence of packets" msgstr "ne lister qu'une suite de paquets" -#: g10/g10.c:174 +#: g10/g10.c:177 msgid "export the ownertrust values" msgstr "exporter les valeurs de confiance" -#: g10/g10.c:175 +#: g10/g10.c:178 msgid "import ownertrust values" msgstr "importer les valeurs de confiance" -#: g10/g10.c:176 +#: g10/g10.c:179 msgid "|[NAMES]|check the trust database" msgstr "|[NOMS]|v�rifier la base de confiance" -#: g10/g10.c:177 +#: g10/g10.c:180 msgid "De-Armor a file or stdin" msgstr "Enlever l'armure d'un fichier ou de stdin" -#: g10/g10.c:178 +#: g10/g10.c:181 msgid "En-Armor a file or stdin" msgstr "Mettre une armure � un fichier ou � stdin" -#: g10/g10.c:179 +#: g10/g10.c:182 msgid "|algo [files]|print message digests" msgstr "|alg. [fich.]|indiquer les fonctions de hachage" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "print all message digests" msgstr "�crire toutes les fonctions de hachage" -#: g10/g10.c:187 +#: g10/g10.c:190 msgid "" "@\n" "Options:\n" @@ -181,112 +181,129 @@ msgstr "" "Options:\n" " " -#: g10/g10.c:189 +#: g10/g10.c:192 msgid "create ascii armored output" msgstr "cr�er une sortie ascii armur�e" -#: g10/g10.c:191 +#: g10/g10.c:194 msgid "use this user-id to sign or decrypt" msgstr "utiliser ce nom d'utilisateur pour signer/d�crypter" -#: g10/g10.c:192 +#: g10/g10.c:195 msgid "use this user-id for encryption" msgstr "utiliser ce nom d'utilisateur pour crypter" -#: g10/g10.c:193 +#: g10/g10.c:196 msgid "|N|set compress level N (0 disables)" msgstr "|N|niveau de compression N (0 d�sactive)" -#: g10/g10.c:194 +#: g10/g10.c:197 msgid "use canonical text mode" msgstr "utiliser le mode de texte canonique" -#: g10/g10.c:196 +#: g10/g10.c:199 msgid "use as output file" msgstr "utiliser comme fichier de sortie" -#: g10/g10.c:197 +#: g10/g10.c:200 msgid "verbose" msgstr "bavard" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:199 +#: g10/g10.c:202 msgid "batch mode: never ask" msgstr "mode automatique: ne jamais demander" -#: g10/g10.c:200 +#: g10/g10.c:203 msgid "assume yes on most questions" msgstr "supposer oui � la plupart des questions" -#: g10/g10.c:201 +#: g10/g10.c:204 msgid "assume no on most questions" msgstr "supposer non � la plupart des questions" -#: g10/g10.c:202 +#: g10/g10.c:205 msgid "add this keyring to the list of keyrings" msgstr "ajouter ce porte-cl�s � la liste des porte-cl�s" -#: g10/g10.c:203 +#: g10/g10.c:206 msgid "add this secret keyring to the list" msgstr "ajouter ce porte-cl�s secret � la liste" -#: g10/g10.c:204 +#: g10/g10.c:207 msgid "|NAME|use NAME as default secret key" msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut" -#: g10/g10.c:205 +#: g10/g10.c:208 msgid "read options from file" msgstr "lire les options du fichier" -#: g10/g10.c:207 +#: g10/g10.c:210 msgid "set debugging flags" msgstr "choisir les attributs de d�boguage" -#: g10/g10.c:208 +#: g10/g10.c:211 msgid "enable full debugging" msgstr "permettre un d�boguage complet" -#: g10/g10.c:209 +#: g10/g10.c:212 msgid "|FD|write status info to this FD" msgstr "|FD|�crire les informations d'�tat sur ce descripteur" -#: g10/g10.c:210 +#: g10/g10.c:213 msgid "do not write comment packets" msgstr "ne pas �crire de paquets de commentaire" -#: g10/g10.c:211 +#: g10/g10.c:214 msgid "(default is 1)" msgstr "(1 par d�faut)" -#: g10/g10.c:212 +#: g10/g10.c:215 msgid "(default is 3)" msgstr "(3 par d�faut)" -#: g10/g10.c:213 -msgid "|file|load extension module" +#: g10/g10.c:216 +#, fuzzy +msgid "|FILE|load extension module FILE" msgstr "|fich|charger un module d'extension" -#: g10/g10.c:214 +#: g10/g10.c:217 msgid "emulate the mode described in RFC1991" msgstr "�muler le mode d�crit dans la RFC1991" -#: g10/g10.c:216 +#: g10/g10.c:218 +#, fuzzy +msgid "|N|use passphrase mode N" +msgstr "Entrez le mot de passe: " + +#: g10/g10.c:220 +#, fuzzy +msgid "|NAME|use message digest algorithm NAME for passphrases" +msgstr "|NOM|utiliser la fonction de hachage NOM" + +#: g10/g10.c:222 +#, fuzzy +msgid "|NAME|use cipher algorithm NAME for passphrases" +msgstr "|NOM|utiliser l'algorithme de cryptage NOM" + +#: g10/g10.c:224 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOM|utiliser l'algorithme de cryptage NOM" -#: g10/g10.c:217 +#: g10/g10.c:225 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOM|utiliser la fonction de hachage NOM" -#: g10/g10.c:218 +#: g10/g10.c:226 msgid "|N|use compress algorithm N" msgstr "|N|utiliser l'algorithme de compression N" -#: g10/g10.c:219 +#: g10/g10.c:227 msgid "throw keyid field of encrypted packets" msgstr "enlever l'idendification de la cl� des paquets crypt�s" -#: g10/g10.c:227 +#: g10/g10.c:235 +#, fuzzy msgid "" "@\n" "Examples:\n" @@ -295,7 +312,7 @@ msgid "" " --clearsign [file] make a clear text signature\n" " --detach-sign [file] make a detached signature\n" " --list-keys [names] show keys\n" -" --fingerprint [names] show fingerprint\n" +" --fingerprint [names] show fingerprints\n" msgstr "" "@\n" "Exemples:\n" @@ -306,19 +323,19 @@ msgstr "" " --list-keys [utilisateur] montrer les cl�s\n" " --fingerprint [utilisateur] montrer les empreintes\n" -#: g10/g10.c:302 +#: g10/g10.c:310 msgid "Please report bugs to <[email protected]>.\n" msgstr "Rapporter toutes anomalies � <[email protected]>.\n" -#: g10/g10.c:307 +#: g10/g10.c:315 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Utilisation: gpgm [options] [fichiers] (-h pour l'aide)" -#: g10/g10.c:309 +#: g10/g10.c:317 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)" -#: g10/g10.c:314 +#: g10/g10.c:322 msgid "" "Syntax: gpgm [options] [files]\n" "GNUPG maintenance utility\n" @@ -326,7 +343,7 @@ msgstr "" "Syntaxe: gpgm [options] [fichiers]\n" "utilitaire de maitenance de GNUPG\n" -#: g10/g10.c:317 +#: g10/g10.c:325 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -336,7 +353,7 @@ msgstr "" "signer, v�rifier, crypter ou d�crypter\n" "l'op�ration par d�faut d�pend des donn�es entr�es\n" -#: g10/g10.c:323 +#: g10/g10.c:331 msgid "" "\n" "Supported algorithms:\n" @@ -344,133 +361,141 @@ msgstr "" "\n" "Algorithmes support�s:\n" -#: g10/g10.c:398 +#: g10/g10.c:406 msgid "usage: gpgm [options] " msgstr "utilisation: gpgm [options] " -#: g10/g10.c:400 +#: g10/g10.c:408 msgid "usage: gpg [options] " msgstr "utilisation: gpg [options] " -#: g10/g10.c:441 +#: g10/g10.c:449 msgid "conflicting commands\n" msgstr "commandes en conflit\n" -#: g10/g10.c:547 +#: g10/g10.c:588 #, c-format msgid "note: no default option file '%s'\n" msgstr "note: pas de fichier d'options par d�faut '%s'\n" -#: g10/g10.c:551 +#: g10/g10.c:592 #, c-format msgid "option file '%s': %s\n" msgstr "fichier d'options '%s' : %s\n" -#: g10/g10.c:558 +#: g10/g10.c:599 #, c-format msgid "reading options from '%s'\n" msgstr "lire les options de '%s'\n" -#: g10/g10.c:737 +#: g10/g10.c:765 g10/g10.c:777 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorithme de cryptage s�lectionn� est invalide\n" -#: g10/g10.c:743 +#: g10/g10.c:771 g10/g10.c:783 msgid "selected digest algorithm is invalid\n" msgstr "la fonction de hachage s�lectionn�e est invalide\n" -#: g10/g10.c:746 +#: g10/g10.c:786 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "l'algorithme de compression doit faire partie de l'�chelle %d..%d\n" -#: g10/g10.c:748 +#: g10/g10.c:788 msgid "completes-needed must be greater than 0\n" msgstr "le nombre de signatures compl�tes minimal doit �tre sup�rieur � 0\n" -#: g10/g10.c:750 +#: g10/g10.c:790 msgid "marginals-needed must be greater than 1\n" msgstr "le nombre de singatures marginales minimal doit �tre sup�rieur � 1\n" -#: g10/g10.c:833 +#: g10/g10.c:793 +msgid "note: simple S2K mode (0) is strongly discouraged\n" +msgstr "" + +#: g10/g10.c:797 +msgid "invalid S2K mode; must be 0, 1 or 3\n" +msgstr "" + +#: g10/g10.c:872 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "n'a pas pu initialiser la base de confiance: %s\n" -#: g10/g10.c:839 +#: g10/g10.c:878 msgid "--store [filename]" msgstr "--store [nom du fichier]" -#: g10/g10.c:847 +#: g10/g10.c:886 msgid "--symmetric [filename]" msgstr "--symmetric [nom du fichier]" -#: g10/g10.c:855 +#: g10/g10.c:894 msgid "--encrypt [filename]" msgstr "--encrypt [nom du fichier]" -#: g10/g10.c:868 +#: g10/g10.c:907 msgid "--sign [filename]" msgstr "--sign [nom du fichier]" -#: g10/g10.c:881 +#: g10/g10.c:920 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom du fichier]" -#: g10/g10.c:895 +#: g10/g10.c:934 msgid "--clearsign [filename]" msgstr "--clearsign [nom du fichier]" -#: g10/g10.c:907 +#: g10/g10.c:946 msgid "--decrypt [filename]" msgstr "--decrypt [nom du fichier]" -#: g10/g10.c:916 +#: g10/g10.c:955 msgid "--edit-key username" msgstr "--edit-key utilisateur" -#: g10/g10.c:924 +#: g10/g10.c:963 msgid "--delete-secret-key username" msgstr "--delete-secret-key utilisateur" -#: g10/g10.c:927 +#: g10/g10.c:966 msgid "--delete-key username" msgstr "--delete-key utilisateur" -#: g10/encode.c:211 g10/g10.c:950 g10/keylist.c:79 +#: g10/encode.c:213 g10/g10.c:989 g10/keylist.c:79 #, c-format msgid "can't open %s: %s\n" msgstr "ne peut ouvrir %s: %s\n" -#: g10/g10.c:961 +#: g10/g10.c:1000 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]" -#: g10/g10.c:1016 +#: g10/g10.c:1055 #, c-format msgid "dearmoring failed: %s\n" msgstr "suppression d'armure non r�ussie: %s\n" -#: g10/g10.c:1024 +#: g10/g10.c:1063 #, c-format msgid "enarmoring failed: %s\n" msgstr "mise d'armure non r�ussie:%s \n" -#: g10/g10.c:1085 +#: g10/g10.c:1124 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "algorithme de hachage invalide '%s'\n" -#: g10/g10.c:1155 +#: g10/g10.c:1194 msgid "[filename]" msgstr "[nom du fichier]" -#: g10/decrypt.c:59 g10/g10.c:1157 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1196 g10/verify.c:66 #, c-format msgid "can't open '%s'\n" msgstr "ne peut ouvrir '%s'\n" -#: g10/g10.c:1202 +#: g10/g10.c:1241 msgid "" "RSA keys are deprecated; please consider creating a new key and use this key " "in the future\n" @@ -478,6 +503,66 @@ msgstr "" "Les cl�s RSA sont d�conseill�es: consid�rez cr�er une nouvelle cl� et " "l'utiliser dans l'avenir\n" +#: g10/armor.c:335 g10/armor.c:375 +msgid "armor header: " +msgstr "" + +#: g10/armor.c:340 +#, fuzzy +msgid "invalid clearsig header\n" +msgstr "Caract�re invalide dans le nom\n" + +#: g10/armor.c:366 +msgid "invalid armor header: " +msgstr "" + +#: g10/armor.c:440 +#, fuzzy, c-format +msgid "armor: %s\n" +msgstr "erreur de lecture: %s\n" + +#: g10/armor.c:484 +msgid "invalid dash escaped line: " +msgstr "" + +#: g10/armor.c:553 +msgid "invalid clear text header: " +msgstr "" + +#: g10/armor.c:783 +#, fuzzy, c-format +msgid "invalid radix64 character %02x skipped\n" +msgstr "Caract�re invalide dans le nom\n" + +#: g10/armor.c:816 +msgid "premature eof (no CRC)\n" +msgstr "" + +#: g10/armor.c:835 +msgid "premature eof (in CRC)\n" +msgstr "" + +#: g10/armor.c:839 +msgid "malformed CRC\n" +msgstr "" + +#: g10/armor.c:843 +#, c-format +msgid "CRC error; %06lx - %06lx\n" +msgstr "" + +#: g10/armor.c:862 +msgid "premature eof (in Trailer)\n" +msgstr "" + +#: g10/armor.c:866 +msgid "error in trailer line\n" +msgstr "" + +#: g10/armor.c:1120 +msgid "no valid RFC1991 or OpenPGP data found.\n" +msgstr "" + #: g10/pkclist.c:71 #, c-format msgid "" @@ -551,16 +636,16 @@ msgstr "" "Pas de valeur de confiance chang�e.\n" "\n" -#: g10/pkclist.c:189 +#: g10/pkclist.c:190 msgid "revoked_key.override" msgstr "" "Si vous voulez utiliser cette cl� r�voqu�e quand-m�me, r�pondez \"oui\"." -#: g10/pkclist.c:190 g10/pkclist.c:277 +#: g10/pkclist.c:191 g10/pkclist.c:281 msgid "Use this key anyway? " msgstr "Utiliser cette cl� quand-m�me? " -#: g10/pkclist.c:272 +#: g10/pkclist.c:276 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -572,57 +657,57 @@ msgstr "" "oui � la prochaine question\n" "\n" -#: g10/pkclist.c:276 +#: g10/pkclist.c:280 msgid "untrusted_key.override" msgstr "" "Si vous voulez utiliser cette cl� peu s�re quand-m�me, r�pondez \"oui\"." -#: g10/pkclist.c:281 +#: g10/pkclist.c:285 msgid "WARNING: Using untrusted key!\n" msgstr "ATTENTION: Utilisation d'une cl� sans confiance!\n" -#: g10/pkclist.c:317 +#: g10/pkclist.c:321 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ATTENTION: Cette cl� � �t� r�voqu�e par son propri�taire\n" -#: g10/pkclist.c:318 +#: g10/pkclist.c:322 msgid " This could mean that the signature is forgery.\n" msgstr " Cela pourrait signifier que la signature est fausse.\n" -#: g10/pkclist.c:339 +#: g10/pkclist.c:343 msgid "Note: This key has expired!\n" msgstr "Note: Cette cl� a expir�!\n" -#: g10/pkclist.c:346 +#: g10/pkclist.c:350 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "" "ATTENTION: Cette cl� n'est pas certifi�e avec une signature de confiance!\n" -#: g10/pkclist.c:348 +#: g10/pkclist.c:352 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " Rien ne dit que la signature appartient au propri�taire.\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:367 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATTENTION: On ne fait PAS confiance � cette cl�\n" -#: g10/pkclist.c:364 +#: g10/pkclist.c:368 msgid " The signature is probably a FORGERY.\n" msgstr " La signature est certainement FAUSSE.\n" -#: g10/pkclist.c:371 +#: g10/pkclist.c:375 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "ATTENTION: Les signatures de cette cl� n'ont pas une confiance suffisante!\n" -#: g10/pkclist.c:374 +#: g10/pkclist.c:378 msgid " It is not certain that the signature belongs to the owner.\n" msgstr "" " Il n'est pas s�r que la signature appartient au propri�taire.\n" -#: g10/pkclist.c:419 +#: g10/pkclist.c:423 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -630,29 +715,29 @@ msgstr "" "Vous n'avez pas sp�cifi� un nom d'utilisateur. (vous pouvez utiliser " "\"-r\")\n" -#: g10/pkclist.c:423 +#: g10/pkclist.c:427 msgid "pklist.user_id.enter" msgstr "Entrez le nom de l'adresse � qui vous voulez envoyer le message." -#: g10/pkclist.c:424 +#: g10/pkclist.c:428 msgid "Enter the user ID: " msgstr "Entrez le nom d'utilisateur: " -#: g10/pkclist.c:435 +#: g10/pkclist.c:439 msgid "No such user ID.\n" msgstr "Pas de tel utilisateur.\n" -#: g10/pkclist.c:469 g10/pkclist.c:496 +#: g10/pkclist.c:473 g10/pkclist.c:500 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: saut�: %s\n" -#: g10/pkclist.c:477 +#: g10/pkclist.c:481 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: erreur pendant la v�rification de la cl�: %s\n" -#: g10/pkclist.c:503 +#: g10/pkclist.c:507 msgid "no valid addressees\n" msgstr "pas de destinataire valide\n" @@ -920,7 +1005,7 @@ msgstr "" "Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n" "\n" -#: g10/keyedit.c:379 g10/keygen.c:694 +#: g10/keyedit.c:377 g10/keygen.c:694 msgid "passphrase not correctly repeated; try again.\n" msgstr "le mot de passe n'a pas �t� correctement r�p�t�; recommencez.\n" @@ -997,32 +1082,37 @@ msgstr "R�pondez \"oui\" (ou simplement \"o\") pour g�n�rer la sous-cl�" msgid "Really create? " msgstr "Cr�er vraiment? " -#: g10/encode.c:87 +#: g10/encode.c:88 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: ne peut ouvrir: %s\n" -#: g10/encode.c:106 +#: g10/encode.c:107 #, c-format msgid "error creating passphrase: %s\n" msgstr "erreur pendant la cr�ation du mot de passe: %s\n" -#: g10/encode.c:151 g10/encode.c:262 +#: g10/encode.c:152 g10/encode.c:264 #, c-format msgid "%s: warning: empty file\n" msgstr "%s: attention: fichier vide\n" -#: g10/encode.c:217 +#: g10/encode.c:219 #, c-format msgid "reading from '%s'\n" msgstr "lecture de '%s'\n" -#: g10/encode.c:390 +#: g10/encode.c:392 #, c-format msgid "%s encrypted for: %s\n" msgstr "%s crypt� pour: %s\n" -#: g10/import.c:105 g10/trustdb.c:1342 +#: g10/getkey.c:884 +#, c-format +msgid "using secondary key %08lX instead of primary key %08lX\n" +msgstr "" + +#: g10/import.c:105 g10/trustdb.c:1349 #, c-format msgid "can't open file: %s\n" msgstr "ne peut ouvrir le fichier: %s\n" @@ -1032,197 +1122,198 @@ msgstr "ne peut ouvrir le fichier: %s\n" msgid "skipping block of type %d\n" msgstr "ne prend pas en compte le bloc du type %d\n" -#: g10/import.c:131 g10/trustdb.c:1420 +#: g10/import.c:131 g10/trustdb.c:1427 #, c-format msgid "read error: %s\n" msgstr "erreur de lecture: %s\n" -#: g10/import.c:271 g10/import.c:441 +#: g10/import.c:272 g10/import.c:445 #, c-format msgid "key %08lX: no user id\n" msgstr "cl� %08lX: pas de nom d'utilisateur\n" -#: g10/import.c:281 +#: g10/import.c:282 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "cl� %08lX: pas de nom d'utilisateur valide\n" -#: g10/import.c:283 +#: g10/import.c:284 msgid "this may be caused by a missing self-signature\n" msgstr "cela peut provenir d'une auto-signature manquante\n" -#: g10/import.c:291 g10/import.c:508 +#: g10/import.c:293 g10/import.c:511 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "cl� %08lX: cl� publique pas trouv�e: %s\n" -#: g10/import.c:297 +#: g10/import.c:299 msgid "no default public keyring\n" msgstr "pas de porte-cl�s public par d�faut\n" -#: g10/import.c:301 +#: g10/import.c:303 #, c-format msgid "writing to '%s'\n" msgstr "�criture de '%s'\n" -#: g10/import.c:305 g10/import.c:359 g10/import.c:562 +#: g10/import.c:307 g10/import.c:362 g10/import.c:565 #, c-format msgid "can't lock public keyring: %s\n" msgstr "ne peut verrouiller le porte-cl�s public: %s\n" -#: g10/import.c:308 +#: g10/import.c:310 #, c-format msgid "can't write to keyring: %s\n" msgstr "ne peut �crire sur le porte-cl�s: %s\n" #. we are ready -#: g10/import.c:311 +#: g10/import.c:313 #, c-format msgid "key %08lX: public key imported\n" msgstr "cl� %08lX: cl� publique import�e\n" -#: g10/import.c:320 +#: g10/import.c:322 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "cl� %08lX: ne v�rifie pas notre copie\n" -#: g10/import.c:333 g10/import.c:517 +#: g10/import.c:335 g10/import.c:520 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "cl� %08lX: ne peut trouver le bloc de cl�s original: %s\n" -#: g10/import.c:340 g10/import.c:524 +#: g10/import.c:342 g10/import.c:527 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "cl� %08lX: ne peut lire le bloc de cl�s original: %s\n" -#: g10/import.c:356 g10/import.c:456 g10/import.c:559 +#: g10/import.c:359 g10/import.c:460 g10/import.c:562 msgid "writing keyblock\n" msgstr "�criture du bloc de cl�s\n" -#: g10/import.c:362 g10/import.c:565 +#: g10/import.c:365 g10/import.c:568 #, c-format msgid "can't write keyblock: %s\n" msgstr "ne peut �crire le bloc de cl�s: %s\n" -#: g10/import.c:366 +#: g10/import.c:369 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "cl� %08lX: un nouvel utilisateur\n" -#: g10/import.c:369 +#: g10/import.c:372 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "cl� %08lX: %d nouveaux utilisateurs\n" -#: g10/import.c:372 +#: g10/import.c:375 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "cl� %08lX: une nouvelle signature\n" -#: g10/import.c:375 +#: g10/import.c:378 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "cl� %08lX: %d nouvelles signatures\n" -#: g10/import.c:378 +#: g10/import.c:381 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "cl� %08lX: une nouvelle sous-cl�\n" -#: g10/import.c:381 +#: g10/import.c:384 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "cl� %08lX: %d nouvelles sous-cl�s\n" -#: g10/import.c:385 +#: g10/import.c:388 #, c-format msgid "key %08lX: not changed\n" msgstr "cl� %08lX: n'a pas chang�\n" -#: g10/import.c:459 +#: g10/import.c:463 #, c-format msgid "can't lock secret keyring: %s\n" msgstr "ne peut verrouiller le porte-cl�s secret: %s\n" -#: g10/import.c:462 -msgid "can't write keyring\n" -msgstr "ne peut �crire le porte-cl�s\n" +#: g10/import.c:466 +#, fuzzy, c-format +msgid "can't write keyring: %s\n" +msgstr "ne peut �crire sur le porte-cl�s: %s\n" #. we are ready -#: g10/import.c:465 +#: g10/import.c:469 #, c-format msgid "key %08lX: secret key imported\n" msgstr "cl� %08lX: cl� secr�te import�e\n" #. we can't merge secret keys -#: g10/import.c:468 +#: g10/import.c:472 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "cl� %08lX: d�j� dans le porte-cl�s secret\n" -#: g10/import.c:472 +#: g10/import.c:476 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "cl� %08lX: cl� secr�te pas trouv�e: %s\n" -#: g10/import.c:502 +#: g10/import.c:505 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "cl� %08lX: pas de cl� publique - ne peut appliquer le certificat de " "r�vocation\n" -#: g10/import.c:535 +#: g10/import.c:538 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "cl� %08lX: certificat de r�vocation invalide: %s - rejet�\n" #. we are ready -#: g10/import.c:568 +#: g10/import.c:571 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "cl� %08lX: certificat de r�vocation import�\n" -#: g10/import.c:598 +#: g10/import.c:601 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "cl� %08lX: pas d'utilisateur pour la signature\n" -#: g10/import.c:605 +#: g10/import.c:608 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "cl� %08lX: algorithme de cl� publique non support�\n" -#: g10/import.c:606 +#: g10/import.c:609 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "cl� %08lX: auto-signature invalide\n" -#: g10/import.c:635 +#: g10/import.c:638 #, c-format msgid "key %08lX: skipped userid '" msgstr "cl� %08lX: utilisateur non pris en compte '" -#: g10/import.c:658 +#: g10/import.c:661 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "" "cl� %08lX: certificat de r�vocation au mauvais endroit - non prise en " "compte\n" -#: g10/import.c:665 +#: g10/import.c:669 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "" "cl� %08lX: certificat de r�vocation invalide: %s - non prise en compte\n" -#: g10/import.c:727 +#: g10/import.c:731 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "cl� %08lX: certificat de r�vocation ajout�\n" -#: g10/import.c:790 g10/import.c:826 +#: g10/import.c:794 g10/import.c:830 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "cl� %08lX: notre copie n'a pas d'auto-signature\n" @@ -1272,17 +1363,17 @@ msgstr "un nom d'utilisateur sans auto-signature valide d�tect�\n" msgid "%d user ids without valid self-signatures detected\n" msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n" -#: g10/keyedit.c:250 +#: g10/keyedit.c:249 #, c-format msgid "Already signed by key %08lX\n" msgstr "D�j� sign� par la cl� %08lX\n" -#: g10/keyedit.c:258 +#: g10/keyedit.c:257 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Rien � signer avec la cl� %08lX\n" -#: g10/keyedit.c:267 +#: g10/keyedit.c:265 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -1290,39 +1381,39 @@ msgstr "" "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n" "avec votre cl�: \"" -#: g10/keyedit.c:274 +#: g10/keyedit.c:272 msgid "sign_uid.okay" msgstr "" -#: g10/keyedit.c:274 +#: g10/keyedit.c:272 msgid "Really sign? " msgstr "Signer r�ellement? " -#: g10/keyedit.c:295 +#: g10/keyedit.c:293 #, c-format msgid "signing failed: %s\n" msgstr "la signature a �chou�: %s\n" -#: g10/keyedit.c:346 +#: g10/keyedit.c:344 msgid "This key is not protected.\n" msgstr "Cette cl� n'est pas prot�g�e.\n" -#: g10/keyedit.c:349 +#: g10/keyedit.c:347 msgid "Key is protected.\n" msgstr "La cl� est prot�g�e.\n" -#: g10/keyedit.c:366 +#: g10/keyedit.c:364 #, c-format msgid "Can't edit this key: %s\n" msgstr "Ne peut �diter cette cl�: %s\n" -#: g10/keyedit.c:371 +#: g10/keyedit.c:369 msgid "" "Enter the new passphrase for this secret key.\n" "\n" msgstr "Entrez le nouveau mot de passe pour cette cl� secr�te.\n" -#: g10/keyedit.c:383 +#: g10/keyedit.c:381 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -1330,318 +1421,322 @@ msgstr "" "Vous ne voulez pas de mot de passe - cela est certainement une *mauvaise* " "id�e\n" -#: g10/keyedit.c:385 +#: g10/keyedit.c:383 msgid "change_passwd.empty.okay" msgstr "" -#: g10/keyedit.c:386 +#: g10/keyedit.c:384 msgid "Do you really want to do this? " msgstr "Voulez-vous vraiment faire cela? " -#: g10/keyedit.c:441 +#: g10/keyedit.c:439 msgid "quit" msgstr "quitter" -#: g10/keyedit.c:441 +#: g10/keyedit.c:439 msgid "quit this menu" msgstr "quitter ce menu" -#: g10/keyedit.c:442 +#: g10/keyedit.c:440 msgid "q" msgstr "q" -#: g10/keyedit.c:443 +#: g10/keyedit.c:441 msgid "save" msgstr "enregistrer" -#: g10/keyedit.c:443 +#: g10/keyedit.c:441 msgid "save and quit" msgstr "enregistrer et quitter" -#: g10/keyedit.c:444 +#: g10/keyedit.c:442 msgid "help" msgstr "aide" -#: g10/keyedit.c:444 +#: g10/keyedit.c:442 msgid "show this help" msgstr "montrer cette aide" # g10/keyedit.c:556 ??? -#: g10/keyedit.c:446 +#: g10/keyedit.c:444 msgid "fpr" msgstr "" -#: g10/keyedit.c:446 +#: g10/keyedit.c:444 msgid "show fingerprint" msgstr "montrer l'empreinte" -#: g10/keyedit.c:447 +#: g10/keyedit.c:445 msgid "list" msgstr "lister" -#: g10/keyedit.c:447 +#: g10/keyedit.c:445 msgid "list key and user ids" msgstr "lister la cl� et les noms d'utilisateurs" -#: g10/keyedit.c:448 +#: g10/keyedit.c:446 msgid "l" msgstr "l" -#: g10/keyedit.c:449 +#: g10/keyedit.c:447 msgid "uid" msgstr "" -#: g10/keyedit.c:449 +#: g10/keyedit.c:447 msgid "select user id N" msgstr "s�lectionner le nom d'utilisateur N" -#: g10/keyedit.c:450 +#: g10/keyedit.c:448 msgid "key" msgstr "cl�" -#: g10/keyedit.c:450 +#: g10/keyedit.c:448 msgid "select secondary key N" msgstr "s�lectionner la cl� secondaire N" -#: g10/keyedit.c:451 +#: g10/keyedit.c:449 msgid "check" msgstr "v�rifier" -#: g10/keyedit.c:451 +#: g10/keyedit.c:449 msgid "list signatures" msgstr "lister les signatures" -#: g10/keyedit.c:452 +#: g10/keyedit.c:450 msgid "c" msgstr "" -#: g10/keyedit.c:453 +#: g10/keyedit.c:451 msgid "sign" msgstr "signer" -#: g10/keyedit.c:453 +#: g10/keyedit.c:451 msgid "sign the key" msgstr "signer la cl�" -#: g10/keyedit.c:454 +#: g10/keyedit.c:452 msgid "s" msgstr "" -#: g10/keyedit.c:455 +#: g10/keyedit.c:453 msgid "debug" msgstr "d�boguer" -#: g10/keyedit.c:456 +#: g10/keyedit.c:454 msgid "adduid" msgstr "aj.ut" -#: g10/keyedit.c:456 +#: g10/keyedit.c:454 msgid "add a user id" msgstr "ajouter un utilisateur" -#: g10/keyedit.c:457 +#: g10/keyedit.c:455 msgid "deluid" msgstr "suppr.ut" -#: g10/keyedit.c:457 +#: g10/keyedit.c:455 msgid "delete user id" msgstr "enlever un utilisateur" -#: g10/keyedit.c:458 +#: g10/keyedit.c:456 msgid "addkey" msgstr "aj.cl�" -#: g10/keyedit.c:458 +#: g10/keyedit.c:456 msgid "add a secondary key" msgstr "ajouter une cl� secondaire" -#: g10/keyedit.c:459 +#: g10/keyedit.c:457 msgid "delkey" msgstr "suppr.cl�" -#: g10/keyedit.c:459 +#: g10/keyedit.c:457 msgid "delete a secondary key" msgstr "enlever une cl� secondaire" -#: g10/keyedit.c:460 +#: g10/keyedit.c:458 msgid "toggle" msgstr "changer" -#: g10/keyedit.c:460 +#: g10/keyedit.c:458 msgid "toggle between secret and public key listing" msgstr "passer de la liste des cl�s secr�tes aux cl�s priv�es et inversement" -#: g10/keyedit.c:462 +#: g10/keyedit.c:460 msgid "t" msgstr "" -#: g10/keyedit.c:463 +#: g10/keyedit.c:461 msgid "pref" msgstr "" -#: g10/keyedit.c:463 +#: g10/keyedit.c:461 msgid "list preferences" msgstr "lister les pr�f�rences" -#: g10/keyedit.c:464 +#: g10/keyedit.c:462 msgid "passwd" msgstr "mot.pas" -#: g10/keyedit.c:464 +#: g10/keyedit.c:462 msgid "change the passphrase" msgstr "changer le mot de passe" -#: g10/keyedit.c:465 +#: g10/keyedit.c:463 msgid "trust" msgstr "confi." -#: g10/keyedit.c:465 +#: g10/keyedit.c:463 msgid "change the ownertrust" msgstr "changer la confiance" -#: g10/keyedit.c:483 +#: g10/keyedit.c:481 msgid "can't do that in batchmode\n" msgstr "ne peut faire cela en mode automatique\n" #. check that they match #. FIXME: check that they both match -#: g10/keyedit.c:506 +#: g10/keyedit.c:504 msgid "Secret key is available.\n" msgstr "La cl� secr�te est disponible.\n" -#: g10/keyedit.c:522 +#: g10/keyedit.c:520 msgid "keyedit.cmd" msgstr "Entrez \"aide\" s'il vous pla�t." -#: g10/keyedit.c:522 +#: g10/keyedit.c:520 msgid "Command> " msgstr "Commande> " -#: g10/keyedit.c:547 +#: g10/keyedit.c:545 msgid "Need the secret key to to this.\n" msgstr "Il faut la cl� secr�te pour faire cela.\n" -#: g10/keyedit.c:566 +#: g10/keyedit.c:564 msgid "keyedit.save.okay" msgstr "" -#: g10/keyedit.c:567 +#: g10/keyedit.c:565 msgid "Save changes? " msgstr "Enregistrer les changements? " -#: g10/keyedit.c:569 +#: g10/keyedit.c:567 msgid "keyedit.cancel.okay" msgstr "" -#: g10/keyedit.c:570 +#: g10/keyedit.c:568 msgid "Quit without saving? " msgstr "Quitter sans enregistrer? " -#: g10/keyedit.c:580 +#: g10/keyedit.c:578 #, c-format msgid "update failed: %s\n" msgstr "la mise � jour a �chou�: %s\n" -#: g10/keyedit.c:587 +#: g10/keyedit.c:585 #, c-format msgid "update secret failed: %s\n" msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n" -#: g10/keyedit.c:595 +#: g10/keyedit.c:593 msgid "Key not changed so no update needed.\n" msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n" -#: g10/keyedit.c:625 +#: g10/keyedit.c:623 msgid "keyedit.sign_all.okay" msgstr "" -#: g10/keyedit.c:626 +#: g10/keyedit.c:624 msgid "Really sign all user ids? " msgstr "Signer vraiment tous les utilisateurs? " -#: g10/keyedit.c:627 +#: g10/keyedit.c:625 msgid "Hint: Select the user ids to sign\n" msgstr "Aide: S�lectionner les utilisateurs � signer\n" -#: g10/keyedit.c:655 +#: g10/keyedit.c:653 msgid "You must select at least one user id.\n" msgstr "Vous devez s�lectionner au moins un utilisateur.\n" -#: g10/keyedit.c:657 +#: g10/keyedit.c:655 msgid "You can't delete the last user id!\n" msgstr "Vous ne pouvez pas supprimer le dernier utilisateur!\n" -#: g10/keyedit.c:659 +#: g10/keyedit.c:657 msgid "keyedit.remove.uid.okay" msgstr "" -#: g10/keyedit.c:660 +#: g10/keyedit.c:658 msgid "Really remove all selected user ids? " msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s? " -#: g10/keyedit.c:661 +#: g10/keyedit.c:659 msgid "Really remove this user id? " msgstr "Enlever r�ellement cet utilisateur? " -#: g10/keyedit.c:684 +#: g10/keyedit.c:682 msgid "You must select at least one key.\n" msgstr "Vous devez s�lectionner au moins une cl�.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:684 msgid "keyedit.remove.subkey.okay" msgstr "" -#: g10/keyedit.c:688 +#: g10/keyedit.c:686 msgid "Do you really want to delete the selected keys? " msgstr "Voulez-vous supprimer les cl�s s�lectionn�es? " -#: g10/keyedit.c:689 +#: g10/keyedit.c:687 msgid "Do you really want to delete this key? " msgstr "Voulez-vous vraiment supprimer cette cl�? " -#: g10/keyedit.c:726 +#: g10/keyedit.c:724 msgid "Invalid command (try \"help\")\n" msgstr "Commande invalide (essayez \"aide\")\n" -#: g10/keyedit.c:1106 +#: g10/keyedit.c:1104 #, c-format msgid "No user id with index %d\n" msgstr "Pas d'utilisateur avec l'index %d\n" -#: g10/keyedit.c:1151 +#: g10/keyedit.c:1149 #, c-format msgid "No secondary key with index %d\n" msgstr "Pas de cl� secondaire avec l'index %d\n" -#: g10/mainproc.c:198 +#: g10/mainproc.c:200 #, c-format msgid "public key decryption failed: %s\n" msgstr "le d�cryptage de la cl� publique a �chou�: %s\n" -#: g10/mainproc.c:228 +#: g10/mainproc.c:230 #, c-format msgid "decryption failed: %s\n" msgstr "le d�cryptage a �chou�: %s\n" -#: g10/mainproc.c:842 +#: g10/mainproc.c:247 +msgid "note: sender requested \"for-your-eyes-only\"\n" +msgstr "" + +#: g10/mainproc.c:846 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Signature faite %.*s avec %s cl� ID %08lX\n" -#: g10/mainproc.c:848 +#: g10/mainproc.c:852 msgid "BAD signature from \"" msgstr "MAUVAISE signature de \"" -#: g10/mainproc.c:849 +#: g10/mainproc.c:853 msgid "Good signature from \"" msgstr "Bonne signature de \"" -#: g10/mainproc.c:860 +#: g10/mainproc.c:864 #, c-format msgid "Can't check signature: %s\n" msgstr "Ne peut v�rifier la signature: %s\n" -#: g10/passphrase.c:117 +#: g10/passphrase.c:141 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -1651,39 +1746,43 @@ msgstr "" "Vous avez besoin d'un mot de passe pour d�verrouiller la cl� secr�te pour\n" "l'utilisateur: \"" -#: g10/passphrase.c:126 +#: g10/passphrase.c:150 #, c-format msgid "(%u-bit %s key, ID %08lX, created %s)\n" msgstr "(cl� de %u bits %s, ID %08lX, cr��e le %s)\n" -#: g10/passphrase.c:167 +#: g10/passphrase.c:174 msgid "passphrase.enter" msgstr "" "Entrez le mot de passe; c'est une phrase secr�te \n" " Blurb, blurb,.... " -#: g10/passphrase.c:167 +#: g10/passphrase.c:174 msgid "Enter pass phrase: " msgstr "Entrez le mot de passe: " -#: g10/passphrase.c:170 +#: g10/passphrase.c:177 msgid "passphrase.repeat" msgstr "" "R�p�tez le dernier mot de passe, pour �tre s�r de ce que vous avez tap�." -#: g10/passphrase.c:171 +#: g10/passphrase.c:178 msgid "Repeat pass phrase: " msgstr "R�p�tez le mot de passe: " -#: g10/plaintext.c:210 +#: g10/plaintext.c:102 +msgid "data not saved; use option \"--output\" to save it\n" +msgstr "" + +#: g10/plaintext.c:214 msgid "detached_signature.filename" msgstr "" -#: g10/plaintext.c:211 +#: g10/plaintext.c:215 msgid "Please enter name of data file: " msgstr "Entrez le nom d'un fichier de donn�es: " -#: g10/plaintext.c:295 +#: g10/plaintext.c:299 #, c-format msgid "can't open signed data '%s'\n" msgstr "ne peut ouvir les donn�es sign�es '%s'\n" @@ -1701,6 +1800,11 @@ msgstr "Mot de passe invalide; r�essayez...\n" msgid "Warning: Weak key detected - please change passphrase again.\n" msgstr "Attention: Mauvaise cl� d�tect�e - changez encore le mot de passe.\n" +#: g10/sig-check.c:155 +msgid "" +"this is a PGP generated ElGamal key which is NOT secure for signatures!\n" +msgstr "" + #: g10/sig-check.c:165 msgid "public key created in future (time warp or clock problem)\n" msgstr "cl� publique cr��e dans le futur (probl�me d'horloge)\n" @@ -1710,76 +1814,86 @@ msgstr "cl� publique cr��e dans le futur (probl�me d'horloge)\n" msgid "warning: signature key expired %s\n" msgstr "attention: la cl� de signatute a expir� le %s\n" -#: g10/trustdb.c:316 +#: g10/trustdb.c:318 #, c-format msgid "error reading sigrec: %s\n" msgstr "erreur pendant la lecture de l'enregistrement de signature: %s\n" -#: g10/trustdb.c:321 +#: g10/trustdb.c:323 #, c-format msgid "chained sigrec %lu has a wrong owner\n" msgstr "l'enregistrement de signature %lu a un mauvais propri�taire\n" -#: g10/trustdb.c:364 +#: g10/trustdb.c:370 #, c-format msgid "key %08lX: secret key without public key\n" msgstr "cl� %08lX: cl� secr�te sans cl� publique\n" -#: g10/trustdb.c:369 +#: g10/trustdb.c:375 #, c-format msgid "key %08lX: secret and public key don't match\n" msgstr "cl� %08lX: les cl�s secr�te et publique ne correspondent pas\n" -#: g10/trustdb.c:380 +#: g10/trustdb.c:386 #, c-format msgid "key %08lX: can't put it into the trustdb\n" msgstr "cl� %08lX: ne peut mettre cela dans la base de confiance\n" -#: g10/trustdb.c:386 +#: g10/trustdb.c:392 #, c-format msgid "key %08lX: query record failed\n" msgstr "cl� %08lX: l'enregistrement de requ�te a �chou�\n" -#: g10/trustdb.c:395 +#: g10/trustdb.c:401 #, c-format msgid "key %08lX: already in ultikey_table\n" msgstr "cl� %08lX: d�ja dans ultikey_table\n" -#: g10/trustdb.c:402 +#: g10/trustdb.c:408 #, c-format msgid "enum_secret_keys failed: %s\n" msgstr "enum_secret_keys a �chou�: %s\n" -#: g10/trustdb.c:1614 +#: g10/trustdb.c:913 +#, fuzzy, c-format +msgid "key %08lX.%lu, uid %02X%02X: no public key for signature %08lX\n" +msgstr "cl� %08lX: pas d'utilisateur pour la signature\n" + +#: g10/trustdb.c:920 +#, fuzzy, c-format +msgid "key %08lX.%lu, uid %02X%02X: invalid %ssignature: %s\n" +msgstr "cl� %08lX: auto-signature invalide\n" + +#: g10/trustdb.c:1624 #, c-format msgid "key %08lX: insert trust record failed: %s\n" msgstr "cl� %08lX: l'insertion d'enregistrement de confiance a �chou�: %s\n" -#: g10/trustdb.c:1618 +#: g10/trustdb.c:1628 #, c-format msgid "key %08lX.%lu: inserted into trustdb\n" msgstr "cl� %08lX.%lu: ins�r�e dans la base de confiance\n" -#: g10/trustdb.c:1629 +#: g10/trustdb.c:1639 #, c-format msgid "key %08lX.%lu: created in future (time warp or clock problem)\n" msgstr "cl� %08lX.%lu: cr��e dans le futur (probl�me d'horloge)\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1647 #, c-format msgid "key %08lX.%lu: expired at %s\n" msgstr "cl� %08lX.%lu: a expir� le %s\n" -#: g10/trustdb.c:1646 +#: g10/trustdb.c:1656 #, c-format msgid "key %08lX.%lu: trust check failed: %s\n" msgstr "cl� %08lX.%lu: la v�rification de confiance a �chou�: %s\n" -#: g10/status.c:233 +#: g10/status.c:246 msgid "No help available" msgstr "Pas d'aide disponible" -#: g10/status.c:239 +#: g10/status.c:252 #, c-format msgid "No help available for '%s'" msgstr "Pas d'aide disponible pour '%s'" @@ -1830,3 +1944,6 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "" "ne peut �viter une mauvaise cl� pour le chiffrement sym�trique: \n" "%d essais ont eu lieu!\n" + +#~ msgid "can't write keyring\n" +#~ msgstr "ne peut �crire le porte-cl�s\n" @@ -5,6 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.4.0\n" +"POT-Creation-Date: 1998-09-30 19:01+0200\n" "PO-Revision-Date: 1998-09-20 16:15+02:00\n" "Last-Translator: Marco d'Itri <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" @@ -12,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: util/secmem.c:226 +#: util/secmem.c:77 msgid "Warning: using insecure memory!\n" msgstr "Attenzione: si sta usando memoria insicura!\n" @@ -52,7 +53,7 @@ msgstr "" "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n" "(Servono ancora %d altri byte)\n" -#: g10/g10.c:143 +#: g10/g10.c:146 msgid "" "@Commands:\n" " " @@ -60,115 +61,115 @@ msgstr "" "@Comandi:\n" " " -#: g10/g10.c:146 +#: g10/g10.c:149 msgid "|[file]|make a signature" msgstr "|[file]|fai una firma" -#: g10/g10.c:147 +#: g10/g10.c:150 msgid "|[file]|make a clear text signature" msgstr "|[file]|fai una firma mantenendo il testo in chiaro" -#: g10/g10.c:148 +#: g10/g10.c:151 msgid "make a detached signature" msgstr "fai una firma separata" -#: g10/g10.c:149 +#: g10/g10.c:152 msgid "encrypt data" msgstr "cifra dati" -#: g10/g10.c:150 +#: g10/g10.c:153 msgid "encryption only with symmetric cipher" msgstr "cifra solo con un cifrario simmetrico" -#: g10/g10.c:151 +#: g10/g10.c:154 msgid "store only" msgstr "immagazzina soltanto" -#: g10/g10.c:152 +#: g10/g10.c:155 msgid "decrypt data (default)" msgstr "decifra dati (predefinito)" -#: g10/g10.c:153 +#: g10/g10.c:156 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:155 +#: g10/g10.c:158 msgid "list keys" msgstr "elenca le chiavi" -#: g10/g10.c:156 +#: g10/g10.c:159 msgid "list keys and signatures" msgstr "elenca le chiavi e le firme" -#: g10/g10.c:157 +#: g10/g10.c:160 msgid "check key signatures" msgstr "controlla le firme delle chiavi" -#: g10/g10.c:158 +#: g10/g10.c:161 msgid "list keys and fingerprints" msgstr "elenca le chiavi e le impronte digitali" -#: g10/g10.c:159 +#: g10/g10.c:162 msgid "list secret keys" msgstr "elenca le chiavi segrete" -#: g10/g10.c:161 +#: g10/g10.c:164 msgid "generate a new key pair" msgstr "genera una nuova coppia di chiavi" -#: g10/g10.c:163 +#: g10/g10.c:166 msgid "remove key from the public keyring" msgstr "rimuove una chiave dal portachiavi pubblico" -#: g10/g10.c:165 +#: g10/g10.c:168 msgid "sign or edit a key" msgstr "firma o modifica una chiave" -#: g10/g10.c:166 +#: g10/g10.c:169 msgid "generate a revocation certificate" msgstr "genera un certificato di revoca" -#: g10/g10.c:168 +#: g10/g10.c:171 msgid "export keys" msgstr "esporta delle chiavi" -#: g10/g10.c:171 +#: g10/g10.c:174 msgid "import/merge keys" msgstr "importa/aggiungi delle chiavi" -#: g10/g10.c:172 +#: g10/g10.c:175 msgid "list only the sequence of packets" msgstr "elenca solo la sequenza dei pacchetti" -#: g10/g10.c:174 +#: g10/g10.c:177 msgid "export the ownertrust values" msgstr "esporta i valori di fiducia" -#: g10/g10.c:175 +#: g10/g10.c:178 msgid "import ownertrust values" msgstr "importa i valori di fiducia" -#: g10/g10.c:176 +#: g10/g10.c:179 msgid "|[NAMES]|check the trust database" msgstr "|[NAMES]|controlla il TrustDB" -#: g10/g10.c:177 +#: g10/g10.c:180 msgid "De-Armor a file or stdin" msgstr "rimuovi l'armatura a un file o a stdin" -#: g10/g10.c:178 +#: g10/g10.c:181 msgid "En-Armor a file or stdin" msgstr "crea l'armatura a un file o a stdin" -#: g10/g10.c:179 +#: g10/g10.c:182 msgid "|algo [files]|print message digests" msgstr "|algo [files]|stampa tutti i message digests" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "print all message digests" msgstr "stampa tutti i message digests" -#: g10/g10.c:187 +#: g10/g10.c:190 msgid "" "@\n" "Options:\n" @@ -178,112 +179,129 @@ msgstr "" "Opzioni:\n" " " -#: g10/g10.c:189 +#: g10/g10.c:192 msgid "create ascii armored output" msgstr "crea un output ascii con armatura" -#: g10/g10.c:191 +#: g10/g10.c:194 msgid "use this user-id to sign or decrypt" msgstr "usa questo user-id per firmare o decifrare" -#: g10/g10.c:192 +#: g10/g10.c:195 msgid "use this user-id for encryption" msgstr "usa questo user-id per cifrare" -#: g10/g10.c:193 +#: g10/g10.c:196 msgid "|N|set compress level N (0 disables)" msgstr "|N|imposta il livello di compressione (0 disabilita)" -#: g10/g10.c:194 +#: g10/g10.c:197 msgid "use canonical text mode" msgstr "usa il modo testo canonico" -#: g10/g10.c:196 +#: g10/g10.c:199 msgid "use as output file" msgstr "usa come file di output" -#: g10/g10.c:197 +#: g10/g10.c:200 msgid "verbose" msgstr "prolisso" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:199 +#: g10/g10.c:202 msgid "batch mode: never ask" msgstr "modo batch: non fare domande" -#: g10/g10.c:200 +#: g10/g10.c:203 msgid "assume yes on most questions" msgstr "assumi \"s�\" a quasi tutte le domande" -#: g10/g10.c:201 +#: g10/g10.c:204 msgid "assume no on most questions" msgstr "assumi \"no\" a quasi tutte le domande" -#: g10/g10.c:202 +#: g10/g10.c:205 msgid "add this keyring to the list of keyrings" msgstr "aggiungi questo portachiavi alla lista" -#: g10/g10.c:203 +#: g10/g10.c:206 msgid "add this secret keyring to the list" msgstr "aggiungi questo portachiavi segreto alla lista" -#: g10/g10.c:204 +#: g10/g10.c:207 msgid "|NAME|use NAME as default secret key" msgstr "|NOME|usa NOME come chiave segreta predefinita" -#: g10/g10.c:205 +#: g10/g10.c:208 msgid "read options from file" msgstr "leggi le opzioni dal file" -#: g10/g10.c:207 +#: g10/g10.c:210 msgid "set debugging flags" msgstr "imposta i flag di debugging" -#: g10/g10.c:208 +#: g10/g10.c:211 msgid "enable full debugging" msgstr "abilita il debugging completo" -#: g10/g10.c:209 +#: g10/g10.c:212 msgid "|FD|write status info to this FD" msgstr "|FD|scrivi le informazioni di stato su questo fd" -#: g10/g10.c:210 +#: g10/g10.c:213 msgid "do not write comment packets" msgstr "non scrivere pacchetti di commento" -#: g10/g10.c:211 +#: g10/g10.c:214 msgid "(default is 1)" msgstr "(predefinito � 1)" -#: g10/g10.c:212 +#: g10/g10.c:215 msgid "(default is 3)" msgstr "(predefinito � 3)" -#: g10/g10.c:213 -msgid "|file|load extension module" +#: g10/g10.c:216 +#, fuzzy +msgid "|FILE|load extension module FILE" msgstr "|file|carica un modulo di estensione" -#: g10/g10.c:214 +#: g10/g10.c:217 msgid "emulate the mode described in RFC1991" msgstr "emula il modo descritto nel RFC1991" -#: g10/g10.c:216 +#: g10/g10.c:218 +#, fuzzy +msgid "|N|use passphrase mode N" +msgstr "Inserisci la passphrase: " + +#: g10/g10.c:220 +#, fuzzy +msgid "|NAME|use message digest algorithm NAME for passphrases" +msgstr "|NAME|usa l'algoritmo di message digest NOME" + +#: g10/g10.c:222 +#, fuzzy +msgid "|NAME|use cipher algorithm NAME for passphrases" +msgstr "|NAME|usa l'algoritmo di cifratura NOME" + +#: g10/g10.c:224 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAME|usa l'algoritmo di cifratura NOME" -#: g10/g10.c:217 +#: g10/g10.c:225 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAME|usa l'algoritmo di message digest NOME" -#: g10/g10.c:218 +#: g10/g10.c:226 msgid "|N|use compress algorithm N" msgstr "|N|usa l'algoritmo di compressione N" -#: g10/g10.c:219 +#: g10/g10.c:227 msgid "throw keyid field of encrypted packets" msgstr "elimina il campo keyid dei pacchetti crittografati" -#: g10/g10.c:227 +#: g10/g10.c:235 +#, fuzzy msgid "" "@\n" "Examples:\n" @@ -292,7 +310,7 @@ msgid "" " --clearsign [file] make a clear text signature\n" " --detach-sign [file] make a detached signature\n" " --list-keys [names] show keys\n" -" --fingerprint [names] show fingerprint\n" +" --fingerprint [names] show fingerprints\n" msgstr "" "@\n" "Esempi:\n" @@ -303,19 +321,19 @@ msgstr "" " --list-keys [names] mostra le chiavi\n" " --fingerprint [names] mostra le impronte digitali\n" -#: g10/g10.c:302 +#: g10/g10.c:310 msgid "Please report bugs to <[email protected]>.\n" msgstr "Per favore segnala i bug a <[email protected]>.\n" -#: g10/g10.c:307 +#: g10/g10.c:315 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Uso: gpgm [opzioni] [file] (-h per l'aiuto)" -#: g10/g10.c:309 +#: g10/g10.c:317 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opzioni] [file] (-h per l'aiuto)" -#: g10/g10.c:314 +#: g10/g10.c:322 msgid "" "Syntax: gpgm [options] [files]\n" "GNUPG maintenance utility\n" @@ -323,7 +341,7 @@ msgstr "" "Sintassi: gpgm [opzioni] [file]\n" "Utility di manutenzione di GNUPG\n" -#: g10/g10.c:317 +#: g10/g10.c:325 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -333,139 +351,149 @@ msgstr "" "firma, controlla, cifra o decifra\n" "l'operazione predefinita dipende dai dati di input\n" -#: g10/g10.c:323 +#: g10/g10.c:331 msgid "" "\n" "Supported algorithms:\n" -msgstr "\nAlgoritmi gestiti:\n" +msgstr "" +"\n" +"Algoritmi gestiti:\n" -#: g10/g10.c:398 +#: g10/g10.c:406 msgid "usage: gpgm [options] " msgstr "uso: gpgm [options] " -#: g10/g10.c:400 +#: g10/g10.c:408 msgid "usage: gpg [options] " msgstr "uso: gpg [options] " -#: g10/g10.c:441 +#: g10/g10.c:449 msgid "conflicting commands\n" msgstr "comandi in conflitto\n" -#: g10/g10.c:547 +#: g10/g10.c:588 #, c-format msgid "note: no default option file '%s'\n" msgstr "nota: nessun file con opzioni predefinite '%s'\n" -#: g10/g10.c:551 +#: g10/g10.c:592 #, c-format msgid "option file '%s': %s\n" msgstr "file con opzioni predefinite '%s': %s\n" -#: g10/g10.c:558 +#: g10/g10.c:599 #, c-format msgid "reading options from '%s'\n" msgstr "lettura delle opzioni da '%s'\n" -#: g10/g10.c:737 +#: g10/g10.c:765 g10/g10.c:777 msgid "selected cipher algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non � valido\n" -#: g10/g10.c:743 +#: g10/g10.c:771 g10/g10.c:783 msgid "selected digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non � valido\n" -#: g10/g10.c:746 +#: g10/g10.c:786 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "l'algoritmo di compressione deve essere tra %d e %d\n" -#: g10/g10.c:748 +#: g10/g10.c:788 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve essere maggiore di 0\n" -#: g10/g10.c:750 +#: g10/g10.c:790 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve essere maggiore di 1\n" -#: g10/g10.c:833 +#: g10/g10.c:793 +msgid "note: simple S2K mode (0) is strongly discouraged\n" +msgstr "" + +#: g10/g10.c:797 +msgid "invalid S2K mode; must be 0, 1 or 3\n" +msgstr "" + +#: g10/g10.c:872 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/g10.c:839 +#: g10/g10.c:878 msgid "--store [filename]" msgstr "--store [nomefile]" -#: g10/g10.c:847 +#: g10/g10.c:886 msgid "--symmetric [filename]" msgstr "--symmetric [nomefile]" -#: g10/g10.c:855 +#: g10/g10.c:894 msgid "--encrypt [filename]" msgstr "--encrypt [nomefile]" -#: g10/g10.c:868 +#: g10/g10.c:907 msgid "--sign [filename]" msgstr "--sign [nomefile]" -#: g10/g10.c:881 +#: g10/g10.c:920 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:895 +#: g10/g10.c:934 msgid "--clearsign [filename]" msgstr "--clearsign [nomefile]" -#: g10/g10.c:907 +#: g10/g10.c:946 msgid "--decrypt [filename]" msgstr "--decrypt [nomefile]" -#: g10/g10.c:916 +#: g10/g10.c:955 msgid "--edit-key username" msgstr "--edit-key nomeutente" -#: g10/g10.c:924 +#: g10/g10.c:963 msgid "--delete-secret-key username" msgstr "--delete-secret-key nomeutente" -#: g10/g10.c:927 +#: g10/g10.c:966 msgid "--delete-key username" msgstr "--delete-key nomeutente" -#: g10/encode.c:211 g10/g10.c:950 g10/keylist.c:79 +#: g10/encode.c:213 g10/g10.c:989 g10/keylist.c:79 #, c-format msgid "can't open %s: %s\n" msgstr "impossibile aprire '%s': %s\n" -#: g10/g10.c:961 +#: g10/g10.c:1000 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [userid] [portachiavi]" -#: g10/g10.c:1016 +#: g10/g10.c:1055 #, c-format msgid "dearmoring failed: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/g10.c:1024 +#: g10/g10.c:1063 #, c-format msgid "enarmoring failed: %s\n" msgstr "creazione dell'armatura fallita: %s\n" -#: g10/g10.c:1085 +#: g10/g10.c:1124 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "algoritmo di hash non valido '%s'\n" -#: g10/g10.c:1155 +#: g10/g10.c:1194 msgid "[filename]" msgstr "[nomefile]" -#: g10/decrypt.c:59 g10/g10.c:1157 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1196 g10/verify.c:66 #, c-format msgid "can't open '%s'\n" msgstr "impossibile aprire '%s'\n" -#: g10/g10.c:1202 +#: g10/g10.c:1241 msgid "" "RSA keys are deprecated; please consider creating a new key and use this key " "in the future\n" @@ -473,6 +501,66 @@ msgstr "" "L'uso di chiavi RSA � deprecato; per favore in futuro considera di creare e\n" "usare una nuova chiave.\n" +#: g10/armor.c:335 g10/armor.c:375 +msgid "armor header: " +msgstr "" + +#: g10/armor.c:340 +#, fuzzy +msgid "invalid clearsig header\n" +msgstr "Carattere non valido nel nome\n" + +#: g10/armor.c:366 +msgid "invalid armor header: " +msgstr "" + +#: g10/armor.c:440 +#, fuzzy, c-format +msgid "armor: %s\n" +msgstr "errore di lettura: %s\n" + +#: g10/armor.c:484 +msgid "invalid dash escaped line: " +msgstr "" + +#: g10/armor.c:553 +msgid "invalid clear text header: " +msgstr "" + +#: g10/armor.c:783 +#, fuzzy, c-format +msgid "invalid radix64 character %02x skipped\n" +msgstr "Carattere non valido nel nome\n" + +#: g10/armor.c:816 +msgid "premature eof (no CRC)\n" +msgstr "" + +#: g10/armor.c:835 +msgid "premature eof (in CRC)\n" +msgstr "" + +#: g10/armor.c:839 +msgid "malformed CRC\n" +msgstr "" + +#: g10/armor.c:843 +#, c-format +msgid "CRC error; %06lx - %06lx\n" +msgstr "" + +#: g10/armor.c:862 +msgid "premature eof (in Trailer)\n" +msgstr "" + +#: g10/armor.c:866 +msgid "error in trailer line\n" +msgstr "" + +#: g10/armor.c:1120 +msgid "no valid RFC1991 or OpenPGP data found.\n" +msgstr "" + #: g10/pkclist.c:71 #, c-format msgid "" @@ -545,15 +633,15 @@ msgstr "" "Nessun valore di fiducia del proprietario modificato.\n" "\n" -#: g10/pkclist.c:189 +#: g10/pkclist.c:190 msgid "revoked_key.override" msgstr "" -#: g10/pkclist.c:190 g10/pkclist.c:277 +#: g10/pkclist.c:191 g10/pkclist.c:281 msgid "Use this key anyway? " msgstr "Uso lo stesso questa chiave? " -#: g10/pkclist.c:272 +#: g10/pkclist.c:276 msgid "" "It is NOT certain that the key belongs to its owner.\n" "If you *really* know what you are doing, you may answer\n" @@ -565,55 +653,55 @@ msgstr "" "prossima domanda.\n" "\n" -#: g10/pkclist.c:276 +#: g10/pkclist.c:280 msgid "untrusted_key.override" msgstr "" -#: g10/pkclist.c:281 +#: g10/pkclist.c:285 msgid "WARNING: Using untrusted key!\n" msgstr "ATTENZIONE: uso di una chiave non fidata!\n" -#: g10/pkclist.c:317 +#: g10/pkclist.c:321 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n" -#: g10/pkclist.c:318 +#: g10/pkclist.c:322 msgid " This could mean that the signature is forgery.\n" msgstr " Questo pu� significare che la firma � stata falsificata.\n" -#: g10/pkclist.c:339 +#: g10/pkclist.c:343 msgid "Note: This key has expired!\n" msgstr "Nota: questa chiave � scaduta!\n" -#: g10/pkclist.c:346 +#: g10/pkclist.c:350 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n" -#: g10/pkclist.c:348 +#: g10/pkclist.c:352 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr "" " Non ci sono indicazioni che la firma appartenga al proprietario.\n" -#: g10/pkclist.c:363 +#: g10/pkclist.c:367 msgid "WARNING: We do NOT trust this key!\n" msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n" -#: g10/pkclist.c:364 +#: g10/pkclist.c:368 msgid " The signature is probably a FORGERY.\n" msgstr " La firma � probabilmente un FALSO.\n" -#: g10/pkclist.c:371 +#: g10/pkclist.c:375 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n" -#: g10/pkclist.c:374 +#: g10/pkclist.c:378 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Non � sicuro che la firma appartenga al proprietario.\n" -#: g10/pkclist.c:419 +#: g10/pkclist.c:423 msgid "" "You did not specify a user ID. (you may use \"-r\")\n" "\n" @@ -621,29 +709,29 @@ msgstr "" "Non hai specificato un user ID. (puoi usare \"-r\")\n" "\n" -#: g10/pkclist.c:423 +#: g10/pkclist.c:427 msgid "pklist.user_id.enter" msgstr "" -#: g10/pkclist.c:424 +#: g10/pkclist.c:428 msgid "Enter the user ID: " msgstr "Inserisci l'user ID: " -#: g10/pkclist.c:435 +#: g10/pkclist.c:439 msgid "No such user ID.\n" msgstr "User ID inesistente.\n" -#: g10/pkclist.c:469 g10/pkclist.c:496 +#: g10/pkclist.c:473 g10/pkclist.c:500 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: saltata: %s\n" -#: g10/pkclist.c:477 +#: g10/pkclist.c:481 #, c-format msgid "%s: error checking key: %s\n" msgstr "%s: errore nel controllare la chiave: %s\n" -#: g10/pkclist.c:503 +#: g10/pkclist.c:507 msgid "no valid addressees\n" msgstr "nessun indirizzo valido\n" @@ -903,7 +991,7 @@ msgstr "" "Ti serve una passphrase per proteggere la tua chiave segreta.\n" "\n" -#: g10/keyedit.c:379 g10/keygen.c:694 +#: g10/keyedit.c:377 g10/keygen.c:694 msgid "passphrase not correctly repeated; try again.\n" msgstr "passphrase non ripetuta correttamente; riprova.\n" @@ -981,32 +1069,37 @@ msgstr "" msgid "Really create? " msgstr "Crea davvero? " -#: g10/encode.c:87 +#: g10/encode.c:88 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: impossibile aprire: %s\n" -#: g10/encode.c:106 +#: g10/encode.c:107 #, c-format msgid "error creating passphrase: %s\n" msgstr "errore nella creazione della passhprase: %s\n" -#: g10/encode.c:151 g10/encode.c:262 +#: g10/encode.c:152 g10/encode.c:264 #, c-format msgid "%s: warning: empty file\n" msgstr "%s: attenzione: file vuoto\n" -#: g10/encode.c:217 +#: g10/encode.c:219 #, c-format msgid "reading from '%s'\n" msgstr "lettura da '%s'\n" -#: g10/encode.c:390 +#: g10/encode.c:392 #, c-format msgid "%s encrypted for: %s\n" msgstr "%s crittografato per: %s\n" -#: g10/import.c:105 g10/trustdb.c:1342 +#: g10/getkey.c:884 +#, c-format +msgid "using secondary key %08lX instead of primary key %08lX\n" +msgstr "" + +#: g10/import.c:105 g10/trustdb.c:1349 #, c-format msgid "can't open file: %s\n" msgstr "impossibile aprire il file: %s\n" @@ -1016,194 +1109,195 @@ msgstr "impossibile aprire il file: %s\n" msgid "skipping block of type %d\n" msgstr "salto un blocco di tipo %d\n" -#: g10/import.c:131 g10/trustdb.c:1420 +#: g10/import.c:131 g10/trustdb.c:1427 #, c-format msgid "read error: %s\n" msgstr "errore di lettura: %s\n" -#: g10/import.c:271 g10/import.c:441 +#: g10/import.c:272 g10/import.c:445 #, c-format msgid "key %08lX: no user id\n" msgstr "chiave %08lX: nessun user id\n" -#: g10/import.c:281 +#: g10/import.c:282 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "chiave %08lX: nessun user id valido\n" -#: g10/import.c:283 +#: g10/import.c:284 msgid "this may be caused by a missing self-signature\n" msgstr "questo pu� essere causato da una autofirma mancante\n" -#: g10/import.c:291 g10/import.c:508 +#: g10/import.c:293 g10/import.c:511 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "chiave %08lX: chiave pubblica non trovata: %s\n" -#: g10/import.c:297 +#: g10/import.c:299 msgid "no default public keyring\n" msgstr "nessun portachiavi pubblico predefinito\n" -#: g10/import.c:301 +#: g10/import.c:303 #, c-format msgid "writing to '%s'\n" msgstr "scrittura in '%s'\n" -#: g10/import.c:305 g10/import.c:359 g10/import.c:562 +#: g10/import.c:307 g10/import.c:362 g10/import.c:565 #, c-format msgid "can't lock public keyring: %s\n" msgstr "impossibile bloccare il portachiavi pubblico: %s\n" -#: g10/import.c:308 +#: g10/import.c:310 #, c-format msgid "can't write to keyring: %s\n" msgstr "impossibile scrivere sul portachiavi pubblico: %s\n" #. we are ready -#: g10/import.c:311 +#: g10/import.c:313 #, c-format msgid "key %08lX: public key imported\n" msgstr "chiave %08lX: chiave pubblica importata\n" -#: g10/import.c:320 +#: g10/import.c:322 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "chiave %08lX: non corrisponde alla nostra copia\n" -#: g10/import.c:333 g10/import.c:517 +#: g10/import.c:335 g10/import.c:520 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n" -#: g10/import.c:340 g10/import.c:524 +#: g10/import.c:342 g10/import.c:527 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n" -#: g10/import.c:356 g10/import.c:456 g10/import.c:559 +#: g10/import.c:359 g10/import.c:460 g10/import.c:562 msgid "writing keyblock\n" msgstr "scrittura del keyblock\n" -#: g10/import.c:362 g10/import.c:565 +#: g10/import.c:365 g10/import.c:568 #, c-format msgid "can't write keyblock: %s\n" msgstr "impossibile aprire il keyblock: %s\n" -#: g10/import.c:366 +#: g10/import.c:369 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "chiave %08lX: un nuovo user id\n" -#: g10/import.c:369 +#: g10/import.c:372 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "chiave %08lX: %d nuovi user id\n" -#: g10/import.c:372 +#: g10/import.c:375 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "chiave %08lX: una nuova firma\n" -#: g10/import.c:375 +#: g10/import.c:378 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "chiave %08lX: %d nuove firme\n" -#: g10/import.c:378 +#: g10/import.c:381 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "chiave %08lX: una nuova subchiave\n" -#: g10/import.c:381 +#: g10/import.c:384 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "chiave %08lX: %d nuove subchiavi\n" -#: g10/import.c:385 +#: g10/import.c:388 #, c-format msgid "key %08lX: not changed\n" msgstr "chiave %08lX: non cambiata\n" -#: g10/import.c:459 +#: g10/import.c:463 #, c-format msgid "can't lock secret keyring: %s\n" msgstr "impossibile bloccare il portachiavi segreto: %s\n" -#: g10/import.c:462 -msgid "can't write keyring\n" -msgstr "impossibile scrivere il portachiavi\n" +#: g10/import.c:466 +#, fuzzy, c-format +msgid "can't write keyring: %s\n" +msgstr "impossibile scrivere sul portachiavi pubblico: %s\n" #. we are ready -#: g10/import.c:465 +#: g10/import.c:469 #, c-format msgid "key %08lX: secret key imported\n" msgstr "chiave %08lX: chiave segreta importata\n" #. we can't merge secret keys -#: g10/import.c:468 +#: g10/import.c:472 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "chiave %08lX: gi� nel portachiavi segreto\n" -#: g10/import.c:472 +#: g10/import.c:476 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "chiave %08lX: chiave segreta non trovata: %s\n" -#: g10/import.c:502 +#: g10/import.c:505 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n" "certificato di revoca\n" -#: g10/import.c:535 +#: g10/import.c:538 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n" #. we are ready -#: g10/import.c:568 +#: g10/import.c:571 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "chiave %08lX: certificato di revoca importato\n" -#: g10/import.c:598 +#: g10/import.c:601 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "chiave %08lX: nessun user id per la firma\n" -#: g10/import.c:605 +#: g10/import.c:608 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n" -#: g10/import.c:606 +#: g10/import.c:609 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "chiave %08lX: autofirma non valida\n" -#: g10/import.c:635 +#: g10/import.c:638 #, c-format msgid "key %08lX: skipped userid '" msgstr "chiave %08lX: saltato l'user id '" -#: g10/import.c:658 +#: g10/import.c:661 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n" -#: g10/import.c:665 +#: g10/import.c:669 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "chiave %08lX: certificato di revoca non valido: %s - saltato\n" -#: g10/import.c:727 +#: g10/import.c:731 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "chiave %08lX: certificato di revoca aggiunto\n" -#: g10/import.c:790 g10/import.c:826 +#: g10/import.c:794 g10/import.c:830 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "chiave %08lX: la nostra copia non ha autofirma\n" @@ -1253,17 +1347,17 @@ msgstr "Trovato 1 user id senza autofirma valida\n" msgid "%d user ids without valid self-signatures detected\n" msgstr "Trovati %d user id senza autofirme valide\n" -#: g10/keyedit.c:250 +#: g10/keyedit.c:249 #, c-format msgid "Already signed by key %08lX\n" msgstr "Gi� firmato dalla chiave %08lX\n" -#: g10/keyedit.c:258 +#: g10/keyedit.c:257 #, c-format msgid "Nothing to sign with key %08lX\n" msgstr "Niente da firmare con la chiave %08lX\n" -#: g10/keyedit.c:267 +#: g10/keyedit.c:265 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -1271,33 +1365,33 @@ msgstr "" "Sei davvero sicuro di volere firmare questa chiave\n" "con la tua chiave: \"" -#: g10/keyedit.c:274 +#: g10/keyedit.c:272 msgid "sign_uid.okay" msgstr "" -#: g10/keyedit.c:274 +#: g10/keyedit.c:272 msgid "Really sign? " msgstr "Firmo davvero? " -#: g10/keyedit.c:295 +#: g10/keyedit.c:293 #, c-format msgid "signing failed: %s\n" msgstr "firma fallita: %s\n" -#: g10/keyedit.c:346 +#: g10/keyedit.c:344 msgid "This key is not protected.\n" msgstr "Questa chiave non � protetta.\n" -#: g10/keyedit.c:349 +#: g10/keyedit.c:347 msgid "Key is protected.\n" msgstr "La chiave � protetta.\n" -#: g10/keyedit.c:366 +#: g10/keyedit.c:364 #, c-format msgid "Can't edit this key: %s\n" msgstr "Impossibile modificare questa chiave: %s\n" -#: g10/keyedit.c:371 +#: g10/keyedit.c:369 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -1305,7 +1399,7 @@ msgstr "" "Inserisci la nuova passphrase per questa chiave segreta.\n" "\n" -#: g10/keyedit.c:383 +#: g10/keyedit.c:381 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -1313,317 +1407,321 @@ msgstr "" "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n" "\n" -#: g10/keyedit.c:385 +#: g10/keyedit.c:383 msgid "change_passwd.empty.okay" msgstr "" -#: g10/keyedit.c:386 +#: g10/keyedit.c:384 msgid "Do you really want to do this? " msgstr "Vuoi veramente farlo?" -#: g10/keyedit.c:441 +#: g10/keyedit.c:439 msgid "quit" msgstr "" -#: g10/keyedit.c:441 +#: g10/keyedit.c:439 msgid "quit this menu" msgstr "abbandona questo men�" -#: g10/keyedit.c:442 +#: g10/keyedit.c:440 msgid "q" msgstr "" -#: g10/keyedit.c:443 +#: g10/keyedit.c:441 msgid "save" msgstr "" -#: g10/keyedit.c:443 +#: g10/keyedit.c:441 msgid "save and quit" msgstr "salva ed esci" -#: g10/keyedit.c:444 +#: g10/keyedit.c:442 msgid "help" msgstr "" -#: g10/keyedit.c:444 +#: g10/keyedit.c:442 msgid "show this help" msgstr "mostra questo aiuto" -#: g10/keyedit.c:446 +#: g10/keyedit.c:444 msgid "fpr" msgstr "" -#: g10/keyedit.c:446 +#: g10/keyedit.c:444 msgid "show fingerprint" msgstr "mostra le impronte digitali" -#: g10/keyedit.c:447 +#: g10/keyedit.c:445 msgid "list" msgstr "" -#: g10/keyedit.c:447 +#: g10/keyedit.c:445 msgid "list key and user ids" msgstr "elenca le chiavi e gli user id" -#: g10/keyedit.c:448 +#: g10/keyedit.c:446 msgid "l" msgstr "" -#: g10/keyedit.c:449 +#: g10/keyedit.c:447 msgid "uid" msgstr "" -#: g10/keyedit.c:449 +#: g10/keyedit.c:447 msgid "select user id N" msgstr "scegli l'user id N" -#: g10/keyedit.c:450 +#: g10/keyedit.c:448 msgid "key" msgstr "" -#: g10/keyedit.c:450 +#: g10/keyedit.c:448 msgid "select secondary key N" msgstr "scegli la chiave secondaria N" -#: g10/keyedit.c:451 +#: g10/keyedit.c:449 msgid "check" msgstr "" -#: g10/keyedit.c:451 +#: g10/keyedit.c:449 msgid "list signatures" msgstr "elenca le firme" -#: g10/keyedit.c:452 +#: g10/keyedit.c:450 msgid "c" msgstr "" -#: g10/keyedit.c:453 +#: g10/keyedit.c:451 msgid "sign" msgstr "" -#: g10/keyedit.c:453 +#: g10/keyedit.c:451 msgid "sign the key" msgstr "firma la chiave" -#: g10/keyedit.c:454 +#: g10/keyedit.c:452 msgid "s" msgstr "" -#: g10/keyedit.c:455 +#: g10/keyedit.c:453 msgid "debug" msgstr "" -#: g10/keyedit.c:456 +#: g10/keyedit.c:454 msgid "adduid" msgstr "" -#: g10/keyedit.c:456 +#: g10/keyedit.c:454 msgid "add a user id" msgstr "aggiungi un user id" -#: g10/keyedit.c:457 +#: g10/keyedit.c:455 msgid "deluid" msgstr "" -#: g10/keyedit.c:457 +#: g10/keyedit.c:455 msgid "delete user id" msgstr "cancella un user id" -#: g10/keyedit.c:458 +#: g10/keyedit.c:456 msgid "addkey" msgstr "" -#: g10/keyedit.c:458 +#: g10/keyedit.c:456 msgid "add a secondary key" msgstr "aggiungi una chiave secondaria" -#: g10/keyedit.c:459 +#: g10/keyedit.c:457 msgid "delkey" msgstr "" -#: g10/keyedit.c:459 +#: g10/keyedit.c:457 msgid "delete a secondary key" msgstr "cancella una chiave secondaria" -#: g10/keyedit.c:460 +#: g10/keyedit.c:458 msgid "toggle" msgstr "" -#: g10/keyedit.c:460 +#: g10/keyedit.c:458 msgid "toggle between secret and public key listing" msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica" -#: g10/keyedit.c:462 +#: g10/keyedit.c:460 msgid "t" msgstr "" -#: g10/keyedit.c:463 +#: g10/keyedit.c:461 msgid "pref" msgstr "" -#: g10/keyedit.c:463 +#: g10/keyedit.c:461 msgid "list preferences" msgstr "elenca le impostazioni" -#: g10/keyedit.c:464 +#: g10/keyedit.c:462 msgid "passwd" msgstr "" -#: g10/keyedit.c:464 +#: g10/keyedit.c:462 msgid "change the passphrase" msgstr "cambia la passphrase" -#: g10/keyedit.c:465 +#: g10/keyedit.c:463 msgid "trust" msgstr "" -#: g10/keyedit.c:465 +#: g10/keyedit.c:463 msgid "change the ownertrust" msgstr "cambia il valore di fiducia" -#: g10/keyedit.c:483 +#: g10/keyedit.c:481 msgid "can't do that in batchmode\n" msgstr "impossibile fare questo in batch mode\n" #. check that they match #. FIXME: check that they both match -#: g10/keyedit.c:506 +#: g10/keyedit.c:504 msgid "Secret key is available.\n" msgstr "� disponibile una chiave segreta.\n" -#: g10/keyedit.c:522 +#: g10/keyedit.c:520 msgid "keyedit.cmd" msgstr "" -#: g10/keyedit.c:522 +#: g10/keyedit.c:520 msgid "Command> " msgstr "Comando> " -#: g10/keyedit.c:547 +#: g10/keyedit.c:545 msgid "Need the secret key to to this.\n" msgstr "Per fare questo serve la chiave segreta.\n" -#: g10/keyedit.c:566 +#: g10/keyedit.c:564 msgid "keyedit.save.okay" msgstr "" -#: g10/keyedit.c:567 +#: g10/keyedit.c:565 msgid "Save changes? " msgstr "Salvo i cambiamenti? " -#: g10/keyedit.c:569 +#: g10/keyedit.c:567 msgid "keyedit.cancel.okay" msgstr "" -#: g10/keyedit.c:570 +#: g10/keyedit.c:568 msgid "Quit without saving? " msgstr "Esco senza salvare? " -#: g10/keyedit.c:580 +#: g10/keyedit.c:578 #, c-format msgid "update failed: %s\n" msgstr "aggiornamento fallito: %s\n" -#: g10/keyedit.c:587 +#: g10/keyedit.c:585 #, c-format msgid "update secret failed: %s\n" msgstr "aggiornamento della chiave segreta fallito: %s\n" -#: g10/keyedit.c:595 +#: g10/keyedit.c:593 msgid "Key not changed so no update needed.\n" msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n" -#: g10/keyedit.c:625 +#: g10/keyedit.c:623 msgid "keyedit.sign_all.okay" msgstr "" -#: g10/keyedit.c:626 +#: g10/keyedit.c:624 msgid "Really sign all user ids? " msgstr "Firmo davvero tutti gli user id? " -#: g10/keyedit.c:627 +#: g10/keyedit.c:625 msgid "Hint: Select the user ids to sign\n" msgstr "Suggerimento: seleziona gli user id da firmare\n" -#: g10/keyedit.c:655 +#: g10/keyedit.c:653 msgid "You must select at least one user id.\n" msgstr "Devi selezionare almeno un user id.\n" -#: g10/keyedit.c:657 +#: g10/keyedit.c:655 msgid "You can't delete the last user id!\n" msgstr "Non puoi cancellare l'ultimo user id!\n" -#: g10/keyedit.c:659 +#: g10/keyedit.c:657 msgid "keyedit.remove.uid.okay" msgstr "" -#: g10/keyedit.c:660 +#: g10/keyedit.c:658 msgid "Really remove all selected user ids? " msgstr "Tolgo davvero tutti gli user id selezionati? " -#: g10/keyedit.c:661 +#: g10/keyedit.c:659 msgid "Really remove this user id? " msgstr "Tolgo davvero questo user id? " -#: g10/keyedit.c:684 +#: g10/keyedit.c:682 msgid "You must select at least one key.\n" msgstr "Devi selezionare almeno una chiave.\n" -#: g10/keyedit.c:686 +#: g10/keyedit.c:684 msgid "keyedit.remove.subkey.okay" msgstr "" -#: g10/keyedit.c:688 +#: g10/keyedit.c:686 msgid "Do you really want to delete the selected keys? " msgstr "Vuoi davvero cancellare le chiavi selezionate? " -#: g10/keyedit.c:689 +#: g10/keyedit.c:687 msgid "Do you really want to delete this key? " msgstr "Vuoi davvero cancellare questa chiave? " -#: g10/keyedit.c:726 +#: g10/keyedit.c:724 msgid "Invalid command (try \"help\")\n" msgstr "Comando non valido (prova \"help\")\n" -#: g10/keyedit.c:1106 +#: g10/keyedit.c:1104 #, c-format msgid "No user id with index %d\n" msgstr "Nessun user id con l'indice %d\n" -#: g10/keyedit.c:1151 +#: g10/keyedit.c:1149 #, c-format msgid "No secondary key with index %d\n" msgstr "Nessuna chiave secondaria con l'indice %d\n" -#: g10/mainproc.c:198 +#: g10/mainproc.c:200 #, c-format msgid "public key decryption failed: %s\n" msgstr "Decifratura della chiave pubblica fallita: %s\n" -#: g10/mainproc.c:228 +#: g10/mainproc.c:230 #, c-format msgid "decryption failed: %s\n" msgstr "decifratura fallita: %s\n" -#: g10/mainproc.c:842 +#: g10/mainproc.c:247 +msgid "note: sender requested \"for-your-eyes-only\"\n" +msgstr "" + +#: g10/mainproc.c:846 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Firma fatta %.*s usando %s key ID %08lX\n" -#: g10/mainproc.c:848 +#: g10/mainproc.c:852 msgid "BAD signature from \"" msgstr "Firma NON corretta da \"" -#: g10/mainproc.c:849 +#: g10/mainproc.c:853 msgid "Good signature from \"" msgstr "Buona firma da \"" -#: g10/mainproc.c:860 +#: g10/mainproc.c:864 #, c-format msgid "Can't check signature: %s\n" msgstr "Impossibile controllare la firma: %s\n" -#: g10/passphrase.c:117 +#: g10/passphrase.c:141 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -1633,36 +1731,40 @@ msgstr "" "Ti serve una passphrase per sbloccare la chiave segreta\n" "dell'utente: \"" -#: g10/passphrase.c:126 +#: g10/passphrase.c:150 #, c-format msgid "(%u-bit %s key, ID %08lX, created %s)\n" msgstr "(chiave %2$s di %1$u-bit, ID %3$08lX, creata il %4$s)\n" -#: g10/passphrase.c:167 +#: g10/passphrase.c:174 msgid "passphrase.enter" msgstr "" -#: g10/passphrase.c:167 +#: g10/passphrase.c:174 msgid "Enter pass phrase: " msgstr "Inserisci la passphrase: " -#: g10/passphrase.c:170 +#: g10/passphrase.c:177 msgid "passphrase.repeat" msgstr "" -#: g10/passphrase.c:171 +#: g10/passphrase.c:178 msgid "Repeat pass phrase: " msgstr "Ripeti la passphrase: " -#: g10/plaintext.c:210 +#: g10/plaintext.c:102 +msgid "data not saved; use option \"--output\" to save it\n" +msgstr "" + +#: g10/plaintext.c:214 msgid "detached_signature.filename" msgstr "" -#: g10/plaintext.c:211 +#: g10/plaintext.c:215 msgid "Please enter name of data file: " msgstr "Inserisci il nome del file di dati: " -#: g10/plaintext.c:295 +#: g10/plaintext.c:299 #, c-format msgid "can't open signed data '%s'\n" msgstr "impossibile aprire i dati firmati '%s'\n" @@ -1682,6 +1784,11 @@ msgstr "" "Attenzione: individuata una chiave debole - per favore cambia ancora la\n" "passphrase.\n" +#: g10/sig-check.c:155 +msgid "" +"this is a PGP generated ElGamal key which is NOT secure for signatures!\n" +msgstr "" + #: g10/sig-check.c:165 msgid "public key created in future (time warp or clock problem)\n" msgstr "" @@ -1693,78 +1800,88 @@ msgstr "" msgid "warning: signature key expired %s\n" msgstr "attenzione: firma della chiave scaduta il %s\n" -#: g10/trustdb.c:316 +#: g10/trustdb.c:318 #, c-format msgid "error reading sigrec: %s\n" msgstr "errore leggendo la sigrec: %s\n" -#: g10/trustdb.c:321 +#: g10/trustdb.c:323 #, c-format msgid "chained sigrec %lu has a wrong owner\n" msgstr "la chained sigrec %lu ha il proprietario sbagliato\n" -#: g10/trustdb.c:364 +#: g10/trustdb.c:370 #, c-format msgid "key %08lX: secret key without public key\n" msgstr "chiave %08lX: chiave segreta senza chiave pubblica\n" -#: g10/trustdb.c:369 +#: g10/trustdb.c:375 #, c-format msgid "key %08lX: secret and public key don't match\n" msgstr "chiave %08lX: le chiavi segreta e pubblica non corrispondono\n" -#: g10/trustdb.c:380 +#: g10/trustdb.c:386 #, c-format msgid "key %08lX: can't put it into the trustdb\n" msgstr "chiave %08lX: impossibile metterla nel trustdb\n" -#: g10/trustdb.c:386 +#: g10/trustdb.c:392 #, c-format msgid "key %08lX: query record failed\n" msgstr "chiave %08lX: richiesta del record fallita\n" -#: g10/trustdb.c:395 +#: g10/trustdb.c:401 #, c-format msgid "key %08lX: already in ultikey_table\n" msgstr "chiave %08lX: gi� in ultikey_table\n" -#: g10/trustdb.c:402 +#: g10/trustdb.c:408 #, c-format msgid "enum_secret_keys failed: %s\n" msgstr "enum_secret_keys fallito: %s\n" -#: g10/trustdb.c:1614 +#: g10/trustdb.c:913 +#, fuzzy, c-format +msgid "key %08lX.%lu, uid %02X%02X: no public key for signature %08lX\n" +msgstr "chiave %08lX: nessun user id per la firma\n" + +#: g10/trustdb.c:920 +#, fuzzy, c-format +msgid "key %08lX.%lu, uid %02X%02X: invalid %ssignature: %s\n" +msgstr "chiave %08lX: autofirma non valida\n" + +#: g10/trustdb.c:1624 #, c-format msgid "key %08lX: insert trust record failed: %s\n" msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n" -#: g10/trustdb.c:1618 +#: g10/trustdb.c:1628 #, c-format msgid "key %08lX.%lu: inserted into trustdb\n" msgstr "chiave %08lX.%lu: inserita nel trustdb\n" -#: g10/trustdb.c:1629 +#: g10/trustdb.c:1639 #, c-format msgid "key %08lX.%lu: created in future (time warp or clock problem)\n" msgstr "" "chiave %08lX.%lu: creata nel futuro (salto nel tempo o problema\n" "con l'orologio)\n" -#: g10/trustdb.c:1637 +#: g10/trustdb.c:1647 #, c-format msgid "key %08lX.%lu: expired at %s\n" msgstr "chiave %08lX.%lu: scaduta il %s\n" -#: g10/trustdb.c:1646 +#: g10/trustdb.c:1656 #, c-format msgid "key %08lX.%lu: trust check failed: %s\n" msgstr "chiave %08lX.%lu: controllo della fiducia fallito: %s\n" -#: g10/status.c:233 +#: g10/status.c:246 msgid "No help available" msgstr "Nessun aiuto disponibile" -#: g10/status.c:239 +#: g10/status.c:252 #, c-format msgid "No help available for '%s'" msgstr "Nessun aiuto disponibile per '%s'" @@ -1814,3 +1931,6 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "" "Impossibile evitare una chiave debole per il cifrario simmetrico;\n" "ho provato %d volte!\n" + +#~ msgid "can't write keyring\n" +#~ msgstr "impossibile scrivere il portachiavi\n" diff --git a/util/logger.c b/util/logger.c index 0f181d8a5..aabeaec7d 100644 --- a/util/logger.c +++ b/util/logger.c @@ -173,13 +173,13 @@ g10_log_bug( const char *fmt, ... ) void g10_log_bug0( const char *file, int line, const char *func ) { - log_bug("Ohhhh jeeee ... (%s:%d:%s)\n", file, line, func ); + log_bug("you found a bug ... (%s:%d:%s)\n", file, line, func ); } #else void g10_log_bug0( const char *file, int line ) { - log_bug("Ohhhh jeeee ... (%s:%d)\n", file, line); + log_bug("you found a bug ... (%s:%d)\n", file, line); } #endif diff --git a/zlib/Makefile b/zlib/Makefile index 0d5d12d55..19fb03b42 100644 --- a/zlib/Makefile +++ b/zlib/Makefile @@ -1,5 +1,5 @@ # Generated automatically from Makefile.in by configure. -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.2f from Makefile.am # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -37,8 +37,6 @@ mandir = ${prefix}/man includedir = ${prefix}/include oldincludedir = /usr/include -DISTDIR = - pkgdatadir = $(datadir)/gnupg pkglibdir = $(libdir)/gnupg pkgincludedir = $(includedir)/gnupg @@ -68,8 +66,8 @@ host_alias = i586-pc-linux-gnu host_triplet = i586-pc-linux-gnu target_alias = i586-pc-linux-gnu target_triplet = i586-pc-linux-gnu -CATALOGS = -CATOBJEXT = +CATALOGS = en.gmo de.gmo it.gmo fr.gmo +CATOBJEXT = .gmo CC = gcc CPP = gcc -E DATADIRNAME = share @@ -77,25 +75,25 @@ DYNLINK_LDFLAGS = -rdynamic G10_LOCALEDIR = /usr/local//locale GENCAT = GMOFILES = en.gmo de.gmo it.gmo fr.gmo -GMSGFMT = +GMSGFMT = /usr/local/bin/msgfmt GT_NO = GT_YES = #YES# INCLUDE_LOCALE_H = #include <locale.h> -INSTOBJEXT = -INTLDEPS = -INTLLIBS = -INTLOBJS = +INSTOBJEXT = .mo +INTLDEPS = $(top_builddir)/intl/libintl.a +INTLLIBS = $(top_builddir)/intl/libintl.a +INTLOBJS = $(GETTOBJS) MKINSTALLDIRS = scripts/mkinstalldirs MPI_EXTRA_ASM_OBJS = -MSGFMT = +MSGFMT = /usr/local/bin/msgfmt PACKAGE = gnupg POFILES = en.po de.po it.po fr.po -POSUB = +POSUB = po RANLIB = ranlib -USE_INCLUDED_LIBINTL = no -USE_NLS = no +USE_INCLUDED_LIBINTL = yes +USE_NLS = yes VERSION = 0.4.0a -ZLIBS = ../zlib/libzlib.a +ZLIBS = l = CFLAGS = -O -Wall @@ -105,7 +103,7 @@ EXTRA_DIST = README algorithm.doc ChangeLog example.c # I found no other easy way to use this only if zlib is neede # doing this with SUBDIR = @xxx@ in the top Makefile.am does not # work because automake doesn't scan this Makefile.am here. -noinst_LIBRARIES = libzlib.a +#noinst_LIBRARIES = libzlib.a libzlib_a_SOURCES = adler32.c compress.c crc32.c gzio.c \ uncompr.c deflate.c trees.c zutil.c \ @@ -124,7 +122,7 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I.. CPPFLAGS = LDFLAGS = -LIBS = -ldl +LIBS = -ldl -lz libzlib_a_LIBADD = libzlib_a_OBJECTS = adler32.o compress.o crc32.o gzio.o uncompr.o \ deflate.o trees.o zutil.o inflate.o infblock.o inftrees.o infcodes.o \ @@ -146,14 +144,14 @@ DEP_FILES = .deps/adler32.P .deps/compress.P .deps/crc32.P \ SOURCES = $(libzlib_a_SOURCES) OBJECTS = $(libzlib_a_OBJECTS) -all: Makefile $(LIBRARIES) +default: all .SUFFIXES: .SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu zlib/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -269,6 +267,8 @@ install: install-exec install-data all uninstall: +all: Makefile $(LIBRARIES) + install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: @@ -305,7 +305,7 @@ maintainer-clean: maintainer-clean-noinstLIBRARIES \ @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ +.PHONY: default mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ |