aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2000-08-01 18:06:27 +0000
committerWerner Koch <[email protected]>2000-08-01 18:06:27 +0000
commitb996bf9777dff35e201a3b6cdd5cbe60b301c991 (patch)
treee66ca4eab69fc4e58be8f50c8afff68abf14e653
parentSee ChangeLog: Thu Jul 27 17:33:04 CEST 2000 Werner Koch (diff)
downloadgnupg-b996bf9777dff35e201a3b6cdd5cbe60b301c991.tar.gz
gnupg-b996bf9777dff35e201a3b6cdd5cbe60b301c991.zip
See ChangeLog: Tue Aug 1 20:06:23 CEST 2000 Werner Koch
-rw-r--r--AUTHORS3
-rw-r--r--NEWS2
-rw-r--r--THANKS1
-rw-r--r--VERSION2
-rw-r--r--doc/gpg.sgml9
-rw-r--r--g10/ChangeLog5
-rw-r--r--g10/g10.c3
-rw-r--r--g10/options.h1
-rw-r--r--g10/pubkey-enc.c2
-rw-r--r--po/da.po425
-rw-r--r--po/de.po426
-rw-r--r--po/eo.po426
-rw-r--r--po/es_ES.po425
-rw-r--r--po/fr.po426
-rw-r--r--po/id.po426
-rw-r--r--po/it.po426
-rw-r--r--po/ja.po426
-rw-r--r--po/nl.po426
-rw-r--r--po/pl.po426
-rw-r--r--po/pt_BR.po426
-rw-r--r--po/pt_PT.po426
-rw-r--r--po/ru.po426
-rw-r--r--po/sv.po426
23 files changed, 3145 insertions, 2845 deletions
diff --git a/AUTHORS b/AUTHORS
index ac600e40e..a2a3b7ea7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,6 +30,9 @@ Matthew Skala <[email protected]> Disclaimer
Niklas Hernaeus <[email protected]> Disclaimer
(weak key patches)
+Nils Ellmenreich <[email protected]> Assignment
+ (configure.in, cipher/rndlinux.c)
+
Pedro Morais <[email protected]> Translations [pt_BR]
R�mi Guyomarch <[email protected]> Assignment
diff --git a/NEWS b/NEWS
index e5ca648a1..72f0c553d 100644
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,7 @@ Noteworthy changes in the current CVS branch STABLE-BRANCH-1-0
to help the British folks to somewhat minimize the danger
of this Orwellian RIP bill.
- * New option --merge-only
+ * New options --merge-only and --try-all-secrets
Noteworthy changes in version 1.0.2 (2000-07-12)
diff --git a/THANKS b/THANKS
index af7a1b63f..c90c4706e 100644
--- a/THANKS
+++ b/THANKS
@@ -84,6 +84,7 @@ Martin Kahlert [email protected]
Martin Hamilton
Martin Schulte [email protected]
Matthew Skala [email protected]
+Matthias Urlichs [email protected]
Max Valianskiy [email protected]
Michael Fischer v. Mollard [email protected]
Michael Roth [email protected]
diff --git a/VERSION b/VERSION
index 3a83d37a6..d665b886a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.2a
+1.0.2b
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index c55b9dc9d..5142ff871 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1372,6 +1372,15 @@ handing out the secret key.
Don't insert new keys into the keyrings while doing an import.
</para></listitem></varlistentry>
+<varlistentry>
+<term>--try-all-secrets</term>
+<listitem><para>
+Don't look at the key ID as stored in the message but try all secret keys in
+turn to find the right decryption key. This option forces the behaviour as
+used by anonymous recipients (created by using --throw-keyid) and might come
+handy in case where an encrypted message contains a bogus key ID.
+</para></listitem></varlistentry>
+
</variablelist>
</refsect1>
diff --git a/g10/ChangeLog b/g10/ChangeLog
index c383e9029..95c4f146c 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 1 20:06:23 CEST 2000 Werner Koch <[email protected]>
+
+ * g10.c: New opttion --try-all-secrets on suggestion from Matthias Urlichs.
+ * pubkey-enc.c (get_session_key): Quite easy to implement here.
+
Thu Jul 27 17:33:04 CEST 2000 Werner Koch <[email protected]>
* g10.c: New option --merge-only. Suggested by Brendan O'Dea.
diff --git a/g10/g10.c b/g10/g10.c
index 65b48f426..49bd67ffc 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -193,6 +193,7 @@ enum cmd_and_opt_values { aNull = 0,
oNoRandomSeedFile,
oNoAutoKeyRetrieve,
oMergeOnly,
+ oTryAllSecrets,
oEmu3DESS2KBug, /* will be removed in 1.1 */
oEmuMDEncodeBug,
aTest };
@@ -378,6 +379,7 @@ static ARGPARSE_OPTS opts[] = {
{ oNoRandomSeedFile, "no-random-seed-file", 0, "@" },
{ oNoAutoKeyRetrieve, "no-auto-key-retrieve", 0, "@" },
{ oMergeOnly, "merge-only", 0, "@" },
+ { oTryAllSecrets, "try-all-secrets", 0, "@" },
{ oEmu3DESS2KBug, "emulate-3des-s2k-bug", 0, "@"},
{ oEmuMDEncodeBug, "emulate-md-encode-bug", 0, "@"},
{0} };
@@ -931,6 +933,7 @@ main( int argc, char **argv )
opt.override_session_key = pargs.r.ret_str;
break;
case oMergeOnly: opt.merge_only = 1; break;
+ case oTryAllSecrets: opt.try_all_secrets = 1; break;
default : pargs.err = configfp? 1:2; break;
}
diff --git a/g10/options.h b/g10/options.h
index 265c50c61..95881092a 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -94,6 +94,7 @@ struct {
const char *override_session_key;
int show_session_key;
int merge_only;
+ int try_all_secrets;
} opt;
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c
index b1a9c8ec4..97c73bbc7 100644
--- a/g10/pubkey-enc.c
+++ b/g10/pubkey-enc.c
@@ -54,7 +54,7 @@ get_session_key( PKT_pubkey_enc *k, DEK *dek )
if( rc )
goto leave;
- if( k->keyid[0] || k->keyid[1] ) {
+ if( (k->keyid[0] || k->keyid[1]) && !opt.try_all_secrets ) {
sk = m_alloc_clear( sizeof *sk );
sk->pubkey_algo = k->pubkey_algo; /* we want a pubkey with this algo*/
if( !(rc = get_seckey( sk, k->keyid )) )
diff --git a/po/da.po b/po/da.po
index b4d652d3d..70719bab7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-27 17:31+0200\n"
"PO-Revision-Date: 2000-03-07 22:51+01:00\n"
"Last-Translator: Birger Langkjer <[email protected]>\n"
"Language-Team: Danish <[email protected]>\n"
@@ -257,7 +257,7 @@ msgstr "... dette er en fejl (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "du fandt en fejl ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan ikke �bne '%s': %s\n"
@@ -338,7 +338,7 @@ msgstr ""
"Ikke nok tilf�ldige byte tilg�ngelig. Please do some other work to give\n"
"the OS a chance to collect more entropy! (Kr�ver %d byte mere)\n"
-#: g10/g10.c:197
+#: g10/g10.c:203
msgid ""
"@Commands:\n"
" "
@@ -346,139 +346,139 @@ msgstr ""
"@Kommandoer:\n"
" "
-#: g10/g10.c:199
+#: g10/g10.c:205
msgid "|[file]|make a signature"
msgstr "|[filer]|opret en signatur"
-#: g10/g10.c:200
+#: g10/g10.c:206
msgid "|[file]|make a clear text signature"
msgstr "|[filer]|opret rentekst signatur"
-#: g10/g10.c:201
+#: g10/g10.c:207
msgid "make a detached signature"
msgstr "opret en separat signatur"
-#: g10/g10.c:202
+#: g10/g10.c:208
msgid "encrypt data"
msgstr "krypt�r data"
-#: g10/g10.c:203
+#: g10/g10.c:209
msgid "encryption only with symmetric cipher"
msgstr "krypt�r kun med symmetriske cifre"
-#: g10/g10.c:204
+#: g10/g10.c:210
msgid "store only"
msgstr "gem kun"
-#: g10/g10.c:205
+#: g10/g10.c:211
msgid "decrypt data (default)"
msgstr "afkrypt�r data (standard)"
-#: g10/g10.c:206
+#: g10/g10.c:212
msgid "verify a signature"
msgstr "godkend en signatur"
-#: g10/g10.c:208
+#: g10/g10.c:214
msgid "list keys"
msgstr "vis n�gler"
-#: g10/g10.c:210
+#: g10/g10.c:216
msgid "list keys and signatures"
msgstr "vis n�gler og signaturer"
-#: g10/g10.c:211
+#: g10/g10.c:217
msgid "check key signatures"
msgstr "tjek n�glesignaturer"
-#: g10/g10.c:212
+#: g10/g10.c:218
msgid "list keys and fingerprints"
msgstr "vis n�gle og fingeraftryk"
-#: g10/g10.c:213
+#: g10/g10.c:219
msgid "list secret keys"
msgstr "vis hemmelige n�gler"
-#: g10/g10.c:214
+#: g10/g10.c:220
msgid "generate a new key pair"
msgstr "gener�r et nyt n�glepar"
-#: g10/g10.c:215
+#: g10/g10.c:221
msgid "remove key from the public keyring"
msgstr "fjern n�gle fra den offentlige n�glering"
-#: g10/g10.c:217
+#: g10/g10.c:223
msgid "remove key from the secret keyring"
msgstr "fjern n�gle fra den hemmelige n�glering"
-#: g10/g10.c:218
+#: g10/g10.c:224
msgid "sign a key"
msgstr "sign�r en n�gle"
-#: g10/g10.c:219
+#: g10/g10.c:225
msgid "sign a key locally"
msgstr "sign�r en n�gle lokalt"
-#: g10/g10.c:220
+#: g10/g10.c:226
msgid "sign or edit a key"
msgstr "sign�r eller redig�r en n�gle"
-#: g10/g10.c:221
+#: g10/g10.c:227
msgid "generate a revocation certificate"
msgstr "Gener�r en annull�rbar certifikat"
-#: g10/g10.c:222
+#: g10/g10.c:228
msgid "export keys"
msgstr "eksport�r n�gler"
-#: g10/g10.c:223
+#: g10/g10.c:229
msgid "export keys to a key server"
msgstr "eksport�r n�gler til en n�gletjener"
-#: g10/g10.c:224
+#: g10/g10.c:230
msgid "import keys from a key server"
msgstr "import�r n�gler fra en n�gleserver"
-#: g10/g10.c:228
+#: g10/g10.c:234
msgid "import/merge keys"
msgstr "import�r/fusion�r n�gler"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "list only the sequence of packets"
msgstr "vis kun pakkesekvensen"
-#: g10/g10.c:232
+#: g10/g10.c:238
msgid "export the ownertrust values"
msgstr "eksport�r ejertillidsv�rdierne"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "import ownertrust values"
msgstr "import�r ejertillidsv�rdierne"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "update the trust database"
msgstr "opdat�r tillidsdatabasen"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|[NAMES]|check the trust database"
msgstr "|[NAMES]|tjek tillidsdatabasen"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "fix a corrupted trust database"
msgstr "repar�r en �delagt tillidsdatabase"
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "De-Armor a file or stdin"
msgstr "De-beskydt en fil el. stdin"
-#: g10/g10.c:242
+#: g10/g10.c:248
msgid "En-Armor a file or stdin"
msgstr "Beskydt en fil el. stdin"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "|algo [files]|print message digests"
msgstr "|algo [filer]|print meddelelsesresum�"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid ""
"@\n"
"Options:\n"
@@ -488,154 +488,154 @@ msgstr ""
"Indstillinger:\n"
" "
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "create ascii armored output"
msgstr "opret ascii beskyttet uddata"
-#: g10/g10.c:252
+#: g10/g10.c:258
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|krypt�r for NAME"
-#: g10/g10.c:255
+#: g10/g10.c:261
msgid "|NAME|use NAME as default recipient"
msgstr "|NAME|brug NAME som standard modtager"
-#: g10/g10.c:257
+#: g10/g10.c:263
msgid "use the default key as default recipient"
msgstr "brug standard n�glen som standard modtager"
-#: g10/g10.c:261
+#: g10/g10.c:267
msgid "use this user-id to sign or decrypt"
msgstr "brug denne bruger-id til at signere eller dekryptere"
-#: g10/g10.c:262
+#: g10/g10.c:268
msgid "|N|set compress level N (0 disables)"
msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
-#: g10/g10.c:264
+#: g10/g10.c:270
msgid "use canonical text mode"
msgstr "brug kanonisk tekstmodus"
-#: g10/g10.c:265
+#: g10/g10.c:271
msgid "use as output file"
msgstr "brug som uddatafil"
-#: g10/g10.c:266
+#: g10/g10.c:272
msgid "verbose"
msgstr "meddelsom"
-#: g10/g10.c:267
+#: g10/g10.c:273
msgid "be somewhat more quiet"
msgstr "v�r mere stille"
-#: g10/g10.c:268
+#: g10/g10.c:274
msgid "don't use the terminal at all"
msgstr "brug overhovedet ikke terminalen"
-#: g10/g10.c:269
+#: g10/g10.c:275
msgid "force v3 signatures"
msgstr "tving v3 signaturer"
-#: g10/g10.c:270
+#: g10/g10.c:276
msgid "always use a MDC for encryption"
msgstr "brug altid en MDC for kryptering"
-#: g10/g10.c:271
+#: g10/g10.c:277
msgid "do not make any changes"
msgstr "lav ingen �ndringer"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:279
msgid "batch mode: never ask"
msgstr "k�rselsmodus: sp�rg aldrig"
-#: g10/g10.c:274
+#: g10/g10.c:280
msgid "assume yes on most questions"
msgstr "forvent ja til de fleste spr�gsm�l"
-#: g10/g10.c:275
+#: g10/g10.c:281
msgid "assume no on most questions"
msgstr "forvent nej til de fleste spr�gsm�l"
-#: g10/g10.c:276
+#: g10/g10.c:282
msgid "add this keyring to the list of keyrings"
msgstr "tilf�j denne n�glering til n�gleringslisten"
-#: g10/g10.c:277
+#: g10/g10.c:283
msgid "add this secret keyring to the list"
msgstr "tilf�j denne hemmeligen�glering til listen"
-#: g10/g10.c:278
+#: g10/g10.c:284
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|brug NAME som standard hemmelign�gle"
-#: g10/g10.c:279
+#: g10/g10.c:285
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
-#: g10/g10.c:280
+#: g10/g10.c:286
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAME|s�t terminal karakters�t til NAME"
-#: g10/g10.c:281
+#: g10/g10.c:287
msgid "read options from file"
msgstr "l�s indstillinger fra fil"
-#: g10/g10.c:285
+#: g10/g10.c:291
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinfo til denne FD"
-#: g10/g10.c:290
+#: g10/g10.c:296
msgid "|FILE|load extension module FILE"
msgstr "|FILE|indl�s udvidelsesmodul FILE"
-#: g10/g10.c:291
+#: g10/g10.c:297
msgid "emulate the mode described in RFC1991"
msgstr "emul�r modusen beskrevet i RFC1991"
-#: g10/g10.c:292
+#: g10/g10.c:298
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "s�t alle pakker, cifre og resum� flag til OpenPGP standard"
-#: g10/g10.c:293
+#: g10/g10.c:299
msgid "|N|use passphrase mode N"
msgstr "|N|brug pasfrasemodus N"
-#: g10/g10.c:295
+#: g10/g10.c:301
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NAME|brug meddelelses resum�algoritme NAME for pasfrase"
-#: g10/g10.c:297
+#: g10/g10.c:303
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
-#: g10/g10.c:298
+#: g10/g10.c:304
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|brug cifferalgoritme NAME"
-#: g10/g10.c:299
+#: g10/g10.c:305
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
-#: g10/g10.c:300
+#: g10/g10.c:306
msgid "|N|use compress algorithm N"
msgstr "|N|brug kompresalgoritme N"
-#: g10/g10.c:301
+#: g10/g10.c:307
msgid "throw keyid field of encrypted packets"
msgstr ""
-#: g10/g10.c:302
+#: g10/g10.c:308
msgid "|NAME=VALUE|use this notation data"
msgstr "|NAME=VALUE|brug denne notationsdata"
-#: g10/g10.c:305
+#: g10/g10.c:311
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/g10.c:308
+#: g10/g10.c:314
msgid ""
"@\n"
"Examples:\n"
@@ -655,16 +655,16 @@ msgstr ""
" --list-keys [navne] vis n�gler\n"
" --fingerprint [navne] vis fingeraftryk\n"
-#: g10/g10.c:403
+#: g10/g10.c:412
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
-#: g10/g10.c:407
+#: g10/g10.c:416
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
# Skal alt dette overs�ttes eller er det flagene?
-#: g10/g10.c:410
+#: g10/g10.c:419
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -674,7 +674,7 @@ msgstr ""
"sign, check, encrypt eller decrypt\n"
"standard operation afh�nger af inddata\n"
-#: g10/g10.c:417
+#: g10/g10.c:426
msgid ""
"\n"
"Supported algorithms:\n"
@@ -682,195 +682,195 @@ msgstr ""
"\n"
"Underst�ttede algoritmer:\n"
-#: g10/g10.c:496
+#: g10/g10.c:505
msgid "usage: gpg [options] "
msgstr "brug: gpg [flag] "
-#: g10/g10.c:549
+#: g10/g10.c:558
msgid "conflicting commands\n"
msgstr "konfliktende kommandoer\n"
-#: g10/g10.c:692
+#: g10/g10.c:701
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTITS: ingen standard alternativfil '%s'\n"
-#: g10/g10.c:696
+#: g10/g10.c:705
#, c-format
msgid "option file `%s': %s\n"
msgstr "alternativfil`%s': %s\n"
-#: g10/g10.c:703
+#: g10/g10.c:712
#, c-format
msgid "reading options from `%s'\n"
msgstr "l�ser indstillinger fra `%s'\n"
-#: g10/g10.c:893
+#: g10/g10.c:902
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s er ikke et gyldigt tegns�t\n"
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:963 g10/g10.c:972
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTITS: %s er ikke til normal brug!\n"
-#: g10/g10.c:951
+#: g10/g10.c:965
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ikke tilladt med %s!\n"
-#: g10/g10.c:954
+#: g10/g10.c:968
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er meningsl�s sammen med %s!\n"
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:987 g10/g10.c:999
msgid "selected cipher algorithm is invalid\n"
msgstr "valgte cifferalgoritme er ugyldig\n"
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:993 g10/g10.c:1005
msgid "selected digest algorithm is invalid\n"
msgstr "valgte resum�algoritme er ugyldig\n"
-#: g10/g10.c:995
+#: g10/g10.c:1009
msgid "the given policy URL is invalid\n"
msgstr "den givne politik-URL er ugyldig\n"
-#: g10/g10.c:998
+#: g10/g10.c:1012
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr ""
-#: g10/g10.c:1000
+#: g10/g10.c:1014
msgid "completes-needed must be greater than 0\n"
msgstr ""
-#: g10/g10.c:1002
+#: g10/g10.c:1016
msgid "marginals-needed must be greater than 1\n"
msgstr ""
-#: g10/g10.c:1004
+#: g10/g10.c:1018
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr ""
-#: g10/g10.c:1007
+#: g10/g10.c:1021
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
-#: g10/g10.c:1011
+#: g10/g10.c:1025
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
# er det klogt at overs�tte TrustDB?
-#: g10/g10.c:1096
+#: g10/g10.c:1110
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "kunne ikke initialisere TillidsDB: %s\n"
-#: g10/g10.c:1102
+#: g10/g10.c:1116
msgid "--store [filename]"
msgstr "--store [filnavn (som gemmes)]"
-#: g10/g10.c:1109
+#: g10/g10.c:1123
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
-#: g10/g10.c:1117
+#: g10/g10.c:1131
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn (som krypteres)]"
-#: g10/g10.c:1130
+#: g10/g10.c:1144
msgid "--sign [filename]"
msgstr "--sign [filnavn (som signeres)]"
-#: g10/g10.c:1143
+#: g10/g10.c:1157
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
-#: g10/g10.c:1157
+#: g10/g10.c:1171
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
-#: g10/g10.c:1174
+#: g10/g10.c:1188
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn (som dekrypteres)]"
-#: g10/g10.c:1182
+#: g10/g10.c:1196
msgid "--sign-key user-id"
msgstr "--sign-key bruger-id"
-#: g10/g10.c:1190
+#: g10/g10.c:1204
msgid "--lsign-key user-id"
msgstr "--lsign-key bruger-id"
-#: g10/g10.c:1198
+#: g10/g10.c:1212
msgid "--edit-key user-id [commands]"
msgstr "--edit-key bruger-id [kommandoer]"
-#: g10/g10.c:1214
+#: g10/g10.c:1228
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key bruger-id"
-#: g10/g10.c:1217
+#: g10/g10.c:1231
msgid "--delete-key user-id"
msgstr "--delete-key bruger-id"
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:260 g10/g10.c:1268 g10/sign.c:393
#, c-format
msgid "can't open %s: %s\n"
msgstr "kan ikke �bne %s: %s\n"
-#: g10/g10.c:1269
+#: g10/g10.c:1283
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
-#: g10/g10.c:1335
+#: g10/g10.c:1349
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: g10/g10.c:1343
+#: g10/g10.c:1357
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
-#: g10/g10.c:1411
+#: g10/g10.c:1428
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "ugyldig hash-algoritme `%s'\n"
-#: g10/g10.c:1492
+#: g10/g10.c:1509
msgid "[filename]"
msgstr "[filnavn]"
-#: g10/g10.c:1496
+#: g10/g10.c:1513
msgid "Go ahead and type your message ...\n"
msgstr "G� til sagen og skriv meddelelsen ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1516 g10/verify.c:68 g10/verify.c:113
#, c-format
msgid "can't open `%s'\n"
msgstr "kan ikke �bne `%s'\n"
-#: g10/g10.c:1669
+#: g10/g10.c:1689
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"f�rste bogstav af en notationsnavn skal v�re et bogstave eller en "
"understregning\n"
-#: g10/g10.c:1675
+#: g10/g10.c:1695
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
msgstr ""
-#: g10/g10.c:1681
+#: g10/g10.c:1701
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
-#: g10/g10.c:1689
+#: g10/g10.c:1709
msgid "a notation value must not use any control characters\n"
msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
@@ -1615,236 +1615,246 @@ msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
msgid "[User id not found]"
msgstr "%s: bruger ikke fundet\n"
-#: g10/import.c:181
+#: g10/import.c:182
#, c-format
msgid "skipping block of type %d\n"
msgstr "sprang over blok af typen %d\n"
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1740 g10/trustdb.c:1781
#, c-format
msgid "%lu keys so far processed\n"
msgstr "%lu n�gler behandlet indtil nu\n"
-#: g10/import.c:193
+#: g10/import.c:194
#, c-format
msgid "error reading `%s': %s\n"
msgstr "fejl ved l�sning af '%s': %s\n"
-#: g10/import.c:203
+#: g10/import.c:204
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Totalt antal behandlede: %lu\n"
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " nye undern�gler: %lu\n"
+
+#: g10/import.c:209
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr ""
-#: g10/import.c:207
+#: g10/import.c:211
#, c-format
msgid " imported: %lu"
msgstr " importerede: %lu"
-#: g10/import.c:213
+#: g10/import.c:217
#, c-format
msgid " unchanged: %lu\n"
msgstr " u�ndrede: %lu\n"
-#: g10/import.c:215
+#: g10/import.c:219
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nye bruger-id'er: %lu\n"
-#: g10/import.c:217
+#: g10/import.c:221
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nye undern�gler: %lu\n"
-#: g10/import.c:219
+#: g10/import.c:223
#, c-format
msgid " new signatures: %lu\n"
msgstr " nye signaturer: %lu\n"
-#: g10/import.c:221
+#: g10/import.c:225
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nye n�gletilbagekald: %lu\n"
-#: g10/import.c:223
+#: g10/import.c:227
#, c-format
msgid " secret keys read: %lu\n"
msgstr " hemmelige n�gler l�st: %lu\n"
-#: g10/import.c:225
+#: g10/import.c:229
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "hemmelige n�gler import: %lu\n"
-#: g10/import.c:227
+#: g10/import.c:231
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "hemmelige n�gler u�ndre: %lu\n"
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "n�gle %08lX: ingen bruger-id\n"
-#: g10/import.c:400
+#: g10/import.c:405
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
-#: g10/import.c:402
+#: g10/import.c:407
msgid "this may be caused by a missing self-signature\n"
msgstr ""
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
+
+#: g10/import.c:431
msgid "no default public keyring\n"
msgstr "ingen standard offentlig n�glering\n"
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
#, c-format
msgid "writing to `%s'\n"
msgstr "skriver til `%s'\n"
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
#, c-format
msgid "can't lock keyring `%s': %s\n"
msgstr "kan ikke l�se n�glering `%s': %s\n"
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "fejl ved skrivning af n�glering `%s': %s\n"
-#: g10/import.c:434
+#: g10/import.c:446
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "n�gle %08lX: offentlig n�gle importeret\n"
-#: g10/import.c:451
+#: g10/import.c:463
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "n�gle %08lX: stemmer ikke med vores kopi\n"
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "n�gle %08lX: kan ikke lokalisere original n�gleblok: %s\n"
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "n�gle %08lX: kan ikke l�se original n�gleblok: %s\n"
-#: g10/import.c:493
+#: g10/import.c:505
#, c-format
msgid "key %08lX: 1 new user ID\n"
msgstr ""
-#: g10/import.c:496
+#: g10/import.c:508
#, c-format
msgid "key %08lX: %d new user IDs\n"
msgstr ""
-#: g10/import.c:499
+#: g10/import.c:511
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr ""
-#: g10/import.c:502
+#: g10/import.c:514
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr ""
-#: g10/import.c:505
+#: g10/import.c:517
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr ""
-#: g10/import.c:508
+#: g10/import.c:520
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr ""
-#: g10/import.c:518
+#: g10/import.c:530
#, c-format
msgid "key %08lX: not changed\n"
msgstr ""
-#: g10/import.c:601
+#: g10/import.c:613
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr ""
#. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr ""
-#: g10/import.c:610
+#: g10/import.c:622
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr ""
-#: g10/import.c:639
+#: g10/import.c:651
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:682
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr ""
-#: g10/import.c:702
+#: g10/import.c:714
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr ""
-#: g10/import.c:744
+#: g10/import.c:756
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr ""
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr ""
-#: g10/import.c:752
+#: g10/import.c:764
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr ""
-#: g10/import.c:767
+#: g10/import.c:779
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr ""
-#: g10/import.c:776
+#: g10/import.c:788
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr ""
-#: g10/import.c:803
+#: g10/import.c:815
#, c-format
msgid "key %08lX: accepted non self-signed user ID '"
msgstr ""
-#: g10/import.c:832
+#: g10/import.c:844
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr ""
-#: g10/import.c:855
+#: g10/import.c:867
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr ""
@@ -1853,32 +1863,32 @@ msgstr ""
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr ""
-#: g10/import.c:889
+#: g10/import.c:901
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr ""
-#: g10/import.c:897
+#: g10/import.c:909
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr ""
-#: g10/import.c:997
+#: g10/import.c:1009
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr ""
-#: g10/import.c:1048
+#: g10/import.c:1060
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr ""
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr ""
@@ -2447,8 +2457,17 @@ msgstr ""
msgid "no secret key\n"
msgstr ""
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "ugyldig rustning"
+
+#: g10/keylist.c:178
+msgid "revoked"
+msgstr ""
+
#. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
#, fuzzy, c-format
msgid " [expires: %s]"
msgstr "N�gle udl�ber d. %s\n"
@@ -2458,104 +2477,104 @@ msgstr "N�gle udl�ber d. %s\n"
msgid "public key is %08lX\n"
msgstr ""
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
msgid "public key encrypted data: good DEK\n"
msgstr ""
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr ""
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr ""
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
msgid "no secret key for decryption available\n"
msgstr ""
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
#, c-format
msgid "public key decryption failed: %s\n"
msgstr ""
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
msgid "decryption okay\n"
msgstr ""
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr ""
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
#, c-format
msgid "decryption failed: %s\n"
msgstr ""
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr ""
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
#, c-format
msgid "original file name='%.*s'\n"
msgstr ""
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
msgid "WARNING: invalid notation data found\n"
msgstr ""
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
msgid "Notation: "
msgstr ""
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
msgid "Policy: "
msgstr "Politik: "
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
msgid "signature verification suppressed\n"
msgstr ""
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr ""
#. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
msgid "BAD signature from \""
msgstr "D�RLIG signatur fra \""
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
msgid "Good signature from \""
msgstr "God signatur fra \""
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
msgid " aka \""
msgstr " alias \""
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Kan ikke tjekke signatur: %s\n"
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr ""
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
msgid "old style (PGP 2.x) signature\n"
msgstr "gammeldags (PGP 2.x) signatur\n"
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
msgid "invalid root packet detected in proc_tree()\n"
msgstr ""
@@ -2621,23 +2640,23 @@ msgstr "Indtast kodes�tning: "
msgid "Repeat passphrase: "
msgstr "Gentag kodes�tning: "
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
msgid "Detached signature.\n"
msgstr ""
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
msgid "Please enter name of data file: "
msgstr ""
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
msgid "reading stdin ...\n"
msgstr "l�ser stdin ...\n"
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
#, c-format
msgid "can't open signed data `%s'\n"
msgstr ""
diff --git a/po/de.po b/po/de.po
index bd919479c..e4b48422b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-27 17:31+0200\n"
"PO-Revision-Date: 2000-06-12 12:50+0200\n"
"Last-Translator: Walter Koch <[email protected]>\n"
"Language-Team: German <[email protected]>\n"
@@ -257,7 +257,7 @@ msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
@@ -340,7 +340,7 @@ msgstr ""
"Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
"(Es werden noch %d Byte ben�tigt.)\n"
-#: g10/g10.c:197
+#: g10/g10.c:203
msgid ""
"@Commands:\n"
" "
@@ -348,139 +348,139 @@ msgstr ""
"@Befehle:\n"
" "
-#: g10/g10.c:199
+#: g10/g10.c:205
msgid "|[file]|make a signature"
msgstr "|[Datei]|Eine Unterschrift erzeugen"
-#: g10/g10.c:200
+#: g10/g10.c:206
msgid "|[file]|make a clear text signature"
msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
-#: g10/g10.c:201
+#: g10/g10.c:207
msgid "make a detached signature"
msgstr "Eine abgetrennte Unterschrift erzeugen"
-#: g10/g10.c:202
+#: g10/g10.c:208
msgid "encrypt data"
msgstr "Daten verschl�sseln"
-#: g10/g10.c:203
+#: g10/g10.c:209
msgid "encryption only with symmetric cipher"
msgstr "Daten symmetrisch verschl�sseln"
-#: g10/g10.c:204
+#: g10/g10.c:210
msgid "store only"
msgstr "Nur speichern"
-#: g10/g10.c:205
+#: g10/g10.c:211
msgid "decrypt data (default)"
msgstr "Daten entschl�sseln (Voreinstellung)"
-#: g10/g10.c:206
+#: g10/g10.c:212
msgid "verify a signature"
msgstr "Signatur pr�fen"
-#: g10/g10.c:208
+#: g10/g10.c:214
msgid "list keys"
msgstr "Liste der Schl�ssel"
-#: g10/g10.c:210
+#: g10/g10.c:216
msgid "list keys and signatures"
msgstr "Liste der Schl�ssel und ihrer Signaturen"
-#: g10/g10.c:211
+#: g10/g10.c:217
msgid "check key signatures"
msgstr "Signaturen der Schl�ssel pr�fen"
-#: g10/g10.c:212
+#: g10/g10.c:218
msgid "list keys and fingerprints"
msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
-#: g10/g10.c:213
+#: g10/g10.c:219
msgid "list secret keys"
msgstr "Liste der geheimen Schl�ssel"
-#: g10/g10.c:214
+#: g10/g10.c:220
msgid "generate a new key pair"
msgstr "Ein neues Schl�sselpaar erzeugen"
-#: g10/g10.c:215
+#: g10/g10.c:221
msgid "remove key from the public keyring"
msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
-#: g10/g10.c:217
+#: g10/g10.c:223
msgid "remove key from the secret keyring"
msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
-#: g10/g10.c:218
+#: g10/g10.c:224
msgid "sign a key"
msgstr "Schl�ssel signieren"
-#: g10/g10.c:219
+#: g10/g10.c:225
msgid "sign a key locally"
msgstr "Schl�ssel nur auf diesem Rechner signieren"
-#: g10/g10.c:220
+#: g10/g10.c:226
msgid "sign or edit a key"
msgstr "Unterschreiben oder Bearbeiten eines Schl."
-#: g10/g10.c:221
+#: g10/g10.c:227
msgid "generate a revocation certificate"
msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
-#: g10/g10.c:222
+#: g10/g10.c:228
msgid "export keys"
msgstr "Schl�ssel exportieren"
-#: g10/g10.c:223
+#: g10/g10.c:229
msgid "export keys to a key server"
msgstr "Schl�ssel zu einem Schl�.server exportieren"
-#: g10/g10.c:224
+#: g10/g10.c:230
msgid "import keys from a key server"
msgstr "Schl�ssel von einem Schl�.server importieren"
-#: g10/g10.c:228
+#: g10/g10.c:234
msgid "import/merge keys"
msgstr "Schl�ssel importieren/kombinieren"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "list only the sequence of packets"
msgstr "Lediglich Struktur der Datenpakete anzeigen"
-#: g10/g10.c:232
+#: g10/g10.c:238
msgid "export the ownertrust values"
msgstr "Exportieren der \"Owner trust\" Werte"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "import ownertrust values"
msgstr "Importieren der \"Owner trust\" Werte"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "update the trust database"
msgstr "�ndern der \"Trust\"-Datenbank"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|[NAMES]|check the trust database"
msgstr "|[NAMEN]|�berpr�fen der \"Trust\"-Datenbank"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "fix a corrupted trust database"
msgstr "Reparieren einer besch�digten \"Trust\"-Datenb."
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "De-Armor a file or stdin"
msgstr "Datei oder stdin von der ASCII-H�lle befreien"
-#: g10/g10.c:242
+#: g10/g10.c:248
msgid "En-Armor a file or stdin"
msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "|algo [files]|print message digests"
msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid ""
"@\n"
"Options:\n"
@@ -490,152 +490,152 @@ msgstr ""
"Optionen:\n"
" "
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "create ascii armored output"
msgstr "Ausgabe mit ASCII-H�lle versehen"
-#: g10/g10.c:252
+#: g10/g10.c:258
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|Verschl�sseln f�r NAME"
-#: g10/g10.c:255
+#: g10/g10.c:261
msgid "|NAME|use NAME as default recipient"
msgstr "|NAME|NAME als voreingestellten Empf�nger benutzen"
-#: g10/g10.c:257
+#: g10/g10.c:263
msgid "use the default key as default recipient"
msgstr ""
"Den Standardschl�ssel als voreingestellten\n"
"Empf�nger benutzen"
-#: g10/g10.c:261
+#: g10/g10.c:267
msgid "use this user-id to sign or decrypt"
msgstr "Mit dieser User-ID signieren"
-#: g10/g10.c:262
+#: g10/g10.c:268
msgid "|N|set compress level N (0 disables)"
msgstr "Kompressionsstufe auf N setzen (0=keine)"
-#: g10/g10.c:264
+#: g10/g10.c:270
msgid "use canonical text mode"
msgstr "Textmodus benutzen"
-#: g10/g10.c:265
+#: g10/g10.c:271
msgid "use as output file"
msgstr "Als Ausgabedatei benutzen"
-#: g10/g10.c:266
+#: g10/g10.c:272
msgid "verbose"
msgstr "Detaillierte Informationen"
-#: g10/g10.c:267
+#: g10/g10.c:273
msgid "be somewhat more quiet"
msgstr "Etwas weniger Infos"
-#: g10/g10.c:268
+#: g10/g10.c:274
msgid "don't use the terminal at all"
msgstr "das Terminal gar nicht benutzen"
-#: g10/g10.c:269
+#: g10/g10.c:275
msgid "force v3 signatures"
msgstr "v3 Signaturen erzwingen"
-#: g10/g10.c:270
+#: g10/g10.c:276
msgid "always use a MDC for encryption"
msgstr "Beim Verschl�sseln ein Siegel (MDC) verwenden"
-#: g10/g10.c:271
+#: g10/g10.c:277
msgid "do not make any changes"
msgstr "Keine wirklichen �nderungen durchf�hren"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:279
msgid "batch mode: never ask"
msgstr "Stapelmodus: Keine Abfragen"
-#: g10/g10.c:274
+#: g10/g10.c:280
msgid "assume yes on most questions"
msgstr "\"Ja\" als Standardantwort annehmen"
-#: g10/g10.c:275
+#: g10/g10.c:281
msgid "assume no on most questions"
msgstr "\"Nein\" als Standardantwort annehmen"
-#: g10/g10.c:276
+#: g10/g10.c:282
msgid "add this keyring to the list of keyrings"
msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
-#: g10/g10.c:277
+#: g10/g10.c:283
msgid "add this secret keyring to the list"
msgstr "Als geheimen Schl�sselbund mitbenutzen"
-#: g10/g10.c:278
+#: g10/g10.c:284
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
-#: g10/g10.c:279
+#: g10/g10.c:285
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|Schl�ssel bei diesem Server nachschlagen"
-#: g10/g10.c:280
+#: g10/g10.c:286
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAME|Terminalzeichensatz NAME benutzen"
-#: g10/g10.c:281
+#: g10/g10.c:287
msgid "read options from file"
msgstr "Optionen aus der Datei lesen"
-#: g10/g10.c:285
+#: g10/g10.c:291
msgid "|FD|write status info to this FD"
msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
-#: g10/g10.c:290
+#: g10/g10.c:296
msgid "|FILE|load extension module FILE"
msgstr "|DATEI|Erweiterungsmodul DATEI laden"
-#: g10/g10.c:291
+#: g10/g10.c:297
msgid "emulate the mode described in RFC1991"
msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
-#: g10/g10.c:292
+#: g10/g10.c:298
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr ""
"alle Paket-, Verschl�sselungs- und\n"
"Hashoptionen auf OpenPGP-Verhalten einstellen"
-#: g10/g10.c:293
+#: g10/g10.c:299
msgid "|N|use passphrase mode N"
msgstr "|N|Verwenden des Mantra-Modus N"
-#: g10/g10.c:295
+#: g10/g10.c:301
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NAME|Hashverfahren NAME f�r Mantras benutzen"
-#: g10/g10.c:297
+#: g10/g10.c:303
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NAME|Verschl�.verfahren NAME f�r Mantras benutzen"
-#: g10/g10.c:298
+#: g10/g10.c:304
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|Verschl�.verfahren NAME benutzen"
-#: g10/g10.c:299
+#: g10/g10.c:305
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|Hashverfahren NAME benutzen"
-#: g10/g10.c:300
+#: g10/g10.c:306
msgid "|N|use compress algorithm N"
msgstr "|N|Komprimierverfahren N benutzen"
-#: g10/g10.c:301
+#: g10/g10.c:307
msgid "throw keyid field of encrypted packets"
msgstr "Entferne Empf�nger-ID verschl�sselter Pakete"
-#: g10/g10.c:302
+#: g10/g10.c:308
msgid "|NAME=VALUE|use this notation data"
msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
-#: g10/g10.c:305
+#: g10/g10.c:311
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -644,7 +644,7 @@ msgstr ""
"(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
"Optionen)\n"
-#: g10/g10.c:308
+#: g10/g10.c:314
msgid ""
"@\n"
"Examples:\n"
@@ -664,17 +664,17 @@ msgstr ""
" --list-keys [Namen] Schl�ssel anzeigen\n"
" --fingerprint [Namen] \"Fingerabdr�cke\" anzeigen\n"
-#: g10/g10.c:403
+#: g10/g10.c:412
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Berichte �ber Bugs (Programmfehler) bitte an <[email protected]>.\n"
"Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
-#: g10/g10.c:407
+#: g10/g10.c:416
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
-#: g10/g10.c:410
+#: g10/g10.c:419
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -684,7 +684,7 @@ msgstr ""
"Signieren, pr�fen, verschl�sseln, entschl�sseln\n"
"Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
-#: g10/g10.c:417
+#: g10/g10.c:426
msgid ""
"\n"
"Supported algorithms:\n"
@@ -692,184 +692,184 @@ msgstr ""
"\n"
"Unterst�tzte Verfahren:\n"
-#: g10/g10.c:496
+#: g10/g10.c:505
msgid "usage: gpg [options] "
msgstr "Aufruf: gpg [Optionen] "
-#: g10/g10.c:549
+#: g10/g10.c:558
msgid "conflicting commands\n"
msgstr "Widerspr�chliche Befehle\n"
-#: g10/g10.c:692
+#: g10/g10.c:701
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
-#: g10/g10.c:696
+#: g10/g10.c:705
#, c-format
msgid "option file `%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
-#: g10/g10.c:703
+#: g10/g10.c:712
#, c-format
msgid "reading options from `%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
-#: g10/g10.c:893
+#: g10/g10.c:902
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s ist kein g�ltiger Zeichensatz.\n"
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:963 g10/g10.c:972
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
-#: g10/g10.c:951
+#: g10/g10.c:965
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
-#: g10/g10.c:954
+#: g10/g10.c:968
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:987 g10/g10.c:999
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgew�hlte Verschl�sslungsverfahren ist ung�ltig\n"
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:993 g10/g10.c:1005
msgid "selected digest algorithm is invalid\n"
msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
-#: g10/g10.c:995
+#: g10/g10.c:1009
msgid "the given policy URL is invalid\n"
msgstr "Die angegebene URL f�r Richtlinien ist ung�ltig\n"
-#: g10/g10.c:998
+#: g10/g10.c:1012
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "Das Komprimierverfahren mu� im Bereich %d bis %d liegen\n"
-#: g10/g10.c:1000
+#: g10/g10.c:1014
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed m�ssen gr��er als 0 sein\n"
-#: g10/g10.c:1002
+#: g10/g10.c:1016
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
-#: g10/g10.c:1004
+#: g10/g10.c:1018
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
-#: g10/g10.c:1007
+#: g10/g10.c:1021
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
-#: g10/g10.c:1011
+#: g10/g10.c:1025
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ung�ltiger \"simple S2K\"-Modus; Wert mu� 0, 1 oder 3 sein\n"
-#: g10/g10.c:1096
+#: g10/g10.c:1110
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
-#: g10/g10.c:1102
+#: g10/g10.c:1116
msgid "--store [filename]"
msgstr "--store [Dateiname]"
-#: g10/g10.c:1109
+#: g10/g10.c:1123
msgid "--symmetric [filename]"
msgstr "--symmetric [Dateiname]"
-#: g10/g10.c:1117
+#: g10/g10.c:1131
msgid "--encrypt [filename]"
msgstr "--encrypt [Dateiname]"
-#: g10/g10.c:1130
+#: g10/g10.c:1144
msgid "--sign [filename]"
msgstr "--sign [Dateiname]"
-#: g10/g10.c:1143
+#: g10/g10.c:1157
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [Dateiname]"
-#: g10/g10.c:1157
+#: g10/g10.c:1171
msgid "--clearsign [filename]"
msgstr "--clearsign [Dateiname]"
-#: g10/g10.c:1174
+#: g10/g10.c:1188
msgid "--decrypt [filename]"
msgstr "--decrypt [Dateiname]"
-#: g10/g10.c:1182
+#: g10/g10.c:1196
msgid "--sign-key user-id"
msgstr "--sign-key User-ID"
-#: g10/g10.c:1190
+#: g10/g10.c:1204
msgid "--lsign-key user-id"
msgstr "--lsign-key User-ID"
-#: g10/g10.c:1198
+#: g10/g10.c:1212
msgid "--edit-key user-id [commands]"
msgstr "--edit-key User-ID [Befehle]"
-#: g10/g10.c:1214
+#: g10/g10.c:1228
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key User-ID"
-#: g10/g10.c:1217
+#: g10/g10.c:1231
msgid "--delete-key user-id"
msgstr "--delete-key User-ID"
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:260 g10/g10.c:1268 g10/sign.c:393
#, c-format
msgid "can't open %s: %s\n"
msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
-#: g10/g10.c:1269
+#: g10/g10.c:1283
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
-#: g10/g10.c:1335
+#: g10/g10.c:1349
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
-#: g10/g10.c:1343
+#: g10/g10.c:1357
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
-#: g10/g10.c:1411
+#: g10/g10.c:1428
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "Ung�ltiges Hashverfahren '%s'\n"
-#: g10/g10.c:1492
+#: g10/g10.c:1509
msgid "[filename]"
msgstr "[Dateiname]"
-#: g10/g10.c:1496
+#: g10/g10.c:1513
msgid "Go ahead and type your message ...\n"
msgstr "Auf geht's - Botschaft eintippen ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1516 g10/verify.c:68 g10/verify.c:113
#, c-format
msgid "can't open `%s'\n"
msgstr "'%s' kann nicht ge�ffnet werden\n"
-#: g10/g10.c:1669
+#: g10/g10.c:1689
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"Das erste Zeichen eines \"notation\"-Namens mu� ein Buchstabe oder\n"
"ein Unterstrich sein\n"
-#: g10/g10.c:1675
+#: g10/g10.c:1695
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -877,12 +877,12 @@ msgstr ""
"Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
"enthalten und mu� mit einem '=' enden\n"
-#: g10/g10.c:1681
+#: g10/g10.c:1701
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
"Punkte in einem \"notation\"-Namen m�ssen von anderen Zeichen umgeben sein\n"
-#: g10/g10.c:1689
+#: g10/g10.c:1709
msgid "a notation value must not use any control characters\n"
msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
@@ -1705,241 +1705,251 @@ msgstr ""
msgid "[User id not found]"
msgstr "[User-ID nicht gefunden]"
-#: g10/import.c:181
+#: g10/import.c:182
#, c-format
msgid "skipping block of type %d\n"
msgstr "�berspringe den Block vom Typ %d\n"
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1740 g10/trustdb.c:1781
#, c-format
msgid "%lu keys so far processed\n"
msgstr "%lu Schl�ssel bislang bearbeitet\n"
-#: g10/import.c:193
+#: g10/import.c:194
#, c-format
msgid "error reading `%s': %s\n"
msgstr "Fehler beim Lesen von `%s': %s\n"
-#: g10/import.c:203
+#: g10/import.c:204
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Anzahl insgesamt bearbeiteter Schl�ssel: %lu\n"
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " neue Unterschl�ssel: %lu\n"
+
+#: g10/import.c:209
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ohne User-ID: %lu\n"
-#: g10/import.c:207
+#: g10/import.c:211
#, c-format
msgid " imported: %lu"
msgstr " importiert: %lu"
-#: g10/import.c:213
+#: g10/import.c:217
#, c-format
msgid " unchanged: %lu\n"
msgstr " unver�ndert: %lu\n"
-#: g10/import.c:215
+#: g10/import.c:219
#, c-format
msgid " new user IDs: %lu\n"
msgstr " neue User-IDs: %lu\n"
-#: g10/import.c:217
+#: g10/import.c:221
#, c-format
msgid " new subkeys: %lu\n"
msgstr " neue Unterschl�ssel: %lu\n"
-#: g10/import.c:219
+#: g10/import.c:223
#, c-format
msgid " new signatures: %lu\n"
msgstr " neue Signaturen: %lu\n"
-#: g10/import.c:221
+#: g10/import.c:225
#, c-format
msgid " new key revocations: %lu\n"
msgstr "neue Schl�sselwiderrufe: %lu\n"
-#: g10/import.c:223
+#: g10/import.c:227
#, c-format
msgid " secret keys read: %lu\n"
msgstr " gelesene geheime Schl.: %lu\n"
-#: g10/import.c:225
+#: g10/import.c:229
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "geheime Schl�ssel importiert: %lu\n"
-#: g10/import.c:227
+#: g10/import.c:231
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " unver�nderte geh.Schl.: %lu\n"
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "Schl�ssel %08lX: Keine User-ID\n"
-#: g10/import.c:400
+#: g10/import.c:405
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
-#: g10/import.c:402
+#: g10/import.c:407
msgid "this may be caused by a missing self-signature\n"
msgstr "dies k�nnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
#, 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:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "Schl�ssel %08lX: dies ist kein rfc2440-Sch�ssel - �bersprungen\n"
+
+#: g10/import.c:431
msgid "no default public keyring\n"
msgstr "Kein voreingestellter �ffentlicher Schl�sselbund\n"
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
#, c-format
msgid "writing to `%s'\n"
msgstr "Schreiben nach '%s'\n"
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
#, c-format
msgid "can't lock keyring `%s': %s\n"
msgstr "kann Schl�sselbund `%s' nicht sperren: %s\n"
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
-#: g10/import.c:434
+#: g10/import.c:446
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel importiert\n"
-#: g10/import.c:451
+#: g10/import.c:463
#, 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:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr ""
"Schl�ssel %08lX: der lokale originale Schl�sselblocks wurde nicht gefunden: "
"%s\n"
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr ""
"Schl�ssel %08lX: Lesefehler im lokalen originalen Schl�sselblocks: %s\n"
-#: g10/import.c:493
+#: g10/import.c:505
#, c-format
msgid "key %08lX: 1 new user ID\n"
msgstr "Schl�ssel %08lX: 1 neue User-ID\n"
-#: g10/import.c:496
+#: g10/import.c:508
#, c-format
msgid "key %08lX: %d new user IDs\n"
msgstr "Schl�ssel %08lX: %d neue User-IDs\n"
-#: g10/import.c:499
+#: g10/import.c:511
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "Schl�ssel %08lX: 1 neue Signatur\n"
-#: g10/import.c:502
+#: g10/import.c:514
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "Schl�ssel %08lX: %d neue Signaturen\n"
-#: g10/import.c:505
+#: g10/import.c:517
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "Schl�ssel %08lX: 1 neuer Unterschl�ssel\n"
-#: g10/import.c:508
+#: g10/import.c:520
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "Schl�ssel %08lX: %d neue Unterschl�ssel\n"
-#: g10/import.c:518
+#: g10/import.c:530
#, c-format
msgid "key %08lX: not changed\n"
msgstr "Schl�ssel %08lX: Nicht ge�ndert\n"
-#: g10/import.c:601
+#: g10/import.c:613
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "Schl�ssel %08lX: Geheimer Schl�ssel importiert\n"
#. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
-#: g10/import.c:610
+#: g10/import.c:622
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "Schl�ssel %08lX: geheimer Schl�ssel nicht gefunden: %s\n"
-#: g10/import.c:639
+#: g10/import.c:651
#, 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:670
+#: g10/import.c:682
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - zur�ckgewiesen\n"
-#: g10/import.c:702
+#: g10/import.c:714
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "Schl�ssel %08lX: Widerrufzertifikat importiert\n"
-#: g10/import.c:744
+#: g10/import.c:756
#, 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:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren\n"
-#: g10/import.c:752
+#: g10/import.c:764
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung\n"
-#: g10/import.c:767
+#: g10/import.c:779
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Schl�sselanbindung\n"
-#: g10/import.c:776
+#: g10/import.c:788
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
-#: g10/import.c:803
+#: g10/import.c:815
#, c-format
msgid "key %08lX: accepted non self-signed user ID '"
msgstr "Schl�ssel %08lX: Nicht eigenbeglaubigte User-ID �bernommen'"
-#: g10/import.c:832
+#: g10/import.c:844
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "Schl�ssel %08lX: User-ID �bergangen '"
-#: g10/import.c:855
+#: g10/import.c:867
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
@@ -1948,33 +1958,33 @@ msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr ""
"Schl�ssel %08lX: Nicht exportf�hige Unterschrift (Klasse %02x) - �bergangen\n"
-#: g10/import.c:889
+#: g10/import.c:901
#, 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:897
+#: g10/import.c:909
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
-#: g10/import.c:997
+#: g10/import.c:1009
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "Schl�ssel %08lX: Doppelte User-ID entdeckt - zusammengef�hrt\n"
-#: g10/import.c:1048
+#: g10/import.c:1060
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "Schl�ssel %08lX: Widerrufzertifikat hinzugef�gt\n"
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "Schl�ssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n"
@@ -2552,8 +2562,18 @@ msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
msgid "no secret key\n"
msgstr "Kein geheimer Schl�ssel\n"
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "Ung�ltige ASCII-H�lle"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
#. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
#, c-format
msgid " [expires: %s]"
msgstr " [verf�llt: %s]"
@@ -2563,109 +2583,109 @@ msgstr " [verf�llt: %s]"
msgid "public key is %08lX\n"
msgstr "�ffentlicher Schl�ssel ist %08lX\n"
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
msgid "public key encrypted data: good DEK\n"
msgstr "Mit �ffentlichem Sch�ssel verschl�sselte Daten: Korrekte DEK\n"
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "verschl�sselt mit %u-Bit %s Schl�ssel, ID %08lX, erzeugt %s\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
# [kw]
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "verschl�sselt mit %s Schl�ssel, ID %08lX\n"
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
msgid "no secret key for decryption available\n"
msgstr "kein geheimer Schl�ssel zur Entschl�sselung vorhanden\n"
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
msgid "decryption okay\n"
msgstr "Enschl�sselung fehlgeschlagen: %s\n"
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
#, c-format
msgid "decryption failed: %s\n"
msgstr "Enschl�sselung fehlgeschlagen: %s\n"
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr ""
"Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
#, c-format
msgid "original file name='%.*s'\n"
msgstr "Urspr�nglicher Dateiname='%.*s'\n"
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
msgid "WARNING: invalid notation data found\n"
msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
msgid "Notation: "
msgstr "\"Notation\": "
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
msgid "Policy: "
msgstr "Richtlinie: "
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
msgid "signature verification suppressed\n"
msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
#. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
msgid "BAD signature from \""
msgstr "FALSCHE Unterschrift von \""
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
msgid "Good signature from \""
msgstr "Korrekte Unterschrift von \""
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
msgid " aka \""
msgstr " alias \""
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
msgid "old style (PGP 2.x) signature\n"
msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
msgid "invalid root packet detected in proc_tree()\n"
msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
@@ -2738,24 +2758,24 @@ msgstr "Geben Sie das Mantra ein: "
msgid "Repeat passphrase: "
msgstr "Geben Sie das Mantra nochmal ein: "
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"Daten wurden nicht gespeichert; verwenden Sie daf�r die Option \"--output\"\n"
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
msgid "Detached signature.\n"
msgstr "Abgetrennte Beglaubigungen.\n"
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
msgid "Please enter name of data file: "
msgstr "Bitte geben Sie den Namen der Datendatei ein: "
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
msgid "reading stdin ...\n"
msgstr "lese stdin ...\n"
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
diff --git a/po/eo.po b/po/eo.po
index db2b5ebe6..db7f63114 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-27 17:31+0200\n"
"PO-Revision-Date: 2000-06-02 21:04+01:00\n"
"Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
"Language-Team: Esperanto <[email protected]>\n"
@@ -255,7 +255,7 @@ msgstr "... �i tio estas cimo (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "vi trovis cimon ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "ne povas malfermi '%s': %s\n"
@@ -336,7 +336,7 @@ msgstr ""
"Nesufi�e da stokastaj datenoj. Bonvolu fari ion por ebligi al la\n"
"mastruma sistemo kolekti pli da entropio! (Mankas %d bitokoj)\n"
-#: g10/g10.c:197
+#: g10/g10.c:203
msgid ""
"@Commands:\n"
" "
@@ -344,139 +344,139 @@ msgstr ""
"@Komandoj:\n"
" "
-#: g10/g10.c:199
+#: g10/g10.c:205
msgid "|[file]|make a signature"
msgstr "|[dosiero]|fari subskribon"
-#: g10/g10.c:200
+#: g10/g10.c:206
msgid "|[file]|make a clear text signature"
msgstr "|[dosiero]|fari klartekstan subskribon"
-#: g10/g10.c:201
+#: g10/g10.c:207
msgid "make a detached signature"
msgstr "fari apartan subskribon"
-#: g10/g10.c:202
+#: g10/g10.c:208
msgid "encrypt data"
msgstr "�ifri datenojn"
-#: g10/g10.c:203
+#: g10/g10.c:209
msgid "encryption only with symmetric cipher"
msgstr "�ifri nur kun simetria �ifro"
-#: g10/g10.c:204
+#: g10/g10.c:210
msgid "store only"
msgstr "nur skribi"
-#: g10/g10.c:205
+#: g10/g10.c:211
msgid "decrypt data (default)"
msgstr "mal�ifri datenojn (implicita elekto)"
-#: g10/g10.c:206
+#: g10/g10.c:212
msgid "verify a signature"
msgstr "kontroli subskribon"
-#: g10/g10.c:208
+#: g10/g10.c:214
msgid "list keys"
msgstr "listigi �losilojn"
-#: g10/g10.c:210
+#: g10/g10.c:216
msgid "list keys and signatures"
msgstr "listigi �losilojn kaj subskribojn"
-#: g10/g10.c:211
+#: g10/g10.c:217
msgid "check key signatures"
msgstr "kontroli �losilsubskribojn"
-#: g10/g10.c:212
+#: g10/g10.c:218
msgid "list keys and fingerprints"
msgstr "listigi �losilojn kaj fingro�purojn"
-#: g10/g10.c:213
+#: g10/g10.c:219
msgid "list secret keys"
msgstr "listigi sekretajn �losilojn"
-#: g10/g10.c:214
+#: g10/g10.c:220
msgid "generate a new key pair"
msgstr "krei novan �losilparon"
-#: g10/g10.c:215
+#: g10/g10.c:221
msgid "remove key from the public keyring"
msgstr "forigi �losilon de la publika �losilaro"
-#: g10/g10.c:217
+#: g10/g10.c:223
msgid "remove key from the secret keyring"
msgstr "forigi �losilon de la sekreta �losilaro"
-#: g10/g10.c:218
+#: g10/g10.c:224
msgid "sign a key"
msgstr "subskribi �losilon"
-#: g10/g10.c:219
+#: g10/g10.c:225
msgid "sign a key locally"
msgstr "subskribi �losilon loke"
-#: g10/g10.c:220
+#: g10/g10.c:226
msgid "sign or edit a key"
msgstr "subskribi a� redakti �losilon"
-#: g10/g10.c:221
+#: g10/g10.c:227
msgid "generate a revocation certificate"
msgstr "krei revokatestilon"
-#: g10/g10.c:222
+#: g10/g10.c:228
msgid "export keys"
msgstr "eksporti �losilojn"
-#: g10/g10.c:223
+#: g10/g10.c:229
msgid "export keys to a key server"
msgstr "eksporti �losilojn al �losilservilo"
-#: g10/g10.c:224
+#: g10/g10.c:230
msgid "import keys from a key server"
msgstr "importi �losilojn de �losilservilo"
-#: g10/g10.c:228
+#: g10/g10.c:234
msgid "import/merge keys"
msgstr "importi/kunfandi �losilojn"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "list only the sequence of packets"
msgstr "listigi nur la sinsekvon de paketoj"
-#: g10/g10.c:232
+#: g10/g10.c:238
msgid "export the ownertrust values"
msgstr "eksporti la posedantofido-valorojn"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "import ownertrust values"
msgstr "importi posedantofido-valorojn"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "update the trust database"
msgstr "aktualigi la fido-datenaron"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|[NAMES]|check the trust database"
msgstr "|[NOMOJ]|kontroli la fido-datenaron"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "fix a corrupted trust database"
msgstr "ripari fu�itan fido-datenaron"
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "De-Armor a file or stdin"
msgstr "elkirasigi dosieron a� la normalan enigon"
-#: g10/g10.c:242
+#: g10/g10.c:248
msgid "En-Armor a file or stdin"
msgstr "enkirasigi dosieron a� la normalan enigon"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "|algo [files]|print message digests"
msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid ""
"@\n"
"Options:\n"
@@ -486,148 +486,148 @@ msgstr ""
"Opcioj:\n"
" "
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "create ascii armored output"
msgstr "krei eligon en askia kiraso"
-#: g10/g10.c:252
+#: g10/g10.c:258
msgid "|NAME|encrypt for NAME"
msgstr "|NOMO|�ifri por NOMO"
-#: g10/g10.c:255
+#: g10/g10.c:261
msgid "|NAME|use NAME as default recipient"
msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
-#: g10/g10.c:257
+#: g10/g10.c:263
msgid "use the default key as default recipient"
msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
-#: g10/g10.c:261
+#: g10/g10.c:267
msgid "use this user-id to sign or decrypt"
msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
-#: g10/g10.c:262
+#: g10/g10.c:268
msgid "|N|set compress level N (0 disables)"
msgstr "|N|difini densig-nivelon N (0=nenia)"
-#: g10/g10.c:264
+#: g10/g10.c:270
msgid "use canonical text mode"
msgstr "uzi tekstan re�imon"
-#: g10/g10.c:265
+#: g10/g10.c:271
msgid "use as output file"
msgstr "uzi dosieron por eligo"
-#: g10/g10.c:266
+#: g10/g10.c:272
msgid "verbose"
msgstr "detala eligo"
-#: g10/g10.c:267
+#: g10/g10.c:273
msgid "be somewhat more quiet"
msgstr "iom malpli da informoj"
-#: g10/g10.c:268
+#: g10/g10.c:274
msgid "don't use the terminal at all"
msgstr "tute ne uzi la terminalon"
-#: g10/g10.c:269
+#: g10/g10.c:275
msgid "force v3 signatures"
msgstr "devigi v3-subskribojn"
-#: g10/g10.c:270
+#: g10/g10.c:276
msgid "always use a MDC for encryption"
msgstr "�iam uzi sigelon (MDC) por �ifrado"
-#: g10/g10.c:271
+#: g10/g10.c:277
msgid "do not make any changes"
msgstr "fari neniajn �an�ojn"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:279
msgid "batch mode: never ask"
msgstr "neinteraga re�imo: neniam demandi"
-#: g10/g10.c:274
+#: g10/g10.c:280
msgid "assume yes on most questions"
msgstr "supozi \"jes\" �e la plej multaj demandoj"
-#: g10/g10.c:275
+#: g10/g10.c:281
msgid "assume no on most questions"
msgstr "supozi \"ne\" �e la plej multaj demandoj"
-#: g10/g10.c:276
+#: g10/g10.c:282
msgid "add this keyring to the list of keyrings"
msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
-#: g10/g10.c:277
+#: g10/g10.c:283
msgid "add this secret keyring to the list"
msgstr "aldoni �i tiun sekretan �losilaron al la listo"
-#: g10/g10.c:278
+#: g10/g10.c:284
msgid "|NAME|use NAME as default secret key"
msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
-#: g10/g10.c:279
+#: g10/g10.c:285
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
-#: g10/g10.c:280
+#: g10/g10.c:286
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
-#: g10/g10.c:281
+#: g10/g10.c:287
msgid "read options from file"
msgstr "legi la opciojn el dosiero"
-#: g10/g10.c:285
+#: g10/g10.c:291
msgid "|FD|write status info to this FD"
msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
-#: g10/g10.c:290
+#: g10/g10.c:296
msgid "|FILE|load extension module FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
-#: g10/g10.c:291
+#: g10/g10.c:297
msgid "emulate the mode described in RFC1991"
msgstr "imiti la re�imon priskribitan en RFC 1991"
-#: g10/g10.c:292
+#: g10/g10.c:298
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "�alti �iujn paket-, �ifrad- kaj kompendi-opciojn al OpenPGP-konduto"
-#: g10/g10.c:293
+#: g10/g10.c:299
msgid "|N|use passphrase mode N"
msgstr "|N|uzi pasfraz-re�imon N"
-#: g10/g10.c:295
+#: g10/g10.c:301
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
-#: g10/g10.c:297
+#: g10/g10.c:303
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
-#: g10/g10.c:298
+#: g10/g10.c:304
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOMO|uzi �ifrad-metodon NOMO"
-#: g10/g10.c:299
+#: g10/g10.c:305
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOMO|uzi kompendi-metodon NOMO"
-#: g10/g10.c:300
+#: g10/g10.c:306
msgid "|N|use compress algorithm N"
msgstr "|N|uzi densig-metodon N"
-#: g10/g10.c:301
+#: g10/g10.c:307
msgid "throw keyid field of encrypted packets"
msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
-#: g10/g10.c:302
+#: g10/g10.c:308
msgid "|NAME=VALUE|use this notation data"
msgstr "|NOMO=VALORO|uzi �i tiun notacian datenon"
-#: g10/g10.c:305
+#: g10/g10.c:311
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -635,7 +635,7 @@ msgstr ""
"@\n"
"(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
-#: g10/g10.c:308
+#: g10/g10.c:314
msgid ""
"@\n"
"Examples:\n"
@@ -655,15 +655,15 @@ msgstr ""
" --list-keys [nomoj] montri �losilojn\n"
" --fingerprint [nomoj] montri fingro�purojn\n"
-#: g10/g10.c:403
+#: g10/g10.c:412
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
-#: g10/g10.c:407
+#: g10/g10.c:416
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-#: g10/g10.c:410
+#: g10/g10.c:419
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -673,7 +673,7 @@ msgstr ""
"subskribi, kontroli, �ifri a� mal�ifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
-#: g10/g10.c:417
+#: g10/g10.c:426
msgid ""
"\n"
"Supported algorithms:\n"
@@ -681,182 +681,182 @@ msgstr ""
"\n"
"Realigitaj metodoj:\n"
-#: g10/g10.c:496
+#: g10/g10.c:505
msgid "usage: gpg [options] "
msgstr "uzado: gpg [opcioj] "
-#: g10/g10.c:549
+#: g10/g10.c:558
msgid "conflicting commands\n"
msgstr "malkongruaj komandoj\n"
-#: g10/g10.c:692
+#: g10/g10.c:701
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
-#: g10/g10.c:696
+#: g10/g10.c:705
#, c-format
msgid "option file `%s': %s\n"
msgstr "opcio-dosiero '%s': %s\n"
-#: g10/g10.c:703
+#: g10/g10.c:712
#, c-format
msgid "reading options from `%s'\n"
msgstr "legas opciojn el '%s'\n"
-#: g10/g10.c:893
+#: g10/g10.c:902
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s ne estas valida signaro\n"
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:963 g10/g10.c:972
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTO: %s ne estas por normala uzado!\n"
-#: g10/g10.c:951
+#: g10/g10.c:965
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ne eblas kun %s!\n"
-#: g10/g10.c:954
+#: g10/g10.c:968
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ne havas sencon kun %s!\n"
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:987 g10/g10.c:999
msgid "selected cipher algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:993 g10/g10.c:1005
msgid "selected digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
-#: g10/g10.c:995
+#: g10/g10.c:1009
msgid "the given policy URL is invalid\n"
msgstr "la donita gvidlinia URL ne validas\n"
-#: g10/g10.c:998
+#: g10/g10.c:1012
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "la densig-metodo devas esti inter %d kaj %d\n"
-#: g10/g10.c:1000
+#: g10/g10.c:1014
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed devas esti pli granda ol 0\n"
-#: g10/g10.c:1002
+#: g10/g10.c:1016
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed devas esti pli granda ol 1\n"
-#: g10/g10.c:1004
+#: g10/g10.c:1018
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
-#: g10/g10.c:1007
+#: g10/g10.c:1021
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
-#: g10/g10.c:1011
+#: g10/g10.c:1025
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
-#: g10/g10.c:1096
+#: g10/g10.c:1110
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
-#: g10/g10.c:1102
+#: g10/g10.c:1116
msgid "--store [filename]"
msgstr "--store [dosiero]"
-#: g10/g10.c:1109
+#: g10/g10.c:1123
msgid "--symmetric [filename]"
msgstr "--symmetric [dosiero]"
-#: g10/g10.c:1117
+#: g10/g10.c:1131
msgid "--encrypt [filename]"
msgstr "--encrypt [dosiero]"
-#: g10/g10.c:1130
+#: g10/g10.c:1144
msgid "--sign [filename]"
msgstr "--sign [dosiero]"
-#: g10/g10.c:1143
+#: g10/g10.c:1157
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
-#: g10/g10.c:1157
+#: g10/g10.c:1171
msgid "--clearsign [filename]"
msgstr "--clearsign [dosiero]"
-#: g10/g10.c:1174
+#: g10/g10.c:1188
msgid "--decrypt [filename]"
msgstr "--decrypt [dosiero]"
-#: g10/g10.c:1182
+#: g10/g10.c:1196
msgid "--sign-key user-id"
msgstr "--sign-key uzantidentigilo"
-#: g10/g10.c:1190
+#: g10/g10.c:1204
msgid "--lsign-key user-id"
msgstr "--lsign-key uzantidentigilo"
-#: g10/g10.c:1198
+#: g10/g10.c:1212
msgid "--edit-key user-id [commands]"
msgstr "--edit-key uzantidentigilo [komandoj]"
-#: g10/g10.c:1214
+#: g10/g10.c:1228
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key uzantidentigilo"
-#: g10/g10.c:1217
+#: g10/g10.c:1231
msgid "--delete-key user-id"
msgstr "--delete-key uzantidentigilo"
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:260 g10/g10.c:1268 g10/sign.c:393
#, c-format
msgid "can't open %s: %s\n"
msgstr "ne povas malfermi %s: %s\n"
-#: g10/g10.c:1269
+#: g10/g10.c:1283
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
-#: g10/g10.c:1335
+#: g10/g10.c:1349
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "elkirasigo malsukcesis: %s\n"
-#: g10/g10.c:1343
+#: g10/g10.c:1357
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
-#: g10/g10.c:1411
+#: g10/g10.c:1428
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
-#: g10/g10.c:1492
+#: g10/g10.c:1509
msgid "[filename]"
msgstr "[dosiero]"
-#: g10/g10.c:1496
+#: g10/g10.c:1513
msgid "Go ahead and type your message ...\n"
msgstr "Ektajpu vian mesa�on ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1516 g10/verify.c:68 g10/verify.c:113
#, c-format
msgid "can't open `%s'\n"
msgstr "ne povas malfermi '%s'\n"
-#: g10/g10.c:1669
+#: g10/g10.c:1689
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr "la unua signo de notacia nomo devas esti litero a� substreko\n"
-#: g10/g10.c:1675
+#: g10/g10.c:1695
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -864,11 +864,11 @@ msgstr ""
"notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
"kaj fini per '='\n"
-#: g10/g10.c:1681
+#: g10/g10.c:1701
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr "punktoj en notacia nomo devas esti inter aliaj signoj\n"
-#: g10/g10.c:1689
+#: g10/g10.c:1709
msgid "a notation value must not use any control characters\n"
msgstr "notacia valoro ne povas enhavi stirsignojn\n"
@@ -1675,237 +1675,247 @@ msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
msgid "[User id not found]"
msgstr "%s: uzanto ne trovita\n"
-#: g10/import.c:181
+#: g10/import.c:182
#, c-format
msgid "skipping block of type %d\n"
msgstr "ignoras blokon de speco %d\n"
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1740 g10/trustdb.c:1781
#, c-format
msgid "%lu keys so far processed\n"
msgstr "%lu �losiloj jam traktitaj\n"
-#: g10/import.c:193
+#: g10/import.c:194
#, c-format
msgid "error reading `%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
-#: g10/import.c:203
+#: g10/import.c:204
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Nombro traktita entute: %lu\n"
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " novaj sub�losiloj: %lu\n"
+
+#: g10/import.c:209
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sen uzantidentigilo: %lu\n"
-#: g10/import.c:207
+#: g10/import.c:211
#, c-format
msgid " imported: %lu"
msgstr " importitaj: %lu"
-#: g10/import.c:213
+#: g10/import.c:217
#, c-format
msgid " unchanged: %lu\n"
msgstr " ne�an�itaj: %lu\n"
-#: g10/import.c:215
+#: g10/import.c:219
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novaj uzantidentigiloj: %lu\n"
-#: g10/import.c:217
+#: g10/import.c:221
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novaj sub�losiloj: %lu\n"
-#: g10/import.c:219
+#: g10/import.c:223
#, c-format
msgid " new signatures: %lu\n"
msgstr " novaj subskriboj: %lu\n"
-#: g10/import.c:221
+#: g10/import.c:225
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novaj �losilrevokoj: %lu\n"
-#: g10/import.c:223
+#: g10/import.c:227
#, c-format
msgid " secret keys read: %lu\n"
msgstr " sekretaj �losiloj legitaj: %lu\n"
-#: g10/import.c:225
+#: g10/import.c:229
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "sekretaj �losiloj importitaj: %lu\n"
-#: g10/import.c:227
+#: g10/import.c:231
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
-#: g10/import.c:400
+#: g10/import.c:405
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
-#: g10/import.c:402
+#: g10/import.c:407
msgid "this may be caused by a missing self-signature\n"
msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "�losilo %08lX: ne estas RFC-2440-�losilo - ignorita\n"
+
+#: g10/import.c:431
msgid "no default public keyring\n"
msgstr "mankas implicita publika �losilaro\n"
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
#, c-format
msgid "writing to `%s'\n"
msgstr "skribas al '%s'\n"
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
#, c-format
msgid "can't lock keyring `%s': %s\n"
msgstr "ne povas �losi la �losilaron '%s': %s\n"
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "eraro dum skribado de �losilaro '%s': %s\n"
-#: g10/import.c:434
+#: g10/import.c:446
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "�losilo %08lX: publika �losilo importita\n"
-#: g10/import.c:451
+#: g10/import.c:463
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "�losilo %08lX: diferencas de nia kopio\n"
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
-#: g10/import.c:493
+#: g10/import.c:505
#, c-format
msgid "key %08lX: 1 new user ID\n"
msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
-#: g10/import.c:496
+#: g10/import.c:508
#, c-format
msgid "key %08lX: %d new user IDs\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
-#: g10/import.c:499
+#: g10/import.c:511
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "�losilo %08lX: 1 nova subskribo\n"
-#: g10/import.c:502
+#: g10/import.c:514
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
-#: g10/import.c:505
+#: g10/import.c:517
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "�losilo %08lX: 1 nova sub�losilo\n"
-#: g10/import.c:508
+#: g10/import.c:520
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
-#: g10/import.c:518
+#: g10/import.c:530
#, c-format
msgid "key %08lX: not changed\n"
msgstr "�losilo %08lX: ne �an�ita\n"
-#: g10/import.c:601
+#: g10/import.c:613
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "�losilo %08lX: sekreta �losilo importita\n"
#. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
-#: g10/import.c:610
+#: g10/import.c:622
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
-#: g10/import.c:639
+#: g10/import.c:651
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
-#: g10/import.c:670
+#: g10/import.c:682
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
-#: g10/import.c:702
+#: g10/import.c:714
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "�losilo %08lX: revokatestilo importita\n"
-#: g10/import.c:744
+#: g10/import.c:756
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
-#: g10/import.c:752
+#: g10/import.c:764
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "�losilo %08lX: nevalida mem-subskribo\n"
-#: g10/import.c:767
+#: g10/import.c:779
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
-#: g10/import.c:776
+#: g10/import.c:788
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
-#: g10/import.c:803
+#: g10/import.c:815
#, c-format
msgid "key %08lX: accepted non self-signed user ID '"
msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
-#: g10/import.c:832
+#: g10/import.c:844
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "�losilo %08lX: ignoris uzantidentigilon '"
-#: g10/import.c:855
+#: g10/import.c:867
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "�losilo %08lX: ignoris sub�losilon\n"
@@ -1914,32 +1924,32 @@ msgstr "�losilo %08lX: ignoris sub�losilon\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
-#: g10/import.c:889
+#: g10/import.c:901
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
-#: g10/import.c:897
+#: g10/import.c:909
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
-#: g10/import.c:997
+#: g10/import.c:1009
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
-#: g10/import.c:1048
+#: g10/import.c:1060
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "�losilo %08lX: revokatestilo aldonita\n"
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "�losilo %08lX: nia kopio ne havas mem-subskribon\n"
@@ -2517,8 +2527,18 @@ msgstr "�u vere krei la revokatestilojn? (j/N)"
msgid "no secret key\n"
msgstr "mankas sekreta �losilo\n"
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "nevalida kiraso"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "rev"
+
#. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
#, c-format
msgid " [expires: %s]"
msgstr " [eksvalidi�os: %s]"
@@ -2528,104 +2548,104 @@ msgstr " [eksvalidi�os: %s]"
msgid "public key is %08lX\n"
msgstr "publika �losilo estas %08lX\n"
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
msgid "public key encrypted data: good DEK\n"
msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "�ifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "�ifrita per %s-�losilo, %08lX\n"
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
msgid "no secret key for decryption available\n"
msgstr "mankas sekreta �losilo por mal�ifrado\n"
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
msgid "decryption okay\n"
msgstr "mal�ifrado sukcesis\n"
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
#, c-format
msgid "decryption failed: %s\n"
msgstr "mal�ifrado malsukcesis: %s\n"
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
#, c-format
msgid "original file name='%.*s'\n"
msgstr "originala dosiernomo='%.*s'\n"
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
msgid "WARNING: invalid notation data found\n"
msgstr "AVERTO: nevalida notacia dateno trovita\n"
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
msgid "Notation: "
msgstr "Notacio: "
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
msgid "Policy: "
msgstr "Gvidlinio: "
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
msgid "signature verification suppressed\n"
msgstr "kontrolo de subskribo estas mal�altita\n"
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
#. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
msgid "BAD signature from \""
msgstr "MALBONA subskribo de \""
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
msgid "Good signature from \""
msgstr "Bona subskribo de \""
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
msgid " aka \""
msgstr " alinome \""
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Ne povas kontroli subskribon: %s\n"
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "memstara subskribo de klaso 0x%02x\n"
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
msgid "old style (PGP 2.x) signature\n"
msgstr "malnovstila subskribo (PGP 2.x)\n"
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
msgid "invalid root packet detected in proc_tree()\n"
msgstr "nevalida radikpaketo trovita en proc_tree()\n"
@@ -2696,23 +2716,23 @@ msgstr "Donu pasfrazon: "
msgid "Repeat passphrase: "
msgstr "Ripetu pasfrazon: "
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n"
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
msgid "Detached signature.\n"
msgstr "Aparta subskribo.\n"
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
msgid "Please enter name of data file: "
msgstr "Bonvolu doni la nomon de la dosiero: "
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
msgid "reading stdin ...\n"
msgstr "legas la normalan enigon ...\n"
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 57017d453..e2fd2af5a 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
# GPG version: 1.0.0
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-27 17:31+0200\n"
"PO-Revision-Date: 1999-10-27 06:35+0200\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-13 10:49:25+0100\n"
@@ -265,7 +265,7 @@ msgstr "... esto es un bug (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "Ha encontrado Vd. un bug... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "no puede abrirse `%s': %s\n"
@@ -348,7 +348,7 @@ msgstr ""
"otro trabajo para que el sistema pueda recolectar m�s entrop�a\n"
"(se necesitan %d bytes m�s).\n"
-#: g10/g10.c:197
+#: g10/g10.c:203
msgid ""
"@Commands:\n"
" "
@@ -356,140 +356,140 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/g10.c:199
+#: g10/g10.c:205
msgid "|[file]|make a signature"
msgstr "|[file]|hace una firma"
-#: g10/g10.c:200
+#: g10/g10.c:206
msgid "|[file]|make a clear text signature"
msgstr "|[file]|hace una firma en texto claro"
-#: g10/g10.c:201
+#: g10/g10.c:207
msgid "make a detached signature"
msgstr "hace una firma separada"
-#: g10/g10.c:202
+#: g10/g10.c:208
msgid "encrypt data"
msgstr "cifra datos"
-#: g10/g10.c:203
+#: g10/g10.c:209
msgid "encryption only with symmetric cipher"
msgstr "cifra s�lo con un cifrado sim�trico"
-#: g10/g10.c:204
+#: g10/g10.c:210
msgid "store only"
msgstr "s�lo almacenar"
-#: g10/g10.c:205
+#: g10/g10.c:211
msgid "decrypt data (default)"
msgstr "descifra datos (predefinido)"
-#: g10/g10.c:206
+#: g10/g10.c:212
msgid "verify a signature"
msgstr "verifica una firma"
-#: g10/g10.c:208
+#: g10/g10.c:214
msgid "list keys"
msgstr "lista claves"
-#: g10/g10.c:210
+#: g10/g10.c:216
msgid "list keys and signatures"
msgstr "lista claves y firmas"
-#: g10/g10.c:211
+#: g10/g10.c:217
msgid "check key signatures"
msgstr "comprueba las firmas de las claves"
-#: g10/g10.c:212
+#: g10/g10.c:218
msgid "list keys and fingerprints"
msgstr "lista claves y huellas dactilares"
-#: g10/g10.c:213
+#: g10/g10.c:219
msgid "list secret keys"
msgstr "lista claves secretas"
-#: g10/g10.c:214
+#: g10/g10.c:220
msgid "generate a new key pair"
msgstr "genera un nuevo par de claves"
-#: g10/g10.c:215
+#: g10/g10.c:221
msgid "remove key from the public keyring"
msgstr "elimina la clave del anillo p�blico"
-#: g10/g10.c:217
+#: g10/g10.c:223
#, fuzzy
msgid "remove key from the secret keyring"
msgstr "elimina la clave del anillo p�blico"
-#: g10/g10.c:218
+#: g10/g10.c:224
msgid "sign a key"
msgstr "firma la clave"
-#: g10/g10.c:219
+#: g10/g10.c:225
msgid "sign a key locally"
msgstr "firma la clave localmente"
-#: g10/g10.c:220
+#: g10/g10.c:226
msgid "sign or edit a key"
msgstr "firma o modifica una clave"
-#: g10/g10.c:221
+#: g10/g10.c:227
msgid "generate a revocation certificate"
msgstr "genera un certificado de revocaci�n"
-#: g10/g10.c:222
+#: g10/g10.c:228
msgid "export keys"
msgstr "exporta claves"
-#: g10/g10.c:223
+#: g10/g10.c:229
msgid "export keys to a key server"
msgstr "exporta claves a un servidor de claves"
-#: g10/g10.c:224
+#: g10/g10.c:230
msgid "import keys from a key server"
msgstr "importa claves desde un servidor de claves"
-#: g10/g10.c:228
+#: g10/g10.c:234
msgid "import/merge keys"
msgstr "importa/fusiona claves"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "list only the sequence of packets"
msgstr "lista s�lo la secuencia de paquetes"
-#: g10/g10.c:232
+#: g10/g10.c:238
msgid "export the ownertrust values"
msgstr "exporta los valores de confianza"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "import ownertrust values"
msgstr "importa los valores de confianza"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "update the trust database"
msgstr "actualiza la base de datos de confianza"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|[NAMES]|check the trust database"
msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "fix a corrupted trust database"
msgstr "arregla una base de datos de confianza da�ada"
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "De-Armor a file or stdin"
msgstr "quita la armadura de un fichero o stdin"
-#: g10/g10.c:242
+#: g10/g10.c:248
msgid "En-Armor a file or stdin"
msgstr "crea la armadura a un fichero o stdin"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "|algo [files]|print message digests"
msgstr "|algo [ficheros]|imprime res�menes de mensaje"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid ""
"@\n"
"Options:\n"
@@ -499,160 +499,160 @@ msgstr ""
"Opciones:\n"
" "
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "create ascii armored output"
msgstr "crea una salida ascii con armadura"
-#: g10/g10.c:252
+#: g10/g10.c:258
msgid "|NAME|encrypt for NAME"
msgstr "|NOMBRE|cifra para NOMBRE"
-#: g10/g10.c:255
+#: g10/g10.c:261
msgid "|NAME|use NAME as default recipient"
msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
-#: g10/g10.c:257
+#: g10/g10.c:263
msgid "use the default key as default recipient"
msgstr "usa la clave por defecto como destinatario"
-#: g10/g10.c:261
+#: g10/g10.c:267
msgid "use this user-id to sign or decrypt"
msgstr "usa este usuario para firmar o descifrar"
-#: g10/g10.c:262
+#: g10/g10.c:268
msgid "|N|set compress level N (0 disables)"
msgstr "|N|nivel de compresi�n N (0 no comprime)"
-#: g10/g10.c:264
+#: g10/g10.c:270
msgid "use canonical text mode"
msgstr "usa modo de texto can�nico"
-#: g10/g10.c:265
+#: g10/g10.c:271
msgid "use as output file"
msgstr "usa como fichero de salida"
-#: g10/g10.c:266
+#: g10/g10.c:272
msgid "verbose"
msgstr "prolijo"
-#: g10/g10.c:267
+#: g10/g10.c:273
msgid "be somewhat more quiet"
msgstr "algo m�s discreto"
-#: g10/g10.c:268
+#: g10/g10.c:274
msgid "don't use the terminal at all"
msgstr "no usa la terminal en absoluto"
-#: g10/g10.c:269
+#: g10/g10.c:275
msgid "force v3 signatures"
msgstr "fuerza firmas v3"
-#: g10/g10.c:270
+#: g10/g10.c:276
msgid "always use a MDC for encryption"
msgstr "siempre usa un MCD para cifrar"
-#: g10/g10.c:271
+#: g10/g10.c:277
msgid "do not make any changes"
msgstr "no hace ning�n cambio"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:279
msgid "batch mode: never ask"
msgstr "proceso por lotes: nunca preguntar"
-#: g10/g10.c:274
+#: g10/g10.c:280
msgid "assume yes on most questions"
msgstr "asume \"s�\" en casi todas las preguntas"
-#: g10/g10.c:275
+#: g10/g10.c:281
msgid "assume no on most questions"
msgstr "asume \"no\" en casi todas las preguntas"
-#: g10/g10.c:276
+#: g10/g10.c:282
msgid "add this keyring to the list of keyrings"
msgstr "a�ade este anillo a la lista de anillos"
-#: g10/g10.c:277
+#: g10/g10.c:283
msgid "add this secret keyring to the list"
msgstr "a�ade este anillo secreto a la lista"
-#: g10/g10.c:278
+#: g10/g10.c:284
msgid "|NAME|use NAME as default secret key"
msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
-#: g10/g10.c:279
+#: g10/g10.c:285
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|SERVIDOR|usa este servidor de claves"
-#: g10/g10.c:280
+#: g10/g10.c:286
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
-#: g10/g10.c:281
+#: g10/g10.c:287
msgid "read options from file"
msgstr "lee opciones del fichero"
-#: g10/g10.c:285
+#: g10/g10.c:291
msgid "|FD|write status info to this FD"
msgstr "|DF|escribe informaci�n de estado en descriptor DF"
-#: g10/g10.c:290
+#: g10/g10.c:296
msgid "|FILE|load extension module FILE"
msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
-#: g10/g10.c:291
+#: g10/g10.c:297
msgid "emulate the mode described in RFC1991"
msgstr "emula el modo descrito en la RFC1991"
-#: g10/g10.c:292
+#: g10/g10.c:298
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr ""
"todas las opciones de paquete, cifrado y\n"
"resumen tipo OpenPGP"
-#: g10/g10.c:293
+#: g10/g10.c:299
msgid "|N|use passphrase mode N"
msgstr "|N|usa modo de contrase�a N"
-#: g10/g10.c:295
+#: g10/g10.c:301
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr ""
"|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE\n"
"para las contrase�as"
-#: g10/g10.c:297
+#: g10/g10.c:303
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr ""
"|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
"contrase�as"
-#: g10/g10.c:298
+#: g10/g10.c:304
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
-#: g10/g10.c:299
+#: g10/g10.c:305
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
-#: g10/g10.c:300
+#: g10/g10.c:306
msgid "|N|use compress algorithm N"
msgstr "|N|usa el algoritmo de compresi�n N"
-#: g10/g10.c:301
+#: g10/g10.c:307
msgid "throw keyid field of encrypted packets"
msgstr "elimina campo keyid de los paquetes cifrados"
-#: g10/g10.c:302
+#: g10/g10.c:308
msgid "|NAME=VALUE|use this notation data"
msgstr "|NOMBRE=VALOR|usa estos datos de notaci�n"
-#: g10/g10.c:305
+#: g10/g10.c:311
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/g10.c:308
+#: g10/g10.c:314
msgid ""
"@\n"
"Examples:\n"
@@ -672,15 +672,15 @@ msgstr ""
" --list-keys [nombres] muestra las claves\n"
" --fingerprint [nombres] muestra las huellas dactilares\n"
-#: g10/g10.c:403
+#: g10/g10.c:412
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
-#: g10/g10.c:407
+#: g10/g10.c:416
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
-#: g10/g10.c:410
+#: g10/g10.c:419
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -690,7 +690,7 @@ msgstr ""
"Firma, comprueba, cifra o descifra.\n"
"La operaci�n por defecto depende del tipo de datos de entrada.\n"
-#: g10/g10.c:417
+#: g10/g10.c:426
msgid ""
"\n"
"Supported algorithms:\n"
@@ -698,182 +698,182 @@ msgstr ""
"\n"
"Algoritmos soportados:\n"
-#: g10/g10.c:496
+#: g10/g10.c:505
msgid "usage: gpg [options] "
msgstr "uso: gpg [opciones] "
-#: g10/g10.c:549
+#: g10/g10.c:558
msgid "conflicting commands\n"
msgstr "comandos incompatibles\n"
-#: g10/g10.c:692
+#: g10/g10.c:701
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
-#: g10/g10.c:696
+#: g10/g10.c:705
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichero de opciones `%s': %s\n"
-#: g10/g10.c:703
+#: g10/g10.c:712
#, c-format
msgid "reading options from `%s'\n"
msgstr "leyendo opciones desde `%s'\n"
-#: g10/g10.c:893
+#: g10/g10.c:902
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s no es un juego de caracteres v�lido\n"
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:963 g10/g10.c:972
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: �%s no es para uso normal!\n"
-#: g10/g10.c:951
+#: g10/g10.c:965
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s no permitido con %s!\n"
-#: g10/g10.c:954
+#: g10/g10.c:968
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s no tiene sentido con %s!\n"
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:987 g10/g10.c:999
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado no es v�lido\n"
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:993 g10/g10.c:1005
msgid "selected digest algorithm is invalid\n"
msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
-#: g10/g10.c:995
+#: g10/g10.c:1009
msgid "the given policy URL is invalid\n"
msgstr "URL de pol�tica no v�lida\n"
-#: g10/g10.c:998
+#: g10/g10.c:1012
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "el algoritmo de compresi�n debe estar en el rango %d-%d\n"
-#: g10/g10.c:1000
+#: g10/g10.c:1014
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser mayor que 0\n"
-#: g10/g10.c:1002
+#: g10/g10.c:1016
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser mayor que 1\n"
-#: g10/g10.c:1004
+#: g10/g10.c:1018
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth debe estar en el rango 1-255\n"
-#: g10/g10.c:1007
+#: g10/g10.c:1021
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
-#: g10/g10.c:1011
+#: g10/g10.c:1025
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
-#: g10/g10.c:1096
+#: g10/g10.c:1110
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
-#: g10/g10.c:1102
+#: g10/g10.c:1116
msgid "--store [filename]"
msgstr "--store [nombre_fichero]"
-#: g10/g10.c:1109
+#: g10/g10.c:1123
msgid "--symmetric [filename]"
msgstr "--symmetric [nombre_fichero]"
-#: g10/g10.c:1117
+#: g10/g10.c:1131
msgid "--encrypt [filename]"
msgstr "--encrypt [nombre_fichero]"
-#: g10/g10.c:1130
+#: g10/g10.c:1144
msgid "--sign [filename]"
msgstr "--sign [nombre_fichero]"
-#: g10/g10.c:1143
+#: g10/g10.c:1157
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nombre_fichero]"
-#: g10/g10.c:1157
+#: g10/g10.c:1171
msgid "--clearsign [filename]"
msgstr "--clearsign [nombre_fichero]"
-#: g10/g10.c:1174
+#: g10/g10.c:1188
msgid "--decrypt [filename]"
msgstr "--decrypt [nombre_fichero]"
-#: g10/g10.c:1182
+#: g10/g10.c:1196
msgid "--sign-key user-id"
msgstr "--sign-key id-usuario"
-#: g10/g10.c:1190
+#: g10/g10.c:1204
msgid "--lsign-key user-id"
msgstr "--lsign-key id-usuario"
-#: g10/g10.c:1198
+#: g10/g10.c:1212
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-usuario [comandos]"
-#: g10/g10.c:1214
+#: g10/g10.c:1228
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key id-usuario"
-#: g10/g10.c:1217
+#: g10/g10.c:1231
msgid "--delete-key user-id"
msgstr "--delete-key id-usuario"
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:260 g10/g10.c:1268 g10/sign.c:393
#, c-format
msgid "can't open %s: %s\n"
msgstr "no puede abrirse `%s': %s\n"
-#: g10/g10.c:1269
+#: g10/g10.c:1283
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
-#: g10/g10.c:1335
+#: g10/g10.c:1349
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminaci�n de armadura fallida: %s\n"
-#: g10/g10.c:1343
+#: g10/g10.c:1357
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creaci�n de armadura fallida: %s\n"
-#: g10/g10.c:1411
+#: g10/g10.c:1428
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de distribuci�n no v�lido `%s'\n"
-#: g10/g10.c:1492
+#: g10/g10.c:1509
msgid "[filename]"
msgstr "[nombre_fichero]"
-#: g10/g10.c:1496
+#: g10/g10.c:1513
msgid "Go ahead and type your message ...\n"
msgstr "Adelante, teclee su mensaje...\n"
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1516 g10/verify.c:68 g10/verify.c:113
#, c-format
msgid "can't open `%s'\n"
msgstr "no puede abrirse `%s'\n"
-#: g10/g10.c:1669
+#: g10/g10.c:1689
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr "El primer caracter de una notaci�n debe ser una letra o un subrayado\n"
-#: g10/g10.c:1675
+#: g10/g10.c:1695
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -881,11 +881,11 @@ msgstr ""
"un nombre de notaci�n debe tener s�lo letras, d�gitos, puntos o subrayados, "
"y acabar con un '='\n"
-#: g10/g10.c:1681
+#: g10/g10.c:1701
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr "los puntos en una notaci�n deben estar rodeados por otros caracteres\n"
-#: g10/g10.c:1689
+#: g10/g10.c:1709
msgid "a notation value must not use any control characters\n"
msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
@@ -1700,238 +1700,248 @@ msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
msgid "[User id not found]"
msgstr "%s: usuario no encontrado\n"
-#: g10/import.c:181
+#: g10/import.c:182
#, c-format
msgid "skipping block of type %d\n"
msgstr "ignorando bloque de tipo %d\n"
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1740 g10/trustdb.c:1781
#, c-format
msgid "%lu keys so far processed\n"
msgstr "hasta ahora se han procesado %lu claves\n"
-#: g10/import.c:193
+#: g10/import.c:194
#, c-format
msgid "error reading `%s': %s\n"
msgstr "error leyendo `%s': %s\n"
-#: g10/import.c:203
+#: g10/import.c:204
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Cantidad total procesada: %lu\n"
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " nuevas subclaves: %lu\n"
+
+#: g10/import.c:209
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sin identificativo: %lu\n"
-#: g10/import.c:207
+#: g10/import.c:211
#, c-format
msgid " imported: %lu"
msgstr " importadas: %lu"
-#: g10/import.c:213
+#: g10/import.c:217
#, c-format
msgid " unchanged: %lu\n"
msgstr " sin cambios: %lu\n"
-#: g10/import.c:215
+#: g10/import.c:219
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nuevos identificativos: %lu\n"
-#: g10/import.c:217
+#: g10/import.c:221
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nuevas subclaves: %lu\n"
-#: g10/import.c:219
+#: g10/import.c:223
#, c-format
msgid " new signatures: %lu\n"
msgstr " nuevas firmas: %lu\n"
-#: g10/import.c:221
+#: g10/import.c:225
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nuevas revocaciones: %lu\n"
-#: g10/import.c:223
+#: g10/import.c:227
#, c-format
msgid " secret keys read: %lu\n"
msgstr " claves secretas le�das: %lu\n"
-#: g10/import.c:225
+#: g10/import.c:229
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " claves secretas importadas: %lu\n"
-#: g10/import.c:227
+#: g10/import.c:231
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "claves secretas sin cambios: %lu\n"
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "clave %08lX: no hay identificativo de usuario\n"
-#: g10/import.c:400
+#: g10/import.c:405
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "clave %08lX: no hay identificativos de usuario v�lidos\n"
-#: g10/import.c:402
+#: g10/import.c:407
msgid "this may be caused by a missing self-signature\n"
msgstr "esto puede ser debido a la ausencia de autofirma\n"
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
+
+#: g10/import.c:431
msgid "no default public keyring\n"
msgstr "no hay anillo p�blico por defecto\n"
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
#, c-format
msgid "writing to `%s'\n"
msgstr "escribiendo en `%s'\n"
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
#, c-format
msgid "can't lock keyring `%s': %s\n"
msgstr "no puede bloquearse el anillo `%s': %s\n"
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "error escribiendo anillo `%s': %s\n"
-#: g10/import.c:434
+#: g10/import.c:446
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "clave %08lX: clave p�blica importada\n"
-#: g10/import.c:451
+#: g10/import.c:463
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "clave %08lX: no se corresponde con nuestra copia\n"
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n"
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n"
-#: g10/import.c:493
+#: g10/import.c:505
#, c-format
msgid "key %08lX: 1 new user ID\n"
msgstr "clave %08lX: 1 nuevo identificativo de usuario\n"
-#: g10/import.c:496
+#: g10/import.c:508
#, c-format
msgid "key %08lX: %d new user IDs\n"
msgstr "clave %08lX: %d nuevos identificativos de usuario\n"
-#: g10/import.c:499
+#: g10/import.c:511
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "clave %08lX: 1 nueva firma\n"
-#: g10/import.c:502
+#: g10/import.c:514
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "clave %08lX: %d nuevas firmas\n"
-#: g10/import.c:505
+#: g10/import.c:517
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "clave %08lX: 1 nueva subclave\n"
-#: g10/import.c:508
+#: g10/import.c:520
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "clave %08lX: %d nuevas subclaves\n"
-#: g10/import.c:518
+#: g10/import.c:530
#, c-format
msgid "key %08lX: not changed\n"
msgstr "clave %08lX: sin cambios\n"
-#: g10/import.c:601
+#: g10/import.c:613
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "clave %08lX: clave secreta importada\n"
#. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "clave %08lX: ya estaba en el anillo secreto\n"
-#: g10/import.c:610
+#: g10/import.c:622
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "clave %08lX: clave secreta no encontrada: %s\n"
-#: g10/import.c:639
+#: g10/import.c:651
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"clave %08lX: falta la clave p�blica - imposibile applicar el\n"
"certificado de revocaci�n\n"
-#: g10/import.c:670
+#: g10/import.c:682
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "clave %08lX: certificado de revocaci�n no v�lido: %s - rechazado\n"
-#: g10/import.c:702
+#: g10/import.c:714
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "clave %08lX: certificado de revocaci�n importado\n"
-#: g10/import.c:744
+#: g10/import.c:756
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "clave %08lX: no hay identificativo de usuario para la firma\n"
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "clave %08lX: algoritmo de clave p�blica no soportado\n"
-#: g10/import.c:752
+#: g10/import.c:764
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "clave %08lX: autofirma no v�lida\n"
-#: g10/import.c:767
+#: g10/import.c:779
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "clave %08lX: no hay subclave para unir\n"
-#: g10/import.c:776
+#: g10/import.c:788
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "clave %08lX.%lu: uni�n de subclave no v�lida\n"
-#: g10/import.c:803
+#: g10/import.c:815
#, c-format
msgid "key %08lX: accepted non self-signed user ID '"
msgstr "clave %08lX: aceptado ID de usuario sin autofirma '"
-#: g10/import.c:832
+#: g10/import.c:844
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "clave %08lX: ignorado ID de usuario '"
-#: g10/import.c:855
+#: g10/import.c:867
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "clave %08lX: subclave ignorada\n"
@@ -1940,33 +1950,33 @@ msgstr "clave %08lX: subclave ignorada\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "clave %08lX: firma no exportable (clase %02x) - ignorada\n"
-#: g10/import.c:889
+#: g10/import.c:901
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr ""
"clave %08lX: certificado de revocaci�n en lugar equivocado - ignorado\n"
-#: g10/import.c:897
+#: g10/import.c:909
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "clave %08lX: certificado de revocaci�n no valido: %s - ignorado\n"
-#: g10/import.c:997
+#: g10/import.c:1009
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
-#: g10/import.c:1048
+#: g10/import.c:1060
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "clave %08lX: certificado de revocaci�n a�adido\n"
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
@@ -2545,8 +2555,17 @@ msgstr "�Crear los certificados de revocaci�n realmente? (s/N)"
msgid "no secret key\n"
msgstr "no hay clave secreta\n"
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "Armadura no v�lida"
+
+#: g10/keylist.c:178
+msgid "revoked"
+msgstr ""
+
#. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
#, fuzzy, c-format
msgid " [expires: %s]"
msgstr "La clave caduca el %s\n"
@@ -2556,104 +2575,104 @@ msgstr "La clave caduca el %s\n"
msgid "public key is %08lX\n"
msgstr "la clave p�blica es %08lX\n"
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
msgid "public key encrypted data: good DEK\n"
msgstr "datos cifrados de la clave p�blica: DEK bueno\n"
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "cifrado con clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s\n"
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "cifrado con clave %s, ID %08lX\n"
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
msgid "no secret key for decryption available\n"
msgstr "clave secreta para descifrado no disponible\n"
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "descifrado de la clave p�blica fallido: %s\n"
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
msgid "decryption okay\n"
msgstr "descifrado correcto\n"
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
#, c-format
msgid "decryption failed: %s\n"
msgstr "descifrado fallido: %s\n"
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nombre fichero original='%.*s'\n"
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
msgid "WARNING: invalid notation data found\n"
msgstr "ATENCI�N: encontrados datos de notaci�n no v�lidos\n"
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
msgid "Notation: "
msgstr "Notaci�n: "
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
msgid "Policy: "
msgstr "Pol�tica: "
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
msgid "signature verification suppressed\n"
msgstr "suprimida la verificaci�n de la firma\n"
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Firma creada el %.*s usando clave %s ID %08lX\n"
#. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
msgid "BAD signature from \""
msgstr "Firma INCORRECTA de \""
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
msgid "Good signature from \""
msgstr "Firma correcta de \""
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
msgid " aka \""
msgstr "tambi�n conocido como \""
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Imposible comprobar la firma: %s\n"
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
#, fuzzy, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "Clase de firma desconocida"
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
msgid "old style (PGP 2.x) signature\n"
msgstr "firma viejo estilo (PGP 2.x)\n"
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
msgid "invalid root packet detected in proc_tree()\n"
msgstr "paquete ra�z no v�lido detectado en proc_tree()\n"
@@ -2726,24 +2745,24 @@ msgstr "Introduzca contrase�a: "
msgid "Repeat passphrase: "
msgstr "Repita contrase�a: "
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "datos no grabados; use la opci�n \"--output\" para grabarlos\n"
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
#, fuzzy
msgid "Detached signature.\n"
msgstr "%d firmas borradas.\n"
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
msgid "Please enter name of data file: "
msgstr "Introduzca el nombre del fichero de datos: "
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
msgid "reading stdin ...\n"
msgstr "leyendo stdin...\n"
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "imposible abrir datos firmados `%s'\n"
diff --git a/po/fr.po b/po/fr.po
index 922228c9c..0eba435d0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.1h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-27 17:31+0200\n"
"PO-Revision-Date: 2000-06-28 18:41+02:00\n"
"Last-Translator: Ga�l Qu�ri <[email protected]>\n"
"Language-Team: French <[email protected]>\n"
@@ -262,7 +262,7 @@ msgstr "... c'est un bug (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "vous avez trouv� un bug... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossible d'ouvrir `%s': %s\n"
@@ -348,7 +348,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:197
+#: g10/g10.c:203
msgid ""
"@Commands:\n"
" "
@@ -356,139 +356,139 @@ msgstr ""
"@Commandes:\n"
" "
-#: g10/g10.c:199
+#: g10/g10.c:205
msgid "|[file]|make a signature"
msgstr "|[fichier]|faire une signature"
-#: g10/g10.c:200
+#: g10/g10.c:206
msgid "|[file]|make a clear text signature"
msgstr "|[fichier]|faire une signature en texte clair"
-#: g10/g10.c:201
+#: g10/g10.c:207
msgid "make a detached signature"
msgstr "faire une signature d�tach�e"
-#: g10/g10.c:202
+#: g10/g10.c:208
msgid "encrypt data"
msgstr "chiffrer les donn�es"
-#: g10/g10.c:203
+#: g10/g10.c:209
msgid "encryption only with symmetric cipher"
msgstr "chiffrement sym�trique seulement"
-#: g10/g10.c:204
+#: g10/g10.c:210
msgid "store only"
msgstr "pas d'action"
-#: g10/g10.c:205
+#: g10/g10.c:211
msgid "decrypt data (default)"
msgstr "d�chiffrer les donn�es (d�faut)"
-#: g10/g10.c:206
+#: g10/g10.c:212
msgid "verify a signature"
msgstr "v�rifier une signature"
-#: g10/g10.c:208
+#: g10/g10.c:214
msgid "list keys"
msgstr "lister les cl�s"
-#: g10/g10.c:210
+#: g10/g10.c:216
msgid "list keys and signatures"
msgstr "lister les cl�s et les signatures"
-#: g10/g10.c:211
+#: g10/g10.c:217
msgid "check key signatures"
msgstr "v�rifier les signatures des cl�s"
-#: g10/g10.c:212
+#: g10/g10.c:218
msgid "list keys and fingerprints"
msgstr "lister les cl�s et les empreintes"
-#: g10/g10.c:213
+#: g10/g10.c:219
msgid "list secret keys"
msgstr "lister les cl�s secr�tes"
-#: g10/g10.c:214
+#: g10/g10.c:220
msgid "generate a new key pair"
msgstr "g�n�rer une nouvelle paire de cl�s"
-#: g10/g10.c:215
+#: g10/g10.c:221
msgid "remove key from the public keyring"
msgstr "enlever la cl� du porte-cl�s public"
-#: g10/g10.c:217
+#: g10/g10.c:223
msgid "remove key from the secret keyring"
msgstr "enlever la cl� du porte-cl�s secret"
-#: g10/g10.c:218
+#: g10/g10.c:224
msgid "sign a key"
msgstr "signer une cl�"
-#: g10/g10.c:219
+#: g10/g10.c:225
msgid "sign a key locally"
msgstr "signer une cl� localement"
-#: g10/g10.c:220
+#: g10/g10.c:226
msgid "sign or edit a key"
msgstr "signer ou �diter une cl�"
-#: g10/g10.c:221
+#: g10/g10.c:227
msgid "generate a revocation certificate"
msgstr "g�n�rer un certificat de r�vocation"
-#: g10/g10.c:222
+#: g10/g10.c:228
msgid "export keys"
msgstr "exporter les cl�s"
-#: g10/g10.c:223
+#: g10/g10.c:229
msgid "export keys to a key server"
msgstr "exporter les cl�s vers un serveur de cl�s"
-#: g10/g10.c:224
+#: g10/g10.c:230
msgid "import keys from a key server"
msgstr "importer les cl�s d'un serveur de cl�s"
-#: g10/g10.c:228
+#: g10/g10.c:234
msgid "import/merge keys"
msgstr "importer/fusionner les cl�s"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "list only the sequence of packets"
msgstr "ne lister que les paquets"
-#: g10/g10.c:232
+#: g10/g10.c:238
msgid "export the ownertrust values"
msgstr "exporter les indices de confiance"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "import ownertrust values"
msgstr "importer les indices de confiance"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "update the trust database"
msgstr "mettre la base de confiance � jour"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|[NAMES]|check the trust database"
msgstr "|[NOMS]|v�rifier la base de confiance"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "fix a corrupted trust database"
msgstr "r�parer une base de confiance corrompue"
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "De-Armor a file or stdin"
msgstr "Enlever l'armure d'un fichier ou de stdin"
-#: g10/g10.c:242
+#: g10/g10.c:248
msgid "En-Armor a file or stdin"
msgstr "Mettre une armure � un fichier ou � stdin"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "|algo [files]|print message digests"
msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid ""
"@\n"
"Options:\n"
@@ -498,148 +498,148 @@ msgstr ""
"Options:\n"
" "
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "create ascii armored output"
msgstr "cr�er une sortie ascii avec armure"
-#: g10/g10.c:252
+#: g10/g10.c:258
msgid "|NAME|encrypt for NAME"
msgstr "|NOM|chiffrer pour NOM"
-#: g10/g10.c:255
+#: g10/g10.c:261
msgid "|NAME|use NAME as default recipient"
msgstr "|NOM|utiliser NOM comme r�cipient par d�faut"
-#: g10/g10.c:257
+#: g10/g10.c:263
msgid "use the default key as default recipient"
msgstr "utiliser la cl� par d�f. comme r�cipient"
-#: g10/g10.c:261
+#: g10/g10.c:267
msgid "use this user-id to sign or decrypt"
msgstr "utiliser ce nom pour signer ou d�chiffrer"
-#: g10/g10.c:262
+#: g10/g10.c:268
msgid "|N|set compress level N (0 disables)"
msgstr "|N|niveau de compression N (0 d�sactive)"
-#: g10/g10.c:264
+#: g10/g10.c:270
msgid "use canonical text mode"
msgstr "utiliser le mode texte canonique"
-#: g10/g10.c:265
+#: g10/g10.c:271
msgid "use as output file"
msgstr "utiliser comme fichier de sortie"
-#: g10/g10.c:266
+#: g10/g10.c:272
msgid "verbose"
msgstr "bavard"
-#: g10/g10.c:267
+#: g10/g10.c:273
msgid "be somewhat more quiet"
msgstr "devenir beaucoup plus silencieux"
-#: g10/g10.c:268
+#: g10/g10.c:274
msgid "don't use the terminal at all"
msgstr "ne pas utiliser du tout le terminal"
-#: g10/g10.c:269
+#: g10/g10.c:275
msgid "force v3 signatures"
msgstr "forcer les signatures en v3"
-#: g10/g10.c:270
+#: g10/g10.c:276
msgid "always use a MDC for encryption"
msgstr "toujours utiliser un sceau pour le chiffrement"
-#: g10/g10.c:271
+#: g10/g10.c:277
msgid "do not make any changes"
msgstr "ne rien changer"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:279
msgid "batch mode: never ask"
msgstr "mode automatique: ne jamais rien demander"
-#: g10/g10.c:274
+#: g10/g10.c:280
msgid "assume yes on most questions"
msgstr "r�pondre oui � la plupart des questions"
-#: g10/g10.c:275
+#: g10/g10.c:281
msgid "assume no on most questions"
msgstr "r�pondre non � la plupart des questions"
-#: g10/g10.c:276
+#: g10/g10.c:282
msgid "add this keyring to the list of keyrings"
msgstr "ajouter ce porte-cl�s � la liste"
-#: g10/g10.c:277
+#: g10/g10.c:283
msgid "add this secret keyring to the list"
msgstr "ajouter ce porte-cl�s secret � la liste"
-#: g10/g10.c:278
+#: g10/g10.c:284
msgid "|NAME|use NAME as default secret key"
msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
-#: g10/g10.c:279
+#: g10/g10.c:285
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
-#: g10/g10.c:280
+#: g10/g10.c:286
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOM|le terminal utilise la table de caract�res NOM"
-#: g10/g10.c:281
+#: g10/g10.c:287
msgid "read options from file"
msgstr "lire les options du fichier"
-#: g10/g10.c:285
+#: g10/g10.c:291
msgid "|FD|write status info to this FD"
msgstr "|FD|�crire l'�tat sur ce descripteur"
-#: g10/g10.c:290
+#: g10/g10.c:296
msgid "|FILE|load extension module FILE"
msgstr "|FICH|charger le module d'extension FICH"
-#: g10/g10.c:291
+#: g10/g10.c:297
msgid "emulate the mode described in RFC1991"
msgstr "imiter le mode d�crit dans la RFC1991"
-#: g10/g10.c:292
+#: g10/g10.c:298
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "utiliser le comportement d�fini par OpenPGP"
-#: g10/g10.c:293
+#: g10/g10.c:299
msgid "|N|use passphrase mode N"
msgstr "|N|coder les mots de passe suivant le mode N"
-#: g10/g10.c:295
+#: g10/g10.c:301
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
-#: g10/g10.c:297
+#: g10/g10.c:303
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
-#: g10/g10.c:298
+#: g10/g10.c:304
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
-#: g10/g10.c:299
+#: g10/g10.c:305
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOM|utiliser la fonction de hachage NOM"
-#: g10/g10.c:300
+#: g10/g10.c:306
msgid "|N|use compress algorithm N"
msgstr "|N|utiliser l'algorithme de compression N"
-#: g10/g10.c:301
+#: g10/g10.c:307
msgid "throw keyid field of encrypted packets"
msgstr "supprimer l'ident. des paquets chiffr�s"
-#: g10/g10.c:302
+#: g10/g10.c:308
msgid "|NAME=VALUE|use this notation data"
msgstr "|NOM=VALEUR|utiliser ces donn�es de notation"
-#: g10/g10.c:305
+#: g10/g10.c:311
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -647,7 +647,7 @@ msgstr ""
"@\n"
"(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
-#: g10/g10.c:308
+#: g10/g10.c:314
msgid ""
"@\n"
"Examples:\n"
@@ -667,17 +667,17 @@ msgstr ""
" --list-keys [utilisateur] montrer les cl�s\n"
" --fingerprint [utilisateur] montrer les empreintes\n"
-#: g10/g10.c:403
+#: g10/g10.c:412
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Signaler toutes anomalies � <[email protected]> (en anglais)\n"
"et tout probl�me de traduction � <[email protected]>.\n"
-#: g10/g10.c:407
+#: g10/g10.c:416
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
-#: g10/g10.c:410
+#: g10/g10.c:419
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -687,7 +687,7 @@ msgstr ""
"signer, v�rifier, chiffrer ou d�chiffrer\n"
"l'op�ration par d�faut d�pend des donn�es entr�es\n"
-#: g10/g10.c:417
+#: g10/g10.c:426
msgid ""
"\n"
"Supported algorithms:\n"
@@ -695,184 +695,184 @@ msgstr ""
"\n"
"Algorithmes support�s:\n"
-#: g10/g10.c:496
+#: g10/g10.c:505
msgid "usage: gpg [options] "
msgstr "utilisation: gpg [options] "
-#: g10/g10.c:549
+#: g10/g10.c:558
msgid "conflicting commands\n"
msgstr "commandes en conflit\n"
-#: g10/g10.c:692
+#: g10/g10.c:701
#, 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:696
+#: g10/g10.c:705
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichier d'options `%s': %s\n"
-#: g10/g10.c:703
+#: g10/g10.c:712
#, c-format
msgid "reading options from `%s'\n"
msgstr "lire les options de `%s'\n"
-#: g10/g10.c:893
+#: g10/g10.c:902
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s n'est pas une table de caract�res valide\n"
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:963 g10/g10.c:972
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
-#: g10/g10.c:951
+#: g10/g10.c:965
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n'est pas permis avec %s !\n"
-#: g10/g10.c:954
+#: g10/g10.c:968
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n'a aucun sens avec %s !\n"
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:987 g10/g10.c:999
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:993 g10/g10.c:1005
msgid "selected digest algorithm is invalid\n"
msgstr "la fonction de hachage s�lectionn�e est invalide\n"
-#: g10/g10.c:995
+#: g10/g10.c:1009
msgid "the given policy URL is invalid\n"
msgstr "l'URL de politique donn�e est invalide\n"
-#: g10/g10.c:998
+#: g10/g10.c:1012
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n"
-#: g10/g10.c:1000
+#: g10/g10.c:1014
msgid "completes-needed must be greater than 0\n"
msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
-#: g10/g10.c:1002
+#: g10/g10.c:1016
msgid "marginals-needed must be greater than 1\n"
msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
-#: g10/g10.c:1004
+#: g10/g10.c:1018
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "�max-cert-depth� doit �tre compris entre 1 et 255\n"
-#: g10/g10.c:1007
+#: g10/g10.c:1021
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
-#: g10/g10.c:1011
+#: g10/g10.c:1025
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
-#: g10/g10.c:1096
+#: g10/g10.c:1110
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "impossible d'initialiser la base de confiance: %s\n"
-#: g10/g10.c:1102
+#: g10/g10.c:1116
msgid "--store [filename]"
msgstr "--store [nom du fichier]"
-#: g10/g10.c:1109
+#: g10/g10.c:1123
msgid "--symmetric [filename]"
msgstr "--symmetric [nom du fichier]"
-#: g10/g10.c:1117
+#: g10/g10.c:1131
msgid "--encrypt [filename]"
msgstr "--encrypt [nom du fichier]"
-#: g10/g10.c:1130
+#: g10/g10.c:1144
msgid "--sign [filename]"
msgstr "--sign [nom du fichier]"
-#: g10/g10.c:1143
+#: g10/g10.c:1157
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nom du fichier]"
-#: g10/g10.c:1157
+#: g10/g10.c:1171
msgid "--clearsign [filename]"
msgstr "--clearsign [nom du fichier]"
-#: g10/g10.c:1174
+#: g10/g10.c:1188
msgid "--decrypt [filename]"
msgstr "--decrypt [nom du fichier]"
-#: g10/g10.c:1182
+#: g10/g10.c:1196
msgid "--sign-key user-id"
msgstr "--sign-key utilisateur"
-#: g10/g10.c:1190
+#: g10/g10.c:1204
msgid "--lsign-key user-id"
msgstr "--lsign-key utilisateur"
-#: g10/g10.c:1198
+#: g10/g10.c:1212
msgid "--edit-key user-id [commands]"
msgstr "--edit-key utilisateur [commandes]"
-#: g10/g10.c:1214
+#: g10/g10.c:1228
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key utilisateur"
-#: g10/g10.c:1217
+#: g10/g10.c:1231
msgid "--delete-key user-id"
msgstr "--delete-key utilisateur"
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:260 g10/g10.c:1268 g10/sign.c:393
#, c-format
msgid "can't open %s: %s\n"
msgstr "impossible d'ouvrir %s: %s\n"
-#: g10/g10.c:1269
+#: g10/g10.c:1283
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
-#: g10/g10.c:1335
+#: g10/g10.c:1349
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "la suppression d'une armure a �chou�: %s\n"
-#: g10/g10.c:1343
+#: g10/g10.c:1357
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "la construction d'une armure a �chou�: %s \n"
-#: g10/g10.c:1411
+#: g10/g10.c:1428
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algorithme de hachage `%s' invalide\n"
-#: g10/g10.c:1492
+#: g10/g10.c:1509
msgid "[filename]"
msgstr "[nom du fichier]"
-#: g10/g10.c:1496
+#: g10/g10.c:1513
msgid "Go ahead and type your message ...\n"
msgstr "Continuez et tapez votre message...\n"
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1516 g10/verify.c:68 g10/verify.c:113
#, c-format
msgid "can't open `%s'\n"
msgstr "impossible d'ouvrir `%s'\n"
-#: g10/g10.c:1669
+#: g10/g10.c:1689
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"le premier caract�re du nom d'une notation doit �tre un lettre ou un trait\n"
"de soulignement\n"
-#: g10/g10.c:1675
+#: g10/g10.c:1695
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -881,13 +881,13 @@ msgstr ""
"des points ou des traits de soulignement et doit se terminer par un signe "
"�gal\n"
-#: g10/g10.c:1681
+#: g10/g10.c:1701
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
"les points dans le nom d'une notation doivent �tre entour�s d'autes "
"caract�res\n"
-#: g10/g10.c:1689
+#: g10/g10.c:1709
msgid "a notation value must not use any control characters\n"
msgstr "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
@@ -1703,238 +1703,248 @@ msgstr ""
msgid "[User id not found]"
msgstr "[Nom utilisateur introuvable]"
-#: g10/import.c:181
+#: g10/import.c:182
#, c-format
msgid "skipping block of type %d\n"
msgstr "un bloc de type %d a �t� ignor�\n"
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1740 g10/trustdb.c:1781
#, c-format
msgid "%lu keys so far processed\n"
msgstr "%lu cl�s trait�es jusqu'ici\n"
-#: g10/import.c:193
+#: g10/import.c:194
#, c-format
msgid "error reading `%s': %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
-#: g10/import.c:203
+#: g10/import.c:204
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Quantit� totale trait�e: %lu\n"
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " nouvelles sous-cl�s: %lu\n"
+
+#: g10/import.c:209
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sans nom d'utilisateur: %lu\n"
-#: g10/import.c:207
+#: g10/import.c:211
#, c-format
msgid " imported: %lu"
msgstr " import�e: %lu"
-#: g10/import.c:213
+#: g10/import.c:217
#, c-format
msgid " unchanged: %lu\n"
msgstr " inchang�e: %lu\n"
-#: g10/import.c:215
+#: g10/import.c:219
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nouveaux noms d'utilisateurs: %lu\n"
-#: g10/import.c:217
+#: g10/import.c:221
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nouvelles sous-cl�s: %lu\n"
-#: g10/import.c:219
+#: g10/import.c:223
#, c-format
msgid " new signatures: %lu\n"
msgstr " nouvelles signatures: %lu\n"
-#: g10/import.c:221
+#: g10/import.c:225
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nouvelles r�vocations de cl�s: %lu\n"
-#: g10/import.c:223
+#: g10/import.c:227
#, c-format
msgid " secret keys read: %lu\n"
msgstr " cl�s secr�tes lues: %lu\n"
-#: g10/import.c:225
+#: g10/import.c:229
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " cl�s secr�tes import�es: %lu\n"
-#: g10/import.c:227
+#: g10/import.c:231
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " cl�s secr�tes inchang�es: %lu\n"
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "cl� %08lX: pas de nom d'utilisateur\n"
-#: g10/import.c:400
+#: g10/import.c:405
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "cl� %08lX: pas de nom d'utilisateur valide\n"
-#: g10/import.c:402
+#: g10/import.c:407
msgid "this may be caused by a missing self-signature\n"
msgstr "cela peut provenir d'une auto-signature manquante\n"
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "cl� %08lX: cl� publique pas trouv�e: %s\n"
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "cl� %08lX: ce n'est pas une cl� rfc2440 - ignor�e\n"
+
+#: g10/import.c:431
msgid "no default public keyring\n"
msgstr "pas de porte-cl�s public par d�faut\n"
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
#, c-format
msgid "writing to `%s'\n"
msgstr "�criture de `%s'\n"
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
#, c-format
msgid "can't lock keyring `%s': %s\n"
msgstr "impossible de verrouiller le porte-cl�s `%s': %s\n"
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
-#: g10/import.c:434
+#: g10/import.c:446
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "cl� %08lX: cl� publique import�e\n"
-#: g10/import.c:451
+#: g10/import.c:463
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "cl� %08lX: ne ressemble pas � notre copie\n"
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "cl� %08lX: impossible de trouver le bloc de cl�s original: %s\n"
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "cl� %08lX: impossible de lire le bloc de cl�s original: %s\n"
-#: g10/import.c:493
+#: g10/import.c:505
#, c-format
msgid "key %08lX: 1 new user ID\n"
msgstr "cl� %08lX: un nouvel utilisateur\n"
-#: g10/import.c:496
+#: g10/import.c:508
#, c-format
msgid "key %08lX: %d new user IDs\n"
msgstr "cl� %08lX: %d nouveaux utilisateurs\n"
-#: g10/import.c:499
+#: g10/import.c:511
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "cl� %08lX: une nouvelle signature\n"
-#: g10/import.c:502
+#: g10/import.c:514
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "cl� %08lX: %d nouvelles signatures\n"
-#: g10/import.c:505
+#: g10/import.c:517
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "cl� %08lX: une nouvelle sous-cl�\n"
-#: g10/import.c:508
+#: g10/import.c:520
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "cl� %08lX: %d nouvelles sous-cl�s\n"
-#: g10/import.c:518
+#: g10/import.c:530
#, c-format
msgid "key %08lX: not changed\n"
msgstr "cl� %08lX: n'a pas chang�\n"
-#: g10/import.c:601
+#: g10/import.c:613
#, 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:605
+#: g10/import.c:617
#, 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:610
+#: g10/import.c:622
#, 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:639
+#: g10/import.c:651
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"cl� %08lX: pas de cl� publique - le certificat de r�vocation ne peut\n"
"�tre appliqu�\n"
-#: g10/import.c:670
+#: g10/import.c:682
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "cl� %08lX: certificat de r�vocation invalide: %s - rejet�\n"
-#: g10/import.c:702
+#: g10/import.c:714
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "cl� %08lX: certificat de r�vocation import�\n"
-#: g10/import.c:744
+#: g10/import.c:756
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "cl� %08lX: pas d'utilisateur pour la signature\n"
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "cl� %08lX: algorithme de cl� publique non support�\n"
-#: g10/import.c:752
+#: g10/import.c:764
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "cl� %08lX: auto-signature invalide\n"
-#: g10/import.c:767
+#: g10/import.c:779
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "cl� %08lX: pas de sous-cl� pour relier la cl�\n"
-#: g10/import.c:776
+#: g10/import.c:788
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "cl� %08lX: liaison avec la sous-cl� invalide\n"
-#: g10/import.c:803
+#: g10/import.c:815
#, c-format
msgid "key %08lX: accepted non self-signed user ID '"
msgstr "cl� %08lX: utilisateur non sign� par lui-m�me accept�: '"
-#: g10/import.c:832
+#: g10/import.c:844
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "cl� %08lX: utilisateur non pris en compte: '"
-#: g10/import.c:855
+#: g10/import.c:867
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "cl� %08lX: sous-cl� non prise en compte\n"
@@ -1943,32 +1953,32 @@ msgstr "cl� %08lX: sous-cl� non prise en compte\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "cl� %08lX: signature non exportable (classe %02x) - ignor�e\n"
-#: g10/import.c:889
+#: g10/import.c:901
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "cl� %08lX: certificat de r�vocation au mauvais endroit - ignor�e\n"
-#: g10/import.c:897
+#: g10/import.c:909
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "cl� %08lX: certificat de r�vocation invalide: %s - ignor�e\n"
-#: g10/import.c:997
+#: g10/import.c:1009
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "cl� %08lX: nom d'utilisateur en double fusionn�\n"
-#: g10/import.c:1048
+#: g10/import.c:1060
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "cl� %08lX: certificat de r�vocation ajout�\n"
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "cl� %08lX: notre copie n'a pas d'auto-signature\n"
@@ -2546,8 +2556,18 @@ msgstr "Faut-il vraiment g�n�rer les certificats de r�vocation ? (o/N)"
msgid "no secret key\n"
msgstr "pas de cl� secr�te\n"
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "armure invalide"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revcl�"
+
#. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
#, c-format
msgid " [expires: %s]"
msgstr " [expire: %s]"
@@ -2557,104 +2577,104 @@ msgstr " [expire: %s]"
msgid "public key is %08lX\n"
msgstr "la cl� publique est %08lX\n"
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
msgid "public key encrypted data: good DEK\n"
msgstr "donn�es chiffr�es par cl� publique: bonne cl� de chiffrement (DEK)\n"
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "chiffr� avec une cl� de %u bits %s, ID %08lX, cr��e le %s\n"
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "chiffr� avec une cl� %s, %08lX\n"
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
msgid "no secret key for decryption available\n"
msgstr "aucune cl� secr�te n'est disponible pour le d�chiffrement\n"
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
msgid "decryption okay\n"
msgstr "le d�chiffrement a r�ussi\n"
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ATTENTION: le message chiffr� a �t� manipul� !\n"
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
#, c-format
msgid "decryption failed: %s\n"
msgstr "le d�chiffrement a �chou�: %s\n"
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nom de fichier original: '%.*s'\n"
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
msgid "WARNING: invalid notation data found\n"
msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
msgid "Notation: "
msgstr "Notation: "
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
msgid "Policy: "
msgstr "Politique: "
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
msgid "signature verification suppressed\n"
msgstr "v�rification de signature supprim�e\n"
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Signature faite %.*s avec une cl� %s ID %08lX\n"
#. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
msgid "BAD signature from \""
msgstr "MAUVAISE signature de \""
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
msgid "Good signature from \""
msgstr "Bonne signature de \""
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
msgid " aka \""
msgstr " alias \""
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossible de v�rifier la signature: %s\n"
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "signature autonome de classe 0x%02x\n"
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
msgid "old style (PGP 2.x) signature\n"
msgstr "signature d'un ancien style (PGP 2.x)\n"
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
msgid "invalid root packet detected in proc_tree()\n"
msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
@@ -2727,25 +2747,25 @@ msgstr "Entrez le mot de passe: "
msgid "Repeat passphrase: "
msgstr "R�p�tez le mot de passe: "
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"les donn�es ne sont pas enregistr�es; utilisez l'option �--output� pour\n"
"les enregistrer\n"
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
msgid "Detached signature.\n"
msgstr "Signature d�tach�e.\n"
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
msgid "Please enter name of data file: "
msgstr "Entrez le nom du fichier de donn�es: "
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
msgid "reading stdin ...\n"
msgstr "lecture de l'entr�e standard...\n"
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
diff --git a/po/id.po b/po/id.po
index 92210149b..43bc7b9ab 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU Privacy Guard 1.0.1\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-27 17:31+0200\n"
"PO-Revision-Date: 2000-02-06 18:04+07:00\n"
"Last-Translator: Tedi Heriyanto <[email protected]>\n"
"Language-Team: Indonesia <[email protected]>\n"
@@ -256,7 +256,7 @@ msgstr "... kesalahan (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "anda menemukan kesalahan ...(%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
@@ -337,7 +337,7 @@ msgstr ""
"Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n"
"memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n"
-#: g10/g10.c:197
+#: g10/g10.c:203
msgid ""
"@Commands:\n"
" "
@@ -345,140 +345,140 @@ msgstr ""
"@Perintah:\n"
" "
-#: g10/g10.c:199
+#: g10/g10.c:205
msgid "|[file]|make a signature"
msgstr "|[file]|buat signature"
-#: g10/g10.c:200
+#: g10/g10.c:206
msgid "|[file]|make a clear text signature"
msgstr "|[file]|buat signature teks"
-#: g10/g10.c:201
+#: g10/g10.c:207
msgid "make a detached signature"
msgstr "buat detached signature"
-#: g10/g10.c:202
+#: g10/g10.c:208
msgid "encrypt data"
msgstr "enkripsi data"
-#: g10/g10.c:203
+#: g10/g10.c:209
msgid "encryption only with symmetric cipher"
msgstr "enkripsi hanya dengan symmetric cipher"
-#: g10/g10.c:204
+#: g10/g10.c:210
msgid "store only"
msgstr "hanya disimpan"
-#: g10/g10.c:205
+#: g10/g10.c:211
msgid "decrypt data (default)"
msgstr "dekripsi data (default)"
-#: g10/g10.c:206
+#: g10/g10.c:212
msgid "verify a signature"
msgstr "verifikasi signature"
-#: g10/g10.c:208
+#: g10/g10.c:214
msgid "list keys"
msgstr "tampilkan kunci"
-#: g10/g10.c:210
+#: g10/g10.c:216
msgid "list keys and signatures"
msgstr "tampilkan kunci dan signature"
-#: g10/g10.c:211
+#: g10/g10.c:217
msgid "check key signatures"
msgstr "periksa signature kunci"
-#: g10/g10.c:212
+#: g10/g10.c:218
msgid "list keys and fingerprints"
msgstr "tampilkan kunci dan fingerprint"
-#: g10/g10.c:213
+#: g10/g10.c:219
msgid "list secret keys"
msgstr "tampilkan kunci rahasia"
-#: g10/g10.c:214
+#: g10/g10.c:220
msgid "generate a new key pair"
msgstr "buat sepasang kunci baru"
-#: g10/g10.c:215
+#: g10/g10.c:221
msgid "remove key from the public keyring"
msgstr "hapus kunci dari keyring publik"
-#: g10/g10.c:217
+#: g10/g10.c:223
#, fuzzy
msgid "remove key from the secret keyring"
msgstr "hapus kunci dari keyring publik"
-#: g10/g10.c:218
+#: g10/g10.c:224
msgid "sign a key"
msgstr "tandai kunci"
-#: g10/g10.c:219
+#: g10/g10.c:225
msgid "sign a key locally"
msgstr "tandai kunci secara lokal"
-#: g10/g10.c:220
+#: g10/g10.c:226
msgid "sign or edit a key"
msgstr "tandai atau edit kunci"
-#: g10/g10.c:221
+#: g10/g10.c:227
msgid "generate a revocation certificate"
msgstr "buat sertifikat revokasi"
-#: g10/g10.c:222
+#: g10/g10.c:228
msgid "export keys"
msgstr "ekspor kunci"
-#: g10/g10.c:223
+#: g10/g10.c:229
msgid "export keys to a key server"
msgstr "ekspor kunci ke key server"
-#: g10/g10.c:224
+#: g10/g10.c:230
msgid "import keys from a key server"
msgstr "impor kunci dari key server"
-#: g10/g10.c:228
+#: g10/g10.c:234
msgid "import/merge keys"
msgstr "impor/gabung kunci"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "list only the sequence of packets"
msgstr "tampilkan hanya urutan paket"
-#: g10/g10.c:232
+#: g10/g10.c:238
msgid "export the ownertrust values"
msgstr "ekspor nilai ownertrust"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "import ownertrust values"
msgstr "impor nilai ownertrust"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "update the trust database"
msgstr "perbarui database trust"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|[NAMES]|check the trust database"
msgstr "|[NAMA]|periksa database trust"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "fix a corrupted trust database"
msgstr "perbaiki database trust yang terkorupsi"
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "De-Armor a file or stdin"
msgstr "De-Armor file atau stdin"
-#: g10/g10.c:242
+#: g10/g10.c:248
msgid "En-Armor a file or stdin"
msgstr "En-Armor file atau stdin"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "|algo [files]|print message digests"
msgstr "|algo [file]|cetak digest pesan"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid ""
"@\n"
"Options:\n"
@@ -488,154 +488,154 @@ msgstr ""
"Pilihan:\n"
" "
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "create ascii armored output"
msgstr "ciptakan output ascii"
-#: g10/g10.c:252
+#: g10/g10.c:258
msgid "|NAME|encrypt for NAME"
msgstr "|NAMA|enkripsi untuk NAMA"
-#: g10/g10.c:255
+#: g10/g10.c:261
msgid "|NAME|use NAME as default recipient"
msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
-#: g10/g10.c:257
+#: g10/g10.c:263
msgid "use the default key as default recipient"
msgstr "gunakan kunci baku sebagai penerima baku"
-#: g10/g10.c:261
+#: g10/g10.c:267
msgid "use this user-id to sign or decrypt"
msgstr "gunakan id-user ini untuk menandai/dekripsi"
-#: g10/g10.c:262
+#: g10/g10.c:268
msgid "|N|set compress level N (0 disables)"
msgstr "|N|set tingkat kompresi N (0 tidak ada)"
-#: g10/g10.c:264
+#: g10/g10.c:270
msgid "use canonical text mode"
msgstr "gunakan mode teks kanonikal"
-#: g10/g10.c:265
+#: g10/g10.c:271
msgid "use as output file"
msgstr "gunakan sebagai file output"
-#: g10/g10.c:266
+#: g10/g10.c:272
msgid "verbose"
msgstr "detil"
-#: g10/g10.c:267
+#: g10/g10.c:273
msgid "be somewhat more quiet"
msgstr "lebih diam"
-#: g10/g10.c:268
+#: g10/g10.c:274
msgid "don't use the terminal at all"
msgstr "jangan menggunakan terminal"
-#: g10/g10.c:269
+#: g10/g10.c:275
msgid "force v3 signatures"
msgstr "paksa signature v3"
-#: g10/g10.c:270
+#: g10/g10.c:276
msgid "always use a MDC for encryption"
msgstr "selalu gunakan MDC untuk enkripsi"
-#: g10/g10.c:271
+#: g10/g10.c:277
msgid "do not make any changes"
msgstr "jangan buat perubahan"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:279
msgid "batch mode: never ask"
msgstr "mode batch: tanpa tanya"
-#: g10/g10.c:274
+#: g10/g10.c:280
msgid "assume yes on most questions"
msgstr "asumsikan ya untuk seluruh pertanyaan"
-#: g10/g10.c:275
+#: g10/g10.c:281
msgid "assume no on most questions"
msgstr "asumsikan tidak untuk seluruh pertanyaan"
-#: g10/g10.c:276
+#: g10/g10.c:282
msgid "add this keyring to the list of keyrings"
msgstr "tambah keyring ini ke daftar keyring"
-#: g10/g10.c:277
+#: g10/g10.c:283
msgid "add this secret keyring to the list"
msgstr "tambah keyring rahasia ini ke daftar"
-#: g10/g10.c:278
+#: g10/g10.c:284
msgid "|NAME|use NAME as default secret key"
msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
-#: g10/g10.c:279
+#: g10/g10.c:285
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
-#: g10/g10.c:280
+#: g10/g10.c:286
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAMA|set charset terminal ke NAMA"
-#: g10/g10.c:281
+#: g10/g10.c:287
msgid "read options from file"
msgstr "baca pilihan dari file"
-#: g10/g10.c:285
+#: g10/g10.c:291
msgid "|FD|write status info to this FD"
msgstr "|FD|tulis info status ke FD ini"
-#: g10/g10.c:290
+#: g10/g10.c:296
msgid "|FILE|load extension module FILE"
msgstr "|FILE|muat modul ekstensi FILE"
-#: g10/g10.c:291
+#: g10/g10.c:297
msgid "emulate the mode described in RFC1991"
msgstr "emulasikan mode seperti dalam RFC1991"
-#: g10/g10.c:292
+#: g10/g10.c:298
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "set pilihan paket, cipher, digest ke OpenPGP"
-#: g10/g10.c:293
+#: g10/g10.c:299
msgid "|N|use passphrase mode N"
msgstr "|N|gunakan passphrase mode N"
-#: g10/g10.c:295
+#: g10/g10.c:301
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
-#: g10/g10.c:297
+#: g10/g10.c:303
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
-#: g10/g10.c:298
+#: g10/g10.c:304
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAMA|gunakan algoritma cipher NAMA"
-#: g10/g10.c:299
+#: g10/g10.c:305
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
-#: g10/g10.c:300
+#: g10/g10.c:306
msgid "|N|use compress algorithm N"
msgstr "|N|gunakan algoritma kompresi N"
-#: g10/g10.c:301
+#: g10/g10.c:307
msgid "throw keyid field of encrypted packets"
msgstr "buang field keyid paket terenkripsi"
-#: g10/g10.c:302
+#: g10/g10.c:308
msgid "|NAME=VALUE|use this notation data"
msgstr "|NAMA=NILAI|gunakan notasi data ini"
-#: g10/g10.c:305
+#: g10/g10.c:311
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/g10.c:308
+#: g10/g10.c:314
msgid ""
"@\n"
"Examples:\n"
@@ -655,15 +655,15 @@ msgstr ""
" --list-keys [nama] tampilkan kunci\n"
" --fingerprint [nama] tampilkan fingerprint\n"
-#: g10/g10.c:403
+#: g10/g10.c:412
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Silakan laporkan kesalahan ke <[email protected]>.\n"
-#: g10/g10.c:407
+#: g10/g10.c:416
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
-#: g10/g10.c:410
+#: g10/g10.c:419
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -673,7 +673,7 @@ msgstr ""
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
-#: g10/g10.c:417
+#: g10/g10.c:426
msgid ""
"\n"
"Supported algorithms:\n"
@@ -681,182 +681,182 @@ msgstr ""
"\n"
"Algoritma yang didukung:\n"
-#: g10/g10.c:496
+#: g10/g10.c:505
msgid "usage: gpg [options] "
msgstr "pemakaian: gpg [pilihan] "
-#: g10/g10.c:549
+#: g10/g10.c:558
msgid "conflicting commands\n"
msgstr "perintah saling konflik\n"
-#: g10/g10.c:692
+#: g10/g10.c:701
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
-#: g10/g10.c:696
+#: g10/g10.c:705
#, c-format
msgid "option file `%s': %s\n"
msgstr "file pilihan `%s': %s\n"
-#: g10/g10.c:703
+#: g10/g10.c:712
#, c-format
msgid "reading options from `%s'\n"
msgstr "membaca pilihan dari `%s'\n"
-#: g10/g10.c:893
+#: g10/g10.c:902
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s bukanlah set karakter yang valid\n"
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:963 g10/g10.c:972
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
-#: g10/g10.c:951
+#: g10/g10.c:965
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
-#: g10/g10.c:954
+#: g10/g10.c:968
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s tidak masuk akal dengan %s!\n"
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:987 g10/g10.c:999
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:993 g10/g10.c:1005
msgid "selected digest algorithm is invalid\n"
msgstr "algoritma digest yang dipilih tidak valid\n"
-#: g10/g10.c:995
+#: g10/g10.c:1009
msgid "the given policy URL is invalid\n"
msgstr "kebijakan URL yang diberikan tidak valid\n"
-#: g10/g10.c:998
+#: g10/g10.c:1012
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "algoritma kompresi harus di antara %d..%d\n"
-#: g10/g10.c:1000
+#: g10/g10.c:1014
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed harus lebih dari 0\n"
-#: g10/g10.c:1002
+#: g10/g10.c:1016
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed harus lebih dari 1\n"
-#: g10/g10.c:1004
+#: g10/g10.c:1018
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth harus di antara 1 hingga 255\n"
-#: g10/g10.c:1007
+#: g10/g10.c:1021
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
-#: g10/g10.c:1011
+#: g10/g10.c:1025
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
-#: g10/g10.c:1096
+#: g10/g10.c:1110
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
-#: g10/g10.c:1102
+#: g10/g10.c:1116
msgid "--store [filename]"
msgstr "--store [namafile]"
-#: g10/g10.c:1109
+#: g10/g10.c:1123
msgid "--symmetric [filename]"
msgstr "--symmetric [namafile]"
-#: g10/g10.c:1117
+#: g10/g10.c:1131
msgid "--encrypt [filename]"
msgstr "--encrypt [namafile]"
-#: g10/g10.c:1130
+#: g10/g10.c:1144
msgid "--sign [filename]"
msgstr "--sign [namafile]"
-#: g10/g10.c:1143
+#: g10/g10.c:1157
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
-#: g10/g10.c:1157
+#: g10/g10.c:1171
msgid "--clearsign [filename]"
msgstr "--clearsign [namafile]"
-#: g10/g10.c:1174
+#: g10/g10.c:1188
msgid "--decrypt [filename]"
msgstr "--decrypt [namafile]"
-#: g10/g10.c:1182
+#: g10/g10.c:1196
msgid "--sign-key user-id"
msgstr "--sign-key id-user"
-#: g10/g10.c:1190
+#: g10/g10.c:1204
msgid "--lsign-key user-id"
msgstr "--lsign-key id-user"
-#: g10/g10.c:1198
+#: g10/g10.c:1212
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-user [perintah]"
-#: g10/g10.c:1214
+#: g10/g10.c:1228
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key id-user"
-#: g10/g10.c:1217
+#: g10/g10.c:1231
msgid "--delete-key user-id"
msgstr "--delete-key id-user"
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:260 g10/g10.c:1268 g10/sign.c:393
#, c-format
msgid "can't open %s: %s\n"
msgstr "tidak dapat membuka %s: %s\n"
-#: g10/g10.c:1269
+#: g10/g10.c:1283
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-user] [keyring]"
-#: g10/g10.c:1335
+#: g10/g10.c:1349
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "gagal dearmoring: %s\n"
-#: g10/g10.c:1343
+#: g10/g10.c:1357
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "gagal enarmoring: %s\n"
-#: g10/g10.c:1411
+#: g10/g10.c:1428
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritma hash tidak valid `%s'\n"
-#: g10/g10.c:1492
+#: g10/g10.c:1509
msgid "[filename]"
msgstr "[namafile]"
-#: g10/g10.c:1496
+#: g10/g10.c:1513
msgid "Go ahead and type your message ...\n"
msgstr "Teruskan dan ketikkan pesan anda ....\n"
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1516 g10/verify.c:68 g10/verify.c:113
#, c-format
msgid "can't open `%s'\n"
msgstr "tidak dapat membuka `%s'\n"
-#: g10/g10.c:1669
+#: g10/g10.c:1689
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr "karakter pertama nama notasi harus huruf atau garis bawah\n"
-#: g10/g10.c:1675
+#: g10/g10.c:1695
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -864,11 +864,11 @@ msgstr ""
"nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan "
"diakhiri dengan sebuah '='\n"
-#: g10/g10.c:1681
+#: g10/g10.c:1701
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr "titik dalam nama notasi harus diapit oleh karakter lain\n"
-#: g10/g10.c:1689
+#: g10/g10.c:1709
msgid "a notation value must not use any control characters\n"
msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
@@ -1669,238 +1669,248 @@ msgstr "menggunakan kunci sekunder %08lX selain kunci primer %08lX\n"
msgid "[User id not found]"
msgstr "%s: user tidak ditemukan\n"
-#: g10/import.c:181
+#: g10/import.c:182
#, c-format
msgid "skipping block of type %d\n"
msgstr "melewati blok tipe %d\n"
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1740 g10/trustdb.c:1781
#, c-format
msgid "%lu keys so far processed\n"
msgstr "%lu kunci telah diproses\n"
-#: g10/import.c:193
+#: g10/import.c:194
#, c-format
msgid "error reading `%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
-#: g10/import.c:203
+#: g10/import.c:204
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Jumlah yang telah diproses: %lu\n"
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " subkey baru: %lu\n"
+
+#: g10/import.c:209
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " tanpa ID user: %lu\n"
-#: g10/import.c:207
+#: g10/import.c:211
#, c-format
msgid " imported: %lu"
msgstr " diimpor: %lu"
-#: g10/import.c:213
+#: g10/import.c:217
#, c-format
msgid " unchanged: %lu\n"
msgstr " tidak berubah: %lu\n"
-#: g10/import.c:215
+#: g10/import.c:219
#, c-format
msgid " new user IDs: %lu\n"
msgstr " ID user baru: %lu\n"
-#: g10/import.c:217
+#: g10/import.c:221
#, c-format
msgid " new subkeys: %lu\n"
msgstr " subkey baru: %lu\n"
-#: g10/import.c:219
+#: g10/import.c:223
#, c-format
msgid " new signatures: %lu\n"
msgstr " signature baru: %lu\n"
-#: g10/import.c:221
+#: g10/import.c:225
#, c-format
msgid " new key revocations: %lu\n"
msgstr " pembatalan kunci baru: %lu\n"
-#: g10/import.c:223
+#: g10/import.c:227
#, c-format
msgid " secret keys read: %lu\n"
msgstr " kunci rahasia dibaca: %lu\n"
-#: g10/import.c:225
+#: g10/import.c:229
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " kunci rahasia diimpor: %lu\n"
-#: g10/import.c:227
+#: g10/import.c:231
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " kunci rahasia tetap: %lu\n"
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "kunci %08lX: tidak ada ID user\n"
-#: g10/import.c:400
+#: g10/import.c:405
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "kunci %08lX: tidak ada ID user yang valid\n"
-#: g10/import.c:402
+#: g10/import.c:407
msgid "this may be caused by a missing self-signature\n"
msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
+
+#: g10/import.c:431
msgid "no default public keyring\n"
msgstr "tidak ada keyring publik baku\n"
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
#, c-format
msgid "writing to `%s'\n"
msgstr "menulis ke `%s'\n"
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
#, c-format
msgid "can't lock keyring `%s': %s\n"
msgstr "tidak dapat mengunci keyring `%s': %s\n"
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
-#: g10/import.c:434
+#: g10/import.c:446
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "kunci %08lX: kunci publik diimpor\n"
-#: g10/import.c:451
+#: g10/import.c:463
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "kunci %08lX: tidak dapat mengalokasi keyblock orisinal: %s\n"
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
-#: g10/import.c:493
+#: g10/import.c:505
#, c-format
msgid "key %08lX: 1 new user ID\n"
msgstr "kunci %08lX: 1 user ID baru\n"
-#: g10/import.c:496
+#: g10/import.c:508
#, c-format
msgid "key %08lX: %d new user IDs\n"
msgstr "kunci %08lX: %d user ID baru\n"
-#: g10/import.c:499
+#: g10/import.c:511
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "kunci %08lX: 1 signature baru\n"
-#: g10/import.c:502
+#: g10/import.c:514
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "kunci %08lX: %d signature baru\n"
-#: g10/import.c:505
+#: g10/import.c:517
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "kunci %08lX: 1 subkey baru\n"
-#: g10/import.c:508
+#: g10/import.c:520
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "kunci %08lX: %d subkey baru\n"
-#: g10/import.c:518
+#: g10/import.c:530
#, c-format
msgid "key %08lX: not changed\n"
msgstr "kunci %08lX: tidak berubah\n"
-#: g10/import.c:601
+#: g10/import.c:613
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "kunci %08lX: kunci rahasia diimpor\n"
#. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
-#: g10/import.c:610
+#: g10/import.c:622
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
-#: g10/import.c:639
+#: g10/import.c:651
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
"pembatalan\n"
-#: g10/import.c:670
+#: g10/import.c:682
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
-#: g10/import.c:702
+#: g10/import.c:714
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "kunci %08lX: sertifikat pembatalan diimpor\n"
-#: g10/import.c:744
+#: g10/import.c:756
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
-#: g10/import.c:752
+#: g10/import.c:764
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "kunci %08lX: self-signature tidak valid\n"
-#: g10/import.c:767
+#: g10/import.c:779
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
-#: g10/import.c:776
+#: g10/import.c:788
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "kunci %08lX: subkey binding tidak valid\n"
-#: g10/import.c:803
+#: g10/import.c:815
#, c-format
msgid "key %08lX: accepted non self-signed user ID '"
msgstr "kunci %08lX: menerima ID user yang tidak self-signed "
-#: g10/import.c:832
+#: g10/import.c:844
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "kunci %08lX: melewati ID user "
-#: g10/import.c:855
+#: g10/import.c:867
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "kunci %08lX: melewati subkey\n"
@@ -1909,32 +1919,32 @@ msgstr "kunci %08lX: melewati subkey\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
-#: g10/import.c:889
+#: g10/import.c:901
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
-#: g10/import.c:897
+#: g10/import.c:909
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
-#: g10/import.c:997
+#: g10/import.c:1009
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
-#: g10/import.c:1048
+#: g10/import.c:1060
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "kunci %08lX: penambahan sertifikat pembatalan\n"
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "kunci %08lX: salinan kita tidak memiliki self-signature\n"
@@ -2511,8 +2521,18 @@ msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
msgid "no secret key\n"
msgstr "tidak ada kunci rahasia\n"
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "armor tidak valid"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
#. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
#, fuzzy, c-format
msgid " [expires: %s]"
msgstr "Kunci berakhir pada %s\n"
@@ -2522,104 +2542,104 @@ msgstr "Kunci berakhir pada %s\n"
msgid "public key is %08lX\n"
msgstr "kunci publik adalah %08lX\n"
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
msgid "public key encrypted data: good DEK\n"
msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
msgid "no secret key for decryption available\n"
msgstr "tidak tersedia kunci rahasia untuk dekripsi\n"
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "gagal dekripsi kunci publik: %s\n"
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
msgid "decryption okay\n"
msgstr "dekripsi lancar\n"
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
#, c-format
msgid "decryption failed: %s\n"
msgstr "gagal dekripsi: %s\n"
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nama file asli='%.*s'\n"
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
msgid "WARNING: invalid notation data found\n"
msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
msgid "Notation: "
msgstr "Notasi: "
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
msgid "Policy: "
msgstr "Kebijakan: "
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
msgid "signature verification suppressed\n"
msgstr "verifikasi signature tidak optimal\n"
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Signature dibuat %.*s menggunakan kunci %s ID %08lX\n"
#. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
msgid "BAD signature from \""
msgstr "signature BURUK dari \""
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
msgid "Good signature from \""
msgstr "Signature baik dari \""
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
msgid " aka \""
msgstr " alias \""
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Tidak dapat memeriksa signature: %s\n"
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
#, fuzzy, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "kelas signature tidak dikenal"
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
msgid "old style (PGP 2.x) signature\n"
msgstr "signature model lama (PGP 2.X)\n"
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
msgid "invalid root packet detected in proc_tree()\n"
msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
@@ -2691,24 +2711,24 @@ msgstr "Masukkan passphrase: "
msgid "Repeat passphrase: "
msgstr "Ulangi passphrase: "
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
#, fuzzy
msgid "Detached signature.\n"
msgstr "Menghapus %d signature.\n"
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
msgid "Please enter name of data file: "
msgstr "Silakan masukkan nama file data: "
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
msgid "reading stdin ...\n"
msgstr "membaca stdin ...\n"
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "tidak dapat membuka data tertandai `%s'\n"
diff --git a/po/it.po b/po/it.po
index f798ee8ca..ddfda4a82 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-27 17:31+0200\n"
"PO-Revision-Date: 1999-12-08 15:51+02:00\n"
"Last-Translator: Marco d'Itri <[email protected]>\n"
"Language-Team: Italian <[email protected]>\n"
@@ -256,7 +256,7 @@ msgstr "... questo � un bug (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "Hai trovato un bug... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossibile aprire `%s': %s\n"
@@ -339,7 +339,7 @@ msgstr ""
"altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
"(Servono altri %d byte)\n"
-#: g10/g10.c:197
+#: g10/g10.c:203
msgid ""
"@Commands:\n"
" "
@@ -347,139 +347,139 @@ msgstr ""
"@Comandi:\n"
" "
-#: g10/g10.c:199
+#: g10/g10.c:205
msgid "|[file]|make a signature"
msgstr "|[file]|fai una firma"
-#: g10/g10.c:200
+#: g10/g10.c:206
msgid "|[file]|make a clear text signature"
msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
-#: g10/g10.c:201
+#: g10/g10.c:207
msgid "make a detached signature"
msgstr "fai una firma separata"
-#: g10/g10.c:202
+#: g10/g10.c:208
msgid "encrypt data"
msgstr "cifra dati"
-#: g10/g10.c:203
+#: g10/g10.c:209
msgid "encryption only with symmetric cipher"
msgstr "cifra solo con un cifrario simmetrico"
-#: g10/g10.c:204
+#: g10/g10.c:210
msgid "store only"
msgstr "immagazzina soltanto"
-#: g10/g10.c:205
+#: g10/g10.c:211
msgid "decrypt data (default)"
msgstr "decifra dati (predefinito)"
-#: g10/g10.c:206
+#: g10/g10.c:212
msgid "verify a signature"
msgstr "verifica una firma"
-#: g10/g10.c:208
+#: g10/g10.c:214
msgid "list keys"
msgstr "elenca le chiavi"
-#: g10/g10.c:210
+#: g10/g10.c:216
msgid "list keys and signatures"
msgstr "elenca le chiavi e le firme"
-#: g10/g10.c:211
+#: g10/g10.c:217
msgid "check key signatures"
msgstr "controlla le firme delle chiavi"
-#: g10/g10.c:212
+#: g10/g10.c:218
msgid "list keys and fingerprints"
msgstr "elenca le chiavi e le impronte digitali"
-#: g10/g10.c:213
+#: g10/g10.c:219
msgid "list secret keys"
msgstr "elenca le chiavi segrete"
-#: g10/g10.c:214
+#: g10/g10.c:220
msgid "generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
-#: g10/g10.c:215
+#: g10/g10.c:221
msgid "remove key from the public keyring"
msgstr "rimuove una chiave dal portachiavi pubblico"
-#: g10/g10.c:217
+#: g10/g10.c:223
msgid "remove key from the secret keyring"
msgstr "rimuove una chiave dal portachiavi privato"
-#: g10/g10.c:218
+#: g10/g10.c:224
msgid "sign a key"
msgstr "firma una chiave"
-#: g10/g10.c:219
+#: g10/g10.c:225
msgid "sign a key locally"
msgstr "firma localmente una chiave"
-#: g10/g10.c:220
+#: g10/g10.c:226
msgid "sign or edit a key"
msgstr "firma o modifica una chiave"
-#: g10/g10.c:221
+#: g10/g10.c:227
msgid "generate a revocation certificate"
msgstr "genera un certificato di revoca"
-#: g10/g10.c:222
+#: g10/g10.c:228
msgid "export keys"
msgstr "esporta delle chiavi"
-#: g10/g10.c:223
+#: g10/g10.c:229
msgid "export keys to a key server"
msgstr "esporta le chiavi a un key server"
-#: g10/g10.c:224
+#: g10/g10.c:230
msgid "import keys from a key server"
msgstr "importa le chiavi da un key server"
-#: g10/g10.c:228
+#: g10/g10.c:234
msgid "import/merge keys"
msgstr "importa/aggiungi delle chiavi"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "list only the sequence of packets"
msgstr "elenca solo la sequenza dei pacchetti"
-#: g10/g10.c:232
+#: g10/g10.c:238
msgid "export the ownertrust values"
msgstr "esporta i valori di fiducia"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "import ownertrust values"
msgstr "importa i valori di fiducia"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "update the trust database"
msgstr "aggiorna il database della fiducia"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|[NAMES]|check the trust database"
msgstr "|[NOMI]|controlla il database della fiducia"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "fix a corrupted trust database"
msgstr "ripara un database della fiducia rovinato"
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "De-Armor a file or stdin"
msgstr "rimuovi l'armatura a un file o a stdin"
-#: g10/g10.c:242
+#: g10/g10.c:248
msgid "En-Armor a file or stdin"
msgstr "crea l'armatura a un file o a stdin"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|stampa tutti i message digests"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid ""
"@\n"
"Options:\n"
@@ -489,156 +489,156 @@ msgstr ""
"Opzioni:\n"
" "
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "create ascii armored output"
msgstr "crea un output ascii con armatura"
-#: g10/g10.c:252
+#: g10/g10.c:258
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|cifra per NOME"
-#: g10/g10.c:255
+#: g10/g10.c:261
msgid "|NAME|use NAME as default recipient"
msgstr "|NOME|usa NOME come destinatario predefinito"
-#: g10/g10.c:257
+#: g10/g10.c:263
msgid "use the default key as default recipient"
msgstr "usa la chiave predefinita come destinatario predefinito"
-#: g10/g10.c:261
+#: g10/g10.c:267
msgid "use this user-id to sign or decrypt"
msgstr "usa questo user-id per firmare o decifrare"
-#: g10/g10.c:262
+#: g10/g10.c:268
msgid "|N|set compress level N (0 disables)"
msgstr "|N|imposta il livello di compressione (0 disab.)"
-#: g10/g10.c:264
+#: g10/g10.c:270
msgid "use canonical text mode"
msgstr "usa il modo testo canonico"
-#: g10/g10.c:265
+#: g10/g10.c:271
msgid "use as output file"
msgstr "usa come file di output"
-#: g10/g10.c:266
+#: g10/g10.c:272
msgid "verbose"
msgstr "prolisso"
-#: g10/g10.c:267
+#: g10/g10.c:273
msgid "be somewhat more quiet"
msgstr "meno prolisso"
-#: g10/g10.c:268
+#: g10/g10.c:274
msgid "don't use the terminal at all"
msgstr "non usa per niente il terminale"
-#: g10/g10.c:269
+#: g10/g10.c:275
msgid "force v3 signatures"
msgstr "forza l'uso di firme v3"
-#: g10/g10.c:270
+#: g10/g10.c:276
msgid "always use a MDC for encryption"
msgstr "usa sempre un MDC per cifrare"
-#: g10/g10.c:271
+#: g10/g10.c:277
msgid "do not make any changes"
msgstr "non fa cambiamenti"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:279
msgid "batch mode: never ask"
msgstr "modo batch: non fa domande"
-#: g10/g10.c:274
+#: g10/g10.c:280
msgid "assume yes on most questions"
msgstr "assumi \"s�\" per quasi tutte le domande"
-#: g10/g10.c:275
+#: g10/g10.c:281
msgid "assume no on most questions"
msgstr "assumi \"no\" per quasi tutte le domande"
-#: g10/g10.c:276
+#: g10/g10.c:282
msgid "add this keyring to the list of keyrings"
msgstr "aggiungi questo portachiavi alla lista"
-#: g10/g10.c:277
+#: g10/g10.c:283
msgid "add this secret keyring to the list"
msgstr "aggiungi questo portachiavi segreto alla lista"
-#: g10/g10.c:278
+#: g10/g10.c:284
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usa NOME come chiave segreta predefinita"
-#: g10/g10.c:279
+#: g10/g10.c:285
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|cerca le chiavi in questo keyserver"
-#: g10/g10.c:280
+#: g10/g10.c:286
msgid "|NAME|set terminal charset to NAME"
msgstr "|NOME|imposta il set di caratteri del terminale NOME"
-#: g10/g10.c:281
+#: g10/g10.c:287
msgid "read options from file"
msgstr "leggi le opzioni dal file"
-#: g10/g10.c:285
+#: g10/g10.c:291
msgid "|FD|write status info to this FD"
msgstr "|FD|scrivi le informazioni di stato su questo FD"
-#: g10/g10.c:290
+#: g10/g10.c:296
msgid "|FILE|load extension module FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
-#: g10/g10.c:291
+#: g10/g10.c:297
msgid "emulate the mode described in RFC1991"
msgstr "emula il modo descritto in RFC 1991"
-#: g10/g10.c:292
+#: g10/g10.c:298
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr ""
"imposta tutte le opzioni di pacchetto,\n"
"cifrario e digest per OpenPGP"
-#: g10/g10.c:293
+#: g10/g10.c:299
msgid "|N|use passphrase mode N"
msgstr "|N|usa il modo N per la passphrase"
-#: g10/g10.c:295
+#: g10/g10.c:301
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
-#: g10/g10.c:297
+#: g10/g10.c:303
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
-#: g10/g10.c:298
+#: g10/g10.c:304
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usa l'algoritmo di cifratura NOME"
-#: g10/g10.c:299
+#: g10/g10.c:305
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usa l'algoritmo di message digest NOME"
-#: g10/g10.c:300
+#: g10/g10.c:306
msgid "|N|use compress algorithm N"
msgstr "|N|usa l'algoritmo di compressione N"
-#: g10/g10.c:301
+#: g10/g10.c:307
msgid "throw keyid field of encrypted packets"
msgstr "elimina il campo keyid dei pacchetti cifrati"
-#: g10/g10.c:302
+#: g10/g10.c:308
msgid "|NAME=VALUE|use this notation data"
msgstr "|NOME=VALORE|usa questi dati per una nota"
-#: g10/g10.c:305
+#: g10/g10.c:311
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/g10.c:308
+#: g10/g10.c:314
msgid ""
"@\n"
"Examples:\n"
@@ -658,15 +658,15 @@ msgstr ""
" --list-keys [nomi] mostra le chiavi\n"
" --fingerprint [nomi] mostra le impronte digitali\n"
-#: g10/g10.c:403
+#: g10/g10.c:412
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Per favore segnala i bug a <[email protected]>.\n"
-#: g10/g10.c:407
+#: g10/g10.c:416
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-#: g10/g10.c:410
+#: g10/g10.c:419
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -676,7 +676,7 @@ msgstr ""
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
-#: g10/g10.c:417
+#: g10/g10.c:426
msgid ""
"\n"
"Supported algorithms:\n"
@@ -684,184 +684,184 @@ msgstr ""
"\n"
"Algoritmi gestiti:\n"
-#: g10/g10.c:496
+#: g10/g10.c:505
msgid "usage: gpg [options] "
msgstr "uso: gpg [opzioni] "
-#: g10/g10.c:549
+#: g10/g10.c:558
msgid "conflicting commands\n"
msgstr "comandi in conflitto\n"
-#: g10/g10.c:692
+#: g10/g10.c:701
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
-#: g10/g10.c:696
+#: g10/g10.c:705
#, c-format
msgid "option file `%s': %s\n"
msgstr "file con le opzioni `%s': %s\n"
-#: g10/g10.c:703
+#: g10/g10.c:712
#, c-format
msgid "reading options from `%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
-#: g10/g10.c:893
+#: g10/g10.c:902
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s non � un set di caratteri valido\n"
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:963 g10/g10.c:972
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s normalmente non deve essere usato!\n"
-#: g10/g10.c:951
+#: g10/g10.c:965
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Non � permesso usare %s con %s!\n"
-#: g10/g10.c:954
+#: g10/g10.c:968
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "Non ha senso usare %s con %s!\n"
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:987 g10/g10.c:999
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:993 g10/g10.c:1005
msgid "selected digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
-#: g10/g10.c:995
+#: g10/g10.c:1009
msgid "the given policy URL is invalid\n"
msgstr "L'URL della policy indicato non � valido\n"
-#: g10/g10.c:998
+#: g10/g10.c:1012
#, 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:1000
+#: g10/g10.c:1014
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve essere maggiore di 0\n"
-#: g10/g10.c:1002
+#: g10/g10.c:1016
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve essere maggiore di 1\n"
-#: g10/g10.c:1004
+#: g10/g10.c:1018
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth deve essere tra 1 e 255\n"
-#: g10/g10.c:1007
+#: g10/g10.c:1021
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
-#: g10/g10.c:1011
+#: g10/g10.c:1025
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
-#: g10/g10.c:1096
+#: g10/g10.c:1110
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
-#: g10/g10.c:1102
+#: g10/g10.c:1116
msgid "--store [filename]"
msgstr "--store [nomefile]"
-#: g10/g10.c:1109
+#: g10/g10.c:1123
msgid "--symmetric [filename]"
msgstr "--symmetric [nomefile]"
-#: g10/g10.c:1117
+#: g10/g10.c:1131
msgid "--encrypt [filename]"
msgstr "--encrypt [nomefile]"
-#: g10/g10.c:1130
+#: g10/g10.c:1144
msgid "--sign [filename]"
msgstr "--sign [nomefile]"
-#: g10/g10.c:1143
+#: g10/g10.c:1157
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
-#: g10/g10.c:1157
+#: g10/g10.c:1171
msgid "--clearsign [filename]"
msgstr "--clearsign [nomefile]"
-#: g10/g10.c:1174
+#: g10/g10.c:1188
msgid "--decrypt [filename]"
msgstr "--decrypt [nomefile]"
-#: g10/g10.c:1182
+#: g10/g10.c:1196
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/g10.c:1190
+#: g10/g10.c:1204
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/g10.c:1198
+#: g10/g10.c:1212
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [comandi]"
-#: g10/g10.c:1214
+#: g10/g10.c:1228
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key user-id"
-#: g10/g10.c:1217
+#: g10/g10.c:1231
msgid "--delete-key user-id"
msgstr "--delete-key user-id"
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:260 g10/g10.c:1268 g10/sign.c:393
#, c-format
msgid "can't open %s: %s\n"
msgstr "impossibile aprire `%s': %s\n"
-#: g10/g10.c:1269
+#: g10/g10.c:1283
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
-#: g10/g10.c:1335
+#: g10/g10.c:1349
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "rimozione dell'armatura fallita: %s\n"
-#: g10/g10.c:1343
+#: g10/g10.c:1357
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
-#: g10/g10.c:1411
+#: g10/g10.c:1428
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo di hash non valido `%s'\n"
-#: g10/g10.c:1492
+#: g10/g10.c:1509
msgid "[filename]"
msgstr "[nomefile]"
-#: g10/g10.c:1496
+#: g10/g10.c:1513
msgid "Go ahead and type your message ...\n"
msgstr "Vai avanti e scrivi il messaggio...\n"
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1516 g10/verify.c:68 g10/verify.c:113
#, c-format
msgid "can't open `%s'\n"
msgstr "impossibile aprire `%s'\n"
-#: g10/g10.c:1669
+#: g10/g10.c:1689
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"il primo carattere del nome di una nota deve essere una lettera o un\n"
"underscore\n"
-#: g10/g10.c:1675
+#: g10/g10.c:1695
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -869,11 +869,11 @@ msgstr ""
"il nome di una nota deve essere formato solo da lettere, numeri, punti o\n"
"underscore e deve finire con `='\n"
-#: g10/g10.c:1681
+#: g10/g10.c:1701
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr "nel nome di una nota i punti devono avere altri caratteri intorno\n"
-#: g10/g10.c:1689
+#: g10/g10.c:1709
msgid "a notation value must not use any control characters\n"
msgstr "il valore di una nota non deve usare caratteri di controllo\n"
@@ -1683,238 +1683,248 @@ msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
msgid "[User id not found]"
msgstr "%s: utente non trovato\n"
-#: g10/import.c:181
+#: g10/import.c:182
#, c-format
msgid "skipping block of type %d\n"
msgstr "salto un blocco di tipo %d\n"
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1740 g10/trustdb.c:1781
#, c-format
msgid "%lu keys so far processed\n"
msgstr "Per ora sono state esaminate %lu chiavi\n"
-#: g10/import.c:193
+#: g10/import.c:194
#, c-format
msgid "error reading `%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
-#: g10/import.c:203
+#: g10/import.c:204
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Numero totale esaminato: %lu\n"
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " nuove subchiavi: %lu\n"
+
+#: g10/import.c:209
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " senza user ID: %lu\n"
-#: g10/import.c:207
+#: g10/import.c:211
#, c-format
msgid " imported: %lu"
msgstr " importate: %lu"
-#: g10/import.c:213
+#: g10/import.c:217
#, c-format
msgid " unchanged: %lu\n"
msgstr " non modificate: %lu\n"
-#: g10/import.c:215
+#: g10/import.c:219
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nuovi user ID: %lu\n"
-#: g10/import.c:217
+#: g10/import.c:221
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nuove subchiavi: %lu\n"
-#: g10/import.c:219
+#: g10/import.c:223
#, c-format
msgid " new signatures: %lu\n"
msgstr " nuove firme: %lu\n"
-#: g10/import.c:221
+#: g10/import.c:225
#, c-format
msgid " new key revocations: %lu\n"
msgstr "nuove revoche di chiavi: %lu\n"
-#: g10/import.c:223
+#: g10/import.c:227
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chiavi segrete lette: %lu\n"
-#: g10/import.c:225
+#: g10/import.c:229
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "chiavi segrete importate: %lu\n"
-#: g10/import.c:227
+#: g10/import.c:231
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "chiavi segrete non cambiate: %lu\n"
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "chiave %08lX: nessun user ID\n"
-#: g10/import.c:400
+#: g10/import.c:405
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "chiave %08lX: nessun user ID valido\n"
-#: g10/import.c:402
+#: g10/import.c:407
msgid "this may be caused by a missing self-signature\n"
msgstr "questo pu� essere causato da una autofirma mancante\n"
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
+
+#: g10/import.c:431
msgid "no default public keyring\n"
msgstr "nessun portachiavi pubblico predefinito\n"
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
#, c-format
msgid "writing to `%s'\n"
msgstr "scrittura in `%s'\n"
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
#, c-format
msgid "can't lock keyring `%s': %s\n"
msgstr "impossibile fare il lock del portachiavi `%s': %s\n"
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
-#: g10/import.c:434
+#: g10/import.c:446
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "chiave %08lX: chiave pubblica importata\n"
-#: g10/import.c:451
+#: g10/import.c:463
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
#, 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:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
#, 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:493
+#: g10/import.c:505
#, c-format
msgid "key %08lX: 1 new user ID\n"
msgstr "chiave %08lX: 1 nuovo user ID\n"
-#: g10/import.c:496
+#: g10/import.c:508
#, c-format
msgid "key %08lX: %d new user IDs\n"
msgstr "chiave %08lX: %d nuovi user ID\n"
-#: g10/import.c:499
+#: g10/import.c:511
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "chiave %08lX: una nuova firma\n"
-#: g10/import.c:502
+#: g10/import.c:514
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "chiave %08lX: %d nuove firme\n"
-#: g10/import.c:505
+#: g10/import.c:517
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "chiave %08lX: una nuova subchiave\n"
-#: g10/import.c:508
+#: g10/import.c:520
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "chiave %08lX: %d nuove subchiavi\n"
-#: g10/import.c:518
+#: g10/import.c:530
#, c-format
msgid "key %08lX: not changed\n"
msgstr "chiave %08lX: non cambiata\n"
-#: g10/import.c:601
+#: g10/import.c:613
#, 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:605
+#: g10/import.c:617
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
-#: g10/import.c:610
+#: g10/import.c:622
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
-#: g10/import.c:639
+#: g10/import.c:651
#, 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:670
+#: g10/import.c:682
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
-#: g10/import.c:702
+#: g10/import.c:714
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "chiave %08lX: certificato di revoca importato\n"
-#: g10/import.c:744
+#: g10/import.c:756
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "chiave %08lX: nessun user ID per la firma\n"
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
-#: g10/import.c:752
+#: g10/import.c:764
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "chiave %08lX: autofirma non valida\n"
-#: g10/import.c:767
+#: g10/import.c:779
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
-#: g10/import.c:776
+#: g10/import.c:788
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "chiave %08lX: legame con la subchiave non valido:\n"
-#: g10/import.c:803
+#: g10/import.c:815
#, c-format
msgid "key %08lX: accepted non self-signed user ID '"
msgstr "chiave %08lX: accettato l'user ID non autofirmato '"
-#: g10/import.c:832
+#: g10/import.c:844
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "chiave %08lX: saltato l'user ID '"
-#: g10/import.c:855
+#: g10/import.c:867
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "chiave %08lX: saltata la subchiave\n"
@@ -1923,32 +1933,32 @@ msgstr "chiave %08lX: saltata la subchiave\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
-#: g10/import.c:889
+#: g10/import.c:901
#, 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:897
+#: g10/import.c:909
#, 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:997
+#: g10/import.c:1009
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
-#: g10/import.c:1048
+#: g10/import.c:1060
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "chiave %08lX: certificato di revoca aggiunto\n"
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
@@ -2528,8 +2538,18 @@ msgstr "Creare davvero i certificati di revoca? (s/N)"
msgid "no secret key\n"
msgstr "manca la chiave segreta\n"
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "armatura non valida"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
#. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
#, fuzzy, c-format
msgid " [expires: %s]"
msgstr "La chiave scadr� il %s\n"
@@ -2539,104 +2559,104 @@ msgstr "La chiave scadr� il %s\n"
msgid "public key is %08lX\n"
msgstr "la chiave pubblica � %08lX\n"
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
msgid "public key encrypted data: good DEK\n"
msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "Cifrato con la chiave %s con ID %08lX\n"
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
msgid "no secret key for decryption available\n"
msgstr "nessuna chiave disponibile per decifrare\n"
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "decifratura della chiave pubblica fallita: %s\n"
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
msgid "decryption okay\n"
msgstr "decifratura corretta\n"
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
#, c-format
msgid "decryption failed: %s\n"
msgstr "decifratura fallita: %s\n"
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome del file originale='%.*s'\n"
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
msgid "WARNING: invalid notation data found\n"
msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
msgid "Notation: "
msgstr "Nota: "
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
msgid "Policy: "
msgstr "Policy: "
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
msgid "signature verification suppressed\n"
msgstr "verifica della firma soppressa\n"
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n"
#. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
msgid "BAD signature from \""
msgstr "Firma NON corretta da \""
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
msgid "Good signature from \""
msgstr "Firma valida da \""
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
msgid " aka \""
msgstr " anche noto come \""
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossibile controllare la firma: %s\n"
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "firma solitaria di classe 0x%02x\n"
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
msgid "old style (PGP 2.x) signature\n"
msgstr "firma vecchio stile (PGP 2.x)\n"
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
msgid "invalid root packet detected in proc_tree()\n"
msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
@@ -2708,24 +2728,24 @@ msgstr "Inserisci la passphrase: "
msgid "Repeat passphrase: "
msgstr "Ripeti la passphrase: "
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
msgid "Detached signature.\n"
msgstr "Firma separata.\n"
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
msgid "Please enter name of data file: "
msgstr "Inserisci il nome del file di dati: "
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
msgid "reading stdin ...\n"
msgstr "viene letto stdin...\n"
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "impossibile aprire i dati firmati `%s'\n"
diff --git a/po/ja.po b/po/ja.po
index e2653d9cf..4525ea459 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-27 17:31+0200\n"
"PO-Revision-Date: 2000-02-16 20:10+09:00\n"
"Last-Translator: IIDA Yosiaki <[email protected]>\n"
"Language-Team: Japanese <[email protected]>\n"
@@ -257,7 +257,7 @@ msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "`%s' �������ޤ���: %s\n"
@@ -338,7 +338,7 @@ msgstr ""
"��ʬ��Ĺ��������������ޤ��󡣥���ȥ��ԡ������ä�����褦��\n"
"OS ��������ѹ����Ƥ���������(%d bytes �ʾ�μ�����ɬ�פǤ�)\n"
-#: g10/g10.c:197
+#: g10/g10.c:203
msgid ""
"@Commands:\n"
" "
@@ -346,139 +346,139 @@ msgstr ""
"@���ޥ��:\n"
" "
-#: g10/g10.c:199
+#: g10/g10.c:205
msgid "|[file]|make a signature"
msgstr "|[file]|��̾�����"
-#: g10/g10.c:200
+#: g10/g10.c:206
msgid "|[file]|make a clear text signature"
msgstr "|[file]|���ꥢ��̾�����"
-#: g10/g10.c:201
+#: g10/g10.c:207
msgid "make a detached signature"
msgstr "ʬΥ��̾�����"
-#: g10/g10.c:202
+#: g10/g10.c:208
msgid "encrypt data"
msgstr "�ǡ�����Ź沽"
-#: g10/g10.c:203
+#: g10/g10.c:209
msgid "encryption only with symmetric cipher"
msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
-#: g10/g10.c:204
+#: g10/g10.c:210
msgid "store only"
msgstr "��¸�Τ�"
-#: g10/g10.c:205
+#: g10/g10.c:211
msgid "decrypt data (default)"
msgstr "�ǡ��������� (�ǥե����)"
-#: g10/g10.c:206
+#: g10/g10.c:212
msgid "verify a signature"
msgstr "��̾�򸡾�"
-#: g10/g10.c:208
+#: g10/g10.c:214
msgid "list keys"
msgstr "�����"
-#: g10/g10.c:210
+#: g10/g10.c:216
msgid "list keys and signatures"
msgstr "���Ƚ�̾�ΰ���"
-#: g10/g10.c:211
+#: g10/g10.c:217
msgid "check key signatures"
msgstr "���ν�̾�򸡾�"
-#: g10/g10.c:212
+#: g10/g10.c:218
msgid "list keys and fingerprints"
msgstr "���Ȼ���ΰ���"
-#: g10/g10.c:213
+#: g10/g10.c:219
msgid "list secret keys"
msgstr "��̩���ΰ���"
-#: g10/g10.c:214
+#: g10/g10.c:220
msgid "generate a new key pair"
msgstr "���������ڥ������"
-#: g10/g10.c:215
+#: g10/g10.c:221
msgid "remove key from the public keyring"
msgstr "��������󥰤��鸰����"
-#: g10/g10.c:217
+#: g10/g10.c:223
msgid "remove key from the secret keyring"
msgstr "��̩����󥰤��鸰����"
-#: g10/g10.c:218
+#: g10/g10.c:224
msgid "sign a key"
msgstr "���˽�̾"
-#: g10/g10.c:219
+#: g10/g10.c:225
msgid "sign a key locally"
msgstr "��������ˤƸ��˽�̾"
-#: g10/g10.c:220
+#: g10/g10.c:226
msgid "sign or edit a key"
msgstr "���ؤν�̾�ޤ����Խ�"
-#: g10/g10.c:221
+#: g10/g10.c:227
msgid "generate a revocation certificate"
msgstr "�˴�����������"
-#: g10/g10.c:222
+#: g10/g10.c:228
msgid "export keys"
msgstr "����񤭽Ф�"
-#: g10/g10.c:223
+#: g10/g10.c:229
msgid "export keys to a key server"
msgstr "�������Ф˸�����Ͽ"
-#: g10/g10.c:224
+#: g10/g10.c:230
msgid "import keys from a key server"
msgstr "�������С����鸰���ɤ߹���"
-#: g10/g10.c:228
+#: g10/g10.c:234
msgid "import/merge keys"
msgstr "�����ɤ߹���/�ޡ���"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "list only the sequence of packets"
msgstr "�ѥ��å���Τߤΰ���"
-#: g10/g10.c:232
+#: g10/g10.c:238
msgid "export the ownertrust values"
msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "import ownertrust values"
msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "update the trust database"
msgstr "���ѥǡ����١����򹹿�"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|[NAMES]|check the trust database"
msgstr "|[NAMES]|���ѥǡ����١���������å�"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "fix a corrupted trust database"
msgstr "���줿���ѥǡ����١�������"
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "De-Armor a file or stdin"
msgstr "�ե�����ޤ���ɸ�����Ϥ����ý���"
-#: g10/g10.c:242
+#: g10/g10.c:248
msgid "En-Armor a file or stdin"
msgstr "�ե�����ޤ���ɸ�����Ϥ����ò�"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|��������������"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid ""
"@\n"
"Options:\n"
@@ -488,154 +488,154 @@ msgstr ""
"���ץ����:\n"
" "
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "create ascii armored output"
msgstr "���������������������"
-#: g10/g10.c:252
+#: g10/g10.c:258
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|NAME �Ѥ˰Ź沽"
-#: g10/g10.c:255
+#: g10/g10.c:261
msgid "|NAME|use NAME as default recipient"
msgstr "|NAME|�ǥե���Ȥμ����ԤȤ��� NAME ���Ѥ���"
-#: g10/g10.c:257
+#: g10/g10.c:263
msgid "use the default key as default recipient"
msgstr "�ǥե���Ȥμ����ԤȤ��ƥǥե���Ȥθ����Ѥ���"
-#: g10/g10.c:261
+#: g10/g10.c:267
msgid "use this user-id to sign or decrypt"
msgstr "��̾������� ���� user-id ���Ѥ���"
-#: g10/g10.c:262
+#: g10/g10.c:268
msgid "|N|set compress level N (0 disables)"
msgstr "|N|���̥�٥�� N �����ꤹ�� (0 ���󰵽�)"
-#: g10/g10.c:264
+#: g10/g10.c:270
msgid "use canonical text mode"
msgstr "ɸ��ƥ����ȥ⡼�ɤ��Ѥ���"
-#: g10/g10.c:265
+#: g10/g10.c:271
msgid "use as output file"
msgstr "���ϥե�����Ȥ����Ѥ���"
-#: g10/g10.c:266
+#: g10/g10.c:272
msgid "verbose"
msgstr "��Ĺ"
-#: g10/g10.c:267
+#: g10/g10.c:273
msgid "be somewhat more quiet"
msgstr "����Ť�"
-#: g10/g10.c:268
+#: g10/g10.c:274
msgid "don't use the terminal at all"
msgstr "ü������Ѥ��ʤ�"
-#: g10/g10.c:269
+#: g10/g10.c:275
msgid "force v3 signatures"
msgstr "����Ū�� v3 ��̾����"
-#: g10/g10.c:270
+#: g10/g10.c:276
msgid "always use a MDC for encryption"
msgstr "�Ź沽�ˤϾ�� MDC �����"
-#: g10/g10.c:271
+#: g10/g10.c:277
msgid "do not make any changes"
msgstr "���Ƥ��ѹ����Ѥ��ʤ�"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:279
msgid "batch mode: never ask"
msgstr "�Хå��⡼��: �䤤��碌��Ԥ�ʤ�"
-#: g10/g10.c:274
+#: g10/g10.c:280
msgid "assume yes on most questions"
msgstr "���Ƥμ���� yes �ȸ��ʤ�"
-#: g10/g10.c:275
+#: g10/g10.c:281
msgid "assume no on most questions"
msgstr "���Ƥμ���� no �ȸ��ʤ�"
-#: g10/g10.c:276
+#: g10/g10.c:282
msgid "add this keyring to the list of keyrings"
msgstr "����󥰤ΰ����� ���θ���ä���"
-#: g10/g10.c:277
+#: g10/g10.c:283
msgid "add this secret keyring to the list"
msgstr "������ ������̩����󥰤�ä���"
-#: g10/g10.c:278
+#: g10/g10.c:284
msgid "|NAME|use NAME as default secret key"
msgstr "|NAME|�ǥե���Ȥ���̩���Ȥ��� NAME ���Ѥ���"
-#: g10/g10.c:279
+#: g10/g10.c:285
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|���θ����� ���θ������Ф��Ѥ���"
-#: g10/g10.c:280
+#: g10/g10.c:286
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAME|ü����ʸ�������ɤ� NAME �����ꤹ��"
-#: g10/g10.c:281
+#: g10/g10.c:287
msgid "read options from file"
msgstr "�ե����뤫�饪�ץ������ɤ߹���"
-#: g10/g10.c:285
+#: g10/g10.c:291
msgid "|FD|write status info to this FD"
msgstr "|FD|���� FD �˾��֤�񤭽Ф�"
-#: g10/g10.c:290
+#: g10/g10.c:296
msgid "|FILE|load extension module FILE"
msgstr "|FILE|��ĥ�⥸�塼�� FILE ���ɤߤ���"
-#: g10/g10.c:291
+#: g10/g10.c:297
msgid "emulate the mode described in RFC1991"
msgstr "RFC1991 �˵��Ҥ��줿�⡼�ɤ��Ѥ���"
-#: g10/g10.c:292
+#: g10/g10.c:298
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "���ƤΥѥ��åȤȰŹ�Ƚ�̾�Υ��ץ����� OpenPGP �ο��������"
-#: g10/g10.c:293
+#: g10/g10.c:299
msgid "|N|use passphrase mode N"
msgstr "|N|�ѥ��ե졼���⡼�� N ���Ѥ���"
-#: g10/g10.c:295
+#: g10/g10.c:301
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NAME|�ѥ��ե졼���˥�å��������󥢥르�ꥺ�� NAME ���Ѥ���"
-#: g10/g10.c:297
+#: g10/g10.c:303
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NAME|�ѥ��ե졼���˰Ź楢�르�ꥺ�� NAME ���Ѥ���"
-#: g10/g10.c:298
+#: g10/g10.c:304
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAME|�Ź楢�르�ꥺ�� NAME ���Ѥ���"
-#: g10/g10.c:299
+#: g10/g10.c:305
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|��å��������󥢥르�ꥺ�� NAME ���Ѥ���"
-#: g10/g10.c:300
+#: g10/g10.c:306
msgid "|N|use compress algorithm N"
msgstr "|NAME|���̥��르�ꥺ�� NAME ���Ѥ���"
-#: g10/g10.c:301
+#: g10/g10.c:307
msgid "throw keyid field of encrypted packets"
msgstr "�Ź�ѥ��åȤθ� ID �ե�����ɤ����Ф���"
-#: g10/g10.c:302
+#: g10/g10.c:308
msgid "|NAME=VALUE|use this notation data"
msgstr "|NAME=VALUE|��������ǡ������Ѥ���"
-#: g10/g10.c:305
+#: g10/g10.c:311
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/g10.c:308
+#: g10/g10.c:314
msgid ""
"@\n"
"Examples:\n"
@@ -655,15 +655,15 @@ msgstr ""
" --list-keys [names] ����ɽ��\n"
" --fingerprint [names] �����ɽ��\n"
-#: g10/g10.c:403
+#: g10/g10.c:412
msgid "Please report bugs to <[email protected]>.\n"
msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǥ�ݡ��Ȥ����äƲ�������\n"
-#: g10/g10.c:407
+#: g10/g10.c:416
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
-#: g10/g10.c:410
+#: g10/g10.c:419
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -673,7 +673,7 @@ msgstr ""
"��̾�����ڡ��Ź沽���ޤ��� ����\n"
"�ǥե���Ȥ�ư������ϥǡ����˰�¸\n"
-#: g10/g10.c:417
+#: g10/g10.c:426
msgid ""
"\n"
"Supported algorithms:\n"
@@ -681,182 +681,182 @@ msgstr ""
"\n"
"���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
-#: g10/g10.c:496
+#: g10/g10.c:505
msgid "usage: gpg [options] "
msgstr "�Ȥ���: gpg [options] "
-#: g10/g10.c:549
+#: g10/g10.c:558
msgid "conflicting commands\n"
msgstr "���ޥ�ɤξ���\n"
-#: g10/g10.c:692
+#: g10/g10.c:701
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "����: �ǥե���ȥ��ץ����ե����� `%s' ������ޤ���\n"
-#: g10/g10.c:696
+#: g10/g10.c:705
#, c-format
msgid "option file `%s': %s\n"
msgstr "���ץ����ե����� `%s': %s\n"
-#: g10/g10.c:703
+#: g10/g10.c:712
#, c-format
msgid "reading options from `%s'\n"
msgstr "`%s' ���饪�ץ������ɤ߹��ߤޤ�\n"
-#: g10/g10.c:893
+#: g10/g10.c:902
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s ��������ʸ�������ɤǤϤ���ޤ���\n"
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:963 g10/g10.c:972
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "����: %s ���̾���Ѥ��ޤ���!\n"
-#: g10/g10.c:951
+#: g10/g10.c:965
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s �� %s �ȶ����Ѥ��뤳�ȤϤǤ��ޤ���!\n"
-#: g10/g10.c:954
+#: g10/g10.c:968
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s �� %s �ȶ����Ѥ��Ƥ��̣������ޤ���!\n"
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:987 g10/g10.c:999
msgid "selected cipher algorithm is invalid\n"
msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:993 g10/g10.c:1005
msgid "selected digest algorithm is invalid\n"
msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
-#: g10/g10.c:995
+#: g10/g10.c:1009
msgid "the given policy URL is invalid\n"
msgstr "Ϳ����줿�ݥꥷ�� URL ��̵���Ǥ�\n"
-#: g10/g10.c:998
+#: g10/g10.c:1012
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "���̥��르�ꥺ��� %d..%d ���ϰϤǤʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1000
+#: g10/g10.c:1014
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed �� 0 ����礭���ͤ�ɬ�פǤ�\n"
-#: g10/g10.c:1002
+#: g10/g10.c:1016
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed �� 1 ����礭���ͤ�ɬ�פǤ�\n"
-#: g10/g10.c:1004
+#: g10/g10.c:1018
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth �� 1 ���� 255 ���ϰϤǤʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1007
+#: g10/g10.c:1021
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "����: ñ��� S2K �⡼�� (0) �λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
-#: g10/g10.c:1011
+#: g10/g10.c:1025
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "̵���� S2K �⡼�ɡ�0, 1 �ޤ��� 3 �Ǥʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1096
+#: g10/g10.c:1110
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:1102
+#: g10/g10.c:1116
msgid "--store [filename]"
msgstr "--store [�ե�����̾]"
-#: g10/g10.c:1109
+#: g10/g10.c:1123
msgid "--symmetric [filename]"
msgstr "--symmetric [�ե�����̾]"
-#: g10/g10.c:1117
+#: g10/g10.c:1131
msgid "--encrypt [filename]"
msgstr "--encrypt [�ե�����̾]"
-#: g10/g10.c:1130
+#: g10/g10.c:1144
msgid "--sign [filename]"
msgstr "--sign [�ե�����̾]"
-#: g10/g10.c:1143
+#: g10/g10.c:1157
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [�ե�����̾]"
-#: g10/g10.c:1157
+#: g10/g10.c:1171
msgid "--clearsign [filename]"
msgstr "--clearsign [�ե�����̾]"
-#: g10/g10.c:1174
+#: g10/g10.c:1188
msgid "--decrypt [filename]"
msgstr "--decrypt [�ե�����̾]"
-#: g10/g10.c:1182
+#: g10/g10.c:1196
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/g10.c:1190
+#: g10/g10.c:1204
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/g10.c:1198
+#: g10/g10.c:1212
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [���ޥ��]"
-#: g10/g10.c:1214
+#: g10/g10.c:1228
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key user-id"
-#: g10/g10.c:1217
+#: g10/g10.c:1231
msgid "--delete-key user-id"
msgstr "--delete-key user-id"
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:260 g10/g10.c:1268 g10/sign.c:393
#, c-format
msgid "can't open %s: %s\n"
msgstr "%s �������ޤ���: %s\n"
-#: g10/g10.c:1269
+#: g10/g10.c:1283
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [�����]"
-#: g10/g10.c:1335
+#: g10/g10.c:1349
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "���ý���˼���: %s\n"
-#: g10/g10.c:1343
+#: g10/g10.c:1357
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "���ò��˼���: %s\n"
-#: g10/g10.c:1411
+#: g10/g10.c:1428
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "�ϥå��奢�르�ꥺ�� `%s' ��̵���Ǥ�\n"
-#: g10/g10.c:1492
+#: g10/g10.c:1509
msgid "[filename]"
msgstr "[�ե�����̾]"
-#: g10/g10.c:1496
+#: g10/g10.c:1513
msgid "Go ahead and type your message ...\n"
msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ʋ����� ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1516 g10/verify.c:68 g10/verify.c:113
#, c-format
msgid "can't open `%s'\n"
msgstr "`%s' �������ޤ���\n"
-#: g10/g10.c:1669
+#: g10/g10.c:1689
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1675
+#: g10/g10.c:1695
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -864,11 +864,11 @@ msgstr ""
"����̾�ˤ�ʸ�����������ɥåȡ��������������(_)�Τߤ��Ѥ���'=' "
"��ȼ��ʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1681
+#: g10/g10.c:1701
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤ�ʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1689
+#: g10/g10.c:1709
msgid "a notation value must not use any control characters\n"
msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
@@ -1666,236 +1666,246 @@ msgstr "���� %08lX ����Ѥ��ޤ� - �縰 %08lX ������\n"
msgid "[User id not found]"
msgstr "%s: �桼�������Ĥ���ޤ���\n"
-#: g10/import.c:181
+#: g10/import.c:182
#, c-format
msgid "skipping block of type %d\n"
msgstr "������ %d �Υ֥��å��򥹥��åפ��ޤ�\n"
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1740 g10/trustdb.c:1781
#, c-format
msgid "%lu keys so far processed\n"
msgstr "%lu ���ޤǽ���\n"
-#: g10/import.c:193
+#: g10/import.c:194
#, c-format
msgid "error reading `%s': %s\n"
msgstr "`%s' ���ɤ߹��ߤ˼���: %s\n"
-#: g10/import.c:203
+#: g10/import.c:204
#, c-format
msgid "Total number processed: %lu\n"
msgstr "��������: %lu\n"
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " ����������: %lu\n"
+
+#: g10/import.c:209
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " �桼�� ID �ʤ�: %lu\n"
-#: g10/import.c:207
+#: g10/import.c:211
#, c-format
msgid " imported: %lu"
msgstr " �ɤ߹���: %lu"
-#: g10/import.c:213
+#: g10/import.c:217
#, c-format
msgid " unchanged: %lu\n"
msgstr " �ѹ��ʤ�: %lu\n"
-#: g10/import.c:215
+#: g10/import.c:219
#, c-format
msgid " new user IDs: %lu\n"
msgstr " �����ʥ桼�� ID: %lu\n"
-#: g10/import.c:217
+#: g10/import.c:221
#, c-format
msgid " new subkeys: %lu\n"
msgstr " ����������: %lu\n"
-#: g10/import.c:219
+#: g10/import.c:223
#, c-format
msgid " new signatures: %lu\n"
msgstr " �����ʽ�̾: %lu\n"
-#: g10/import.c:221
+#: g10/import.c:225
#, c-format
msgid " new key revocations: %lu\n"
msgstr " �����ʸ����˴�: %lu\n"
-#: g10/import.c:223
+#: g10/import.c:227
#, c-format
msgid " secret keys read: %lu\n"
msgstr " ��̩�����ɤ߽Ф�: %lu\n"
-#: g10/import.c:225
+#: g10/import.c:229
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " ��̩�����ɤ߹���: %lu\n"
-#: g10/import.c:227
+#: g10/import.c:231
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " �ѹ���̵����̩��: %lu\n"
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "�� %08lX: �桼�� ID ������ޤ���\n"
-#: g10/import.c:400
+#: g10/import.c:405
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "�� %08lX: ���ѤǤ���桼�� ID ������ޤ���\n"
-#: g10/import.c:402
+#: g10/import.c:407
msgid "this may be caused by a missing self-signature\n"
msgstr "���ʽ�̾������Ƥ��ʤ�����Ǥ��礦\n"
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "�� %08lX: �����������Ĥ���ޤ���: %s\n"
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "�� %08lX: rfc2440 �θ��ǤϤ���ޤ��� - �����åפ��ޤ�\n"
+
+#: g10/import.c:431
msgid "no default public keyring\n"
msgstr "�ǥե���Ȥθ�������󥰤�����ޤ���\n"
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
#, c-format
msgid "writing to `%s'\n"
msgstr "`%s' �ؤν񤭽Ф�\n"
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
#, c-format
msgid "can't lock keyring `%s': %s\n"
msgstr "����� `%s' �Υ��å����Ǥ��ޤ���: %s\n"
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "����� `%s' �ν񤭹��ߤ˼���: %s\n"
-#: g10/import.c:434
+#: g10/import.c:446
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "�� %08lX: ���������ɤ߹��ߤޤ���\n"
-#: g10/import.c:451
+#: g10/import.c:463
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "�� %08lX: �桹����ͭ���븰�Ȱۤʤ�ޤ�\n"
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "�� %08lX: ���ꥸ�ʥ�θ��֥��å��˰��֤Ǥ��ޤ���: %s\n"
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "�� %08lX: ���ꥸ�ʥ�θ��֥��å����ɤ�ޤ���: %s\n"
-#: g10/import.c:493
+#: g10/import.c:505
#, c-format
msgid "key %08lX: 1 new user ID\n"
msgstr "�� %08lX: �����ʥ桼�� ID �� 1 ��\n"
-#: g10/import.c:496
+#: g10/import.c:508
#, c-format
msgid "key %08lX: %d new user IDs\n"
msgstr "�� %08lX: �����ʥ桼�� ID �� %d ��\n"
-#: g10/import.c:499
+#: g10/import.c:511
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "�� %08lX: �����ʽ�̾�� 1 ��\n"
-#: g10/import.c:502
+#: g10/import.c:514
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "�� %08lX: �����ʽ�̾�� %d ��\n"
-#: g10/import.c:505
+#: g10/import.c:517
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "�� %08lX: ������������ 1 ��\n"
-#: g10/import.c:508
+#: g10/import.c:520
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "�� %08lX: ������������ %d ��\n"
-#: g10/import.c:518
+#: g10/import.c:530
#, c-format
msgid "key %08lX: not changed\n"
msgstr "�� %08lX: �ѹ��ʤ�\n"
-#: g10/import.c:601
+#: g10/import.c:613
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "�� %08lX: ��̩�����ɤ߹��ߤޤ���\n"
#. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "�� %08lX: ������̩����󥰤ˤ���ޤ�\n"
-#: g10/import.c:610
+#: g10/import.c:622
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "�� %08lX: ��̩�������Ĥ���ޤ���: %s\n"
-#: g10/import.c:639
+#: g10/import.c:651
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr "�� %08lX: ������������ޤ��� - �˴��������Ŭ�Ѥ��Ǥ��ޤ���\n"
-#: g10/import.c:670
+#: g10/import.c:682
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "�� %08lX: ̵�����˴�������: %s - ���ݤ��ޤ���\n"
-#: g10/import.c:702
+#: g10/import.c:714
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "�� %08lX: �˴���������ɤ߹��ߤޤ���\n"
-#: g10/import.c:744
+#: g10/import.c:756
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "�� %08lX: ��̾���б�����桼�� ID ������ޤ���\n"
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "�� %08lX: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
-#: g10/import.c:752
+#: g10/import.c:764
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "�� %08lX: ���ʽ�̾��̵���Ǥ�\n"
-#: g10/import.c:767
+#: g10/import.c:779
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "�� %08lX: �����б���������������ޤ���\n"
-#: g10/import.c:776
+#: g10/import.c:788
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "�� %08lX: ̵�����������б��Ǥ�\n"
-#: g10/import.c:803
+#: g10/import.c:815
#, c-format
msgid "key %08lX: accepted non self-signed user ID '"
msgstr "�� %08lX: �������줿���ʽ�̾����Ƥ��ʤ��桼�� ID '"
-#: g10/import.c:832
+#: g10/import.c:844
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "�� %08lX: �����åפ����桼�� ID '"
-#: g10/import.c:855
+#: g10/import.c:867
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "�� %08lX: �����åפ�������\n"
@@ -1904,32 +1914,32 @@ msgstr "�� %08lX: �����åפ�������\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "�� %08lX: �񤭽Ф��ԲĤʽ�̾ (class %02x) - �����å�\n"
-#: g10/import.c:889
+#: g10/import.c:901
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "�� %08lX: �˴������񤬴ְ�ä����ꤵ��Ƥ��ޤ� - �����å�\n"
-#: g10/import.c:897
+#: g10/import.c:909
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "�� %08lX: ̵�����˴�������: %s - �����å�\n"
-#: g10/import.c:997
+#: g10/import.c:1009
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "�� %08lX: ��ʣ�����桼�� ID �θ��� - �ɲ�\n"
-#: g10/import.c:1048
+#: g10/import.c:1060
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "�� %08lX: �˴���������ɲ�\n"
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "�� %08lX: �桹�Υ��ԡ��ˤϼ��ʽ�̾������ޤ���\n"
@@ -2506,8 +2516,18 @@ msgstr "�˴�������� ������ �������ޤ���? (y/N)"
msgid "no secret key\n"
msgstr "��̩��������ޤ���\n"
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "̵�������äǤ�"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
#. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
#, fuzzy, c-format
msgid " [expires: %s]"
msgstr "���� %s �ˤƴ����ڤ�ˤʤ�ޤ�\n"
@@ -2517,104 +2537,104 @@ msgstr "���� %s �ˤƴ����ڤ�ˤʤ�ޤ�\n"
msgid "public key is %08lX\n"
msgstr "�������� %08lX �Ǥ�\n"
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
msgid "public key encrypted data: good DEK\n"
msgstr "�������ǰŹ沽���줿�ǡ���: ������ DEK �Ǥ�\n"
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "%u �ӥå� %s ��, ID %08lX �ˤ�äưŹ沽����ޤ��� %s\n"
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "%s ��, ID %08lX �ˤ�äưŹ沽����ޤ���\n"
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
msgid "no secret key for decryption available\n"
msgstr "�����ɬ�פ���̩��������ޤ���\n"
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "������������˼���: %s\n"
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
msgid "decryption okay\n"
msgstr "���������\n"
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
#, c-format
msgid "decryption failed: %s\n"
msgstr "����˼���: %s\n"
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "����: �����Ԥϡ��ɤ߽�������������פ褦�˵��Ƥ��ޤ�\n"
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
#, c-format
msgid "original file name='%.*s'\n"
msgstr "���Υե�����̾='%.*s'\n"
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "��Ω�˴�����gpg --import�פ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
msgid "WARNING: invalid notation data found\n"
msgstr "�ٹ�: ̵��������ǡ���������ޤ�\n"
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
msgid "Notation: "
msgstr "����: "
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
msgid "Policy: "
msgstr "�ݥꥷ��: "
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
msgid "signature verification suppressed\n"
msgstr "��̾�θ��ڤ��Ǥ��ޤ���\n"
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "%.*s �� %s �� ID %08lX �ˤ���̾\n"
#. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
msgid "BAD signature from \""
msgstr "�����ʽ�̾: \""
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
msgid "Good signature from \""
msgstr "��������̾: \""
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
msgid " aka \""
msgstr " ��̾ \""
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
#, c-format
msgid "Can't check signature: %s\n"
msgstr "��̾�θ��ڤ��Ǥ��ޤ���: %s\n"
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "���饹0x%02x����Ω��̾\n"
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
msgid "old style (PGP 2.x) signature\n"
msgstr "�Ť����� (PGP 2.x) �ˤ���̾\n"
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
msgid "invalid root packet detected in proc_tree()\n"
msgstr "proc_tree() �����̵���ʥѥ��åȤ����Ф���ޤ���\n"
@@ -2686,25 +2706,25 @@ msgstr "�ѥ��ե졼��������: "
msgid "Repeat passphrase: "
msgstr "�ѥ��ե졼���������: "
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"�ǡ�������¸����Ƥ��ޤ�����¸����ˤ� \"--output\" "
"���ץ�������Ѥ��Ʋ�������\n"
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
msgid "Detached signature.\n"
msgstr "ʬΥ��̾��\n"
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
msgid "Please enter name of data file: "
msgstr "�ǡ����ե������̾��������: "
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
msgid "reading stdin ...\n"
msgstr "ɸ�����Ϥ���ɤ߹����� ...\n"
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "��̾���줿�ǡ��� `%s' �������ޤ���\n"
diff --git a/po/nl.po b/po/nl.po
index b299216b5..f07a9311d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-27 17:31+0200\n"
"PO-Revision-Date: 2000-02-20 21:30+01:00\n"
"Last-Translator: Ivo Timmermans <[email protected]>\n"
"Language-Team: Dutch <[email protected]>\n"
@@ -255,7 +255,7 @@ msgstr "... dit is een programmeerfout (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "u heeft een fout in het programma gevonden ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan `%s' niet openen: %s\n"
@@ -337,7 +337,7 @@ msgstr ""
"om het besturingssysteem de kans te geven om meer entropie te\n"
"verzamelen! (Nog %d bytes nodig)\n"
-#: g10/g10.c:197
+#: g10/g10.c:203
msgid ""
"@Commands:\n"
" "
@@ -345,139 +345,139 @@ msgstr ""
"@Opdrachten:\n"
" "
-#: g10/g10.c:199
+#: g10/g10.c:205
msgid "|[file]|make a signature"
msgstr "|[bestand]|maak een ondertekening"
-#: g10/g10.c:200
+#: g10/g10.c:206
msgid "|[file]|make a clear text signature"
msgstr "|[bestand]|maak een niet versleutelde ondertekening"
-#: g10/g10.c:201
+#: g10/g10.c:207
msgid "make a detached signature"
msgstr "maak een losstaande ondertekening"
-#: g10/g10.c:202
+#: g10/g10.c:208
msgid "encrypt data"
msgstr "versleutel gegevens"
-#: g10/g10.c:203
+#: g10/g10.c:209
msgid "encryption only with symmetric cipher"
msgstr "versleutel slechts met een symmetrische versleutelmethode"
-#: g10/g10.c:204
+#: g10/g10.c:210
msgid "store only"
msgstr "alleen bewaren"
-#: g10/g10.c:205
+#: g10/g10.c:211
msgid "decrypt data (default)"
msgstr "gegevens decoderen (standaard)"
-#: g10/g10.c:206
+#: g10/g10.c:212
msgid "verify a signature"
msgstr "ondertekening controleren"
-#: g10/g10.c:208
+#: g10/g10.c:214
msgid "list keys"
msgstr "lijst van sleutels genereren"
-#: g10/g10.c:210
+#: g10/g10.c:216
msgid "list keys and signatures"
msgstr "sleutels en ondertekeningen opnoemen"
-#: g10/g10.c:211
+#: g10/g10.c:217
msgid "check key signatures"
msgstr "sleutelverificaties controleren"
-#: g10/g10.c:212
+#: g10/g10.c:218
msgid "list keys and fingerprints"
msgstr "sleutels en vingerafdrukken opnoemen"
-#: g10/g10.c:213
+#: g10/g10.c:219
msgid "list secret keys"
msgstr "geheime sleutels opnoemen"
-#: g10/g10.c:214
+#: g10/g10.c:220
msgid "generate a new key pair"
msgstr "nieuw sleutelpaar genereren"
-#: g10/g10.c:215
+#: g10/g10.c:221
msgid "remove key from the public keyring"
msgstr "sleutel weghalen uit de publieke sleutelbos"
-#: g10/g10.c:217
+#: g10/g10.c:223
msgid "remove key from the secret keyring"
msgstr "sleutel weghalen uit de geheime sleutelbos"
-#: g10/g10.c:218
+#: g10/g10.c:224
msgid "sign a key"
msgstr "onderteken een sleutel"
-#: g10/g10.c:219
+#: g10/g10.c:225
msgid "sign a key locally"
msgstr "onderteken een sleutel lokaal"
-#: g10/g10.c:220
+#: g10/g10.c:226
msgid "sign or edit a key"
msgstr "onderteken of bewerk een sleutel"
-#: g10/g10.c:221
+#: g10/g10.c:227
msgid "generate a revocation certificate"
msgstr "genereer een terugtrekkings-certificaat"
-#: g10/g10.c:222
+#: g10/g10.c:228
msgid "export keys"
msgstr "exporteer sleutels"
-#: g10/g10.c:223
+#: g10/g10.c:229
msgid "export keys to a key server"
msgstr "exporteer sleutels naar een sleutelserver"
-#: g10/g10.c:224
+#: g10/g10.c:230
msgid "import keys from a key server"
msgstr "importeer sleutels van een sleutelserver"
-#: g10/g10.c:228
+#: g10/g10.c:234
msgid "import/merge keys"
msgstr "sleutels importeren/samenvoegen"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "list only the sequence of packets"
msgstr "noem alleen de volgorde van pakketten"
-#: g10/g10.c:232
+#: g10/g10.c:238
msgid "export the ownertrust values"
msgstr "exporteer het vertrouwen in de eigenaars"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "import ownertrust values"
msgstr "importeer het vertrouwen in de eigenaars"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "update the trust database"
msgstr "werk de vertrouwensdatabase bij"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|[NAMES]|check the trust database"
msgstr "|[NAMEN]|controleer de vertrouwensdatabase"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "fix a corrupted trust database"
msgstr "repareer een beschadigde vertrouwensdatabase"
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "De-Armor a file or stdin"
msgstr "Verwijder de beveiliging op bestand of standaard invoer"
-#: g10/g10.c:242
+#: g10/g10.c:248
msgid "En-Armor a file or stdin"
msgstr "Voeg beveiliging toe aan bestad of standaard invoer"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "|algo [files]|print message digests"
msgstr "|algo [bestanden]|geef controlegetal van berichten weer"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid ""
"@\n"
"Options:\n"
@@ -487,155 +487,155 @@ msgstr ""
"Opties:\n"
" "
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "create ascii armored output"
msgstr "genereer beveiliging in ASCII"
-#: g10/g10.c:252
+#: g10/g10.c:258
msgid "|NAME|encrypt for NAME"
msgstr "|NAAM|versleutel voor NAAM"
-#: g10/g10.c:255
+#: g10/g10.c:261
msgid "|NAME|use NAME as default recipient"
msgstr "|NAAM|gebruik NAAM als standaard ontvanger"
-#: g10/g10.c:257
+#: g10/g10.c:263
msgid "use the default key as default recipient"
msgstr "gebruik de standaard sleutel als standaard ontvanger"
-#: g10/g10.c:261
+#: g10/g10.c:267
msgid "use this user-id to sign or decrypt"
msgstr ""
"gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen"
-#: g10/g10.c:262
+#: g10/g10.c:268
msgid "|N|set compress level N (0 disables)"
msgstr "|N|stel compressieniveau in op N (uitzetten met 0)"
-#: g10/g10.c:264
+#: g10/g10.c:270
msgid "use canonical text mode"
msgstr "gebruik de verkorte tekstmodus"
-#: g10/g10.c:265
+#: g10/g10.c:271
msgid "use as output file"
msgstr "gebruik als uitvoerbestand"
-#: g10/g10.c:266
+#: g10/g10.c:272
msgid "verbose"
msgstr "geef meer informatie"
-#: g10/g10.c:267
+#: g10/g10.c:273
msgid "be somewhat more quiet"
msgstr "wees iets stiller"
-#: g10/g10.c:268
+#: g10/g10.c:274
msgid "don't use the terminal at all"
msgstr "gebruik de terminal helemaal niet"
-#: g10/g10.c:269
+#: g10/g10.c:275
msgid "force v3 signatures"
msgstr "forcees v3 ondertekening"
-#: g10/g10.c:270
+#: g10/g10.c:276
msgid "always use a MDC for encryption"
msgstr "gebruik altijd een MDC voor versleuteling"
-#: g10/g10.c:271
+#: g10/g10.c:277
msgid "do not make any changes"
msgstr "maak geen enkele verandering"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:279
msgid "batch mode: never ask"
msgstr "doorlopende modus: vraag nooit"
-#: g10/g10.c:274
+#: g10/g10.c:280
msgid "assume yes on most questions"
msgstr "veronderstel ja als antwoord op de meeste vragen"
-#: g10/g10.c:275
+#: g10/g10.c:281
msgid "assume no on most questions"
msgstr "veronderstel nee als antwoord op de meeste vragen"
-#: g10/g10.c:276
+#: g10/g10.c:282
msgid "add this keyring to the list of keyrings"
msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen"
-#: g10/g10.c:277
+#: g10/g10.c:283
msgid "add this secret keyring to the list"
msgstr "voeg deze geheime sleutelbos toe aan de lijst"
-#: g10/g10.c:278
+#: g10/g10.c:284
msgid "|NAME|use NAME as default secret key"
msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel"
-#: g10/g10.c:279
+#: g10/g10.c:285
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken"
-#: g10/g10.c:280
+#: g10/g10.c:286
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAAM|zet tekenverzameling van terminal op NAAM"
-#: g10/g10.c:281
+#: g10/g10.c:287
msgid "read options from file"
msgstr "lees opties uit bestand"
-#: g10/g10.c:285
+#: g10/g10.c:291
msgid "|FD|write status info to this FD"
msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
-#: g10/g10.c:290
+#: g10/g10.c:296
msgid "|FILE|load extension module FILE"
msgstr "|BESTAND|laad extensiemodule BESTAND"
-#: g10/g10.c:291
+#: g10/g10.c:297
msgid "emulate the mode described in RFC1991"
msgstr "doe als RFC1991 voorschrijft"
-#: g10/g10.c:292
+#: g10/g10.c:298
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "zet alle pakket-, versleutel- en controle-opties naar OpenPGP gedrag"
-#: g10/g10.c:293
+#: g10/g10.c:299
msgid "|N|use passphrase mode N"
msgstr "|N|gebruik sleuteltekst modus N"
-#: g10/g10.c:295
+#: g10/g10.c:301
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM voor sleutelteksten"
-#: g10/g10.c:297
+#: g10/g10.c:303
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NAAM|gebruik versleutelalgoritme NAAM voor sleutelteksten"
-#: g10/g10.c:298
+#: g10/g10.c:304
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAAM|gebruik versleutelalgoritme NAAM"
-#: g10/g10.c:299
+#: g10/g10.c:305
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM"
-#: g10/g10.c:300
+#: g10/g10.c:306
msgid "|N|use compress algorithm N"
msgstr "|N|gebruik compressiealgoritme N"
-#: g10/g10.c:301
+#: g10/g10.c:307
msgid "throw keyid field of encrypted packets"
msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
-#: g10/g10.c:302
+#: g10/g10.c:308
msgid "|NAME=VALUE|use this notation data"
msgstr "|NAAM=WAARDE|gebruik deze notitiegegevens"
-#: g10/g10.c:305
+#: g10/g10.c:311
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/g10.c:308
+#: g10/g10.c:314
msgid ""
"@\n"
"Examples:\n"
@@ -655,17 +655,17 @@ msgstr ""
" --list-keys [namen] toon sleutels\n"
" --fingerprints [namen] toon vingerafdrukken\n"
-#: g10/g10.c:403
+#: g10/g10.c:412
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Meld fouten in het programma a.u.b. aan <[email protected]>;\n"
"fouten in de vertaling aan <[email protected]>.\n"
-#: g10/g10.c:407
+#: g10/g10.c:416
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
-#: g10/g10.c:410
+#: g10/g10.c:419
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -675,7 +675,7 @@ msgstr ""
"onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
"standaardactie hangt af van de gegevens\n"
-#: g10/g10.c:417
+#: g10/g10.c:426
msgid ""
"\n"
"Supported algorithms:\n"
@@ -683,184 +683,184 @@ msgstr ""
"\n"
"Ondersteunde algoritmes:\n"
-#: g10/g10.c:496
+#: g10/g10.c:505
msgid "usage: gpg [options] "
msgstr "gebruik: gpg [opties] "
-#: g10/g10.c:549
+#: g10/g10.c:558
msgid "conflicting commands\n"
msgstr "tegenstrijdige commando's\n"
-#: g10/g10.c:692
+#: g10/g10.c:701
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "LET OP: geen bestand `%s' met standaardopties\n"
-#: g10/g10.c:696
+#: g10/g10.c:705
#, c-format
msgid "option file `%s': %s\n"
msgstr "optiebestand `%s': %s\n"
-#: g10/g10.c:703
+#: g10/g10.c:712
#, c-format
msgid "reading options from `%s'\n"
msgstr "opties inlezen van `%s'\n"
-#: g10/g10.c:893
+#: g10/g10.c:902
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s is een onbekende tekenverzameling\n"
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:963 g10/g10.c:972
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "LET OP: %s is niet voor gewoon gebruik!\n"
-#: g10/g10.c:951
+#: g10/g10.c:965
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s is niet toegestaan met deze %s!\n"
-#: g10/g10.c:954
+#: g10/g10.c:968
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s heeft geen betekenis met %s!\n"
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:987 g10/g10.c:999
msgid "selected cipher algorithm is invalid\n"
msgstr "geselecteerd versleutelalgoritme is ongeldig\n"
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:993 g10/g10.c:1005
msgid "selected digest algorithm is invalid\n"
msgstr "geselecteerd controle-algoritme is ongeldig\n"
-#: g10/g10.c:995
+#: g10/g10.c:1009
msgid "the given policy URL is invalid\n"
msgstr "de gegeven beleids-URL is ongeldig\n"
-#: g10/g10.c:998
+#: g10/g10.c:1012
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "compressie-algoritme moet in het bereik %d..%d liggen\n"
-#: g10/g10.c:1000
+#: g10/g10.c:1014
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed(?) moet groter zijn dan 0\n"
-#: g10/g10.c:1002
+#: g10/g10.c:1016
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed(?) moet groter zijn dan 1\n"
-#: g10/g10.c:1004
+#: g10/g10.c:1018
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth moet tussen de 1 en de 255 (inclusief) liggen\n"
-#: g10/g10.c:1007
+#: g10/g10.c:1021
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "LET OP: simpele S2K mode (0) wordt met klem afgeraden\n"
-#: g10/g10.c:1011
+#: g10/g10.c:1025
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n"
-#: g10/g10.c:1096
+#: g10/g10.c:1110
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n"
-#: g10/g10.c:1102
+#: g10/g10.c:1116
msgid "--store [filename]"
msgstr "--store [bestandsnaam]"
-#: g10/g10.c:1109
+#: g10/g10.c:1123
msgid "--symmetric [filename]"
msgstr "--symmetric [bestandsnaam]"
-#: g10/g10.c:1117
+#: g10/g10.c:1131
msgid "--encrypt [filename]"
msgstr "--encrypt [bestandsnaam]"
-#: g10/g10.c:1130
+#: g10/g10.c:1144
msgid "--sign [filename]"
msgstr "--sign [bestandsnaam]"
-#: g10/g10.c:1143
+#: g10/g10.c:1157
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [bestandsnaam]"
-#: g10/g10.c:1157
+#: g10/g10.c:1171
msgid "--clearsign [filename]"
msgstr "--clearsign [bestandsnaam]"
-#: g10/g10.c:1174
+#: g10/g10.c:1188
msgid "--decrypt [filename]"
msgstr "--decrypt [bestandsnaam]"
-#: g10/g10.c:1182
+#: g10/g10.c:1196
msgid "--sign-key user-id"
msgstr "--sign-key gebruikersidentificatie"
-#: g10/g10.c:1190
+#: g10/g10.c:1204
msgid "--lsign-key user-id"
msgstr "--lsign-key gebruikers-identificatie"
-#: g10/g10.c:1198
+#: g10/g10.c:1212
msgid "--edit-key user-id [commands]"
msgstr "--edit-key gebruikersidentificatie [opdrachten]"
-#: g10/g10.c:1214
+#: g10/g10.c:1228
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key gebruikersidentificatie"
-#: g10/g10.c:1217
+#: g10/g10.c:1231
msgid "--delete-key user-id"
msgstr "--delete-key gebruikersidentificatie"
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:260 g10/g10.c:1268 g10/sign.c:393
#, c-format
msgid "can't open %s: %s\n"
msgstr "kan %s niet openen: %s\n"
-#: g10/g10.c:1269
+#: g10/g10.c:1283
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]"
-#: g10/g10.c:1335
+#: g10/g10.c:1349
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "opheffen van beveiliging mislukt: %s\n"
-#: g10/g10.c:1343
+#: g10/g10.c:1357
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "beveiligen mislukt: %s\n"
-#: g10/g10.c:1411
+#: g10/g10.c:1428
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "ongeldig frommelalgoritme `%s'\n"
-#: g10/g10.c:1492
+#: g10/g10.c:1509
msgid "[filename]"
msgstr "[bestandsnaam]"
-#: g10/g10.c:1496
+#: g10/g10.c:1513
msgid "Go ahead and type your message ...\n"
msgstr "Gaat uw gang, type het bericht ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1516 g10/verify.c:68 g10/verify.c:113
#, c-format
msgid "can't open `%s'\n"
msgstr "kan `%s' niet openen\n"
-#: g10/g10.c:1669
+#: g10/g10.c:1689
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"het eerste teken van een notitienaam moet een letter of laag liggend steepje "
"zijn\n"
-#: g10/g10.c:1675
+#: g10/g10.c:1695
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -868,11 +868,11 @@ msgstr ""
"een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
"en eindig met een =\n"
-#: g10/g10.c:1681
+#: g10/g10.c:1701
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr "punten in notitienamen moeten omgeven zijn door andere tekens\n"
-#: g10/g10.c:1689
+#: g10/g10.c:1709
msgid "a notation value must not use any control characters\n"
msgstr "een notitienaam mag geen controletekens bevatten\n"
@@ -1695,240 +1695,250 @@ msgstr "gebruik secundaire sleutel %08lx in plaats van de primaire %08lx\n"
msgid "[User id not found]"
msgstr "%s: gebruiker niet gevonden\n"
-#: g10/import.c:181
+#: g10/import.c:182
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok van type %d wordt overgeslagen\n"
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1740 g10/trustdb.c:1781
#, c-format
msgid "%lu keys so far processed\n"
msgstr "%lu sleutels zijn tot nu toe behandeld\n"
-#: g10/import.c:193
+#: g10/import.c:194
#, c-format
msgid "error reading `%s': %s\n"
msgstr "fout bij lezen `%s': %s\n"
-#: g10/import.c:203
+#: g10/import.c:204
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Totaal aantal behandeld: %lu\n"
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid " skipped new keys: %lu\n"
+msgstr "nieuwe subsleutels: %lu\n"
+
+#: g10/import.c:209
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " zonder identificatie: %lu\n"
-#: g10/import.c:207
+#: g10/import.c:211
#, c-format
msgid " imported: %lu"
msgstr "ge�mporteerd: %lu"
-#: g10/import.c:213
+#: g10/import.c:217
#, c-format
msgid " unchanged: %lu\n"
msgstr "onveranderd: %lu\n"
-#: g10/import.c:215
+#: g10/import.c:219
#, c-format
msgid " new user IDs: %lu\n"
msgstr "nieuwe gebruikers: %lu\n"
-#: g10/import.c:217
+#: g10/import.c:221
#, c-format
msgid " new subkeys: %lu\n"
msgstr "nieuwe subsleutels: %lu\n"
-#: g10/import.c:219
+#: g10/import.c:223
#, c-format
msgid " new signatures: %lu\n"
msgstr "nieuwe ondertekeningen: %lu\n"
-#: g10/import.c:221
+#: g10/import.c:225
#, c-format
msgid " new key revocations: %lu\n"
msgstr "nieuwe sleutelterugtrekkingen: %lu\n"
-#: g10/import.c:223
+#: g10/import.c:227
#, c-format
msgid " secret keys read: %lu\n"
msgstr "geheime sleutels gelezen: %lu\n"
-#: g10/import.c:225
+#: g10/import.c:229
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "geheime sleutels ge�mporteerd: %lu\n"
-#: g10/import.c:227
+#: g10/import.c:231
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "onveranderde geheime sleutels: %lu\n"
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "sleutel %08lX: geen gebruikersidentificatie\n"
-#: g10/import.c:400
+#: g10/import.c:405
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "sleutel %08lX: geen geldige gebruikersidentificaties\n"
-#: g10/import.c:402
+#: g10/import.c:407
msgid "this may be caused by a missing self-signature\n"
msgstr ""
"dit zou veroorzaakt kunnen worden door een ontbrekende zelf-ondertkening\n"
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
+
+#: g10/import.c:431
msgid "no default public keyring\n"
msgstr "geen standaard openbare sleutelbos\n"
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
#, c-format
msgid "writing to `%s'\n"
msgstr "schrijven naar `%s'\n"
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
#, c-format
msgid "can't lock keyring `%s': %s\n"
msgstr "kan sleutelbos `%s' niet vergrendelen: %s\n"
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
-#: g10/import.c:434
+#: g10/import.c:446
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "sleutel %08lX: openbare sleutel ge�mporteerd\n"
-#: g10/import.c:451
+#: g10/import.c:463
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "sleutel %08lX: komt niet overeen met onze kopie\n"
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "sleutel %08lX: kan originele sleutelblok niet vinden: %s\n"
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "sleutel %08lX: kan origineel sleutelblok niet lezen: %s\n"
-#: g10/import.c:493
+#: g10/import.c:505
#, c-format
msgid "key %08lX: 1 new user ID\n"
msgstr "sleutel %08lX: 1 nieuwe gebruiker\n"
-#: g10/import.c:496
+#: g10/import.c:508
#, c-format
msgid "key %08lX: %d new user IDs\n"
msgstr "sleutel %08lX: %d nieuwe gebruikers\n"
-#: g10/import.c:499
+#: g10/import.c:511
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "sleutel %08lX: 1 nieuwe ondertekening\n"
-#: g10/import.c:502
+#: g10/import.c:514
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n"
-#: g10/import.c:505
+#: g10/import.c:517
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "sleutel %08lX: 1 nieuwe subsleutel\n"
-#: g10/import.c:508
+#: g10/import.c:520
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "sleutel %08lX: %d nieuwe subsleutels\n"
-#: g10/import.c:518
+#: g10/import.c:530
#, c-format
msgid "key %08lX: not changed\n"
msgstr "sleutel %08lX: niet veranderd\n"
-#: g10/import.c:601
+#: g10/import.c:613
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "sleutel %08lX: geheime sleutel ge�mporteerd\n"
#. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "sleutel %08lX: reeds aanwezig in de geheime sleutelbos\n"
-#: g10/import.c:610
+#: g10/import.c:622
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
-#: g10/import.c:639
+#: g10/import.c:651
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"sleutel %08lX: geen openbare sleutel - kan terugtrekkingscertificaat niet "
"toepassen\n"
-#: g10/import.c:670
+#: g10/import.c:682
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - afgewezen\n"
-#: g10/import.c:702
+#: g10/import.c:714
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "sleutel %08lX: terugtrekkingscertificaat ge�mporteerd\n"
-#: g10/import.c:744
+#: g10/import.c:756
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "sleutel %08lX: geen gebruikersidentificatie voor ondertekening\n"
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n"
-#: g10/import.c:752
+#: g10/import.c:764
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "sleutel %08lX: ongeldige eigen ondertekening\n"
-#: g10/import.c:767
+#: g10/import.c:779
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
-#: g10/import.c:776
+#: g10/import.c:788
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
-#: g10/import.c:803
+#: g10/import.c:815
#, c-format
msgid "key %08lX: accepted non self-signed user ID '"
msgstr ""
"sleutel %08lX: niet zelfondertekende gebruikersidentificatie geaccepteerd '"
-#: g10/import.c:832
+#: g10/import.c:844
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "sleutel %08lX: gebruikersidentificatie overgeslagen '"
-#: g10/import.c:855
+#: g10/import.c:867
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "sleutel %08lX: subsleutel overgeslagen\n"
@@ -1937,37 +1947,37 @@ msgstr "sleutel %08lX: subsleutel overgeslagen\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr ""
"sleutel %08lX: niet exporteerbare ondertekening (klasse %02x) - "
"overgeslagen\n"
-#: g10/import.c:889
+#: g10/import.c:901
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr ""
"sleutel %08lX: terugtrekkingscertificaat op de verkeerde plek - "
"overgeslagen\n"
-#: g10/import.c:897
+#: g10/import.c:909
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - overgeslagen\n"
-#: g10/import.c:997
+#: g10/import.c:1009
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr ""
"sleutel %08lX: dubbele gebruikersidentificatie gevonden - samengevoegd\n"
-#: g10/import.c:1048
+#: g10/import.c:1060
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "sleutel %08lX: terugtrekkingscertificaat toegevoegd\n"
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "sleutel %08lX: onze versie heeft geen zelfondertekening\n"
@@ -2547,8 +2557,18 @@ msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
msgid "no secret key\n"
msgstr "geen geheime sleutel\n"
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "ongeldige versleuteling"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
#. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
#, fuzzy, c-format
msgid " [expires: %s]"
msgstr "Sleutel verloopt op %s\n"
@@ -2558,105 +2578,105 @@ msgstr "Sleutel verloopt op %s\n"
msgid "public key is %08lX\n"
msgstr "openbare sleutel is %08lX\n"
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
msgid "public key encrypted data: good DEK\n"
msgstr "gegevens versleuteld met een openbare sleutel: goede DEK\n"
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "versleuteld met %u-bit %s sleutel, nummer %08lX, gemaakt op %s\n"
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "versleuteld met %s sleutel, nummer %08lX\n"
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
msgid "no secret key for decryption available\n"
msgstr "geheime sleutel voor ontsleuteling is niet beschikbaar\n"
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "openbare sleutel-ontsleuteling ging niet: %s\n"
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
msgid "decryption okay\n"
msgstr "ontsleutelen ging goed\n"
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "LET OP: het versleutelde bericht is veranderd!\n"
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
#, c-format
msgid "decryption failed: %s\n"
msgstr "ontsleuteling mislukte: %s\n"
# Dit kan wel Engels blijven.. toch?
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "LET OP: afzender vroeg om \"for-your-eyes-only\"\n"
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
#, c-format
msgid "original file name='%.*s'\n"
msgstr "originele bestandsnaam='%.*s'\n"
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "alleenstaande intrekking - gebruik \"gpg --import\" om uit te voeren\n"
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
msgid "WARNING: invalid notation data found\n"
msgstr "LET OP: ongeldige aantekeningen gevonden\n"
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
msgid "Notation: "
msgstr "Aantekening: "
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
msgid "Policy: "
msgstr "Beleid: "
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
msgid "signature verification suppressed\n"
msgstr "controle van de ondertekening overgeslagen\n"
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Ondertekening gemaakt op %.*s met %s sleutel nummer %08lX\n"
#. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
msgid "BAD signature from \""
msgstr "FOUTE ondertekening van \""
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
msgid "Good signature from \""
msgstr "Correcte ondertekening van \""
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
msgid " aka \""
msgstr " alias \""
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Kan ondertekening niet controleren: %s\n"
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "losstaande ondertekening van type 0x%02x\n"
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
msgid "old style (PGP 2.x) signature\n"
msgstr "oude stijl (PGP 2.x) ondertekening\n"
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
msgid "invalid root packet detected in proc_tree()\n"
msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n"
@@ -2727,24 +2747,24 @@ msgstr "Geef de sleuteltekst: "
msgid "Repeat passphrase: "
msgstr "Herhaal de sleuteltekst: "
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"gegevens niet bewaard; gebruik de optie \"--output\" om het op te slaan in\n"
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
msgid "Detached signature.\n"
msgstr "Losstaande ondertekening.\n"
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
msgid "Please enter name of data file: "
msgstr "Geef de naam van het gegevensbestand: "
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
msgid "reading stdin ...\n"
msgstr "lezen uit standaard invoer ...\n"
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "kan ondertekende gegevens `%s' niet openen\n"
diff --git a/po/pl.po b/po/pl.po
index d2662c11f..6f711e4ce 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-27 17:31+0200\n"
"PO-Revision-Date: 1999-12-05 21:29+01:00\n"
"Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
"Language-Team: Polish <[email protected]>\n"
@@ -265,7 +265,7 @@ msgstr "... to jest b��d w programie (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nie mo�na otworzy� %s: %s\n"
@@ -349,7 +349,7 @@ msgstr ""
"Prosz� kontynuowa� inne dzia�ania aby system m�g� zebra� odpowiedni�\n"
"ilo�� entropii do ich wygenerowania (brakuje %d bajt�w).\n"
-#: g10/g10.c:197
+#: g10/g10.c:203
msgid ""
"@Commands:\n"
" "
@@ -357,139 +357,139 @@ msgstr ""
"@Polecenia:\n"
" "
-#: g10/g10.c:199
+#: g10/g10.c:205
msgid "|[file]|make a signature"
msgstr "|[plik]|z�o�enie podpisu"
-#: g10/g10.c:200
+#: g10/g10.c:206
msgid "|[file]|make a clear text signature"
msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
-#: g10/g10.c:201
+#: g10/g10.c:207
msgid "make a detached signature"
msgstr "sporz�dzenie podpisu oddzielonego od dokumentu"
-#: g10/g10.c:202
+#: g10/g10.c:208
msgid "encrypt data"
msgstr "szyfrowanie danych"
-#: g10/g10.c:203
+#: g10/g10.c:209
msgid "encryption only with symmetric cipher"
msgstr "szyfrowanie tylko szyfrem symetrycznym"
-#: g10/g10.c:204
+#: g10/g10.c:210
msgid "store only"
msgstr "tylko zapis do pliku"
-#: g10/g10.c:205
+#: g10/g10.c:211
msgid "decrypt data (default)"
msgstr "odszyfrowywanie danych (domy�lnie)"
-#: g10/g10.c:206
+#: g10/g10.c:212
msgid "verify a signature"
msgstr "sprawdzenie podpisu"
-#: g10/g10.c:208
+#: g10/g10.c:214
msgid "list keys"
msgstr "lista kluczy"
-#: g10/g10.c:210
+#: g10/g10.c:216
msgid "list keys and signatures"
msgstr "lista kluczy i podpis�w"
-#: g10/g10.c:211
+#: g10/g10.c:217
msgid "check key signatures"
msgstr "sprawdzenie podpis�w kluczy"
-#: g10/g10.c:212
+#: g10/g10.c:218
msgid "list keys and fingerprints"
msgstr "lista kluczy i ich odcisk�w"
-#: g10/g10.c:213
+#: g10/g10.c:219
msgid "list secret keys"
msgstr "lista kluczy tajnych"
-#: g10/g10.c:214
+#: g10/g10.c:220
msgid "generate a new key pair"
msgstr "generacja nowej pary klucza"
-#: g10/g10.c:215
+#: g10/g10.c:221
msgid "remove key from the public keyring"
msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
-#: g10/g10.c:217
+#: g10/g10.c:223
msgid "remove key from the secret keyring"
msgstr "usuni�cie klucza ze zbioru kluczy tajnych"
-#: g10/g10.c:218
+#: g10/g10.c:224
msgid "sign a key"
msgstr "z�o�enie podpisu na kluczu"
-#: g10/g10.c:219
+#: g10/g10.c:225
msgid "sign a key locally"
msgstr "z�o�enie lokalnego podpisu na kluczu"
-#: g10/g10.c:220
+#: g10/g10.c:226
msgid "sign or edit a key"
msgstr "podpisanie lub modyfikacja klucza"
-#: g10/g10.c:221
+#: g10/g10.c:227
msgid "generate a revocation certificate"
msgstr "tworzenie certyfikatu uniewa�nienia klucza"
-#: g10/g10.c:222
+#: g10/g10.c:228
msgid "export keys"
msgstr "eksport kluczy do pliku"
-#: g10/g10.c:223
+#: g10/g10.c:229
msgid "export keys to a key server"
msgstr "eksport kluczy do serwera kluczy"
-#: g10/g10.c:224
+#: g10/g10.c:230
msgid "import keys from a key server"
msgstr "import kluczy z serwera kluczy"
-#: g10/g10.c:228
+#: g10/g10.c:234
msgid "import/merge keys"
msgstr "import/do��czanie kluczy"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "list only the sequence of packets"
msgstr "wypisane sekwencji pakiet�w"
-#: g10/g10.c:232
+#: g10/g10.c:238
msgid "export the ownertrust values"
msgstr "eksport warto�ci zaufania"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "import ownertrust values"
msgstr "wczytanie warto��i zaufania"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "update the trust database"
msgstr "uaktualnienie bazy zaufania"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|[NAMES]|check the trust database"
msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "fix a corrupted trust database"
msgstr "naprawa uszkodzonej bazy zaufania"
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "De-Armor a file or stdin"
msgstr "zdj�cie opakowania ASCII pliku lub potoku"
-#: g10/g10.c:242
+#: g10/g10.c:248
msgid "En-Armor a file or stdin"
msgstr "opakowanie ASCII pliku lub potoku"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "|algo [files]|print message digests"
msgstr "|algo [pliki]|skr�ty wiadomo�ci"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid ""
"@\n"
"Options:\n"
@@ -499,154 +499,154 @@ msgstr ""
"Opcje:\n"
" "
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "create ascii armored output"
msgstr "plik wynikowy b�dzie w opakowaniu ASCII"
-#: g10/g10.c:252
+#: g10/g10.c:258
msgid "|NAME|encrypt for NAME"
msgstr "|NAZWA|szyfrowanie dla adresata NAZWA"
-#: g10/g10.c:255
+#: g10/g10.c:261
msgid "|NAME|use NAME as default recipient"
msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
-#: g10/g10.c:257
+#: g10/g10.c:263
msgid "use the default key as default recipient"
msgstr "domy�lny klucz jest domy�lnym adresatem"
-#: g10/g10.c:261
+#: g10/g10.c:267
msgid "use this user-id to sign or decrypt"
msgstr "identyfikator do podpisania lub odszyfrowania"
-#: g10/g10.c:262
+#: g10/g10.c:268
msgid "|N|set compress level N (0 disables)"
msgstr "|N|poziom kompresji N (0 - brak)"
-#: g10/g10.c:264
+#: g10/g10.c:270
msgid "use canonical text mode"
msgstr "kanoniczny format tekstowy"
-#: g10/g10.c:265
+#: g10/g10.c:271
msgid "use as output file"
msgstr "plik wyj�ciowy"
-#: g10/g10.c:266
+#: g10/g10.c:272
msgid "verbose"
msgstr "z informacjami dodatkowymi"
-#: g10/g10.c:267
+#: g10/g10.c:273
msgid "be somewhat more quiet"
msgstr "mniej komunikat�ww"
-#: g10/g10.c:268
+#: g10/g10.c:274
msgid "don't use the terminal at all"
msgstr "bez odwo�a� do terminala"
-#: g10/g10.c:269
+#: g10/g10.c:275
msgid "force v3 signatures"
msgstr "wymuszenie trzeciej wersji formatu podpis�w"
-#: g10/g10.c:270
+#: g10/g10.c:276
msgid "always use a MDC for encryption"
msgstr "do szyfrowania b�dzie u�ywany MDC"
-#: g10/g10.c:271
+#: g10/g10.c:277
msgid "do not make any changes"
msgstr "pozostawienie bez zmian"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:279
msgid "batch mode: never ask"
msgstr "tryb wsadowy: �adnych pyta�"
-#: g10/g10.c:274
+#: g10/g10.c:280
msgid "assume yes on most questions"
msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
-#: g10/g10.c:275
+#: g10/g10.c:281
msgid "assume no on most questions"
msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
-#: g10/g10.c:276
+#: g10/g10.c:282
msgid "add this keyring to the list of keyrings"
msgstr "doda� zbi�r kluczy do listy u�ywanych"
-#: g10/g10.c:277
+#: g10/g10.c:283
msgid "add this secret keyring to the list"
msgstr "doda� zbi�r kluczy tajnych do listy"
-#: g10/g10.c:278
+#: g10/g10.c:284
msgid "|NAME|use NAME as default secret key"
msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
-#: g10/g10.c:279
+#: g10/g10.c:285
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
-#: g10/g10.c:280
+#: g10/g10.c:286
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
-#: g10/g10.c:281
+#: g10/g10.c:287
msgid "read options from file"
msgstr "wczytanie opcji z pliku"
-#: g10/g10.c:285
+#: g10/g10.c:291
msgid "|FD|write status info to this FD"
msgstr "|FD|zapisa� opis stanu do FD"
-#: g10/g10.c:290
+#: g10/g10.c:296
msgid "|FILE|load extension module FILE"
msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
-#: g10/g10.c:291
+#: g10/g10.c:297
msgid "emulate the mode described in RFC1991"
msgstr "emulacja trybu opisanego w RFC1991"
-#: g10/g10.c:292
+#: g10/g10.c:298
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "zgodno�� ustawie� pakiet�w, szyfr�w i skr�t�w z OpenPGP"
-#: g10/g10.c:293
+#: g10/g10.c:299
msgid "|N|use passphrase mode N"
msgstr "|N|N-ty tryb wprowadzania wyra�enia przej�ciowego"
-#: g10/g10.c:295
+#: g10/g10.c:301
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|ALG|algorytm obliczania skr�t�w wiadomo�ci ALG"
-#: g10/g10.c:297
+#: g10/g10.c:303
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
-#: g10/g10.c:298
+#: g10/g10.c:304
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
-#: g10/g10.c:299
+#: g10/g10.c:305
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
-#: g10/g10.c:300
+#: g10/g10.c:306
msgid "|N|use compress algorithm N"
msgstr "|N|algorytm kompresji N"
-#: g10/g10.c:301
+#: g10/g10.c:307
msgid "throw keyid field of encrypted packets"
msgstr "usuni�cie identyfikator�w kluczy z pakiet�w"
-#: g10/g10.c:302
+#: g10/g10.c:308
msgid "|NAME=VALUE|use this notation data"
msgstr "|NAZWA=TRE��|adnotacje"
-#: g10/g10.c:305
+#: g10/g10.c:311
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/g10.c:308
+#: g10/g10.c:314
msgid ""
"@\n"
"Examples:\n"
@@ -667,15 +667,15 @@ msgstr ""
" --list-keys [nazwy] pokazuje klucze\n"
" --fingerprint [nazwy] pokazuje odciski kluczy\n"
-#: g10/g10.c:403
+#: g10/g10.c:412
msgid "Please report bugs to <[email protected]>.\n"
msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
-#: g10/g10.c:407
+#: g10/g10.c:416
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
-#: g10/g10.c:410
+#: g10/g10.c:419
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -685,7 +685,7 @@ msgstr ""
"podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
"domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
-#: g10/g10.c:417
+#: g10/g10.c:426
msgid ""
"\n"
"Supported algorithms:\n"
@@ -693,182 +693,182 @@ msgstr ""
"\n"
"Obs�ugiwane algorytmy:\n"
-#: g10/g10.c:496
+#: g10/g10.c:505
msgid "usage: gpg [options] "
msgstr "wywo�anie: gpg [opcje]"
-#: g10/g10.c:549
+#: g10/g10.c:558
msgid "conflicting commands\n"
msgstr "sprzeczne polecenia\n"
-#: g10/g10.c:692
+#: g10/g10.c:701
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
-#: g10/g10.c:696
+#: g10/g10.c:705
#, c-format
msgid "option file `%s': %s\n"
msgstr "plik opcji '%s': %s\n"
-#: g10/g10.c:703
+#: g10/g10.c:712
#, c-format
msgid "reading options from `%s'\n"
msgstr "odczyt opcji z '%s'\n"
-#: g10/g10.c:893
+#: g10/g10.c:902
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:963 g10/g10.c:972
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
-#: g10/g10.c:951
+#: g10/g10.c:965
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s jest niedozwolony z %s!\n"
-#: g10/g10.c:954
+#: g10/g10.c:968
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nie ma sensu z %s!\n"
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:987 g10/g10.c:999
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:993 g10/g10.c:1005
msgid "selected digest algorithm is invalid\n"
msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
-#: g10/g10.c:995
+#: g10/g10.c:1009
msgid "the given policy URL is invalid\n"
msgstr "podany URL regulaminu jest niepoprawny\n"
-#: g10/g10.c:998
+#: g10/g10.c:1012
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "ustawienie algortytmu kompresji musi pochodzi� z zakresu %d..%d\n"
-#: g10/g10.c:1000
+#: g10/g10.c:1014
msgid "completes-needed must be greater than 0\n"
msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
-#: g10/g10.c:1002
+#: g10/g10.c:1016
msgid "marginals-needed must be greater than 1\n"
msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
-#: g10/g10.c:1004
+#: g10/g10.c:1018
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
-#: g10/g10.c:1007
+#: g10/g10.c:1021
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
-#: g10/g10.c:1011
+#: g10/g10.c:1025
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
-#: g10/g10.c:1096
+#: g10/g10.c:1110
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
-#: g10/g10.c:1102
+#: g10/g10.c:1116
msgid "--store [filename]"
msgstr "--store [plik]"
-#: g10/g10.c:1109
+#: g10/g10.c:1123
msgid "--symmetric [filename]"
msgstr "--symmetric [plik]"
-#: g10/g10.c:1117
+#: g10/g10.c:1131
msgid "--encrypt [filename]"
msgstr "--encrypt [plik]"
-#: g10/g10.c:1130
+#: g10/g10.c:1144
msgid "--sign [filename]"
msgstr "--sign [plik]"
-#: g10/g10.c:1143
+#: g10/g10.c:1157
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [plik]"
-#: g10/g10.c:1157
+#: g10/g10.c:1171
msgid "--clearsign [filename]"
msgstr "--clearsign [plik]"
-#: g10/g10.c:1174
+#: g10/g10.c:1188
msgid "--decrypt [filename]"
msgstr "--decrypt [plik]"
-#: g10/g10.c:1182
+#: g10/g10.c:1196
msgid "--sign-key user-id"
msgstr "--sign-key nazwa u�ytkownika"
-#: g10/g10.c:1190
+#: g10/g10.c:1204
msgid "--lsign-key user-id"
msgstr "--lsign-key nazwa u�ytkownika"
-#: g10/g10.c:1198
+#: g10/g10.c:1212
msgid "--edit-key user-id [commands]"
msgstr "--edit-key nazwa u�ytkownika [polecenia]"
-#: g10/g10.c:1214
+#: g10/g10.c:1228
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key nazwa u�ytkownika"
-#: g10/g10.c:1217
+#: g10/g10.c:1231
msgid "--delete-key user-id"
msgstr "--delete-key nazwa u�ytkownika"
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:260 g10/g10.c:1268 g10/sign.c:393
#, c-format
msgid "can't open %s: %s\n"
msgstr "nie mo�na otworzy� %s: %s\n"
-#: g10/g10.c:1269
+#: g10/g10.c:1283
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
-#: g10/g10.c:1335
+#: g10/g10.c:1349
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "usuni�cie opakowania ASCII nie powiod�o si�: %s\n"
-#: g10/g10.c:1343
+#: g10/g10.c:1357
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
-#: g10/g10.c:1411
+#: g10/g10.c:1428
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "niew�a�ciwy algorytm skr�tu '%s'\n"
-#: g10/g10.c:1492
+#: g10/g10.c:1509
msgid "[filename]"
msgstr "[nazwa pliku]"
-#: g10/g10.c:1496
+#: g10/g10.c:1513
msgid "Go ahead and type your message ...\n"
msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1516 g10/verify.c:68 g10/verify.c:113
#, c-format
msgid "can't open `%s'\n"
msgstr "nie mo�na otworzy� '%s'\n"
-#: g10/g10.c:1669
+#: g10/g10.c:1689
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr "adnotacja musi zaczyna� si� od litery lub podkre�lenia\n"
-#: g10/g10.c:1675
+#: g10/g10.c:1695
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -876,11 +876,11 @@ msgstr ""
"nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki,\n"
"podkre�lenia, i musi ko�czy� si� '='\n"
-#: g10/g10.c:1681
+#: g10/g10.c:1701
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr "kropki w adnotacji musz� znajdowa� si� pomi�dzy innymi znakami\n"
-#: g10/g10.c:1689
+#: g10/g10.c:1709
msgid "a notation value must not use any control characters\n"
msgstr "warto�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
@@ -1702,241 +1702,251 @@ msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
msgid "[User id not found]"
msgstr "%s: nie znaleziono u�ytkownika\n"
-#: g10/import.c:181
+#: g10/import.c:182
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d zostaje pomini�ty\n"
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1740 g10/trustdb.c:1781
#, c-format
msgid "%lu keys so far processed\n"
msgstr "%lu kluczy przetworzonych do tej chwili\n"
-#: g10/import.c:193
+#: g10/import.c:194
#, c-format
msgid "error reading `%s': %s\n"
msgstr "b��d odczytu '%s': %s\n"
-#: g10/import.c:203
+#: g10/import.c:204
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Og�em przetworzonych kluczy: %lu\n"
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " nowych podkluczy: %lu\n"
+
+#: g10/import.c:209
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " bez identyfikatora: %lu\n"
-#: g10/import.c:207
+#: g10/import.c:211
#, c-format
msgid " imported: %lu"
msgstr " do��czono do zbioru: %lu"
-#: g10/import.c:213
+#: g10/import.c:217
#, c-format
msgid " unchanged: %lu\n"
msgstr " bez zmian: %lu\n"
-#: g10/import.c:215
+#: g10/import.c:219
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nowych identyfikator�w: %lu\n"
-#: g10/import.c:217
+#: g10/import.c:221
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nowych podkluczy: %lu\n"
-#: g10/import.c:219
+#: g10/import.c:223
#, c-format
msgid " new signatures: %lu\n"
msgstr " nowych podpis�w: %lu\n"
-#: g10/import.c:221
+#: g10/import.c:225
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nowych uniewa�nie� kluczy: %lu\n"
-#: g10/import.c:223
+#: g10/import.c:227
#, c-format
msgid " secret keys read: %lu\n"
msgstr " tajnych kluczy wczytanych: %lu\n"
-#: g10/import.c:225
+#: g10/import.c:229
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " tajnych kluczy dodanych: %lu\n"
-#: g10/import.c:227
+#: g10/import.c:231
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " tajnych kluczy bez zmian: %lu\n"
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
-#: g10/import.c:400
+#: g10/import.c:405
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
-#: g10/import.c:402
+#: g10/import.c:407
msgid "this may be caused by a missing self-signature\n"
msgstr "to mo�e by� spowodowane brakiem podpisu w�a�ciciela klucza\n"
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "klucz %08lX: brak klucza publicznego: %s\n"
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pomini�ty\n"
+
+#: g10/import.c:431
msgid "no default public keyring\n"
msgstr "brak domy�lnego zbioru kluczy publicznych\n"
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
#, c-format
msgid "writing to `%s'\n"
msgstr "zapis do '%s'\n"
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
#, c-format
msgid "can't lock keyring `%s': %s\n"
msgstr "nie mo�na zablokowa� zbioru kluczy publicznych '%s': %s\n"
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
-#: g10/import.c:434
+#: g10/import.c:446
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "klucz %08lX: klucz publiczny do��czony do zbioru\n"
-#: g10/import.c:451
+#: g10/import.c:463
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "klucz %08lX: nie zgadza si� z lokalnie posiadan� kopi�\n"
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
-#: g10/import.c:493
+#: g10/import.c:505
#, c-format
msgid "key %08lX: 1 new user ID\n"
msgstr "klucz %08lX: 1 nowy identyfikator u�ytkownika\n"
-#: g10/import.c:496
+#: g10/import.c:508
#, c-format
msgid "key %08lX: %d new user IDs\n"
msgstr "klucz %08lX: %d nowych identyfikator�w u�ytkownika\n"
-#: g10/import.c:499
+#: g10/import.c:511
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "klucz %08lX: 1 nowy podpis\n"
-#: g10/import.c:502
+#: g10/import.c:514
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "klucz %08lX: %d nowych podpis�w\n"
-#: g10/import.c:505
+#: g10/import.c:517
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "klucz %08lX: 1 nowy podklucz\n"
-#: g10/import.c:508
+#: g10/import.c:520
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "klucz %08lX: %d nowych podkluczy\n"
-#: g10/import.c:518
+#: g10/import.c:530
#, c-format
msgid "key %08lX: not changed\n"
msgstr "klucz %08lX: bez zmian\n"
-#: g10/import.c:601
+#: g10/import.c:613
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
#. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
-#: g10/import.c:610
+#: g10/import.c:622
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "klucz %08lX: brak klucza tajnego: %s\n"
-#: g10/import.c:639
+#: g10/import.c:651
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"klucz %08lX: brak klucza publicznego - wczytany certyfikat \n"
"uniwa�nienia nie mo�e by� zastosowany\n"
-#: g10/import.c:670
+#: g10/import.c:682
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr ""
"klucz %08lX: niepoprawny certyfikat uniewa�nienia:\n"
"%s - odrzucony\n"
-#: g10/import.c:702
+#: g10/import.c:714
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "klucz %08lX: wczytany certyfikat uniewa�nienia\n"
-#: g10/import.c:744
+#: g10/import.c:756
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr ""
"klucz %08lX: nie obs�ugiwany algorytm szyfrowania z kluczem publicznym\n"
-#: g10/import.c:752
+#: g10/import.c:764
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "klucz %08lX: niepoprawny podpis w�a�ciciela klucza\n"
-#: g10/import.c:767
+#: g10/import.c:779
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
-#: g10/import.c:776
+#: g10/import.c:788
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
-#: g10/import.c:803
+#: g10/import.c:815
#, c-format
msgid "key %08lX: accepted non self-signed user ID '"
msgstr "klucz %08lX: przyj�to identyfikator nie podpisany nim samym '"
-#: g10/import.c:832
+#: g10/import.c:844
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
-#: g10/import.c:855
+#: g10/import.c:867
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "klucz %08lX: podklucz pomini�ty\n"
@@ -1945,34 +1955,34 @@ msgstr "klucz %08lX: podklucz pomini�ty\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "klucz %08lX: podpis nieeksportowalny (klasa %02x) - pomini�ty\n"
-#: g10/import.c:889
+#: g10/import.c:901
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr ""
"klucz %08lX: certyfikat uniewa�nienia umieszczony w niew�a�ciwym \n"
"miejscu - zosta� pomini�ty\n"
-#: g10/import.c:897
+#: g10/import.c:909
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - pomini�ty\n"
-#: g10/import.c:997
+#: g10/import.c:1009
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "key %08lX: powt�rzony identyfikator u�ytkownika - do��czony\n"
-#: g10/import.c:1048
+#: g10/import.c:1060
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "klucz %08lX: dodany certyfikat uniewa�nienia\n"
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "klucz %08lX: dost�pna kopia nie jest podpisana ni� sam�\n"
@@ -2553,8 +2563,18 @@ msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N)"
msgid "no secret key\n"
msgstr "brak klucza tajnego\n"
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "b��d w opakowaniu ASCII"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "unpkl"
+
#. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
#, fuzzy, c-format
msgid " [expires: %s]"
msgstr "Data wa�no�ci klucza: %s\n"
@@ -2564,73 +2584,73 @@ msgstr "Data wa�no�ci klucza: %s\n"
msgid "public key is %08lX\n"
msgstr "klucz publiczny %08lX\n"
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
msgid "public key encrypted data: good DEK\n"
msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "d�ugo�� %u bit�w, typ %s, klucz %08lX, stworzony %s\n"
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "zaszyfrowane kluczem %s, o identyfikatorze %08lX\n"
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
msgid "no secret key for decryption available\n"
msgstr "odszyfrowuj�cy klucz tajny do jest niedost�pny\n"
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
msgid "decryption okay\n"
msgstr "odszyfrowane poprawnie\n"
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "OSTRZE�ENIE: dokonano manipulacji zaszyfrowan� wiadomo�ci�!\n"
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
#, c-format
msgid "decryption failed: %s\n"
msgstr "b��d odszyfrowywania: %s\n"
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana!\n"
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
#, c-format
msgid "original file name='%.*s'\n"
msgstr "pierwotna nazwa pliku='%.*s'\n"
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"oddzielony certyfikat uniewa�nienia - wywo�aj \"gpg --import\" aby go u�y�\n"
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
msgid "WARNING: invalid notation data found\n"
msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
msgid "Notation: "
msgstr "Adnotacja: "
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
msgid "Policy: "
msgstr "Regulamin: "
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
msgid "signature verification suppressed\n"
msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr ""
@@ -2638,33 +2658,33 @@ msgstr ""
"z u�yciem klucza o identyfikatorze %08lX\n"
#. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
msgid "BAD signature from \""
msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
msgid "Good signature from \""
msgstr "Poprawny podpis z�o�ony przez \""
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
msgid " aka \""
msgstr " alias \""
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "oddzielony podpis klasy 0x%02x\n"
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis starego typu (PGP 2.x)\n"
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
msgid "invalid root packet detected in proc_tree()\n"
msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
@@ -2739,24 +2759,24 @@ msgstr "Wyra�enie przej�ciowe: "
msgid "Repeat passphrase: "
msgstr "Powt�rzone wyra�enie przej�ciowe: "
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"dane nie zosta�y zapisane; nale�y u�y� opcji \"--output\" aby je zapisa�\n"
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
msgid "Detached signature.\n"
msgstr "Podpis oddzielony.\n"
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
msgid "Please enter name of data file: "
msgstr "Nazwa pliku danych: "
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
msgid "reading stdin ...\n"
msgstr "odczyt ze strumienia standardowego wej�cia...\n"
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "nie mo�na otworzy� podpisanego pliku '%s'\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6fdf31e9d..91949bae9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-27 17:31+0200\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-20 23:46:36-0200\n"
"From: Thiago Jung Bauermann <[email protected]>\n"
@@ -261,7 +261,7 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "voc� encontrou um bug ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
@@ -343,7 +343,7 @@ msgstr ""
"para que o sistema possa coletar mais entropia!\n"
"(S�o necess�rios mais %d bytes)\n"
-#: g10/g10.c:197
+#: g10/g10.c:203
msgid ""
"@Commands:\n"
" "
@@ -351,144 +351,144 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/g10.c:199
+#: g10/g10.c:205
msgid "|[file]|make a signature"
msgstr "|[arquivo]|fazer uma assinatura"
-#: g10/g10.c:200
+#: g10/g10.c:206
msgid "|[file]|make a clear text signature"
msgstr "|[arquivo]|fazer uma assinatura em texto puro"
-#: g10/g10.c:201
+#: g10/g10.c:207
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
-#: g10/g10.c:202
+#: g10/g10.c:208
msgid "encrypt data"
msgstr "criptografar dados"
-#: g10/g10.c:203
+#: g10/g10.c:209
msgid "encryption only with symmetric cipher"
msgstr ""
"criptografar apenas com criptografia\n"
"sim�trica"
-#: g10/g10.c:204
+#: g10/g10.c:210
msgid "store only"
msgstr "apenas armazenar"
-#: g10/g10.c:205
+#: g10/g10.c:211
msgid "decrypt data (default)"
msgstr "descriptografar dados (padr�o)"
-#: g10/g10.c:206
+#: g10/g10.c:212
msgid "verify a signature"
msgstr "verificar uma assinatura"
-#: g10/g10.c:208
+#: g10/g10.c:214
msgid "list keys"
msgstr "listar as chaves"
-#: g10/g10.c:210
+#: g10/g10.c:216
msgid "list keys and signatures"
msgstr "listar as chaves e as assinaturas"
-#: g10/g10.c:211
+#: g10/g10.c:217
msgid "check key signatures"
msgstr "verificar as assinaturas das chaves"
-#: g10/g10.c:212
+#: g10/g10.c:218
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impress�es digitais"
-#: g10/g10.c:213
+#: g10/g10.c:219
msgid "list secret keys"
msgstr "listar as chaves secretas"
-#: g10/g10.c:214
+#: g10/g10.c:220
msgid "generate a new key pair"
msgstr "gerar um novo par de chaves"
-#: g10/g10.c:215
+#: g10/g10.c:221
msgid "remove key from the public keyring"
msgstr "remover a chave do chaveiro p�blico"
-#: g10/g10.c:217
+#: g10/g10.c:223
msgid "remove key from the secret keyring"
msgstr "remover a chave do chaveiro secreto"
-#: g10/g10.c:218
+#: g10/g10.c:224
msgid "sign a key"
msgstr "assinar uma chave"
-#: g10/g10.c:219
+#: g10/g10.c:225
msgid "sign a key locally"
msgstr "assinar uma chave localmente"
-#: g10/g10.c:220
+#: g10/g10.c:226
msgid "sign or edit a key"
msgstr "assinar ou editar uma chave"
-#: g10/g10.c:221
+#: g10/g10.c:227
msgid "generate a revocation certificate"
msgstr "gerar um certificado de revoga��o"
-#: g10/g10.c:222
+#: g10/g10.c:228
msgid "export keys"
msgstr "exportar chaves"
-#: g10/g10.c:223
+#: g10/g10.c:229
msgid "export keys to a key server"
msgstr "exportar chaves para um servidor"
-#: g10/g10.c:224
+#: g10/g10.c:230
msgid "import keys from a key server"
msgstr "importar chaves de um servidor"
-#: g10/g10.c:228
+#: g10/g10.c:234
msgid "import/merge keys"
msgstr "importar/fundir chaves"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "list only the sequence of packets"
msgstr "listar apenas as seq��ncias de pacotes"
# ownertrust ???
-#: g10/g10.c:232
+#: g10/g10.c:238
msgid "export the ownertrust values"
msgstr "exportar os valores de confian�a"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "import ownertrust values"
msgstr "importar os valores de confian�a"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "update the trust database"
msgstr "atualizar o banco de dados de confiabilidade"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|[NAMES]|check the trust database"
msgstr "|[NOMES]|verificar o banco de dados de confiabilidade"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "fix a corrupted trust database"
msgstr ""
"consertar um banco de dados de confiabilidade\n"
"danificado"
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "De-Armor a file or stdin"
msgstr "retirar a armadura de um arquivo ou de \"stdin\""
-#: g10/g10.c:242
+#: g10/g10.c:248
msgid "En-Armor a file or stdin"
msgstr "criar armadura para um arquivo ou \"stdin\""
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "|algo [files]|print message digests"
msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid ""
"@\n"
"Options:\n"
@@ -498,171 +498,171 @@ msgstr ""
"Op��es:\n"
" "
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "create ascii armored output"
msgstr "criar sa�da com armadura ascii"
-#: g10/g10.c:252
+#: g10/g10.c:258
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|criptografar para NOME"
-#: g10/g10.c:255
+#: g10/g10.c:261
msgid "|NAME|use NAME as default recipient"
msgstr "|NOME|usar NOME como destinat�rio padr�o"
-#: g10/g10.c:257
+#: g10/g10.c:263
msgid "use the default key as default recipient"
msgstr "usar a chave padr�o como destinat�rio padr�o"
-#: g10/g10.c:261
+#: g10/g10.c:267
msgid "use this user-id to sign or decrypt"
msgstr ""
"usar este identificador de usu�rio para\n"
"assinar ou descriptografar"
-#: g10/g10.c:262
+#: g10/g10.c:268
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|estabelecer n�vel de compress�o N\n"
"(0 desabilita)"
-#: g10/g10.c:264
+#: g10/g10.c:270
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
-#: g10/g10.c:265
+#: g10/g10.c:271
msgid "use as output file"
msgstr "usar como arquivo de sa�da"
-#: g10/g10.c:266
+#: g10/g10.c:272
msgid "verbose"
msgstr "detalhado"
-#: g10/g10.c:267
+#: g10/g10.c:273
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
-#: g10/g10.c:268
+#: g10/g10.c:274
msgid "don't use the terminal at all"
msgstr "nunca usar o terminal"
-#: g10/g10.c:269
+#: g10/g10.c:275
msgid "force v3 signatures"
msgstr "for�ar assinaturas v3"
-#: g10/g10.c:270
+#: g10/g10.c:276
msgid "always use a MDC for encryption"
msgstr "sempre usar um MDC para criptografar"
-#: g10/g10.c:271
+#: g10/g10.c:277
msgid "do not make any changes"
msgstr "n�o fazer altera��es"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:279
msgid "batch mode: never ask"
msgstr "modo n�o-interativo: nunca perguntar"
-#: g10/g10.c:274
+#: g10/g10.c:280
msgid "assume yes on most questions"
msgstr "assumir sim para a maioria das perguntas"
-#: g10/g10.c:275
+#: g10/g10.c:281
msgid "assume no on most questions"
msgstr "assumir n�o para a maioria das perguntas"
-#: g10/g10.c:276
+#: g10/g10.c:282
msgid "add this keyring to the list of keyrings"
msgstr "adicionar este chaveiro � lista de chaveiros"
-#: g10/g10.c:277
+#: g10/g10.c:283
msgid "add this secret keyring to the list"
msgstr "adicionar este chaveiro secreto � lista"
-#: g10/g10.c:278
+#: g10/g10.c:284
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usar NOME como chave secreta padr�o"
-#: g10/g10.c:279
+#: g10/g10.c:285
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|ENDERE�O|usar este servidor para buscar chaves"
-#: g10/g10.c:280
+#: g10/g10.c:286
msgid "|NAME|set terminal charset to NAME"
msgstr ""
"|NOME|definir mapa de caracteres do terminal como\n"
"NOME"
-#: g10/g10.c:281
+#: g10/g10.c:287
msgid "read options from file"
msgstr "ler op��es do arquivo"
-#: g10/g10.c:285
+#: g10/g10.c:291
msgid "|FD|write status info to this FD"
msgstr ""
"|DA|escrever informa��es de estado para o\n"
"descritor de arquivo DA"
-#: g10/g10.c:290
+#: g10/g10.c:296
msgid "|FILE|load extension module FILE"
msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
-#: g10/g10.c:291
+#: g10/g10.c:297
msgid "emulate the mode described in RFC1991"
msgstr "emular o modo descrito no RFC1991"
-#: g10/g10.c:292
+#: g10/g10.c:298
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr ""
"configurar todas as op��es de pacote,\n"
"criptografia e \"digest\" para comportamento\n"
"OpenPGP"
-#: g10/g10.c:293
+#: g10/g10.c:299
msgid "|N|use passphrase mode N"
msgstr "|N|usar frase secreta modo N"
-#: g10/g10.c:295
+#: g10/g10.c:301
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr ""
"|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
"para frases secretas"
-#: g10/g10.c:297
+#: g10/g10.c:303
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr ""
"|NOME|usar algoritmo de criptografia NOME para\n"
"frases secretas"
-#: g10/g10.c:298
+#: g10/g10.c:304
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usar algoritmo de criptografia NOME"
-#: g10/g10.c:299
+#: g10/g10.c:305
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
-#: g10/g10.c:300
+#: g10/g10.c:306
msgid "|N|use compress algorithm N"
msgstr "|N|usar algoritmo de compress�o N"
-#: g10/g10.c:301
+#: g10/g10.c:307
msgid "throw keyid field of encrypted packets"
msgstr ""
"eliminar o campo keyid dos pacotes\n"
"criptografados"
-#: g10/g10.c:302
+#: g10/g10.c:308
msgid "|NAME=VALUE|use this notation data"
msgstr "|NOME=VALOR|usar estes dados de nota��o"
-#: g10/g10.c:305
+#: g10/g10.c:311
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/g10.c:308
+#: g10/g10.c:314
msgid ""
"@\n"
"Examples:\n"
@@ -682,15 +682,15 @@ msgstr ""
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impress�es digitais\n"
-#: g10/g10.c:403
+#: g10/g10.c:412
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor comunique bugs para <[email protected]>.\n"
-#: g10/g10.c:407
+#: g10/g10.c:416
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
-#: g10/g10.c:410
+#: g10/g10.c:419
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -700,7 +700,7 @@ msgstr ""
"assina, verifica, criptografa ou descriptografa\n"
"a opera��o padr�o depende dos dados de entrada\n"
-#: g10/g10.c:417
+#: g10/g10.c:426
msgid ""
"\n"
"Supported algorithms:\n"
@@ -708,185 +708,185 @@ msgstr ""
"\n"
"Algoritmos suportados:\n"
-#: g10/g10.c:496
+#: g10/g10.c:505
msgid "usage: gpg [options] "
msgstr "uso: gpg [op��es] "
-#: g10/g10.c:549
+#: g10/g10.c:558
msgid "conflicting commands\n"
msgstr "comandos conflitantes\n"
-#: g10/g10.c:692
+#: g10/g10.c:701
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
-#: g10/g10.c:696
+#: g10/g10.c:705
#, c-format
msgid "option file `%s': %s\n"
msgstr "arquivo de op��es `%s': %s\n"
-#: g10/g10.c:703
+#: g10/g10.c:712
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo op��es de `%s'\n"
-#: g10/g10.c:893
+#: g10/g10.c:902
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:963 g10/g10.c:972
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s n�o � para uso normal!\n"
-#: g10/g10.c:951
+#: g10/g10.c:965
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n�o � permitido com %s!\n"
-#: g10/g10.c:954
+#: g10/g10.c:968
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n�o faz sentido com %s!\n"
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:987 g10/g10.c:999
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:993 g10/g10.c:1005
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
-#: g10/g10.c:995
+#: g10/g10.c:1009
msgid "the given policy URL is invalid\n"
msgstr "a URL de pol�tica dada � inv�lida\n"
-#: g10/g10.c:998
+#: g10/g10.c:1012
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
-#: g10/g10.c:1000
+#: g10/g10.c:1014
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
-#: g10/g10.c:1002
+#: g10/g10.c:1016
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
-#: g10/g10.c:1004
+#: g10/g10.c:1018
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth deve estar na entre 1 e 255\n"
-#: g10/g10.c:1007
+#: g10/g10.c:1021
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
-#: g10/g10.c:1011
+#: g10/g10.c:1025
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
-#: g10/g10.c:1096
+#: g10/g10.c:1110
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
-#: g10/g10.c:1102
+#: g10/g10.c:1116
msgid "--store [filename]"
msgstr "--store [nome_do_arquivo]"
-#: g10/g10.c:1109
+#: g10/g10.c:1123
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_arquivo]"
-#: g10/g10.c:1117
+#: g10/g10.c:1131
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_arquivo]"
-#: g10/g10.c:1130
+#: g10/g10.c:1144
msgid "--sign [filename]"
msgstr "--sign [nome_do_arquivo]"
-#: g10/g10.c:1143
+#: g10/g10.c:1157
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_arquivo]"
-#: g10/g10.c:1157
+#: g10/g10.c:1171
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_arquivo]"
-#: g10/g10.c:1174
+#: g10/g10.c:1188
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_arquivo]"
-#: g10/g10.c:1182
+#: g10/g10.c:1196
msgid "--sign-key user-id"
msgstr "--sign-key id-usu�rio"
-#: g10/g10.c:1190
+#: g10/g10.c:1204
msgid "--lsign-key user-id"
msgstr "--lsign-key id-usu�rio"
-#: g10/g10.c:1198
+#: g10/g10.c:1212
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-usu�rio [comandos]"
-#: g10/g10.c:1214
+#: g10/g10.c:1228
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key id-usu�rio"
-#: g10/g10.c:1217
+#: g10/g10.c:1231
msgid "--delete-key user-id"
msgstr "--delete-key id-usu�rio"
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:260 g10/g10.c:1268 g10/sign.c:393
#, c-format
msgid "can't open %s: %s\n"
msgstr "imposs�vel abrir %s: %s\n"
-#: g10/g10.c:1269
+#: g10/g10.c:1283
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
-#: g10/g10.c:1335
+#: g10/g10.c:1349
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
-#: g10/g10.c:1343
+#: g10/g10.c:1357
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
# "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/g10.c:1411
+#: g10/g10.c:1428
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de hash inv�lido `%s'\n"
-#: g10/g10.c:1492
+#: g10/g10.c:1509
msgid "[filename]"
msgstr "[nome_do_arquivo]"
-#: g10/g10.c:1496
+#: g10/g10.c:1513
msgid "Go ahead and type your message ...\n"
msgstr "V� em frente e digite sua mensagem ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1516 g10/verify.c:68 g10/verify.c:113
#, c-format
msgid "can't open `%s'\n"
msgstr "imposs�vel abrir `%s'\n"
-#: g10/g10.c:1669
+#: g10/g10.c:1689
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"o primeiro caractere de um nome de nota��o deve ser uma letra ou um "
"sublinhado\n"
-#: g10/g10.c:1675
+#: g10/g10.c:1695
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -894,12 +894,12 @@ msgstr ""
"um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
"terminar com '='\n"
-#: g10/g10.c:1681
+#: g10/g10.c:1701
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
"pontos em um nome de nota��o devem estar cercados por outros caracteres\n"
-#: g10/g10.c:1689
+#: g10/g10.c:1709
msgid "a notation value must not use any control characters\n"
msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
@@ -1709,238 +1709,248 @@ msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
msgid "[User id not found]"
msgstr "%s: usu�rio n�o encontrado\n"
-#: g10/import.c:181
+#: g10/import.c:182
#, c-format
msgid "skipping block of type %d\n"
msgstr "ignorando bloco do tipo %d\n"
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1740 g10/trustdb.c:1781
#, c-format
msgid "%lu keys so far processed\n"
msgstr "%lu chaves processadas at� agora\n"
-#: g10/import.c:193
+#: g10/import.c:194
#, c-format
msgid "error reading `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: g10/import.c:203
+#: g10/import.c:204
#, c-format
msgid "Total number processed: %lu\n"
msgstr "N�mero total processado: %lu\n"
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " novas subchaves: %lu\n"
+
+#: g10/import.c:209
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sem IDs de usu�rios: %lu\n"
-#: g10/import.c:207
+#: g10/import.c:211
#, c-format
msgid " imported: %lu"
msgstr " importados: %lu"
-#: g10/import.c:213
+#: g10/import.c:217
#, c-format
msgid " unchanged: %lu\n"
msgstr " n�o modificados: %lu\n"
-#: g10/import.c:215
+#: g10/import.c:219
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novos IDs de usu�rios: %lu\n"
-#: g10/import.c:217
+#: g10/import.c:221
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novas subchaves: %lu\n"
-#: g10/import.c:219
+#: g10/import.c:223
#, c-format
msgid " new signatures: %lu\n"
msgstr " novas assinaturas: %lu\n"
-#: g10/import.c:221
+#: g10/import.c:225
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novas revoga��es de chaves: %lu\n"
-#: g10/import.c:223
+#: g10/import.c:227
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chaves secretas lidas: %lu\n"
-#: g10/import.c:225
+#: g10/import.c:229
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " chaves secretas importadas: %lu\n"
-#: g10/import.c:227
+#: g10/import.c:231
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " chaves secretas n�o modificadas: %lu\n"
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "chave %08lX: sem ID de usu�rio\n"
-#: g10/import.c:400
+#: g10/import.c:405
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "chave %08lX: sem IDs de usu�rios v�lidos\n"
-#: g10/import.c:402
+#: g10/import.c:407
msgid "this may be caused by a missing self-signature\n"
msgstr "isto pode ser causado por falta de auto-assinatura\n"
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
+
+#: g10/import.c:431
msgid "no default public keyring\n"
msgstr "sem chaveiro p�blico padr�o\n"
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
#, c-format
msgid "writing to `%s'\n"
msgstr "escrevendo para `%s'\n"
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
#, c-format
msgid "can't lock keyring `%s': %s\n"
msgstr "imposs�vel bloquear chaveiro `%s': %s\n"
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: g10/import.c:434
+#: g10/import.c:446
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "chave %08lX: chave p�blica importada\n"
-#: g10/import.c:451
+#: g10/import.c:463
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
-#: g10/import.c:493
+#: g10/import.c:505
#, c-format
msgid "key %08lX: 1 new user ID\n"
msgstr "chave %8lX: 1 novo ID de usu�rio\n"
-#: g10/import.c:496
+#: g10/import.c:508
#, c-format
msgid "key %08lX: %d new user IDs\n"
msgstr "chave %08lX: %d novos IDs de usu�rios\n"
-#: g10/import.c:499
+#: g10/import.c:511
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "chave %08lX: 1 nova assinatura\n"
-#: g10/import.c:502
+#: g10/import.c:514
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "chave %08lX: %d novas assinaturas\n"
-#: g10/import.c:505
+#: g10/import.c:517
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "chave %08lX: 1 nova subchave\n"
-#: g10/import.c:508
+#: g10/import.c:520
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "chave %08lX: %d novas subchaves\n"
-#: g10/import.c:518
+#: g10/import.c:530
#, c-format
msgid "key %08lX: not changed\n"
msgstr "chave %08lX: n�o modificada\n"
-#: g10/import.c:601
+#: g10/import.c:613
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "chave %08lX: chave secreta importada\n"
#. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "chave %08lX: j� est� no chaveiro secreto\n"
-#: g10/import.c:610
+#: g10/import.c:622
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
-#: g10/import.c:639
+#: g10/import.c:651
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
"de revoga��o\n"
-#: g10/import.c:670
+#: g10/import.c:682
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
-#: g10/import.c:702
+#: g10/import.c:714
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "chave %08lX: certificado de revoga��o importado\n"
-#: g10/import.c:744
+#: g10/import.c:756
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "chave %08lX: nenhum ID de usu�rio para assinatura\n"
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
-#: g10/import.c:752
+#: g10/import.c:764
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "chave %08lX: auto-assinatura inv�lida\n"
-#: g10/import.c:767
+#: g10/import.c:779
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
-#: g10/import.c:776
+#: g10/import.c:788
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "chave %08lX: liga��o de subchave inv�lida\n"
-#: g10/import.c:803
+#: g10/import.c:815
#, c-format
msgid "key %08lX: accepted non self-signed user ID '"
msgstr "chave %08lX: aceito ID de usu�rio sem auto-assinatura '"
-#: g10/import.c:832
+#: g10/import.c:844
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "chave %08lX: ignorado ID de usu�rio '"
-#: g10/import.c:855
+#: g10/import.c:867
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "chave %08lX: subchave ignorada\n"
@@ -1949,32 +1959,32 @@ msgstr "chave %08lX: subchave ignorada\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
-#: g10/import.c:889
+#: g10/import.c:901
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
-#: g10/import.c:897
+#: g10/import.c:909
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorada\n"
-#: g10/import.c:997
+#: g10/import.c:1009
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
-#: g10/import.c:1048
+#: g10/import.c:1060
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "chave %08lX: certificado de revoga��o adicionado\n"
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "chave %08lX: nossa c�pia n�o tem auto-assinatura\n"
@@ -2554,8 +2564,18 @@ msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
msgid "no secret key\n"
msgstr "nenhuma chave secreta\n"
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "armadura inv�lida"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
#. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
#, fuzzy, c-format
msgid " [expires: %s]"
msgstr "A chave expira em %s\n"
@@ -2565,104 +2585,104 @@ msgstr "A chave expira em %s\n"
msgid "public key is %08lX\n"
msgstr "a chave p�blica � %08lX\n"
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
msgid "public key encrypted data: good DEK\n"
msgstr "dados criptografados com chave p�blica: DEK v�lido\n"
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "criptografado com chave %u-bit %s, ID %08lX, criada em %s\n"
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "criptografado com chave %s, ID %08lX\n"
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
msgid "no secret key for decryption available\n"
msgstr "nenhuma chave secreta para descriptografia dispon�vel\n"
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "descriptografia de chave p�blica falhou: %s\n"
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
msgid "decryption okay\n"
msgstr "descriptografia correta\n"
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
#, c-format
msgid "decryption failed: %s\n"
msgstr "descriptografia falhou: %s\n"
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome de arquivo original='%.*s'\n"
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
msgid "WARNING: invalid notation data found\n"
msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
msgid "Notation: "
msgstr "Nota��o: "
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
msgid "Policy: "
msgstr "Pol�tica: "
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
msgid "signature verification suppressed\n"
msgstr "verifica��o de assinatura suprimida\n"
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
#. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
msgid "BAD signature from \""
msgstr "Assinatura INCORRETA de \""
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
msgid "Good signature from \""
msgstr "Assinatura correta de \""
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
msgid " aka \""
msgstr " ou \""
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Imposs�vel verificar assinatura: %s\n"
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "assinatura isolada da classe 0x%02x\n"
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
msgid "old style (PGP 2.x) signature\n"
msgstr "formato de assinatura antigo (PGP2.x)\n"
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
msgid "invalid root packet detected in proc_tree()\n"
msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
@@ -2735,23 +2755,23 @@ msgstr "Digite a frase secreta: "
msgid "Repeat passphrase: "
msgstr "Repita a frase secreta: "
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "dados n�o salvos; use a op��o \"--output\" para salv�-los\n"
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
msgid "Detached signature.\n"
msgstr "Assinatura separada.\n"
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
msgid "Please enter name of data file: "
msgstr "Por favor digite o nome do arquivo de dados: "
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
msgid "reading stdin ...\n"
msgstr "lendo de \"stdin\" ...\n"
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "imposs�vel abrir dados assinados `%s'\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 8c6555bf0..12d704251 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-27 17:31+0200\n"
"PO-Revision-Date: 1999-09-09 20:28+0000\n"
"Last-Translator: Pedro Morais <[email protected]>\n"
"Language-Team: pt\n"
@@ -258,7 +258,7 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "voc� encontrou um bug ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
@@ -339,7 +339,7 @@ msgstr ""
"N�o h� bytes aleat�rios suficientes. Por favor, fa�a outro trabalho para\n"
"que o sistema possa recolher mais entropia! (S�o necess�rios mais %d bytes)\n"
-#: g10/g10.c:197
+#: g10/g10.c:203
msgid ""
"@Commands:\n"
" "
@@ -347,140 +347,140 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/g10.c:199
+#: g10/g10.c:205
msgid "|[file]|make a signature"
msgstr "|[ficheiro]|fazer uma assinatura"
-#: g10/g10.c:200
+#: g10/g10.c:206
msgid "|[file]|make a clear text signature"
msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
-#: g10/g10.c:201
+#: g10/g10.c:207
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
-#: g10/g10.c:202
+#: g10/g10.c:208
msgid "encrypt data"
msgstr "encriptar dados"
-#: g10/g10.c:203
+#: g10/g10.c:209
msgid "encryption only with symmetric cipher"
msgstr "encriptar apenas com cifra sim�trica"
-#: g10/g10.c:204
+#: g10/g10.c:210
msgid "store only"
msgstr "apenas armazenar"
-#: g10/g10.c:205
+#: g10/g10.c:211
msgid "decrypt data (default)"
msgstr "desencriptar dados (ac��o por omiss�o)"
-#: g10/g10.c:206
+#: g10/g10.c:212
msgid "verify a signature"
msgstr "verificar uma assinatura"
-#: g10/g10.c:208
+#: g10/g10.c:214
msgid "list keys"
msgstr "listar as chaves"
-#: g10/g10.c:210
+#: g10/g10.c:216
msgid "list keys and signatures"
msgstr "listar as chaves e as assinaturas"
-#: g10/g10.c:211
+#: g10/g10.c:217
msgid "check key signatures"
msgstr "verificar as assinaturas das chaves"
-#: g10/g10.c:212
+#: g10/g10.c:218
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impress�es digitais"
-#: g10/g10.c:213
+#: g10/g10.c:219
msgid "list secret keys"
msgstr "listar as chaves secretas"
-#: g10/g10.c:214
+#: g10/g10.c:220
msgid "generate a new key pair"
msgstr "gerar um novo par de chaves"
-#: g10/g10.c:215
+#: g10/g10.c:221
msgid "remove key from the public keyring"
msgstr "remover a chave do porta-chaves p�blico"
-#: g10/g10.c:217
+#: g10/g10.c:223
msgid "remove key from the secret keyring"
msgstr "remover a chave do porta-chaves secreto"
-#: g10/g10.c:218
+#: g10/g10.c:224
msgid "sign a key"
msgstr "assinar uma chave"
-#: g10/g10.c:219
+#: g10/g10.c:225
msgid "sign a key locally"
msgstr "assinar uma chave localmente"
-#: g10/g10.c:220
+#: g10/g10.c:226
msgid "sign or edit a key"
msgstr "assinar ou editar uma chave"
-#: g10/g10.c:221
+#: g10/g10.c:227
msgid "generate a revocation certificate"
msgstr "gerar um certificado de revoga��o"
-#: g10/g10.c:222
+#: g10/g10.c:228
msgid "export keys"
msgstr "exportar chaves"
-#: g10/g10.c:223
+#: g10/g10.c:229
msgid "export keys to a key server"
msgstr "exportar chaves para um servidor"
-#: g10/g10.c:224
+#: g10/g10.c:230
msgid "import keys from a key server"
msgstr "importar chaves de um servidor"
-#: g10/g10.c:228
+#: g10/g10.c:234
msgid "import/merge keys"
msgstr "importar/fundir chaves"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "list only the sequence of packets"
msgstr "listar apenas as sequ�ncias de pacotes"
# ownertrust ???
-#: g10/g10.c:232
+#: g10/g10.c:238
msgid "export the ownertrust values"
msgstr "exportar os valores de confian�a"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "import ownertrust values"
msgstr "importar os valores de confian�a"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "update the trust database"
msgstr "actualizar a base de dados de confian�a"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|[NAMES]|check the trust database"
msgstr "|[NOMES]|verificar a base de dados de confian�a"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "fix a corrupted trust database"
msgstr "consertar uma base de dados de confian�a"
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "De-Armor a file or stdin"
msgstr "retirar armadura de um ficheiro ou do \"stdin\""
-#: g10/g10.c:242
+#: g10/g10.c:248
msgid "En-Armor a file or stdin"
msgstr "criar armadura para um ficheiro ou \"stdin\""
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "|algo [files]|print message digests"
msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid ""
"@\n"
"Options:\n"
@@ -490,171 +490,171 @@ msgstr ""
"Op��es:\n"
" "
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "create ascii armored output"
msgstr "criar sa�da com armadura ascii"
-#: g10/g10.c:252
+#: g10/g10.c:258
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|encriptar para NOME"
-#: g10/g10.c:255
+#: g10/g10.c:261
msgid "|NAME|use NAME as default recipient"
msgstr "|NOME|usar NOME como destinat�rio padr�o"
-#: g10/g10.c:257
+#: g10/g10.c:263
msgid "use the default key as default recipient"
msgstr "usar a chave padr�o como destinat�rio padr�o"
-#: g10/g10.c:261
+#: g10/g10.c:267
msgid "use this user-id to sign or decrypt"
msgstr ""
"usar este identificador de utilizador para\n"
"assinar ou desencriptar"
-#: g10/g10.c:262
+#: g10/g10.c:268
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|estabelecer n�vel de compress�o N\n"
"(0 desactiva)"
-#: g10/g10.c:264
+#: g10/g10.c:270
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
-#: g10/g10.c:265
+#: g10/g10.c:271
msgid "use as output file"
msgstr "usar como ficheiro de sa�da"
-#: g10/g10.c:266
+#: g10/g10.c:272
msgid "verbose"
msgstr "detalhado"
-#: g10/g10.c:267
+#: g10/g10.c:273
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
-#: g10/g10.c:268
+#: g10/g10.c:274
msgid "don't use the terminal at all"
msgstr "nunca usar o terminal"
-#: g10/g10.c:269
+#: g10/g10.c:275
msgid "force v3 signatures"
msgstr "for�ar assinaturas v3"
-#: g10/g10.c:270
+#: g10/g10.c:276
msgid "always use a MDC for encryption"
msgstr "sempre usar um MDC para encriptar"
-#: g10/g10.c:271
+#: g10/g10.c:277
msgid "do not make any changes"
msgstr "n�o fazer altera��es"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:279
msgid "batch mode: never ask"
msgstr "modo n�o-interactivo: nunca perguntar"
-#: g10/g10.c:274
+#: g10/g10.c:280
msgid "assume yes on most questions"
msgstr "assumir sim para a maioria das perguntas"
-#: g10/g10.c:275
+#: g10/g10.c:281
msgid "assume no on most questions"
msgstr "assumir n�o para a maioria das perguntas"
-#: g10/g10.c:276
+#: g10/g10.c:282
msgid "add this keyring to the list of keyrings"
msgstr ""
"adicionar este porta-chaves\n"
"� lista de porta-chaves"
-#: g10/g10.c:277
+#: g10/g10.c:283
msgid "add this secret keyring to the list"
msgstr "adicionar este porta-chaves secreto � lista"
-#: g10/g10.c:278
+#: g10/g10.c:284
msgid "|NAME|use NAME as default secret key"
msgstr "|NOME|usar NOME como chave secreta por omiss�o"
-#: g10/g10.c:279
+#: g10/g10.c:285
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|ENDERE�O|usar este servidor para buscar chaves"
-#: g10/g10.c:280
+#: g10/g10.c:286
msgid "|NAME|set terminal charset to NAME"
msgstr ""
"|NOME|definir mapa de caracteres do terminal como\n"
"NOME"
-#: g10/g10.c:281
+#: g10/g10.c:287
msgid "read options from file"
msgstr "ler op��es do ficheiro"
-#: g10/g10.c:285
+#: g10/g10.c:291
msgid "|FD|write status info to this FD"
msgstr ""
"|DF|escrever informa��es de estado para o\n"
"descritor de ficheiro DF"
-#: g10/g10.c:290
+#: g10/g10.c:296
msgid "|FILE|load extension module FILE"
msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
-#: g10/g10.c:291
+#: g10/g10.c:297
msgid "emulate the mode described in RFC1991"
msgstr "emular o modo descrito no RFC1991"
-#: g10/g10.c:292
+#: g10/g10.c:298
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr ""
"configurar todas as op��es de pacote,\n"
"criptografia e \"digest\" para comportamento\n"
"OpenPGP"
-#: g10/g10.c:293
+#: g10/g10.c:299
msgid "|N|use passphrase mode N"
msgstr "|N|usar mode de frase secreta N"
-#: g10/g10.c:295
+#: g10/g10.c:301
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr ""
"|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
"para frases secretas"
-#: g10/g10.c:297
+#: g10/g10.c:303
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr ""
"|NOME|usar algoritmo de criptografia NOME para\n"
"frases secretas"
-#: g10/g10.c:298
+#: g10/g10.c:304
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NOME|usar algoritmo de criptografia NOME"
-#: g10/g10.c:299
+#: g10/g10.c:305
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
-#: g10/g10.c:300
+#: g10/g10.c:306
msgid "|N|use compress algorithm N"
msgstr "|N|usar algoritmo de compress�o N"
-#: g10/g10.c:301
+#: g10/g10.c:307
msgid "throw keyid field of encrypted packets"
msgstr "eliminar campo keyid dos pacotes encriptados"
-#: g10/g10.c:302
+#: g10/g10.c:308
msgid "|NAME=VALUE|use this notation data"
msgstr "|NOME=VALOR|usar estes dados de nota��o"
-#: g10/g10.c:305
+#: g10/g10.c:311
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/g10.c:308
+#: g10/g10.c:314
msgid ""
"@\n"
"Examples:\n"
@@ -674,15 +674,15 @@ msgstr ""
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impress�es digitais\n"
-#: g10/g10.c:403
+#: g10/g10.c:412
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor comunique bugs para <[email protected]>.\n"
-#: g10/g10.c:407
+#: g10/g10.c:416
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
-#: g10/g10.c:410
+#: g10/g10.c:419
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -692,7 +692,7 @@ msgstr ""
"assina, verifica, encripta ou desencripta\n"
"a opera��o por omiss�o depende dos dados de entrada\n"
-#: g10/g10.c:417
+#: g10/g10.c:426
msgid ""
"\n"
"Supported algorithms:\n"
@@ -700,185 +700,185 @@ msgstr ""
"\n"
"Algoritmos suportados:\n"
-#: g10/g10.c:496
+#: g10/g10.c:505
msgid "usage: gpg [options] "
msgstr "uso: gpg [op��es] "
-#: g10/g10.c:549
+#: g10/g10.c:558
msgid "conflicting commands\n"
msgstr "comandos em conflito\n"
-#: g10/g10.c:692
+#: g10/g10.c:701
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
-#: g10/g10.c:696
+#: g10/g10.c:705
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de op��es `%s': %s\n"
-#: g10/g10.c:703
+#: g10/g10.c:712
#, c-format
msgid "reading options from `%s'\n"
msgstr "a ler op��es de `%s'\n"
-#: g10/g10.c:893
+#: g10/g10.c:902
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:963 g10/g10.c:972
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s n�o � para uso normal!\n"
-#: g10/g10.c:951
+#: g10/g10.c:965
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n�o � permitido com %s!\n"
-#: g10/g10.c:954
+#: g10/g10.c:968
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n�o faz sentido com %s!\n"
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:987 g10/g10.c:999
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado n�o � v�lido\n"
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:993 g10/g10.c:1005
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
-#: g10/g10.c:995
+#: g10/g10.c:1009
msgid "the given policy URL is invalid\n"
msgstr "a URL de pol�tica dada � inv�lida\n"
-#: g10/g10.c:998
+#: g10/g10.c:1012
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
-#: g10/g10.c:1000
+#: g10/g10.c:1014
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
-#: g10/g10.c:1002
+#: g10/g10.c:1016
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
-#: g10/g10.c:1004
+#: g10/g10.c:1018
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth deve estar na entre 1 e 255\n"
-#: g10/g10.c:1007
+#: g10/g10.c:1021
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
-#: g10/g10.c:1011
+#: g10/g10.c:1025
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
-#: g10/g10.c:1096
+#: g10/g10.c:1110
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
-#: g10/g10.c:1102
+#: g10/g10.c:1116
msgid "--store [filename]"
msgstr "--store [nome_do_ficheiro]"
-#: g10/g10.c:1109
+#: g10/g10.c:1123
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_ficheiro]"
-#: g10/g10.c:1117
+#: g10/g10.c:1131
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_ficheiro]"
-#: g10/g10.c:1130
+#: g10/g10.c:1144
msgid "--sign [filename]"
msgstr "--sign [nome_do_ficheiro]"
-#: g10/g10.c:1143
+#: g10/g10.c:1157
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
-#: g10/g10.c:1157
+#: g10/g10.c:1171
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_ficheiro]"
-#: g10/g10.c:1174
+#: g10/g10.c:1188
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_ficheiro]"
-#: g10/g10.c:1182
+#: g10/g10.c:1196
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizador"
-#: g10/g10.c:1190
+#: g10/g10.c:1204
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizador"
-#: g10/g10.c:1198
+#: g10/g10.c:1212
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizador [comandos]"
-#: g10/g10.c:1214
+#: g10/g10.c:1228
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key id-utilizador"
-#: g10/g10.c:1217
+#: g10/g10.c:1231
msgid "--delete-key user-id"
msgstr "--delete-key id-utilizador"
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:260 g10/g10.c:1268 g10/sign.c:393
#, c-format
msgid "can't open %s: %s\n"
msgstr "imposs�vel abrir %s: %s\n"
-#: g10/g10.c:1269
+#: g10/g10.c:1283
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
-#: g10/g10.c:1335
+#: g10/g10.c:1349
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
-#: g10/g10.c:1343
+#: g10/g10.c:1357
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
# "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/g10.c:1411
+#: g10/g10.c:1428
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de hash inv�lido `%s'\n"
-#: g10/g10.c:1492
+#: g10/g10.c:1509
msgid "[filename]"
msgstr "[nome_do_ficheiro]"
-#: g10/g10.c:1496
+#: g10/g10.c:1513
msgid "Go ahead and type your message ...\n"
msgstr "Digite a sua mensagem ...\n"
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1516 g10/verify.c:68 g10/verify.c:113
#, c-format
msgid "can't open `%s'\n"
msgstr "imposs�vel abrir `%s'\n"
-#: g10/g10.c:1669
+#: g10/g10.c:1689
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"o primeiro caracter de um nome de nota��o deve ser uma letra ou um "
"sublinhado\n"
-#: g10/g10.c:1675
+#: g10/g10.c:1695
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -886,12 +886,12 @@ msgstr ""
"um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
"terminar com '='\n"
-#: g10/g10.c:1681
+#: g10/g10.c:1701
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
"pontos num nome de nota��o devem estar cercados por outros caracteres\n"
-#: g10/g10.c:1689
+#: g10/g10.c:1709
msgid "a notation value must not use any control characters\n"
msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
@@ -1703,238 +1703,248 @@ msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
msgid "[User id not found]"
msgstr "%s: utilizador n�o encontrado\n"
-#: g10/import.c:181
+#: g10/import.c:182
#, c-format
msgid "skipping block of type %d\n"
msgstr "ignorando bloco do tipo %d\n"
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1740 g10/trustdb.c:1781
#, c-format
msgid "%lu keys so far processed\n"
msgstr "%lu chaves processadas at� agora\n"
-#: g10/import.c:193
+#: g10/import.c:194
#, c-format
msgid "error reading `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: g10/import.c:203
+#: g10/import.c:204
#, c-format
msgid "Total number processed: %lu\n"
msgstr "N�mero total processado: %lu\n"
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " novas subchaves: %lu\n"
+
+#: g10/import.c:209
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sem IDs de utilizadores: %lu\n"
-#: g10/import.c:207
+#: g10/import.c:211
#, c-format
msgid " imported: %lu"
msgstr " importados: %lu"
-#: g10/import.c:213
+#: g10/import.c:217
#, c-format
msgid " unchanged: %lu\n"
msgstr " n�o modificados: %lu\n"
-#: g10/import.c:215
+#: g10/import.c:219
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novos IDs de utilizadores: %lu\n"
-#: g10/import.c:217
+#: g10/import.c:221
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novas subchaves: %lu\n"
-#: g10/import.c:219
+#: g10/import.c:223
#, c-format
msgid " new signatures: %lu\n"
msgstr " novas assinaturas: %lu\n"
-#: g10/import.c:221
+#: g10/import.c:225
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novas revoga��es de chaves: %lu\n"
-#: g10/import.c:223
+#: g10/import.c:227
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chaves secretas lidas: %lu\n"
-#: g10/import.c:225
+#: g10/import.c:229
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " chaves secretas importadas: %lu\n"
-#: g10/import.c:227
+#: g10/import.c:231
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " chaves secretas n�o modificadas: %lu\n"
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "chave %08lX: sem ID de utilizador\n"
-#: g10/import.c:400
+#: g10/import.c:405
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
-#: g10/import.c:402
+#: g10/import.c:407
msgid "this may be caused by a missing self-signature\n"
msgstr "isto pode ser causado por falta de auto-assinatura\n"
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
+
+#: g10/import.c:431
msgid "no default public keyring\n"
msgstr "sem porta-chaves p�blico padr�o\n"
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
#, c-format
msgid "writing to `%s'\n"
msgstr "a escrever para `%s'\n"
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
#, c-format
msgid "can't lock keyring `%s': %s\n"
msgstr "imposs�vel trancar porta-chaves `%s': %s\n"
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
-#: g10/import.c:434
+#: g10/import.c:446
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "chave %08lX: chave p�blica importada\n"
-#: g10/import.c:451
+#: g10/import.c:463
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
-#: g10/import.c:493
+#: g10/import.c:505
#, c-format
msgid "key %08lX: 1 new user ID\n"
msgstr "chave %8lX: 1 novo ID de utilizador\n"
-#: g10/import.c:496
+#: g10/import.c:508
#, c-format
msgid "key %08lX: %d new user IDs\n"
msgstr "chave %08lX: %d novos IDs de utilizadores\n"
-#: g10/import.c:499
+#: g10/import.c:511
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "chave %08lX: 1 nova assinatura\n"
-#: g10/import.c:502
+#: g10/import.c:514
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "chave %08lX: %d novas assinaturas\n"
-#: g10/import.c:505
+#: g10/import.c:517
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "chave %08lX: 1 nova subchave\n"
-#: g10/import.c:508
+#: g10/import.c:520
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "chave %08lX: %d novas subchaves\n"
-#: g10/import.c:518
+#: g10/import.c:530
#, c-format
msgid "key %08lX: not changed\n"
msgstr "chave %08lX: n�o modificada\n"
-#: g10/import.c:601
+#: g10/import.c:613
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "chave %08lX: chave secreta importada\n"
#. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
-#: g10/import.c:610
+#: g10/import.c:622
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
-#: g10/import.c:639
+#: g10/import.c:651
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
"de revoga��o\n"
-#: g10/import.c:670
+#: g10/import.c:682
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
-#: g10/import.c:702
+#: g10/import.c:714
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "chave %08lX: certificado de revoga��o importado\n"
-#: g10/import.c:744
+#: g10/import.c:756
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
-#: g10/import.c:752
+#: g10/import.c:764
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "chave %08lX: auto-assinatura inv�lida\n"
-#: g10/import.c:767
+#: g10/import.c:779
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
-#: g10/import.c:776
+#: g10/import.c:788
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "chave %08lX: liga��o de subchave inv�lida\n"
-#: g10/import.c:803
+#: g10/import.c:815
#, c-format
msgid "key %08lX: accepted non self-signed user ID '"
msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '"
-#: g10/import.c:832
+#: g10/import.c:844
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "chave %08lX: ignorado ID de utilizador '"
-#: g10/import.c:855
+#: g10/import.c:867
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "chave %08lX: subchave ignorada\n"
@@ -1943,32 +1953,32 @@ msgstr "chave %08lX: subchave ignorada\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
-#: g10/import.c:889
+#: g10/import.c:901
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
-#: g10/import.c:897
+#: g10/import.c:909
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
-#: g10/import.c:997
+#: g10/import.c:1009
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
-#: g10/import.c:1048
+#: g10/import.c:1060
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "chave %08lX: certificado de revoga��o adicionado\n"
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "chave %08lX: a nossa c�pia n�o tem auto-assinatura\n"
@@ -2548,8 +2558,18 @@ msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
msgid "no secret key\n"
msgstr "nenhuma chave secreta\n"
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "armadura inv�lida"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
#. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
#, fuzzy, c-format
msgid " [expires: %s]"
msgstr "A chave expira em %s\n"
@@ -2559,104 +2579,104 @@ msgstr "A chave expira em %s\n"
msgid "public key is %08lX\n"
msgstr "a chave p�blica � %08lX\n"
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
msgid "public key encrypted data: good DEK\n"
msgstr "dados encriptados com chave p�blica: DEK v�lido\n"
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "encriptado com chave %u-bit %s, ID %08lX, criada em %s\n"
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "encriptado com chave %s, ID %08lX\n"
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
msgid "no secret key for decryption available\n"
msgstr "nenhuma chave secreta para desencripta��o dispon�vel\n"
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "desencripta��o de chave p�blica falhou: %s\n"
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
msgid "decryption okay\n"
msgstr "desencripta��o correcta\n"
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "CUIDADO: a mensagem encriptada foi manipulada!\n"
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
#, c-format
msgid "decryption failed: %s\n"
msgstr "desencripta��o falhou: %s\n"
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome do ficheiro original='%.*s'\n"
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
msgid "WARNING: invalid notation data found\n"
msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
msgid "Notation: "
msgstr "Nota��o: "
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
msgid "Policy: "
msgstr "Pol�tica: "
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
msgid "signature verification suppressed\n"
msgstr "verifica��o de assinatura suprimida\n"
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
#. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
msgid "BAD signature from \""
msgstr "Assinatura INCORRECTA de \""
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
msgid "Good signature from \""
msgstr "Assinatura correta de \""
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
msgid " aka \""
msgstr " ou \""
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Imposs�vel verificar assinatura: %s\n"
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "assinatura de classe 0x%02x\n"
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
msgid "old style (PGP 2.x) signature\n"
msgstr "formato de assinatura antigo (PGP2.x)\n"
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
msgid "invalid root packet detected in proc_tree()\n"
msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
@@ -2729,23 +2749,23 @@ msgstr "Digite a frase secreta: "
msgid "Repeat passphrase: "
msgstr "Repita a frase secreta: "
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "dados n�o gravados; use a op��o \"--output\" para grav�-los\n"
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
msgid "Detached signature.\n"
msgstr "Assinatura desacoplada.\n"
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
msgid "Please enter name of data file: "
msgstr "Por favor digite o nome do ficheiro de dados: "
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
msgid "reading stdin ...\n"
msgstr "lendo do \"stdin\" ...\n"
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "imposs�vel abrir dados assinados `%s'\n"
diff --git a/po/ru.po b/po/ru.po
index 3e908ba90..66d46d966 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
# QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
msgid ""
msgstr ""
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-27 17:31+0200\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-01-26 22:08:36+0100\n"
"From: Gregory Steuck <[email protected]>\n"
@@ -313,7 +313,7 @@ msgstr "��-�� ... ������ � ��������� (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "�� ����� ������ � ��������� ... (%s:%d)\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1249
#, fuzzy, c-format
msgid "can't open `%s': %s\n"
msgstr "���������� ������� ���� `%s': %s\n"
@@ -395,7 +395,7 @@ msgstr ""
"������������ ��������� ������. ����������, ��������� ���-������, �����\n"
"�� ����� ������� �������������� ��������� �����! (����� ��� %d ����)\n"
-#: g10/g10.c:197
+#: g10/g10.c:203
msgid ""
"@Commands:\n"
" "
@@ -403,147 +403,147 @@ msgstr ""
"@�������:\n"
" "
-#: g10/g10.c:199
+#: g10/g10.c:205
#, fuzzy
msgid "|[file]|make a signature"
msgstr "|[����]|������� �������"
-#: g10/g10.c:200
+#: g10/g10.c:206
#, fuzzy
msgid "|[file]|make a clear text signature"
msgstr "|[����]|������� ��������� �������"
-#: g10/g10.c:201
+#: g10/g10.c:207
msgid "make a detached signature"
msgstr "������� ��������� �������"
-#: g10/g10.c:202
+#: g10/g10.c:208
msgid "encrypt data"
msgstr "����������� ������"
-#: g10/g10.c:203
+#: g10/g10.c:209
msgid "encryption only with symmetric cipher"
msgstr "����������� ������������ ����������"
-#: g10/g10.c:204
+#: g10/g10.c:210
msgid "store only"
msgstr "������ ���������"
-#: g10/g10.c:205
+#: g10/g10.c:211
msgid "decrypt data (default)"
msgstr "������������ ������ (�� ���������)"
-#: g10/g10.c:206
+#: g10/g10.c:212
msgid "verify a signature"
msgstr "��������� �������"
-#: g10/g10.c:208
+#: g10/g10.c:214
msgid "list keys"
msgstr "������ ������"
-#: g10/g10.c:210
+#: g10/g10.c:216
msgid "list keys and signatures"
msgstr "������ ������ � ��������"
-#: g10/g10.c:211
+#: g10/g10.c:217
msgid "check key signatures"
msgstr "��������� ������� �� �����"
-#: g10/g10.c:212
+#: g10/g10.c:218
msgid "list keys and fingerprints"
msgstr "������ ������ � �� \"����������� �������\""
-#: g10/g10.c:213
+#: g10/g10.c:219
msgid "list secret keys"
msgstr "������ ��������� ������"
-#: g10/g10.c:214
+#: g10/g10.c:220
msgid "generate a new key pair"
msgstr "������������� ����� ���� ������ (�������� � ���������)"
-#: g10/g10.c:215
+#: g10/g10.c:221
msgid "remove key from the public keyring"
msgstr "������� ���� �� ������"
-#: g10/g10.c:217
+#: g10/g10.c:223
#, fuzzy
msgid "remove key from the secret keyring"
msgstr "������� ���� �� ������"
-#: g10/g10.c:218
+#: g10/g10.c:224
#, fuzzy
msgid "sign a key"
msgstr "��������� ����"
-#: g10/g10.c:219
+#: g10/g10.c:225
#, fuzzy
msgid "sign a key locally"
msgstr "��������� ����"
-#: g10/g10.c:220
+#: g10/g10.c:226
msgid "sign or edit a key"
msgstr "��������� ��� ������������� ����"
-#: g10/g10.c:221
+#: g10/g10.c:227
msgid "generate a revocation certificate"
msgstr "������������� ���������� ����������"
-#: g10/g10.c:222
+#: g10/g10.c:228
msgid "export keys"
msgstr "�������������� �����"
-#: g10/g10.c:223
+#: g10/g10.c:229
msgid "export keys to a key server"
msgstr ""
-#: g10/g10.c:224
+#: g10/g10.c:230
msgid "import keys from a key server"
msgstr ""
-#: g10/g10.c:228
+#: g10/g10.c:234
msgid "import/merge keys"
msgstr "�������������/�������� �����"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "list only the sequence of packets"
msgstr "���������� ������ ������������������ �������"
-#: g10/g10.c:232
+#: g10/g10.c:238
#, fuzzy
msgid "export the ownertrust values"
msgstr "�������������� ��������� �������\n"
-#: g10/g10.c:234
+#: g10/g10.c:240
#, fuzzy
msgid "import ownertrust values"
msgstr "������������� ��������� �������\n"
-#: g10/g10.c:236
+#: g10/g10.c:242
#, fuzzy
msgid "update the trust database"
msgstr "|[�����]|��������� ���� ������ �������"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|[NAMES]|check the trust database"
msgstr "|[�����]|��������� ���� ������ �������"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "fix a corrupted trust database"
msgstr "��������� ����������� ���� ������ �������"
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "De-Armor a file or stdin"
msgstr "������������ stdin ��� ���� �� ASCII-�������������"
-#: g10/g10.c:242
+#: g10/g10.c:248
msgid "En-Armor a file or stdin"
msgstr "������������ stdin ��� ���� � ASCII-�������������"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|���������� �������� ���������"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid ""
"@\n"
"Options:\n"
@@ -553,164 +553,164 @@ msgstr ""
"���������:\n"
" "
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "create ascii armored output"
msgstr "����� � ASCII-�������������"
-#: g10/g10.c:252
+#: g10/g10.c:258
#, fuzzy
msgid "|NAME|encrypt for NAME"
msgstr "|���|������������ ������������ ���������� ���"
-#: g10/g10.c:255
+#: g10/g10.c:261
#, fuzzy
msgid "|NAME|use NAME as default recipient"
msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
-#: g10/g10.c:257
+#: g10/g10.c:263
msgid "use the default key as default recipient"
msgstr ""
-#: g10/g10.c:261
+#: g10/g10.c:267
msgid "use this user-id to sign or decrypt"
msgstr ""
"������������ ��������� ������������� ������������ ��� ������� ��� �����������"
-#: g10/g10.c:262
+#: g10/g10.c:268
msgid "|N|set compress level N (0 disables)"
msgstr "|N|���������� ������� ������ (0 - �� �������)"
-#: g10/g10.c:264
+#: g10/g10.c:270
msgid "use canonical text mode"
msgstr "������������ ������������ ��������� �����"
-#: g10/g10.c:265
+#: g10/g10.c:271
msgid "use as output file"
msgstr "������������ � �������� ��������� �����"
-#: g10/g10.c:266
+#: g10/g10.c:272
msgid "verbose"
msgstr "������������"
-#: g10/g10.c:267
+#: g10/g10.c:273
msgid "be somewhat more quiet"
msgstr ""
-#: g10/g10.c:268
+#: g10/g10.c:274
msgid "don't use the terminal at all"
msgstr ""
-#: g10/g10.c:269
+#: g10/g10.c:275
#, fuzzy
msgid "force v3 signatures"
msgstr "��������� ������� �� �����"
-#: g10/g10.c:270
+#: g10/g10.c:276
#, fuzzy
msgid "always use a MDC for encryption"
msgstr "������������ ��������� ������������� ������������ ��� ����������"
-#: g10/g10.c:271
+#: g10/g10.c:277
msgid "do not make any changes"
msgstr "Keine wirklichen �nderungen durchf�hren"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:279
msgid "batch mode: never ask"
msgstr "�������� �����: ������ �� ����������"
-#: g10/g10.c:274
+#: g10/g10.c:280
msgid "assume yes on most questions"
msgstr "�������� \"��\" �� ����������� ��������"
-#: g10/g10.c:275
+#: g10/g10.c:281
msgid "assume no on most questions"
msgstr "�������� \"���\" �� ����������� ��������"
-#: g10/g10.c:276
+#: g10/g10.c:282
msgid "add this keyring to the list of keyrings"
msgstr "�������� ��� ������ � ������ ������ ������"
-#: g10/g10.c:277
+#: g10/g10.c:283
msgid "add this secret keyring to the list"
msgstr "�������� ��� ��������� ������ � ������ ������ ������"
-#: g10/g10.c:278
+#: g10/g10.c:284
msgid "|NAME|use NAME as default secret key"
msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
-#: g10/g10.c:279
+#: g10/g10.c:285
msgid "|HOST|use this keyserver to lookup keys"
msgstr ""
-#: g10/g10.c:280
+#: g10/g10.c:286
#, fuzzy
msgid "|NAME|set terminal charset to NAME"
msgstr "|���|������������ ������������ ���������� ���"
-#: g10/g10.c:281
+#: g10/g10.c:287
msgid "read options from file"
msgstr "������ ��������� �� �����"
-#: g10/g10.c:285
+#: g10/g10.c:291
msgid "|FD|write status info to this FD"
msgstr "|FD| ���������� ���������� � ��������� � ���������� (FD)"
-#: g10/g10.c:290
+#: g10/g10.c:296
#, fuzzy
msgid "|FILE|load extension module FILE"
msgstr "|����|��������� ���� � ������������ ��������"
-#: g10/g10.c:291
+#: g10/g10.c:297
msgid "emulate the mode described in RFC1991"
msgstr "����������� ����� ��������� � RFC1991"
-#: g10/g10.c:292
+#: g10/g10.c:298
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr ""
-#: g10/g10.c:293
+#: g10/g10.c:299
#, fuzzy
msgid "|N|use passphrase mode N"
msgstr "|N|������������ �������� ����� ������ N\n"
-#: g10/g10.c:295
+#: g10/g10.c:301
#, fuzzy
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|���|������������ ���-�������� ��� ��� �������� ����"
-#: g10/g10.c:297
+#: g10/g10.c:303
#, fuzzy
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|���|������������ ������������ ���������� ��� ��� �������� ����"
-#: g10/g10.c:298
+#: g10/g10.c:304
msgid "|NAME|use cipher algorithm NAME"
msgstr "|���|������������ ������������ ���������� ���"
-#: g10/g10.c:299
+#: g10/g10.c:305
msgid "|NAME|use message digest algorithm NAME"
msgstr "|���|������������ ���-�������� ���"
-#: g10/g10.c:300
+#: g10/g10.c:306
msgid "|N|use compress algorithm N"
msgstr "|N|������������ �������� ������ N"
-#: g10/g10.c:301
+#: g10/g10.c:307
msgid "throw keyid field of encrypted packets"
msgstr "����������� ���� keyid � ������������� �������"
-#: g10/g10.c:302
+#: g10/g10.c:308
msgid "|NAME=VALUE|use this notation data"
msgstr ""
-#: g10/g10.c:305
+#: g10/g10.c:311
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/g10.c:308
+#: g10/g10.c:314
#, fuzzy
msgid ""
"@\n"
@@ -731,17 +731,17 @@ msgstr ""
" --list-keys [names] �������� ������ ������\n"
" --fingerprint [names] �������� \"��������� �������\" ������\n"
-#: g10/g10.c:403
+#: g10/g10.c:412
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"����������, ����������� ��������� �� ������� �� ������ "
-#: g10/g10.c:407
+#: g10/g10.c:416
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�������������: gpg [���������] [�����] (-h ��� ������)"
-#: g10/g10.c:410
+#: g10/g10.c:419
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -751,7 +751,7 @@ msgstr ""
"�����������, ��������� �������, ������� ��� ��������������\n"
"����� ������ ������� �� ������� ������\n"
-#: g10/g10.c:417
+#: g10/g10.c:426
msgid ""
"\n"
"Supported algorithms:\n"
@@ -759,198 +759,198 @@ msgstr ""
"\n"
"�������������� ���������:\n"
-#: g10/g10.c:496
+#: g10/g10.c:505
msgid "usage: gpg [options] "
msgstr "�������������: gpg [���������] "
-#: g10/g10.c:549
+#: g10/g10.c:558
msgid "conflicting commands\n"
msgstr "Widerspr�chliche Kommandos\n"
-#: g10/g10.c:692
+#: g10/g10.c:701
#, fuzzy, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "���������: ���� ���������� �� ��������� `%s' �����������\n"
-#: g10/g10.c:696
+#: g10/g10.c:705
#, c-format
msgid "option file `%s': %s\n"
msgstr "���� ���������� `%s': %s\n"
-#: g10/g10.c:703
+#: g10/g10.c:712
#, c-format
msgid "reading options from `%s'\n"
msgstr "�������� ��������� �� `%s'\n"
-#: g10/g10.c:893
+#: g10/g10.c:902
#, fuzzy, c-format
msgid "%s is not a valid character set\n"
msgstr "������������ ������ � �����������.\n"
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:963 g10/g10.c:972
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr ""
-#: g10/g10.c:951
+#: g10/g10.c:965
#, c-format
msgid "%s not allowed with %s!\n"
msgstr ""
-#: g10/g10.c:954
+#: g10/g10.c:968
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr ""
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:987 g10/g10.c:999
msgid "selected cipher algorithm is invalid\n"
msgstr "������ ������������ �������� ����������\n"
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:993 g10/g10.c:1005
msgid "selected digest algorithm is invalid\n"
msgstr "������ ������������ ��������-��������\n"
-#: g10/g10.c:995
+#: g10/g10.c:1009
msgid "the given policy URL is invalid\n"
msgstr ""
-#: g10/g10.c:998
+#: g10/g10.c:1012
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "�������� �������� ����� ����� �������� �� %d �� %d\n"
-#: g10/g10.c:1000
+#: g10/g10.c:1014
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ������ ���� ������ 0\n"
-#: g10/g10.c:1002
+#: g10/g10.c:1016
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ������ ���� ������ 1\n"
-#: g10/g10.c:1004
+#: g10/g10.c:1018
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr ""
-#: g10/g10.c:1007
+#: g10/g10.c:1021
#, fuzzy
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "���������: ������� S2K ����� (0) ����� �� �������������\n"
-#: g10/g10.c:1011
+#: g10/g10.c:1025
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "������������ ����� S2K: ������ ���� 0, 1 ��� 3\n"
-#: g10/g10.c:1096
+#: g10/g10.c:1110
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "������ ������������� ���� ������ �������: %s\n"
-#: g10/g10.c:1102
+#: g10/g10.c:1116
msgid "--store [filename]"
msgstr "--store [��� �����]"
-#: g10/g10.c:1109
+#: g10/g10.c:1123
msgid "--symmetric [filename]"
msgstr "--symmetric [��� �����]"
-#: g10/g10.c:1117
+#: g10/g10.c:1131
msgid "--encrypt [filename]"
msgstr "--encrypt [��� �����]"
-#: g10/g10.c:1130
+#: g10/g10.c:1144
msgid "--sign [filename]"
msgstr "--sign [��� �����]"
-#: g10/g10.c:1143
+#: g10/g10.c:1157
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [��� �����]"
-#: g10/g10.c:1157
+#: g10/g10.c:1171
msgid "--clearsign [filename]"
msgstr "--clearsign [��� �����]"
-#: g10/g10.c:1174
+#: g10/g10.c:1188
msgid "--decrypt [filename]"
msgstr "--decrypt [��� �����]"
-#: g10/g10.c:1182
+#: g10/g10.c:1196
msgid "--sign-key user-id"
msgstr ""
-#: g10/g10.c:1190
+#: g10/g10.c:1204
#, fuzzy
msgid "--lsign-key user-id"
msgstr "--delete-key ���-������������"
-#: g10/g10.c:1198
+#: g10/g10.c:1212
#, fuzzy
msgid "--edit-key user-id [commands]"
msgstr "--edit-key ���-������������"
-#: g10/g10.c:1214
+#: g10/g10.c:1228
#, fuzzy
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key ���-������������"
-#: g10/g10.c:1217
+#: g10/g10.c:1231
#, fuzzy
msgid "--delete-key user-id"
msgstr "--delete-key ���-������������"
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:260 g10/g10.c:1268 g10/sign.c:393
#, c-format
msgid "can't open %s: %s\n"
msgstr "���������� ������� ���� `%s': %s\n"
-#: g10/g10.c:1269
+#: g10/g10.c:1283
#, fuzzy
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [������������� ������������] [������ ������]"
-#: g10/g10.c:1335
+#: g10/g10.c:1349
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "������ �������������: %s\n"
-#: g10/g10.c:1343
+#: g10/g10.c:1357
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "������ �����������: %s\n"
-#: g10/g10.c:1411
+#: g10/g10.c:1428
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "������������ ���-�������� `%s'\n"
-#: g10/g10.c:1492
+#: g10/g10.c:1509
msgid "[filename]"
msgstr "[��� �����]"
-#: g10/g10.c:1496
+#: g10/g10.c:1513
msgid "Go ahead and type your message ...\n"
msgstr ""
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1516 g10/verify.c:68 g10/verify.c:113
#, c-format
msgid "can't open `%s'\n"
msgstr "���������� ������� ���� `%s'\n"
-#: g10/g10.c:1669
+#: g10/g10.c:1689
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
-#: g10/g10.c:1675
+#: g10/g10.c:1695
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
msgstr ""
-#: g10/g10.c:1681
+#: g10/g10.c:1701
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr ""
-#: g10/g10.c:1689
+#: g10/g10.c:1709
msgid "a notation value must not use any control characters\n"
msgstr ""
@@ -1773,238 +1773,248 @@ msgstr "������������ �������������� ���� %09lX ������ ��������� %08lX%\n"
msgid "[User id not found]"
msgstr "%s: ������������ �� ������\n"
-#: g10/import.c:181
+#: g10/import.c:182
#, c-format
msgid "skipping block of type %d\n"
msgstr "���������� ���� ���� %d\n"
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1740 g10/trustdb.c:1781
#, c-format
msgid "%lu keys so far processed\n"
msgstr ""
-#: g10/import.c:193
+#: g10/import.c:194
#, fuzzy, c-format
msgid "error reading `%s': %s\n"
msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
-#: g10/import.c:203
+#: g10/import.c:204
#, c-format
msgid "Total number processed: %lu\n"
msgstr ""
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid " skipped new keys: %lu\n"
+msgstr "���� %08lX: %d ����� ��������\n"
+
+#: g10/import.c:209
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr ""
-#: g10/import.c:207
+#: g10/import.c:211
#, c-format
msgid " imported: %lu"
msgstr ""
-#: g10/import.c:213
+#: g10/import.c:217
#, c-format
msgid " unchanged: %lu\n"
msgstr ""
-#: g10/import.c:215
+#: g10/import.c:219
#, c-format
msgid " new user IDs: %lu\n"
msgstr ""
-#: g10/import.c:217
+#: g10/import.c:221
#, c-format
msgid " new subkeys: %lu\n"
msgstr ""
-#: g10/import.c:219
+#: g10/import.c:223
#, fuzzy, c-format
msgid " new signatures: %lu\n"
msgstr "���� %08lX: %d ����� ��������\n"
-#: g10/import.c:221
+#: g10/import.c:225
#, c-format
msgid " new key revocations: %lu\n"
msgstr ""
-#: g10/import.c:223
+#: g10/import.c:227
#, c-format
msgid " secret keys read: %lu\n"
msgstr ""
-#: g10/import.c:225
+#: g10/import.c:229
#, fuzzy, c-format
msgid " secret keys imported: %lu\n"
msgstr "���� %08lX: ��������� ���� ������������\n"
-#: g10/import.c:227
+#: g10/import.c:231
#, fuzzy, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "����������� ������������ ��������� ����"
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
#, fuzzy, c-format
msgid "key %08lX: no user ID\n"
msgstr "���� %08lX: ��� �������������� ������������\n"
-#: g10/import.c:400
+#: g10/import.c:405
#, fuzzy, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
-#: g10/import.c:402
+#: g10/import.c:407
msgid "this may be caused by a missing self-signature\n"
msgstr "��� ����� ���� ������� ����������� ����-�������\n"
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "���� %08lX: �������� ���� �� ������: %s\n"
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
+
+#: g10/import.c:431
msgid "no default public keyring\n"
msgstr "��� ������ �������� ������ �� ���������\n"
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
#, c-format
msgid "writing to `%s'\n"
msgstr "������������ � `%s'\n"
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
#, fuzzy, c-format
msgid "can't lock keyring `%s': %s\n"
msgstr "���������� ������������� ������ �������� ������: %s\n"
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
#, fuzzy, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
-#: g10/import.c:434
+#: g10/import.c:446
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "���� %08lX: �������� ���� ������������\n"
-#: g10/import.c:451
+#: g10/import.c:463
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "���� %08lX: �� ��������� � ����� ������\n"
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "���� %08lX: ���������� ���������� original keyblock: %s\n"
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "���� %08lX: ���������� ��������� original keyblock: %s\n"
-#: g10/import.c:493
+#: g10/import.c:505
#, fuzzy, c-format
msgid "key %08lX: 1 new user ID\n"
msgstr "���� %08lX: 1 ����� ������������� ������������\n"
-#: g10/import.c:496
+#: g10/import.c:508
#, fuzzy, c-format
msgid "key %08lX: %d new user IDs\n"
msgstr "���� %08lX: %d ����� ��������������� �������������\n"
-#: g10/import.c:499
+#: g10/import.c:511
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "���� %08lX: 1 ����� �������\n"
-#: g10/import.c:502
+#: g10/import.c:514
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "���� %08lX: %d ����� ��������\n"
-#: g10/import.c:505
+#: g10/import.c:517
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "���� %08lX: 1 ����� ���-����\n"
-#: g10/import.c:508
+#: g10/import.c:520
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "���� %08lX: %d ����� ���-������\n"
-#: g10/import.c:518
+#: g10/import.c:530
#, c-format
msgid "key %08lX: not changed\n"
msgstr "���� %08lX: �� �������\n"
-#: g10/import.c:601
+#: g10/import.c:613
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "���� %08lX: ��������� ���� ������������\n"
#. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "���� %08lX: ��� �� ������ ��������� ������\n"
-#: g10/import.c:610
+#: g10/import.c:622
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "���� %08lX: ��������� ���� �� ������: %s\n"
-#: g10/import.c:639
+#: g10/import.c:651
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"���� %08lX: ��� ��������� ����� - ���������� ��������� ���������� "
"����������\n"
-#: g10/import.c:670
+#: g10/import.c:682
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "���� %08lX: ������������ ���������� ����������: %s - ���������\n"
-#: g10/import.c:702
+#: g10/import.c:714
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "���� %08lX: ���������� ���������� ������������\n"
-#: g10/import.c:744
+#: g10/import.c:756
#, fuzzy, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "���� %08lX: ���������������� �������� ��������� �����\n"
-#: g10/import.c:752
+#: g10/import.c:764
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "���� %08lX: ������������ ����-�������\n"
-#: g10/import.c:767
+#: g10/import.c:779
#, fuzzy, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "���� %08lX: ��� �������������� ������������\n"
-#: g10/import.c:776
+#: g10/import.c:788
#, fuzzy, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
-#: g10/import.c:803
+#: g10/import.c:815
#, fuzzy, c-format
msgid "key %08lX: accepted non self-signed user ID '"
msgstr "���� %08lX: �������� ������������� ������������ '"
-#: g10/import.c:832
+#: g10/import.c:844
#, fuzzy, c-format
msgid "key %08lX: skipped user ID '"
msgstr "���� %08lX: �������� ������������� ������������ '"
-#: g10/import.c:855
+#: g10/import.c:867
#, fuzzy, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "���� %08lX: 1 ����� ���-����\n"
@@ -2013,32 +2023,32 @@ msgstr "���� %08lX: 1 ����� ���-����\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
#, fuzzy, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "���� %08lX: ���������� ���������� � ������������ ����� - ��������\n"
-#: g10/import.c:889
+#: g10/import.c:901
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "���� %08lX: ���������� ���������� � ������������ ����� - ��������\n"
-#: g10/import.c:897
+#: g10/import.c:909
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "���� %08lX: ������������ ���������� ����������: %s - ��������\n"
-#: g10/import.c:997
+#: g10/import.c:1009
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr ""
-#: g10/import.c:1048
+#: g10/import.c:1060
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "���� %08lX: ���������� ���������� ��������\n"
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "���� %08lX: ���� ����� �� ����� ����-�������\n"
@@ -2663,8 +2673,18 @@ msgstr "������������� ���������� ����������"
msgid "no secret key\n"
msgstr "������ ��������� ����"
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "������������ ASCII-���������"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "����"
+
#. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
#, fuzzy, c-format
msgid " [expires: %s]"
msgstr "���� ��������� �� %s\n"
@@ -2674,109 +2694,109 @@ msgstr "���� ��������� �� %s\n"
msgid "public key is %08lX\n"
msgstr "�������� ���� �� ������"
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
#, fuzzy
msgid "public key encrypted data: good DEK\n"
msgstr "����������� �������� ������ �� ������� %s\n"
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
#, fuzzy, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "(%u-��� %s ����, ID %08lX, ������ %s)\n"
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
#, fuzzy, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "������� ������� %.*s, ��������� %s ���� %08lX\n"
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
#, fuzzy
msgid "no secret key for decryption available\n"
msgstr "��������� ���� �� ����������"
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "����������� �������� ������ �� ������� %s\n"
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
#, fuzzy
msgid "decryption okay\n"
msgstr "����������� �� �������: %s\n"
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr ""
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
#, c-format
msgid "decryption failed: %s\n"
msgstr "����������� �� �������: %s\n"
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
#, fuzzy
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "���������: ����������� �������� \"������-���-�����-����\"\n"
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
#, c-format
msgid "original file name='%.*s'\n"
msgstr ""
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
#, fuzzy
msgid "WARNING: invalid notation data found\n"
msgstr "�� ������� ���������� RFC1991 ��� OpenPGP ������.\n"
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
msgid "Notation: "
msgstr ""
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
msgid "Policy: "
msgstr ""
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
msgid "signature verification suppressed\n"
msgstr ""
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "������� ������� %.*s, ��������� %s ���� %08lX\n"
#. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
msgid "BAD signature from \""
msgstr "������ ������� �� \""
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
msgid "Good signature from \""
msgstr "������� ������� �� \""
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
msgid " aka \""
msgstr ""
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
#, c-format
msgid "Can't check signature: %s\n"
msgstr "���������� ��������� �������: %s\n"
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
#, fuzzy, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "������� ������������ ����"
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
msgid "old style (PGP 2.x) signature\n"
msgstr ""
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
msgid "invalid root packet detected in proc_tree()\n"
msgstr ""
@@ -2850,24 +2870,24 @@ msgstr "������� �������� �����: %s\n"
msgid "Repeat passphrase: "
msgstr "��������� �������� �����: %s\n"
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "������ �� ���� ���������; �������������� --\"output\" ��� ����������\n"
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
#, fuzzy
msgid "Detached signature.\n"
msgstr "%d ������ ��������\n"
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
msgid "Please enter name of data file: "
msgstr "����������, ������� ��� ����� ������: "
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
msgid "reading stdin ...\n"
msgstr ""
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "���������� ������� ����������� ������ `%s' .\n"
diff --git a/po/sv.po b/po/sv.po
index e5d6e248e..82e487675 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-27 17:31+0200\n"
"PO-Revision-Date: 2000-04-23 16:43+02:00\n"
"Last-Translator: Daniel Resare <[email protected]>\n"
"Language-Team: Swedish <[email protected]>\n"
@@ -268,7 +268,7 @@ msgstr "... detta �r en bugg (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "du har hittat en bugg ... (%s:%d)\\n\n"
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1249
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan inte �ppna \"%s\": %s\n"
@@ -351,7 +351,7 @@ msgstr ""
"en stund f�r att ge operativsystemet en chans att samla mer entropi!\n"
"(Beh�ver %d fler byte)\n"
-#: g10/g10.c:197
+#: g10/g10.c:203
msgid ""
"@Commands:\n"
" "
@@ -359,139 +359,139 @@ msgstr ""
"@Kommandon:\n"
" "
-#: g10/g10.c:199
+#: g10/g10.c:205
msgid "|[file]|make a signature"
msgstr "|[fil]|skapa en signatur"
-#: g10/g10.c:200
+#: g10/g10.c:206
msgid "|[file]|make a clear text signature"
msgstr "|[fil]|skapa en klartext-signatur"
-#: g10/g10.c:201
+#: g10/g10.c:207
msgid "make a detached signature"
msgstr "skapa en signatur i en separat fil"
-#: g10/g10.c:202
+#: g10/g10.c:208
msgid "encrypt data"
msgstr "kryptera data"
-#: g10/g10.c:203
+#: g10/g10.c:209
msgid "encryption only with symmetric cipher"
msgstr "endast kryptering med symmetriskt chiffer"
-#: g10/g10.c:204
+#: g10/g10.c:210
msgid "store only"
msgstr "endast lagring"
-#: g10/g10.c:205
+#: g10/g10.c:211
msgid "decrypt data (default)"
msgstr "dekryptera data (normall�ge)"
-#: g10/g10.c:206
+#: g10/g10.c:212
msgid "verify a signature"
msgstr "verifiera en signatur"
-#: g10/g10.c:208
+#: g10/g10.c:214
msgid "list keys"
msgstr "r�kna upp nycklar"
-#: g10/g10.c:210
+#: g10/g10.c:216
msgid "list keys and signatures"
msgstr "r�kna upp nycklar och signaturer"
-#: g10/g10.c:211
+#: g10/g10.c:217
msgid "check key signatures"
msgstr "verifiera nyckelsignaturer"
-#: g10/g10.c:212
+#: g10/g10.c:218
msgid "list keys and fingerprints"
msgstr "r�kna upp nycklar och fingeravtryck"
-#: g10/g10.c:213
+#: g10/g10.c:219
msgid "list secret keys"
msgstr "r�kna upp hemliga nycklar"
-#: g10/g10.c:214
+#: g10/g10.c:220
msgid "generate a new key pair"
msgstr "generera ett nytt nyckelpar"
-#: g10/g10.c:215
+#: g10/g10.c:221
msgid "remove key from the public keyring"
msgstr "ta bort en nyckel fr�n den publika nyckelringen"
-#: g10/g10.c:217
+#: g10/g10.c:223
msgid "remove key from the secret keyring"
msgstr "ta bort en nyckel fr�n den hemliga nyckelringen"
-#: g10/g10.c:218
+#: g10/g10.c:224
msgid "sign a key"
msgstr "signera en nyckel"
-#: g10/g10.c:219
+#: g10/g10.c:225
msgid "sign a key locally"
msgstr "signera en nyckel lokalt"
-#: g10/g10.c:220
+#: g10/g10.c:226
msgid "sign or edit a key"
msgstr "signera eller redigera en nyckel"
-#: g10/g10.c:221
+#: g10/g10.c:227
msgid "generate a revocation certificate"
msgstr "generera ett �terkallelesecertifikat"
-#: g10/g10.c:222
+#: g10/g10.c:228
msgid "export keys"
msgstr "exportera nycklar"
-#: g10/g10.c:223
+#: g10/g10.c:229
msgid "export keys to a key server"
msgstr "exportera nycklar till en nyckelserver"
-#: g10/g10.c:224
+#: g10/g10.c:230
msgid "import keys from a key server"
msgstr "importera nycklar fr�n en nyckelserver"
-#: g10/g10.c:228
+#: g10/g10.c:234
msgid "import/merge keys"
msgstr "importera/sl� ihop nycklar"
-#: g10/g10.c:230
+#: g10/g10.c:236
msgid "list only the sequence of packets"
msgstr "skriv endast ut paketsekvensen"
-#: g10/g10.c:232
+#: g10/g10.c:238
msgid "export the ownertrust values"
msgstr "exportera de v�rden som representerar �gartillit"
-#: g10/g10.c:234
+#: g10/g10.c:240
msgid "import ownertrust values"
msgstr "importera v�rden som representerar �gartillit"
-#: g10/g10.c:236
+#: g10/g10.c:242
msgid "update the trust database"
msgstr "uppdatera tillitsdatabasen"
-#: g10/g10.c:238
+#: g10/g10.c:244
msgid "|[NAMES]|check the trust database"
msgstr "|[NAMN]|kontrollera tillitsdatabasen"
-#: g10/g10.c:239
+#: g10/g10.c:245
msgid "fix a corrupted trust database"
msgstr "reparera en korrupt tillitsdatabas"
-#: g10/g10.c:240
+#: g10/g10.c:246
msgid "De-Armor a file or stdin"
msgstr "Skala av en fil eller standard in"
-#: g10/g10.c:242
+#: g10/g10.c:248
msgid "En-Armor a file or stdin"
msgstr "Skapa ett skal f�r en fil eller standard in"
-#: g10/g10.c:244
+#: g10/g10.c:250
msgid "|algo [files]|print message digests"
msgstr "|algo [filer]|skriv ut kontrollsummor"
-#: g10/g10.c:248
+#: g10/g10.c:254
msgid ""
"@\n"
"Options:\n"
@@ -501,148 +501,148 @@ msgstr ""
"Flaggor:\n"
" "
-#: g10/g10.c:250
+#: g10/g10.c:256
msgid "create ascii armored output"
msgstr "skapa utdata med ett ascii-skal"
-#: g10/g10.c:252
+#: g10/g10.c:258
msgid "|NAME|encrypt for NAME"
msgstr "|NAMN|kryptera f�r NAMN"
-#: g10/g10.c:255
+#: g10/g10.c:261
msgid "|NAME|use NAME as default recipient"
msgstr "|NAMN|anv�nd NAMN som standardv�rdet f�r mottagare"
-#: g10/g10.c:257
+#: g10/g10.c:263
msgid "use the default key as default recipient"
msgstr "anv�nd standardnyckeln som standardmottagare"
-#: g10/g10.c:261
+#: g10/g10.c:267
msgid "use this user-id to sign or decrypt"
msgstr "anv�nd denna anv�ndaridentitet f�r att signera eller dekryptera"
-#: g10/g10.c:262
+#: g10/g10.c:268
msgid "|N|set compress level N (0 disables)"
msgstr "|N|s�tt kompressionsniv�n till N (0 f�r att sl� av kompression)"
-#: g10/g10.c:264
+#: g10/g10.c:270
msgid "use canonical text mode"
msgstr "anv�nd \"ursprunglig text\"-l�get"
-#: g10/g10.c:265
+#: g10/g10.c:271
msgid "use as output file"
msgstr "anv�nd som fil f�r utdata"
-#: g10/g10.c:266
+#: g10/g10.c:272
msgid "verbose"
msgstr "utf�rlig"
-#: g10/g10.c:267
+#: g10/g10.c:273
msgid "be somewhat more quiet"
msgstr "var n�got tystare"
-#: g10/g10.c:268
+#: g10/g10.c:274
msgid "don't use the terminal at all"
msgstr "anv�nd inte terminalen alls"
-#: g10/g10.c:269
+#: g10/g10.c:275
msgid "force v3 signatures"
msgstr "anv�nd v3-signaturer"
-#: g10/g10.c:270
+#: g10/g10.c:276
msgid "always use a MDC for encryption"
msgstr "anv�nd alltid en MDC f�r kryptering"
-#: g10/g10.c:271
+#: g10/g10.c:277
msgid "do not make any changes"
msgstr "g�r inga �ndringar"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/g10.c:279
msgid "batch mode: never ask"
msgstr "batch-l�ge: fr�ga aldrig"
-#: g10/g10.c:274
+#: g10/g10.c:280
msgid "assume yes on most questions"
msgstr "anta att svaret �r ja p� de flesta fr�gor"
-#: g10/g10.c:275
+#: g10/g10.c:281
msgid "assume no on most questions"
msgstr "anta att svaret �r nej p� de flesta fr�gor"
-#: g10/g10.c:276
+#: g10/g10.c:282
msgid "add this keyring to the list of keyrings"
msgstr "l�gg till denna nyckelring till listan av nyckelringar"
-#: g10/g10.c:277
+#: g10/g10.c:283
msgid "add this secret keyring to the list"
msgstr "l�gg till denna hemliga nyckelring till listan"
-#: g10/g10.c:278
+#: g10/g10.c:284
msgid "|NAME|use NAME as default secret key"
msgstr "|NAMN|anv�nd NAMN som f�rvald hemlig nyckel"
-#: g10/g10.c:279
+#: g10/g10.c:285
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|V�RD|anv�nd denna nyckelserver f�r att sl� upp nycklar"
-#: g10/g10.c:280
+#: g10/g10.c:286
msgid "|NAME|set terminal charset to NAME"
msgstr "|NAMN|s�tt teckentabellen f�r terminalen till NAMN"
-#: g10/g10.c:281
+#: g10/g10.c:287
msgid "read options from file"
msgstr "l�s flaggor fr�n fil"
-#: g10/g10.c:285
+#: g10/g10.c:291
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinformation till denna FD"
-#: g10/g10.c:290
+#: g10/g10.c:296
msgid "|FILE|load extension module FILE"
msgstr "|FIL|ladda till�ggsmodul FIL"
-#: g10/g10.c:291
+#: g10/g10.c:297
msgid "emulate the mode described in RFC1991"
msgstr "imitera l�get som beskrivs i RFC1991"
-#: g10/g10.c:292
+#: g10/g10.c:298
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "st�ll om alla flaggor s� att gpg f�ljer OpenPGP-standarden"
-#: g10/g10.c:293
+#: g10/g10.c:299
msgid "|N|use passphrase mode N"
msgstr "|N|anv�nd l�senordsl�get N"
-#: g10/g10.c:295
+#: g10/g10.c:301
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN f�r l�senordsfraser"
-#: g10/g10.c:297
+#: g10/g10.c:303
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|NAMN|anv�nd chifferalgoritmen NAMN f�r l�senordsfraser"
-#: g10/g10.c:298
+#: g10/g10.c:304
msgid "|NAME|use cipher algorithm NAME"
msgstr "|NAMN|anv�nd chifferalgoritmen NAMN"
-#: g10/g10.c:299
+#: g10/g10.c:305
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN"
-#: g10/g10.c:300
+#: g10/g10.c:306
msgid "|N|use compress algorithm N"
msgstr "|N|anv�nd komprimeringsalgoritmen N"
-#: g10/g10.c:301
+#: g10/g10.c:307
msgid "throw keyid field of encrypted packets"
msgstr "sl�ng bort nyckelidentitetsf�ltet fr�n krypterade paket"
-#: g10/g10.c:302
+#: g10/g10.c:308
msgid "|NAME=VALUE|use this notation data"
msgstr "|NAMN=V�RDE|anv�nd detta s�tt f�r att beskriva data"
-#: g10/g10.c:305
+#: g10/g10.c:311
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -650,7 +650,7 @@ msgstr ""
"@\n"
"(Se manualsidan f�r en komplett lista p� alla kommandon och flaggor)\n"
-#: g10/g10.c:308
+#: g10/g10.c:314
msgid ""
"@\n"
"Examples:\n"
@@ -670,17 +670,17 @@ msgstr ""
"--list-keys [namn] visa nycklar\n"
"--fingerprint [namn] visa fingeravtryck\n"
-#: g10/g10.c:403
+#: g10/g10.c:412
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Rapportera g�rna fel till <[email protected]>.\n"
"Rapportera g�rna fel eller synpunkter p� �vers�ttningen till <[email protected]>.\n"
-#: g10/g10.c:407
+#: g10/g10.c:416
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Anv�ndning: gpg [flaggor] [filer] (-h f�r hj�lp)"
-#: g10/g10.c:410
+#: g10/g10.c:419
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -690,7 +690,7 @@ msgstr ""
"signera, kontrollera, kryptera eller dekryptera\n"
"vilken operation som utf�rs beror p� programmets indata\n"
-#: g10/g10.c:417
+#: g10/g10.c:426
msgid ""
"\n"
"Supported algorithms:\n"
@@ -698,62 +698,62 @@ msgstr ""
"\n"
"St�dda algoritmer:\n"
-#: g10/g10.c:496
+#: g10/g10.c:505
msgid "usage: gpg [options] "
msgstr "anv�ndning: gpg [flaggor] "
-#: g10/g10.c:549
+#: g10/g10.c:558
msgid "conflicting commands\n"
msgstr "motstridiga kommandon\n"
-#: g10/g10.c:692
+#: g10/g10.c:701
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTERA: inst�llningsfilen \"%s\" saknas\n"
-#: g10/g10.c:696
+#: g10/g10.c:705
#, c-format
msgid "option file `%s': %s\n"
msgstr "inst�llningsfil \"%s\": %s\n"
-#: g10/g10.c:703
+#: g10/g10.c:712
#, c-format
msgid "reading options from `%s'\n"
msgstr "l�ser flaggor fr�n \"%s\"\n"
-#: g10/g10.c:893
+#: g10/g10.c:902
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s �r ingen giltig teckentabell\n"
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/g10.c:963 g10/g10.c:972
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTERA: %s �r inte f�r normal anv�ndning!\n"
-#: g10/g10.c:951
+#: g10/g10.c:965
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s �r inte till�ten tillsammans med %s!\n"
-#: g10/g10.c:954
+#: g10/g10.c:968
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "det �r ingen po�ng att anv�nda %s tillsammans med %s!\n"
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/g10.c:987 g10/g10.c:999
msgid "selected cipher algorithm is invalid\n"
msgstr "den valda chifferalgoritmen �r ogiltig\n"
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/g10.c:993 g10/g10.c:1005
msgid "selected digest algorithm is invalid\n"
msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
-#: g10/g10.c:995
+#: g10/g10.c:1009
msgid "the given policy URL is invalid\n"
msgstr "angiven URL �r ogiltig\n"
-#: g10/g10.c:998
+#: g10/g10.c:1012
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
@@ -764,127 +764,127 @@ msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
# �r �nd� litet. Eventuellt borde meddelandena inte alls
# �vers�ttas f�r att g�ra eventuell fels�kning l�ttare
# f�r internationella fels�kare
-#: g10/g10.c:1000
+#: g10/g10.c:1014
msgid "completes-needed must be greater than 0\n"
msgstr "variabeln \"completes-needed\" m�ste ha ett v�rde som �r st�rre �n 0\n"
-#: g10/g10.c:1002
+#: g10/g10.c:1016
msgid "marginals-needed must be greater than 1\n"
msgstr "variabeln \"marginals-needed\" m�ste vara st�rre �n 1\n"
-#: g10/g10.c:1004
+#: g10/g10.c:1018
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "variabeln \"max-cert-depth\" m�ste ha ett v�rde mellan 1 och 255\n"
-#: g10/g10.c:1007
+#: g10/g10.c:1021
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTERA: enkelt S2K-l�ge (0) rekommenderas inte\n"
-#: g10/g10.c:1011
+#: g10/g10.c:1025
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ogiltigt S2K-l�ge; m�ste vara 0, 1 eller 3\n"
-#: g10/g10.c:1096
+#: g10/g10.c:1110
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
-#: g10/g10.c:1102
+#: g10/g10.c:1116
msgid "--store [filename]"
msgstr "--store [filnamn]"
-#: g10/g10.c:1109
+#: g10/g10.c:1123
msgid "--symmetric [filename]"
msgstr "--symmetric [filnamn]"
-#: g10/g10.c:1117
+#: g10/g10.c:1131
msgid "--encrypt [filename]"
msgstr "--encrypt [filnamn]"
-#: g10/g10.c:1130
+#: g10/g10.c:1144
msgid "--sign [filename]"
msgstr "--sign [filnamn]"
-#: g10/g10.c:1143
+#: g10/g10.c:1157
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnamn]"
-#: g10/g10.c:1157
+#: g10/g10.c:1171
msgid "--clearsign [filename]"
msgstr "--clearsign [filnamn]"
-#: g10/g10.c:1174
+#: g10/g10.c:1188
msgid "--decrypt [filename]"
msgstr "--decrypt [filnamn]"
-#: g10/g10.c:1182
+#: g10/g10.c:1196
msgid "--sign-key user-id"
msgstr "--sign-key anv�ndaridentitet"
-#: g10/g10.c:1190
+#: g10/g10.c:1204
msgid "--lsign-key user-id"
msgstr "--lsign-key anv�ndaridentitet"
-#: g10/g10.c:1198
+#: g10/g10.c:1212
msgid "--edit-key user-id [commands]"
msgstr "--edit-key anv�ndaridentitet [kommandon]"
-#: g10/g10.c:1214
+#: g10/g10.c:1228
msgid "--delete-secret-key user-id"
msgstr "--delete-secret-key anv�ndaridentitet"
-#: g10/g10.c:1217
+#: g10/g10.c:1231
msgid "--delete-key user-id"
msgstr "--delete-key anv�ndaridentitet"
# Filnamn b�de med och utan fnuttar finns. lite ologiskt. Vill n�gon
# fixa en patch?
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:260 g10/g10.c:1268 g10/sign.c:393
#, c-format
msgid "can't open %s: %s\n"
msgstr "kan inte �ppna %s: %s\n"
-#: g10/g10.c:1269
+#: g10/g10.c:1283
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [anv�ndaridentitet] [nyckelring]"
-#: g10/g10.c:1335
+#: g10/g10.c:1349
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "misslyckades med att ta bort skalet: %s\n"
-#: g10/g10.c:1343
+#: g10/g10.c:1357
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "misslyckades med att skapa skal: %s\n"
-#: g10/g10.c:1411
+#: g10/g10.c:1428
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "felaktig hash-algoritm \"%s\"\n"
-#: g10/g10.c:1492
+#: g10/g10.c:1509
msgid "[filename]"
msgstr "[filnamn]"
-#: g10/g10.c:1496
+#: g10/g10.c:1513
msgid "Go ahead and type your message ...\n"
msgstr "Skriv ditt meddelande h�r ...\n"
# se f�rra kommentaren
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1516 g10/verify.c:68 g10/verify.c:113
#, c-format
msgid "can't open `%s'\n"
msgstr "kan inte �ppna \"%s\"\n"
-#: g10/g10.c:1669
+#: g10/g10.c:1689
msgid ""
"the first character of a notation name must be a letter or an underscore\n"
msgstr ""
"det f�rsta tecknet i ett notationsnamn m�ste vara en bokstav eller\n"
"ett understrykningstecken (_)\n"
-#: g10/g10.c:1675
+#: g10/g10.c:1695
msgid ""
"a notation name must have only letters, digits, dots or underscores and end "
"with an '='\n"
@@ -892,11 +892,11 @@ msgstr ""
"ett notationsnamn kan bara inneh�lla bokst�ver, siffror, punkter eller\n"
"understrykningstecken och sluta med ett likhetstecken\n"
-#: g10/g10.c:1681
+#: g10/g10.c:1701
msgid "dots in a notation name must be surrounded by other characters\n"
msgstr "punkter i ett notationsnamn m�ste vara omgivna av andra tecken\n"
-#: g10/g10.c:1689
+#: g10/g10.c:1709
msgid "a notation value must not use any control characters\n"
msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
@@ -1713,239 +1713,249 @@ msgstr "anv�nder sekund�ra nyckeln %08lX ist�llet f�r prim�rnyckeln %08lX\n"
msgid "[User id not found]"
msgstr "%s: hittade inte anv�ndaren\n"
-#: g10/import.c:181
+#: g10/import.c:182
#, c-format
msgid "skipping block of type %d\n"
msgstr "hoppar �ver block av typen %d\n"
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:189 g10/trustdb.c:1740 g10/trustdb.c:1781
#, c-format
msgid "%lu keys so far processed\n"
msgstr "har behandlat %lu nycklar hittills\n"
-#: g10/import.c:193
+#: g10/import.c:194
#, c-format
msgid "error reading `%s': %s\n"
msgstr "fel vid l�sning av \"%s\": %s\n"
-#: g10/import.c:203
+#: g10/import.c:204
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Totalt antal behandlade enheter: %lu\n"
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " nya undernycklar: %lu\n"
+
+#: g10/import.c:209
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " utan anv�ndaridentiteter: %lu\n"
-#: g10/import.c:207
+#: g10/import.c:211
#, c-format
msgid " imported: %lu"
msgstr " importerade: %lu"
-#: g10/import.c:213
+#: g10/import.c:217
#, c-format
msgid " unchanged: %lu\n"
msgstr " of�r�ndrade: %lu\n"
-#: g10/import.c:215
+#: g10/import.c:219
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nya anv�ndaridentiteter: %lu\n"
-#: g10/import.c:217
+#: g10/import.c:221
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nya undernycklar: %lu\n"
-#: g10/import.c:219
+#: g10/import.c:223
#, c-format
msgid " new signatures: %lu\n"
msgstr " nya signaturer: %lu\n"
-#: g10/import.c:221
+#: g10/import.c:225
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nya �terkallelser av nycklar: %lu\n"
-#: g10/import.c:223
+#: g10/import.c:227
#, c-format
msgid " secret keys read: %lu\n"
msgstr " antal l�sta hemliga nycklar: %lu\n"
-#: g10/import.c:225
+#: g10/import.c:229
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "antal importerade hemliga nycklar: %lu\n"
-#: g10/import.c:227
+#: g10/import.c:231
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "antal of�r�ndrade hemliga nycklar: %lu\n"
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:391 g10/import.c:590
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "nyckel %08lX: ingen anv�ndaridentitet\n"
-#: g10/import.c:400
+#: g10/import.c:405
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "nyckel %08lX: inga giltiga anv�ndaridentiteter\n"
-#: g10/import.c:402
+#: g10/import.c:407
msgid "this may be caused by a missing self-signature\n"
msgstr "detta kan bero p� att det saknas en sj�lvsignatur\n"
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:418 g10/import.c:657
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "nyckel %08lX: hittade ingen publik nyckel: %s\n"
-#: g10/import.c:419
+#: g10/import.c:423
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "nyckeln %08lX f�ljer inte standarden RFC2440 - �verhoppad\n"
+
+#: g10/import.c:431
msgid "no default public keyring\n"
msgstr "ingen f�rvald publik nyckel\n"
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:435 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
#, c-format
msgid "writing to `%s'\n"
msgstr "skriver till \"%s\"\n"
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
+#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
#, c-format
msgid "can't lock keyring `%s': %s\n"
msgstr "kan inte l�sa nyckelringen \"%s\": %s\n"
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
-#: g10/import.c:434
+#: g10/import.c:446
#, c-format
msgid "key %08lX: public key imported\n"
msgstr "nyckel %08lX: importerade publik nyckel\n"
-#: g10/import.c:451
+#: g10/import.c:463
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "nyckel %08lX: matchar inte v�r lokala kopia\n"
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:472 g10/import.c:665
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "nyckel %08lX: kan inte hitta det ursprungliga nyckelblocket: %s\n"
-#: g10/import.c:466 g10/import.c:659
+#: g10/import.c:478 g10/import.c:671
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "nyckel %08lX: kan inte l�sa det ursprungliga nyckelblocket %s\n"
-#: g10/import.c:493
+#: g10/import.c:505
#, c-format
msgid "key %08lX: 1 new user ID\n"
msgstr "nyckel %08lX: 1 ny anv�ndaridentitet\n"
-#: g10/import.c:496
+#: g10/import.c:508
#, c-format
msgid "key %08lX: %d new user IDs\n"
msgstr "nyckel %08lX: %d nya anv�ndaridentiteter\n"
-#: g10/import.c:499
+#: g10/import.c:511
#, c-format
msgid "key %08lX: 1 new signature\n"
msgstr "nyckel %08lX: 1 ny signatur\n"
-#: g10/import.c:502
+#: g10/import.c:514
#, c-format
msgid "key %08lX: %d new signatures\n"
msgstr "nyckel %08lX: %d nya signaturer\n"
-#: g10/import.c:505
+#: g10/import.c:517
#, c-format
msgid "key %08lX: 1 new subkey\n"
msgstr "nyckel %08lX: 1 ny undernyckel\n"
-#: g10/import.c:508
+#: g10/import.c:520
#, c-format
msgid "key %08lX: %d new subkeys\n"
msgstr "nyckel %08lX: %d nya undernycklar\n"
-#: g10/import.c:518
+#: g10/import.c:530
#, c-format
msgid "key %08lX: not changed\n"
msgstr "nyckel %08lX: inte f�r�ndrad\n"
-#: g10/import.c:601
+#: g10/import.c:613
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "nyckel %08lX: den hemliga nyckeln �r importerad\n"
#. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:617
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
-#: g10/import.c:610
+#: g10/import.c:622
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
-#: g10/import.c:639
+#: g10/import.c:651
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr ""
"nyckel %08lX: ingen publik nyckel - kan inte till�mpa "
"�terkallelsecertifikatet\n"
-#: g10/import.c:670
+#: g10/import.c:682
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "nyckel %08lX: ogiltigt �terkallelsecertifikat: %s - avvisat\n"
-#: g10/import.c:702
+#: g10/import.c:714
#, c-format
msgid "key %08lX: revocation certificate imported\n"
msgstr "nyckel %08lX: �terkallelsecertifikat importerat\n"
-#: g10/import.c:744
+#: g10/import.c:756
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "nyckel %08lX: ingen anv�ndaridentitet f�r signaturen\n"
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:763 g10/import.c:787
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "nyckel %08lX: algoritmen f�r publik nyckel ej st�dd\n"
-#: g10/import.c:752
+#: g10/import.c:764
#, c-format
msgid "key %08lX: invalid self-signature\n"
msgstr "nyckel %08lX: ogiltig sj�lvsignatur\n"
-#: g10/import.c:767
+#: g10/import.c:779
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "nyckel %08lX: ingen undernyckel f�r nyckelbindning\n"
-#: g10/import.c:776
+#: g10/import.c:788
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
# vad inneb�r fnutten i slutet?
-#: g10/import.c:803
+#: g10/import.c:815
#, c-format
msgid "key %08lX: accepted non self-signed user ID '"
msgstr "nyckel %08lX: accepterade icke sj�lvsignerad anv�ndaridentitet '"
-#: g10/import.c:832
+#: g10/import.c:844
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "nyckel %08lX: hoppade �ver anv�ndaridentitet '"
-#: g10/import.c:855
+#: g10/import.c:867
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "nyckel %08lX: hoppade �ver undernyckel\n"
@@ -1954,32 +1964,32 @@ msgstr "nyckel %08lX: hoppade �ver undernyckel\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:880
+#: g10/import.c:892
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade �ver\n"
-#: g10/import.c:889
+#: g10/import.c:901
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "nyckel %08lX: �terkallelsecertifikat p� fel plats - hoppade �ver\n"
-#: g10/import.c:897
+#: g10/import.c:909
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "nyckel %08lX: felaktigt �terkallelsecertifikat: %s - hoppade �ver\n"
-#: g10/import.c:997
+#: g10/import.c:1009
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "nyckel %08lX: anv�ndaridentitet hittades tv� g�nger - slog ihop\n"
-#: g10/import.c:1048
+#: g10/import.c:1060
#, c-format
msgid "key %08lX: revocation certificate added\n"
msgstr "nyckel %08lX: lade till �terkallelsecertifikat\n"
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1174 g10/import.c:1227
#, c-format
msgid "key %08lX: our copy has no self-signature\n"
msgstr "nyckel %08lX: v�r kopia har ingen sj�lvsignatur\n"
@@ -2560,8 +2570,18 @@ msgstr "Vill du verkligen skapa �terkallelsecertifikaten? (j/N)"
msgid "no secret key\n"
msgstr "ingen hemlig nyckel\n"
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "felaktigt skal"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
#. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:400 g10/mainproc.c:760
#, c-format
msgid " [expires: %s]"
msgstr "[g�r ut: %s]"
@@ -2578,107 +2598,107 @@ msgstr "den publika nyckeln �r %08lX\n"
# r�tt publik nyckel att kryptera datat med. Jag tycker
# inte att svenska �vers�ttningen �r mycket obskyrare �n engelska
# originalet iallafall.
-#: g10/mainproc.c:248
+#: g10/mainproc.c:257
msgid "public key encrypted data: good DEK\n"
msgstr "data krypterad med publik nyckel: korrekt krypteringsnyckel\n"
-#: g10/mainproc.c:281
+#: g10/mainproc.c:299
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "krypterad med %u-bitars %s-nyckel, ID %08lX, skapad %s\n"
-#: g10/mainproc.c:291
+#: g10/mainproc.c:309
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "krypterad med %s-nyckel, ID %08lX\n"
-#: g10/mainproc.c:297
+#: g10/mainproc.c:315
msgid "no secret key for decryption available\n"
msgstr "det finns ingen hemlig nyckel tillg�nglig f�r dekryptering\n"
-#: g10/mainproc.c:306
+#: g10/mainproc.c:324
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "dekryptering med publik nyckel misslyckades: %s\n"
-#: g10/mainproc.c:343
+#: g10/mainproc.c:361
msgid "decryption okay\n"
msgstr "dekrypteringen lyckades\n"
-#: g10/mainproc.c:348
+#: g10/mainproc.c:366
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VARNING: det krypterade meddelandet har �ndrats!\n"
-#: g10/mainproc.c:353
+#: g10/mainproc.c:371
#, c-format
msgid "decryption failed: %s\n"
msgstr "dekrypteringen misslyckades: %s\n"
-#: g10/mainproc.c:372
+#: g10/mainproc.c:390
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTERA: avs�ndaren efterfr�gade \"endast-f�r-dina-�gon\"\n"
-#: g10/mainproc.c:374
+#: g10/mainproc.c:392
#, c-format
msgid "original file name='%.*s'\n"
msgstr "ursprungligt filnamn=\"%.*s\"\n"
-#: g10/mainproc.c:526
+#: g10/mainproc.c:544
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"frist�ende �terkallelsecertifikat - anv�nd \"gpg --import\" f�r\n"
"att applicera\n"
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:631 g10/mainproc.c:640
msgid "WARNING: invalid notation data found\n"
msgstr "VARNING: ogiltig notationsdata hittades\n"
-#: g10/mainproc.c:625
+#: g10/mainproc.c:643
msgid "Notation: "
msgstr "Notation: "
# finns det n�gon bra svensk �vers�ttning av policy?
-#: g10/mainproc.c:632
+#: g10/mainproc.c:650
msgid "Policy: "
msgstr "Policy: "
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1080
msgid "signature verification suppressed\n"
msgstr "signaturen verifierades inte\n"
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1086
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "Signerades %.*s med hj�lp av %s-nyckeln med ID %08lX\n"
#. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1112 g10/mainproc.c:1123
msgid "BAD signature from \""
msgstr "FELAKTIG signatur fr�n \""
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1113 g10/mainproc.c:1124
msgid "Good signature from \""
msgstr "Korrekt signatur fr�n \""
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1115
msgid " aka \""
msgstr " �ven k�nd som \""
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1171
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Kan inte verifiera signaturen: %s\n"
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1235
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "frist�ende signatur av klassen 0x%02x\n"
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1281
msgid "old style (PGP 2.x) signature\n"
msgstr "signatur av den gamla (PGP 2.x) typen\n"
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1286
msgid "invalid root packet detected in proc_tree()\n"
msgstr "felaktigt rotpaket hittades i proc_tree()\n"
@@ -2752,23 +2772,23 @@ msgstr "Ange l�senordsfras: "
msgid "Repeat passphrase: "
msgstr "Repetera l�senordsfrasen: "
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "data sparades inte, anv�nd flaggan \"--output\" f�r att spara den\n"
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
msgid "Detached signature.\n"
msgstr "L�skopplad signatur.\n"
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
msgid "Please enter name of data file: "
msgstr "Ange namnet p� datafilen: "
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
msgid "reading stdin ...\n"
msgstr "l�ser fr�n standard in ...\n"
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "kan inte �ppna signerad data \"%s\"\n"