aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2004-05-22 11:33:47 +0000
committerWerner Koch <[email protected]>2004-05-22 11:33:47 +0000
commit3624da002fcee186ecc772449d9305c5b6af7d0b (patch)
tree63f5ebb7bd3ec9526556623d6544166a768619b1
parentAbout to release 1.3.6 (diff)
downloadgnupg-3624da002fcee186ecc772449d9305c5b6af7d0b.tar.gz
gnupg-3624da002fcee186ecc772449d9305c5b6af7d0b.zip
some late minor fixes.V1-3-6
Diffstat (limited to '')
-rw-r--r--g10/ChangeLog11
-rw-r--r--g10/cardglue.h2
-rw-r--r--g10/ccid-driver.c9
-rw-r--r--g10/keyedit.c2
-rw-r--r--g10/mainproc.c8
-rw-r--r--g10/options.h2
-rw-r--r--g10/status.c2
-rw-r--r--g10/trustdb.c8
-rw-r--r--m4/Makefile.in1
-rw-r--r--po/de.po1713
-rw-r--r--po/[email protected]bin111388 -> 111138 bytes
-rw-r--r--po/[email protected]1684
-rw-r--r--po/[email protected]bin110188 -> 109930 bytes
-rw-r--r--po/[email protected]1684
14 files changed, 2603 insertions, 2523 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index d33dec6cd..6292cc59e 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,14 @@
+2004-05-22 Werner Koch <[email protected]>
+
+ * trustdb.c (check_regexp): s/EXP/EXPR/.
+
+ * keyedit.c (trustsig_prompt): Remoev useless range check.
+
+ * options.h: Renamed ctrl to glo_ctrl. Changed all users.
+
+ * ccid-driver.c (ccid_open_reader): Print a warning when CCID
+ can't be used.
+
2004-05-21 David Shaw <[email protected]>
* mainproc.c (check_sig_and_print): If we're honoring preferred
diff --git a/g10/cardglue.h b/g10/cardglue.h
index 454f8bf93..f6f64bc48 100644
--- a/g10/cardglue.h
+++ b/g10/cardglue.h
@@ -123,7 +123,7 @@ void card_set_reader_port (const char *portstr);
char *serialno_and_fpr_from_sk (const unsigned char *sn, size_t snlen,
PKT_secret_key *sk);
-void send_status_info (CTRL ctrl, const char *keyword, ...);
+void send_status_info (ctrl_t ctrl, const char *keyword, ...);
void gcry_md_hash_buffer (int algo, void *digest,
const void *buffer, size_t length);
void log_printf (const char *fmt, ...);
diff --git a/g10/ccid-driver.c b/g10/ccid-driver.c
index 3a142cacb..131693820 100644
--- a/g10/ccid-driver.c
+++ b/g10/ccid-driver.c
@@ -513,8 +513,13 @@ ccid_open_reader (ccid_driver_t *handle, int readerno)
if (rc)
{
DEBUGOUT_1 ("usb_claim_interface failed: %d\n", rc);
-
- XXXXX;
+#if defined(GNUPG_MAJOR_VERSION) \
+ || (defined(GNUPG_SCD_MAIN_HEADER) && defined(HAVE_JNLIB_LOGGING))
+ log_info ("CCID can't be used - "
+ "please check that the device file "
+ "(e.g. /proc/bus/usb) "
+ "has appropriate permissions\n" );
+#endif
free (*handle);
*handle = NULL;
diff --git a/g10/keyedit.c b/g10/keyedit.c
index ba5020ed7..755e357bd 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -343,8 +343,6 @@ trustsig_prompt(byte *trust_value,byte *trust_depth,char **regexp)
cpr_kill_prompt();
*trust_depth=atoi(p);
m_free(p);
- if(*trust_depth<1 || *trust_depth>255)
- *trust_depth=0;
}
tty_printf("\n");
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 514ee1843..d2061e30e 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1374,9 +1374,9 @@ check_sig_and_print( CTX c, KBNODE node )
{
int res;
- ctrl.in_auto_key_retrieve++;
+ glo_ctrl.in_auto_key_retrieve++;
res=keyserver_import_keyid(sig->keyid,spec);
- ctrl.in_auto_key_retrieve--;
+ glo_ctrl.in_auto_key_retrieve--;
if(!res)
rc=do_check_sig(c, node, NULL, &is_expkey, &is_revkey );
free_keyserver_spec(spec);
@@ -1396,9 +1396,9 @@ check_sig_and_print( CTX c, KBNODE node )
{
int res;
- ctrl.in_auto_key_retrieve++;
+ glo_ctrl.in_auto_key_retrieve++;
res=keyserver_import_keyid ( sig->keyid, opt.keyserver );
- ctrl.in_auto_key_retrieve--;
+ glo_ctrl.in_auto_key_retrieve--;
if(!res)
rc = do_check_sig(c, node, NULL, &is_expkey, &is_revkey );
}
diff --git a/g10/options.h b/g10/options.h
index d8ed34b3e..dd5c2802c 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -208,7 +208,7 @@ EXTERN_UNLESS_MAIN_MODULE
struct {
int in_auto_key_retrieve; /* True if we are doing an
auto_key_retrieve. */
-} ctrl;
+} glo_ctrl;
#define DBG_PACKET_VALUE 1 /* debug packet reading/writing */
#define DBG_MPI_VALUE 2 /* debug mpi details */
diff --git a/g10/status.c b/g10/status.c
index 91443a10a..b6e91740d 100644
--- a/g10/status.c
+++ b/g10/status.c
@@ -167,7 +167,7 @@ get_status_string ( int no )
static int
status_currently_allowed (int no)
{
- if (!ctrl.in_auto_key_retrieve)
+ if (!glo_ctrl.in_auto_key_retrieve)
return 1; /* Yes. */
/* We allow some statis anyway, so that import statistics are
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 5cb69ccfe..9cf2eff67 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1507,19 +1507,19 @@ mark_usable_uid_certs (KBNODE keyblock, KBNODE uidnode,
signature. Returns 1 for match, and 0 for no match or regex
error. */
static int
-check_regexp(const char *exp,const char *string)
+check_regexp(const char *expr,const char *string)
{
#ifdef DISABLE_REGEX
/* When DISABLE_REGEX is defined, assume all regexps do not
match. */
return 0;
#elif defined(__riscos__)
- return riscos_check_regexp(exp, string, DBG_TRUST);
+ return riscos_check_regexp(expr, string, DBG_TRUST);
#else
int ret;
regex_t pat;
- if(regcomp(&pat,exp,REG_ICASE|REG_NOSUB|REG_EXTENDED)!=0)
+ if(regcomp(&pat,expr,REG_ICASE|REG_NOSUB|REG_EXTENDED)!=0)
return 0;
ret=regexec(&pat,string,0,NULL,0);
@@ -1527,7 +1527,7 @@ check_regexp(const char *exp,const char *string)
regfree(&pat);
if(DBG_TRUST)
- log_debug("regexp \"%s\" on \"%s\": %s\n",exp,string,ret==0?"YES":"NO");
+ log_debug("regexp \"%s\" on \"%s\": %s\n",expr,string,ret==0?"YES":"NO");
return (ret==0);
#endif
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 8d6b724b1..b4abac685 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -80,6 +80,7 @@ GETOPT = @GETOPT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GPGKEYS_HKP = @GPGKEYS_HKP@
+GPGKEYS_HTTP = @GPGKEYS_HTTP@
GPGKEYS_LDAP = @GPGKEYS_LDAP@
GPGKEYS_LDAP_FALSE = @GPGKEYS_LDAP_FALSE@
GPGKEYS_LDAP_TRUE = @GPGKEYS_LDAP_TRUE@
diff --git a/po/de.po b/po/de.po
index 90dba155e..15c958a41 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.0.7\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-02-26 18:37+0100\n"
+"POT-Creation-Date: 2004-05-22 13:30+0200\n"
"PO-Revision-Date: 2003-11-27 17:50+0100\n"
"Last-Translator: Walter Koch <[email protected]>\n"
"Language-Team: German <[email protected]>\n"
@@ -304,7 +304,7 @@ msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
-#: cipher/random.c:387 g10/keygen.c:1917 g10/import.c:169
+#: cipher/random.c:387 g10/keygen.c:2028 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
@@ -404,7 +404,7 @@ msgstr ""
msgid "can't generate a prime with less than %d bits\n"
msgstr ""
-#: g10/g10.c:350
+#: g10/g10.c:354
msgid ""
"@Commands:\n"
" "
@@ -412,127 +412,127 @@ msgstr ""
"@Befehle:\n"
" "
-#: g10/g10.c:352
+#: g10/g10.c:356
msgid "|[file]|make a signature"
msgstr "|[Datei]|Eine Unterschrift erzeugen"
-#: g10/g10.c:353
+#: g10/g10.c:357
msgid "|[file]|make a clear text signature"
msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid "make a detached signature"
msgstr "Eine abgetrennte Unterschrift erzeugen"
-#: g10/g10.c:355
+#: g10/g10.c:359
msgid "encrypt data"
msgstr "Daten verschl�sseln"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "encryption only with symmetric cipher"
msgstr "Daten symmetrisch verschl�sseln"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "decrypt data (default)"
msgstr "Daten entschl�sseln (Voreinstellung)"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "verify a signature"
msgstr "Signatur pr�fen"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "list keys"
msgstr "Liste der Schl�ssel"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "list keys and signatures"
msgstr "Liste der Schl�ssel und ihrer Signaturen"
-#: g10/g10.c:366
+#: g10/g10.c:370
msgid "list and check key signatures"
msgstr "Signaturen der Schl�ssel pr�fen"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys and fingerprints"
msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
-#: g10/g10.c:368
+#: g10/g10.c:372
msgid "list secret keys"
msgstr "Liste der geheimen Schl�ssel"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "generate a new key pair"
msgstr "Ein neues Schl�sselpaar erzeugen"
-#: g10/g10.c:370
+#: g10/g10.c:374
msgid "remove keys from the public keyring"
msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "remove keys from the secret keyring"
msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "sign a key"
msgstr "Schl�ssel signieren"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "sign a key locally"
msgstr "Schl�ssel nur f�r diesen Rechner signieren"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign or edit a key"
msgstr "Unterschreiben oder bearbeiten eines Schl."
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "generate a revocation certificate"
msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
-#: g10/g10.c:380
+#: g10/g10.c:384
msgid "export keys"
msgstr "Schl�ssel exportieren"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "export keys to a key server"
msgstr "Schl�ssel zu einem Schl�.server exportieren"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "import keys from a key server"
msgstr "Schl�ssel von einem Schl�.server importieren"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "search for keys on a key server"
msgstr "Schl�ssel auf einem Schl�.server suchen"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "update all keys from a keyserver"
msgstr "alle Schl�ssel per Schl�.server aktualisieren"
-#: g10/g10.c:390
+#: g10/g10.c:393
msgid "import/merge keys"
msgstr "Schl�ssel importieren/kombinieren"
-#: g10/g10.c:393
+#: g10/g10.c:396
msgid "print the card status"
msgstr ""
-#: g10/g10.c:394
+#: g10/g10.c:397
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:395
+#: g10/g10.c:398
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:402
+#: g10/g10.c:406
msgid "update the trust database"
msgstr "�ndern der \"Trust\"-Datenbank"
-#: g10/g10.c:409
+#: g10/g10.c:413
msgid "|algo [files]|print message digests"
msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
-#: g10/g10.c:413 g10/gpgv.c:64
+#: g10/g10.c:417 g10/gpgv.c:64
msgid ""
"@\n"
"Options:\n"
@@ -542,51 +542,55 @@ msgstr ""
"Optionen:\n"
" "
-#: g10/g10.c:415
+#: g10/g10.c:419
msgid "create ascii armored output"
msgstr "Ausgabe mit ASCII-H�lle versehen"
-#: g10/g10.c:417
+#: g10/g10.c:421
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|Verschl�sseln f�r NAME"
-#: g10/g10.c:428
+#: g10/g10.c:432
msgid "use this user-id to sign or decrypt"
msgstr "Mit dieser User-ID signieren"
-#: g10/g10.c:429
+#: g10/g10.c:433
msgid "|N|set compress level N (0 disables)"
msgstr "Kompressionsstufe auf N setzen (0=keine)"
-#: g10/g10.c:434
+#: g10/g10.c:438
msgid "use canonical text mode"
msgstr "Textmodus benutzen"
-#: g10/g10.c:444
+#: g10/g10.c:448
msgid "use as output file"
msgstr "Als Ausgabedatei benutzen"
-#: g10/g10.c:446 g10/gpgv.c:66
+#: g10/g10.c:450 g10/gpgv.c:66
msgid "verbose"
msgstr "Detaillierte Informationen"
-#: g10/g10.c:457
+#: g10/g10.c:461
msgid "do not make any changes"
msgstr "Keine wirklichen �nderungen durchf�hren"
-#: g10/g10.c:458
+#: g10/g10.c:462
msgid "prompt before overwriting"
msgstr "vor �berschreiben nachfragen"
-#: g10/g10.c:502
+#: g10/g10.c:506
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:503
+#: g10/g10.c:507
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:526
+#: g10/g10.c:529
+msgid "allow the use of admin card commands"
+msgstr ""
+
+#: g10/g10.c:534
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -595,7 +599,7 @@ msgstr ""
"(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
"Optionen)\n"
-#: g10/g10.c:529
+#: g10/g10.c:537
msgid ""
"@\n"
"Examples:\n"
@@ -615,17 +619,17 @@ msgstr ""
" --list-keys [Namen] Schl�ssel anzeigen\n"
" --fingerprint [Namen] \"Fingerabdr�cke\" anzeigen\n"
-#: g10/g10.c:702 g10/gpgv.c:91
+#: g10/g10.c:712 g10/gpgv.c:91
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Berichte �ber Programmfehler bitte in englisch an <[email protected]>.\n"
"Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
-#: g10/g10.c:719
+#: g10/g10.c:729
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
-#: g10/g10.c:722
+#: g10/g10.c:732
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -635,7 +639,7 @@ msgstr ""
"Signieren, pr�fen, verschl�sseln, entschl�sseln.\n"
"Die voreingestellte Operation ist abh�ngig von den Eingabedaten.\n"
-#: g10/g10.c:733
+#: g10/g10.c:743
msgid ""
"\n"
"Supported algorithms:\n"
@@ -643,73 +647,73 @@ msgstr ""
"\n"
"Unterst�tzte Verfahren:\n"
-#: g10/g10.c:736
+#: g10/g10.c:746
msgid "Pubkey: "
msgstr ""
-#: g10/g10.c:742 g10/keyedit.c:1718
+#: g10/g10.c:752 g10/keyedit.c:1721
msgid "Cipher: "
msgstr ""
-#: g10/g10.c:748
+#: g10/g10.c:758
msgid "Hash: "
msgstr ""
-#: g10/g10.c:754 g10/keyedit.c:1764
+#: g10/g10.c:764 g10/keyedit.c:1767
msgid "Compression: "
msgstr "Kompression: "
-#: g10/g10.c:837
+#: g10/g10.c:847
msgid "usage: gpg [options] "
msgstr "Aufruf: gpg [Optionen] "
-#: g10/g10.c:940
+#: g10/g10.c:950
msgid "conflicting commands\n"
msgstr "Widerspr�chliche Befehle\n"
-#: g10/g10.c:958
+#: g10/g10.c:968
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "Kein '='-Zeichen in der Gruppendefinition \"%s\"\n"
-#: g10/g10.c:1155
+#: g10/g10.c:1165
#, c-format
msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Home Verzeichnisses \"%s\"\n"
-#: g10/g10.c:1158
+#: g10/g10.c:1168
#, c-format
msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Konfiguartionsdatei \"%s\"\n"
-#: g10/g10.c:1161
+#: g10/g10.c:1171
#, c-format
msgid "WARNING: unsafe ownership on extension \"%s\"\n"
msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Erweiterung \"%s\"\n"
-#: g10/g10.c:1167
+#: g10/g10.c:1177
#, c-format
msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte der Home Verzeichnisses \"%s\"\n"
-#: g10/g10.c:1170
+#: g10/g10.c:1180
#, c-format
msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei \"%s\"\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1183
#, c-format
msgid "WARNING: unsafe permissions on extension \"%s\"\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte der Erweiterung \"%s\"\n"
-#: g10/g10.c:1179
+#: g10/g10.c:1189
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
msgstr ""
"WARNUNG: Unsicheres Besitzverh�ltnis des �bergeordneten Verzeichnisses des "
"Home Verzeichniss \"%s\"\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1192
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
@@ -717,21 +721,21 @@ msgstr ""
"WARNUNG: Unsicheres Besitzverh�ltnis des �bergeordneten Verzeichnisses der "
"Konfigurationsdatei \"%s\"\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1195
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
msgstr ""
"WARNUNG: Unsicheres Besitzverh�ltnis des �bergeordneten Verzeichnisses der "
"Erweiterung \"%s\"\n"
-#: g10/g10.c:1191
+#: g10/g10.c:1201
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
msgstr ""
"WARNUNG: Unsichere Zugriffsrechte der �bergeordneten Verzeichnisses des Home "
"Verzeichniss \"%s\"\n"
-#: g10/g10.c:1194
+#: g10/g10.c:1204
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
@@ -740,386 +744,397 @@ msgstr ""
"WARNUNG: Unsichere Zugriffsrechte des �bergeordneten Verzeichnisses der "
"Konfigurationsdatei \"%s\"\n"
-#: g10/g10.c:1197
+#: g10/g10.c:1207
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
msgstr ""
"WARNUNG: Unsichere Zugriffsrechte des �bergeordneten Verzeichnisses der "
"Erweiterung \"%s\"\n"
-#: g10/g10.c:1323
+#: g10/g10.c:1333
#, fuzzy, c-format
msgid "unknown configuration item \"%s\"\n"
msgstr "Neue Konfigurationsdatei `%s' erstellt\n"
-#: g10/g10.c:1570
+#: g10/g10.c:1600
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
-#: g10/g10.c:1606
+#: g10/g10.c:1636
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
-#: g10/g10.c:1610
+#: g10/g10.c:1640
#, c-format
msgid "option file `%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
-#: g10/g10.c:1617
+#: g10/g10.c:1647
#, c-format
msgid "reading options from `%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
-#: g10/g10.c:1842 g10/g10.c:2333 g10/g10.c:2344
+#: g10/g10.c:1873 g10/g10.c:2408 g10/g10.c:2419
#, 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:1855
+#: g10/g10.c:1886
#, c-format
msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
msgstr ""
"Verschl�sselungserweiterung \"%s\" wurde wegen falscher Rechte nicht "
"geladen\n"
-#: g10/g10.c:2066
+#: g10/g10.c:2098
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s ist kein g�ltiger Zeichensatz.\n"
-#: g10/g10.c:2084
-msgid "could not parse keyserver URI\n"
+#: g10/g10.c:2117 g10/keyedit.c:3212
+#, fuzzy
+msgid "could not parse keyserver URL\n"
msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
-#: g10/g10.c:2093
+#: g10/g10.c:2123
+#, fuzzy, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: ung�ltige Verify Option.\n"
+
+#: g10/g10.c:2126
+#, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "Ung�ltige Verify Option\n"
+
+#: g10/g10.c:2133
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ung�ltige Import Option.\n"
-#: g10/g10.c:2096
+#: g10/g10.c:2136
msgid "invalid import options\n"
msgstr "Ung�ltige Import Option\n"
-#: g10/g10.c:2103
+#: g10/g10.c:2143
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ung�ltige Export Option.\n"
-#: g10/g10.c:2106
+#: g10/g10.c:2146
msgid "invalid export options\n"
msgstr "Ung�ltige export Option\n"
-#: g10/g10.c:2129
+#: g10/g10.c:2171
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ung�ltige List Option.\n"
-#: g10/g10.c:2132
+#: g10/g10.c:2174
msgid "invalid list options\n"
msgstr "Ung�ltige List Option\n"
-#: g10/g10.c:2153
+#: g10/g10.c:2197
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ung�ltige Verify Option.\n"
-#: g10/g10.c:2156
+#: g10/g10.c:2200
msgid "invalid verify options\n"
msgstr "Ung�ltige Verify Option\n"
-#: g10/g10.c:2163
+#: g10/g10.c:2207
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
-#: g10/g10.c:2322
+#: g10/g10.c:2397
msgid "WARNING: program may create a core file!\n"
msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
-#: g10/g10.c:2326
+#: g10/g10.c:2401
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WARNUNG: %s ersetzt %s\n"
-#: g10/g10.c:2335
+#: g10/g10.c:2410
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
-#: g10/g10.c:2338
+#: g10/g10.c:2413
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
-#: g10/g10.c:2359
+#: g10/g10.c:2434
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"Im --pgp2-Modus k�nnen Sie nur abgetrennte oder Klartextunterschriften "
"machen\n"
-#: g10/g10.c:2365
+#: g10/g10.c:2440
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
"Im --pgp2-Modus k�nnen Sie nicht gleichzeitig unterschreiben und "
"verschl�sseln\n"
-#: g10/g10.c:2371
+#: g10/g10.c:2446
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"Im --pgp2-Modus m�ssen Sie Dateien benutzen und k�nnen keine Pipes "
"verwenden.\n"
-#: g10/g10.c:2384
+#: g10/g10.c:2459
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"Verschl�ssen einer Botschaft ben�tigt im --pgp2-Modus die IDEA-"
"Verschl�sselung\n"
-#: g10/g10.c:2452 g10/g10.c:2476
+#: g10/g10.c:2527 g10/g10.c:2551
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
-#: g10/g10.c:2458 g10/g10.c:2482
+#: g10/g10.c:2533 g10/g10.c:2557
msgid "selected digest algorithm is invalid\n"
msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
-#: g10/g10.c:2464
+#: g10/g10.c:2539
msgid "selected compression algorithm is invalid\n"
msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
-#: g10/g10.c:2470
+#: g10/g10.c:2545
msgid "selected certification digest algorithm is invalid\n"
msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
-#: g10/g10.c:2485
+#: g10/g10.c:2560
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed m�ssen gr��er als 0 sein\n"
-#: g10/g10.c:2487
+#: g10/g10.c:2562
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
-#: g10/g10.c:2489
+#: g10/g10.c:2564
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
-#: g10/g10.c:2491
+#: g10/g10.c:2566
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ung�ltiger \"default-check-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
-#: g10/g10.c:2493
+#: g10/g10.c:2568
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ung�ltiger \"default-check-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
-#: g10/g10.c:2496
+#: g10/g10.c:2571
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
-#: g10/g10.c:2500
+#: g10/g10.c:2575
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:2507
+#: g10/g10.c:2582
msgid "invalid default preferences\n"
msgstr "ung�ltige Standard Voreinstellungen\n"
-#: g10/g10.c:2516
+#: g10/g10.c:2591
msgid "invalid personal cipher preferences\n"
msgstr "ung�ltige private Verschl�sselungsvoreinstellungen\n"
-#: g10/g10.c:2520
+#: g10/g10.c:2595
msgid "invalid personal digest preferences\n"
msgstr "ung�ltige private Hashvoreinstellungen\n"
-#: g10/g10.c:2524
+#: g10/g10.c:2599
msgid "invalid personal compress preferences\n"
msgstr "ung�ltige private Komprimierungsvoreinstellungen\n"
-#: g10/g10.c:2557
+#: g10/g10.c:2632
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s arbeiter noch nicht zusammen mit %s\n"
-#: g10/g10.c:2604
+#: g10/g10.c:2679
#, c-format
msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
msgstr ""
"Die Benutzung des Verschl�sselungsverfahren %s ist im %s-Modus nicht "
"erlaubt.\n"
-#: g10/g10.c:2609
+#: g10/g10.c:2684
#, c-format
msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
-#: g10/g10.c:2614
+#: g10/g10.c:2689
#, c-format
msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
msgstr ""
"Die Benutzung des Komprimierungsverfahren %s ist im %s-Modus nicht erlaubt.\n"
-#: g10/g10.c:2702
+#: g10/g10.c:2777
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
-#: g10/g10.c:2713
+#: g10/g10.c:2788
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"WARNUNG: Empf�nger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
-#: g10/g10.c:2724
+#: g10/g10.c:2799
msgid "--store [filename]"
msgstr "--store [Dateiname]"
-#: g10/g10.c:2731
+#: g10/g10.c:2806
msgid "--symmetric [filename]"
msgstr "--symmetric [Dateiname]"
-#: g10/g10.c:2743
+#: g10/g10.c:2818
msgid "--encrypt [filename]"
msgstr "--encrypt [Dateiname]"
-#: g10/g10.c:2756
+#: g10/g10.c:2831
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [Dateiname]"
-#: g10/g10.c:2758
+#: g10/g10.c:2833
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2761
+#: g10/g10.c:2836
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
"Die Benutzung von --symmetric --encrypt ist im %s-Modus nicht erlaubt.\n"
-#: g10/g10.c:2779
+#: g10/g10.c:2854
msgid "--sign [filename]"
msgstr "--sign [Dateiname]"
-#: g10/g10.c:2792
+#: g10/g10.c:2867
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [Dateiname]"
-#: g10/g10.c:2807
+#: g10/g10.c:2882
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [Dateiname]"
-#: g10/g10.c:2809
+#: g10/g10.c:2884
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"Die Benutzung von --symmetric --sign-encrypt kann nicht zusammen mit --s2k-"
"mode 0 geschehen.\n"
-#: g10/g10.c:2812
+#: g10/g10.c:2887
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
"Die Benutzung von --symmetric --sign --encrypt ist im %s-Modus nicht "
"erlaubt.\n"
-#: g10/g10.c:2832
+#: g10/g10.c:2907
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [Dateiname]"
-#: g10/g10.c:2841
+#: g10/g10.c:2916
msgid "--clearsign [filename]"
msgstr "--clearsign [Dateiname]"
-#: g10/g10.c:2866
+#: g10/g10.c:2941
msgid "--decrypt [filename]"
msgstr "--decrypt [Dateiname]"
-#: g10/g10.c:2874
+#: g10/g10.c:2949
msgid "--sign-key user-id"
msgstr "--sign-key User-ID"
-#: g10/g10.c:2878
+#: g10/g10.c:2953
msgid "--lsign-key user-id"
msgstr "--lsign-key User-ID"
-#: g10/g10.c:2882
+#: g10/g10.c:2957
msgid "--nrsign-key user-id"
msgstr "--nrsign-key User-ID"
-#: g10/g10.c:2886
+#: g10/g10.c:2961
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key User-ID"
-#: g10/g10.c:2910
+#: g10/g10.c:2985
msgid "--edit-key user-id [commands]"
msgstr "--edit-key User-ID [Befehle]"
-#: g10/g10.c:2966 g10/encode.c:474 g10/sign.c:886
+#: g10/g10.c:3041 g10/encode.c:474 g10/sign.c:891
#, c-format
msgid "can't open %s: %s\n"
msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
-#: g10/g10.c:2981
+#: g10/g10.c:3056
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
-#: g10/g10.c:3018
+#: g10/g10.c:3093
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Senden an den Schl�sselserver fehlgeschlagen: %s\n"
-#: g10/g10.c:3020
+#: g10/g10.c:3095
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Empfangen vom Schl�sselserverfehler fehlgeschlagen: %s\n"
-#: g10/g10.c:3022
+#: g10/g10.c:3097
#, c-format
msgid "key export failed: %s\n"
msgstr "Schl�sselexport fehlgeschlagen: %s\n"
-#: g10/g10.c:3033
+#: g10/g10.c:3108
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Schl�sselserversuche fehlgeschlagen: %s\n"
-#: g10/g10.c:3043
+#: g10/g10.c:3118
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Schl�sselserver-Refresh fehlgeschlagen: %s\n"
-#: g10/g10.c:3084
+#: g10/g10.c:3159
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
-#: g10/g10.c:3092
+#: g10/g10.c:3167
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
-#: g10/g10.c:3179
+#: g10/g10.c:3254
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "Ung�ltiges Hashverfahren '%s'\n"
-#: g10/g10.c:3302
+#: g10/g10.c:3377
msgid "[filename]"
msgstr "[Dateiname]"
-#: g10/g10.c:3306
+#: g10/g10.c:3381
msgid "Go ahead and type your message ...\n"
msgstr "Auf geht's - Botschaft eintippen ...\n"
-#: g10/g10.c:3309 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3384 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "'%s' kann nicht ge�ffnet werden\n"
-#: g10/g10.c:3583
+#: g10/g10.c:3658
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1127,23 +1142,23 @@ msgstr ""
"Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
"enthalten und mu� mit einem '=' enden\n"
-#: g10/g10.c:3592
+#: g10/g10.c:3667
msgid "a user notation name must contain the '@' character\n"
msgstr "Ein \"user-notation\"-Name mu� ein '@' Zeichen verwenden\n"
-#: g10/g10.c:3602
+#: g10/g10.c:3677
msgid "a notation value must not use any control characters\n"
msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
-#: g10/g10.c:3636
+#: g10/g10.c:3711
msgid "the given certification policy URL is invalid\n"
msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
-#: g10/g10.c:3638
+#: g10/g10.c:3713
msgid "the given signature policy URL is invalid\n"
msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
-#: g10/g10.c:3671
+#: g10/g10.c:3746
msgid "the given signature preferred keyserver URL is invalid\n"
msgstr ""
"Die angegebene Unterschriften-Bevorzugter-Schl�sselserver-URL ist ung�ltig\n"
@@ -1195,77 +1210,77 @@ msgstr "Ung�ltige Klartextsignatur-Einleitung\n"
msgid "nested clear text signatures\n"
msgstr "verschachtelte Klartextunterschriften\n"
-#: g10/armor.c:540
+#: g10/armor.c:553
msgid "invalid dash escaped line: "
msgstr "Ung�ltige mit Bindestrich \"escapte\" Zeile: "
-#: g10/armor.c:552
+#: g10/armor.c:565
msgid "unexpected armor:"
msgstr "Unerwartete ASCII-H�lle:"
-#: g10/armor.c:678 g10/armor.c:1254
+#: g10/armor.c:695 g10/armor.c:1277
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "Ung�ltiges \"radix64\" Zeichen %02x ignoriert\n"
-#: g10/armor.c:721
+#: g10/armor.c:738
msgid "premature eof (no CRC)\n"
msgstr "vorzeitiges Dateiende (keine Pr�fsumme)\n"
-#: g10/armor.c:755
+#: g10/armor.c:772
msgid "premature eof (in CRC)\n"
msgstr "vorzeitiges Dateiende (innerhalb der Pr�fsumme)\n"
-#: g10/armor.c:759
+#: g10/armor.c:776
msgid "malformed CRC\n"
msgstr "Falsch aufgebaute Pr�fsumme\n"
-#: g10/armor.c:763 g10/armor.c:1291
+#: g10/armor.c:780 g10/armor.c:1314
#, c-format
msgid "CRC error; %06lx - %06lx\n"
msgstr "Pr�fsummenfehler; %06lx - %06lx\n"
-#: g10/armor.c:783
+#: g10/armor.c:800
msgid "premature eof (in Trailer)\n"
msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
-#: g10/armor.c:787
+#: g10/armor.c:804
msgid "error in trailer line\n"
msgstr "Fehler in der Nachsatzzeile\n"
-#: g10/armor.c:1069
+#: g10/armor.c:1092
msgid "no valid OpenPGP data found.\n"
msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
-#: g10/armor.c:1074
+#: g10/armor.c:1097
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "ung�ltige ASCII-H�lle: Zeile ist l�nger als %d Zeichen\n"
-#: g10/armor.c:1078
+#: g10/armor.c:1101
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"\"quoted printable\" Zeichen in der ASCII-H�lle gefunden - m�glicherweise\n"
" war ein fehlerhafter E-Mail-Transporter(\"MTA\") die Ursache\n"
-#: g10/pkclist.c:63 g10/revoke.c:575
+#: g10/pkclist.c:63 g10/revoke.c:576
msgid "No reason specified"
msgstr "Kein Grund angegeben"
-#: g10/pkclist.c:65 g10/revoke.c:577
+#: g10/pkclist.c:65 g10/revoke.c:578
msgid "Key is superseded"
msgstr "Schl�ssel ist �berholt"
-#: g10/pkclist.c:67 g10/revoke.c:576
+#: g10/pkclist.c:67 g10/revoke.c:577
msgid "Key has been compromised"
msgstr "Hinweis: Dieser Schl�ssel ist nicht mehr sicher"
-#: g10/pkclist.c:69 g10/revoke.c:578
+#: g10/pkclist.c:69 g10/revoke.c:579
msgid "Key is no longer used"
msgstr "Schl�ssel wird nicht mehr benutzt"
-#: g10/pkclist.c:71 g10/revoke.c:579
+#: g10/pkclist.c:71 g10/revoke.c:580
msgid "User ID is no longer valid"
msgstr "User-ID ist nicht mehr g�ltig"
@@ -1277,11 +1292,11 @@ msgstr "Grund f�r Widerruf: "
msgid "revocation comment: "
msgstr "Widerruf-Bemerkung: "
-#: g10/pkclist.c:265
+#: g10/pkclist.c:197
msgid "iImMqQsS"
msgstr "iImMqQsS"
-#: g10/pkclist.c:273
+#: g10/pkclist.c:205
#, c-format
msgid ""
"No trust value assigned to:\n"
@@ -1290,11 +1305,11 @@ msgstr ""
"Es ist kein \"trust value\" zugewiesen f�r:\n"
"%4u%c/%08lX %s \""
-#: g10/pkclist.c:302 g10/mainproc.c:1508
+#: g10/pkclist.c:234 g10/mainproc.c:1536
msgid " aka \""
msgstr " alias \""
-#: g10/pkclist.c:313 g10/keyedit.c:310
+#: g10/pkclist.c:245 g10/keyedit.c:311
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1307,116 +1322,116 @@ msgstr ""
"unterschiedlichen Quellen ...)?\n"
"\n"
-#: g10/pkclist.c:317
+#: g10/pkclist.c:249
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = Wei� nicht so recht oder kann es nicht sagen\n"
-#: g10/pkclist.c:319
+#: g10/pkclist.c:251
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = Nein, ihm traue ich NICHT\n"
-#: g10/pkclist.c:321
+#: g10/pkclist.c:253
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Ich vertraue ihm einigerma�en\n"
-#: g10/pkclist.c:323
+#: g10/pkclist.c:255
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Ich vertraue ihm vollst�ndig\n"
-#: g10/pkclist.c:325
+#: g10/pkclist.c:257
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = Ich vertraue ihm absolut\n"
-#: g10/pkclist.c:328
+#: g10/pkclist.c:260
msgid " i = please show me more information\n"
msgstr " i = Bitte weitere Information anzeigen\n"
-#: g10/pkclist.c:331
+#: g10/pkclist.c:263
msgid " m = back to the main menu\n"
msgstr " m = Zur�ck zum Men�\n"
-#: g10/pkclist.c:334
+#: g10/pkclist.c:266
msgid " s = skip this key\n"
msgstr " s = diesen Schl�ssel �berSpringen\n"
-#: g10/pkclist.c:335
+#: g10/pkclist.c:267
msgid " q = quit\n"
msgstr " q = verlassen\n"
-#: g10/pkclist.c:339
+#: g10/pkclist.c:271
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
-#: g10/pkclist.c:345 g10/revoke.c:604
+#: g10/pkclist.c:277 g10/revoke.c:605
msgid "Your decision? "
msgstr "Ihre Auswahl? "
-#: g10/pkclist.c:366
+#: g10/pkclist.c:298
msgid "Do you really want to set this key to ultimate trust? "
msgstr "M�chten Sie diesem Schl�ssel wirklich uneingeschr�nkt vertrauen? "
-#: g10/pkclist.c:380
+#: g10/pkclist.c:312
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Zertifikate f�hren zu einem letztlich vertrauensw�rdigen Schl�ssel:\n"
-#: g10/pkclist.c:455
+#: g10/pkclist.c:386
#, c-format
msgid "key %08lX: key has been revoked!\n"
msgstr "Schl�ssel %08lX: Schl�ssel wurde widerrufen\n"
-#: g10/pkclist.c:462 g10/pkclist.c:474 g10/pkclist.c:573
+#: g10/pkclist.c:393 g10/pkclist.c:405 g10/pkclist.c:504
msgid "Use this key anyway? "
msgstr "Diesen Schl�ssel trotzdem benutzen? "
-#: g10/pkclist.c:467
+#: g10/pkclist.c:398
#, c-format
msgid "key %08lX: subkey has been revoked!\n"
msgstr "Schl�ssel %08lX: Unterschl�ssel wurde widerrufen\n"
-#: g10/pkclist.c:488
+#: g10/pkclist.c:419
#, c-format
msgid "%08lX: key has expired\n"
msgstr "%08lX: Schl�ssel ist verfallen!\n"
-#: g10/pkclist.c:498
+#: g10/pkclist.c:429
#, c-format
msgid "%08lX: There is no assurance this key belongs to the named user\n"
msgstr ""
"%08lX: Es gibt keinen Hinweis, da� dieser Schl�ssel wirklich dem "
"vorgeblichen Besitzer geh�rt.\n"
-#: g10/pkclist.c:504
+#: g10/pkclist.c:435
#, c-format
msgid "%08lX: We do NOT trust this key\n"
msgstr "%08lX: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
-#: g10/pkclist.c:509
+#: g10/pkclist.c:440
#, c-format
msgid "%08lX: There is limited assurance this key belongs to the named user\n"
msgstr ""
"%08lX: Es gibt begrenzte Hinweisw, da� dieser Schl�ssel wirklich dem "
"vorgeblichen Besitzer geh�rt.\n"
-#: g10/pkclist.c:515
+#: g10/pkclist.c:446
msgid "This key probably belongs to the named user\n"
msgstr ""
"Dieser Schl�ssel geh�rt h�chstwahrscheinlich dem angegebenen Besitzer\n"
-#: g10/pkclist.c:520
+#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr ""
"Dieser Schl�ssel geh�rt uns (da wir n�mlich den geheimen Schl�ssel dazu "
"haben)\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:499
msgid ""
"It is NOT certain that the key belongs to the person named\n"
"in the user ID. If you *really* know what you are doing,\n"
@@ -1427,99 +1442,99 @@ msgstr ""
"Wenn Sie *wirklich* wissen, was Sie tun, k�nnen Sie die n�chste\n"
"Frage mit ja beantworten\n"
-#: g10/pkclist.c:582 g10/pkclist.c:612
+#: g10/pkclist.c:513 g10/pkclist.c:543
msgid "WARNING: Using untrusted key!\n"
msgstr "WARNUNG: Ein Schl�ssel ohne gesichertes Vertrauen wird benutzt!\n"
-#: g10/pkclist.c:619
+#: g10/pkclist.c:550
#, fuzzy
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr ""
"WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: Widerrufschl�ssel %08lX ist "
"nicht vorhanden\n"
-#: g10/pkclist.c:628
+#: g10/pkclist.c:559
#, fuzzy
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "WARNUNG: Dieser Schl�ssel wurde von seinem Besitzer widerrufen!\n"
-#: g10/pkclist.c:631
+#: g10/pkclist.c:562
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "WARNUNG: Dieser Schl�ssel wurde von seinem Besitzer widerrufen!\n"
-#: g10/pkclist.c:632
+#: g10/pkclist.c:563
msgid " This could mean that the signature is forgery.\n"
msgstr " Das k�nnte bedeuten, da� die Signatur gef�lscht ist.\n"
-#: g10/pkclist.c:638
+#: g10/pkclist.c:569
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "WARNUNG: Dieser Unterschl�ssel wurde von seinem Besitzer widerrufen!\n"
-#: g10/pkclist.c:643
+#: g10/pkclist.c:574
msgid "Note: This key has been disabled.\n"
msgstr "Hinweis: Dieser Schl�ssel wurde abgeschaltet.\n"
-#: g10/pkclist.c:648
+#: g10/pkclist.c:579
msgid "Note: This key has expired!\n"
msgstr "Hinweis: Dieser Schl�ssel ist verfallen!\n"
-#: g10/pkclist.c:659
+#: g10/pkclist.c:590
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "WARNUNG: Dieser Schl�ssel tr�gt keine vertrauensw�rdige Signatur!\n"
-#: g10/pkclist.c:661
+#: g10/pkclist.c:592
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" Es gibt keinen Hinweis, da� die Signatur wirklich dem vorgeblichen "
"Besitzer geh�rt.\n"
-#: g10/pkclist.c:669
+#: g10/pkclist.c:600
msgid "WARNING: We do NOT trust this key!\n"
msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
-#: g10/pkclist.c:670
+#: g10/pkclist.c:601
msgid " The signature is probably a FORGERY.\n"
msgstr " Die Signatur ist wahrscheinlich eine F�LSCHUNG.\n"
-#: g10/pkclist.c:678
+#: g10/pkclist.c:609
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"WARNUNG: Dieser Schl�ssel ist nicht durch hinreichend vertrauensw�rdige "
"Signaturen zertifiziert!\n"
-#: g10/pkclist.c:680
+#: g10/pkclist.c:611
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr ""
" Es ist nicht sicher, da� die Signatur wirklich dem vorgeblichen "
"Besitzer geh�rt.\n"
-#: g10/pkclist.c:832 g10/pkclist.c:868 g10/encode.c:791
+#: g10/pkclist.c:763 g10/pkclist.c:799 g10/encode.c:791
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
-#: g10/pkclist.c:845 g10/pkclist.c:878 g10/pkclist.c:1047 g10/pkclist.c:1107
+#: g10/pkclist.c:776 g10/pkclist.c:809 g10/pkclist.c:978 g10/pkclist.c:1038
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: �bersprungen: %s\n"
-#: g10/pkclist.c:855 g10/pkclist.c:1079
+#: g10/pkclist.c:786 g10/pkclist.c:1010
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
-#: g10/pkclist.c:897
+#: g10/pkclist.c:828
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Sie haben keine User-ID angegeben (Sie k�nnen die Option \"-r\" verwenden).\n"
-#: g10/pkclist.c:913
+#: g10/pkclist.c:844
msgid "Current recipients:\n"
msgstr "Liste der aktuellen Empf�nger:\n"
-#: g10/pkclist.c:939
+#: g10/pkclist.c:870
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -1527,124 +1542,124 @@ msgstr ""
"\n"
"Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
-#: g10/pkclist.c:955
+#: g10/pkclist.c:886
msgid "No such user ID.\n"
msgstr "Keine solche User-ID vorhanden.\n"
-#: g10/pkclist.c:960 g10/pkclist.c:1022
+#: g10/pkclist.c:891 g10/pkclist.c:953
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"�bersprungen: �ffentlicher Schl�ssel bereits als Standardempf�nger gesetzt\n"
-#: g10/pkclist.c:978
+#: g10/pkclist.c:909
msgid "Public key is disabled.\n"
msgstr "�ffentlicher Schl�ssel ist abgeschaltet.\n"
-#: g10/pkclist.c:985
+#: g10/pkclist.c:916
msgid "skipped: public key already set\n"
msgstr "�bersprungen: �ffentlicher Schl�ssel bereits gesetzt\n"
-#: g10/pkclist.c:1014
+#: g10/pkclist.c:945
#, c-format
msgid "unknown default recipient `%s'\n"
msgstr "Unbekannter voreingestellter Empf�nger '%s'\n"
-#: g10/pkclist.c:1059
+#: g10/pkclist.c:990
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: �bersprungen: �ffentlicher Schl�ssel ist abgeschaltet\n"
-#: g10/pkclist.c:1114
+#: g10/pkclist.c:1045
msgid "no valid addressees\n"
msgstr "Keine g�ltigen Adressaten\n"
-#: g10/keygen.c:204
+#: g10/keygen.c:207
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "Voreinstellung %s ist doppelt\n"
-#: g10/keygen.c:211
+#: g10/keygen.c:214
msgid "too many cipher preferences\n"
msgstr "zu viele Verscl�sselungsverfahren Voreinstellungen\n"
-#: g10/keygen.c:213
+#: g10/keygen.c:216
msgid "too many digest preferences\n"
msgstr "zu viele Hashmethoden Voreinstellungen\n"
-#: g10/keygen.c:215
+#: g10/keygen.c:218
msgid "too many compression preferences\n"
msgstr "zu viele Kompressionsverhfahren Voreinstellungen\n"
-#: g10/keygen.c:312
+#: g10/keygen.c:315
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "Ung�ltiger Begriff `%s' in den Voreinstellungen\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:734
msgid "writing direct signature\n"
msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
-#: g10/keygen.c:676
+#: g10/keygen.c:773
msgid "writing self signature\n"
msgstr "Die Eigenbeglaubigung wird geschrieben\n"
-#: g10/keygen.c:720
+#: g10/keygen.c:819
msgid "writing key binding signature\n"
msgstr "Schreiben der \"key-binding\" Signatur\n"
-#: g10/keygen.c:774 g10/keygen.c:858 g10/keygen.c:949
+#: g10/keygen.c:881 g10/keygen.c:965 g10/keygen.c:1056
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Ung�ltig Schl�ssell�nge; %u Bit werden verwendet\n"
-#: g10/keygen.c:779 g10/keygen.c:863 g10/keygen.c:954
+#: g10/keygen.c:886 g10/keygen.c:970 g10/keygen.c:1061
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Schl�ssell�nge auf %u Bit aufgerundet\n"
-#: g10/keygen.c:1054
+#: g10/keygen.c:1161
msgid "Please select what kind of key you want:\n"
msgstr "Bitte w�hlen Sie, welche Art von Schl�ssel Sie m�chten:\n"
-#: g10/keygen.c:1056
+#: g10/keygen.c:1163
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA und ElGamal (voreingestellt)\n"
-#: g10/keygen.c:1057
+#: g10/keygen.c:1164
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (nur signieren/beglaubigen)\n"
-#: g10/keygen.c:1059
+#: g10/keygen.c:1166
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (nur verschl�sseln)\n"
-#: g10/keygen.c:1060
+#: g10/keygen.c:1167
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (nur signieren/beglaubigen)\n"
-#: g10/keygen.c:1062
+#: g10/keygen.c:1169
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (nur verschl�sseln)\n"
-#: g10/keygen.c:1064
+#: g10/keygen.c:1171
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (signieren/beglaubigen und verschl�sseln)\n"
-#: g10/keygen.c:1067 g10/keyedit.c:319 g10/keyedit.c:340 g10/keyedit.c:356
+#: g10/keygen.c:1174 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
msgid "Your selection? "
msgstr "Ihre Auswahl? "
-#: g10/keygen.c:1101 g10/keyedit.c:800 g10/revoke.c:637
+#: g10/keygen.c:1208 g10/keyedit.c:800 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Ung�ltige Auswahl.\n"
-#: g10/keygen.c:1114
+#: g10/keygen.c:1221
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1657,28 +1672,28 @@ msgstr ""
" standard Schl�ssell�nge ist 1024 Bit\n"
" gr��te sinnvolle Schl�ssell�nge ist 2048 Bit\n"
-#: g10/keygen.c:1123
+#: g10/keygen.c:1230
msgid "What keysize do you want? (1024) "
msgstr "Welche Schl�ssell�nge w�nschen Sie? (1024) "
-#: g10/keygen.c:1128
+#: g10/keygen.c:1235
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA erlaubt nur Schl�ssell�ngen von 512 bis 1024\n"
-#: g10/keygen.c:1130
+#: g10/keygen.c:1237
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "zu kurz; 1024 ist die kleinste f�r RSA m�gliche Schl�ssell�nge.\n"
-#: g10/keygen.c:1133
+#: g10/keygen.c:1240
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
-#: g10/keygen.c:1144
+#: g10/keygen.c:1251
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "Sch�sselgr��e zu hoch; %d ist der Maximalwert.\n"
-#: g10/keygen.c:1149
+#: g10/keygen.c:1256
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1686,11 +1701,11 @@ msgstr ""
"Schl�ssell�ngen gr��er als 2048 werden nicht empfohlen, da die\n"
"Berechnungen dann WIRKLICH lange brauchen!\n"
-#: g10/keygen.c:1152
+#: g10/keygen.c:1259
msgid "Are you sure that you want this keysize? "
msgstr "Sind Sie sicher, da� Sie diese Schl�ssell�nge w�nschen? "
-#: g10/keygen.c:1153
+#: g10/keygen.c:1260
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1698,17 +1713,17 @@ msgstr ""
"Gut, aber bitte denken Sie auch daran, da� Monitor und Tastatur Daten "
"abstrahlen und diese leicht mitgelesen werden k�nnen.\n"
-#: g10/keygen.c:1162
+#: g10/keygen.c:1269
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Die verlangte Schl�ssell�nge betr�gt %u Bit\n"
-#: g10/keygen.c:1165 g10/keygen.c:1169
+#: g10/keygen.c:1272 g10/keygen.c:1276
#, c-format
msgid "rounded up to %u bits\n"
msgstr "aufgerundet auf %u Bit\n"
-#: g10/keygen.c:1220
+#: g10/keygen.c:1327
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1724,7 +1739,7 @@ msgstr ""
" <n>m = Schl�ssel verf�llt nach n Monaten\n"
" <n>y = Schl�ssel verf�llt nach n Jahren\n"
-#: g10/keygen.c:1229
+#: g10/keygen.c:1336
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1740,29 +1755,29 @@ msgstr ""
" <n>m = Schl�ssel verf�llt nach n Monaten\n"
" <n>y = Schl�ssel verf�llt nach n Jahren\n"
-#: g10/keygen.c:1251
+#: g10/keygen.c:1358
msgid "Key is valid for? (0) "
msgstr "Wie lange bleibt der Schl�ssel g�ltig? (0) "
-#: g10/keygen.c:1253
+#: g10/keygen.c:1360
msgid "Signature is valid for? (0) "
msgstr "Wie lange bleibt die Beglaubigung g�ltig? (0) "
-#: g10/keygen.c:1258
+#: g10/keygen.c:1365
msgid "invalid value\n"
msgstr "Ung�ltiger Wert.\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1370
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s verf�llt nie.\n"
-#: g10/keygen.c:1270
+#: g10/keygen.c:1377
#, c-format
msgid "%s expires at %s\n"
msgstr "%s verf�llt am %s\n"
-#: g10/keygen.c:1276
+#: g10/keygen.c:1383
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1770,11 +1785,11 @@ msgstr ""
"Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
"Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
-#: g10/keygen.c:1281
+#: g10/keygen.c:1388
msgid "Is this correct (y/n)? "
msgstr "Ist dies richtig? (j/n) "
-#: g10/keygen.c:1324
+#: g10/keygen.c:1431
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1790,44 +1805,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1336
+#: g10/keygen.c:1443
msgid "Real name: "
msgstr "Ihr Name (\"Vorname Nachname\"): "
-#: g10/keygen.c:1344
+#: g10/keygen.c:1451
msgid "Invalid character in name\n"
msgstr "Ung�ltiges Zeichen im Namen\n"
-#: g10/keygen.c:1346
+#: g10/keygen.c:1453
msgid "Name may not start with a digit\n"
msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
-#: g10/keygen.c:1348
+#: g10/keygen.c:1455
msgid "Name must be at least 5 characters long\n"
msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
-#: g10/keygen.c:1356
+#: g10/keygen.c:1463
msgid "Email address: "
msgstr "E-Mail-Adresse: "
-#: g10/keygen.c:1367
+#: g10/keygen.c:1474
msgid "Not a valid email address\n"
msgstr "Diese E-Mail-Adresse ist ung�ltig\n"
-#: g10/keygen.c:1375
+#: g10/keygen.c:1482
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:1381
+#: g10/keygen.c:1488
msgid "Invalid character in comment\n"
msgstr "Ung�ltiges Zeichen im Kommentar.\n"
-#: g10/keygen.c:1404
+#: g10/keygen.c:1511
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Sie benutzen den Zeichensatz `%s'\n"
-#: g10/keygen.c:1410
+#: g10/keygen.c:1517
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1838,27 +1853,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1415
+#: g10/keygen.c:1522
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Bitte keine E-Mailadressen als Namen oder Kommentar verwenden\n"
-#: g10/keygen.c:1420
+#: g10/keygen.c:1527
msgid "NnCcEeOoQq"
msgstr "NnKkEeFfBb"
-#: g10/keygen.c:1430
+#: g10/keygen.c:1537
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "�ndern: (N)ame, (K)ommentar, (E)-Mail oder (B)eenden? "
-#: g10/keygen.c:1431
+#: g10/keygen.c:1538
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "�ndern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? "
-#: g10/keygen.c:1450
+#: g10/keygen.c:1557
msgid "Please correct the error first\n"
msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
-#: g10/keygen.c:1489
+#: g10/keygen.c:1596
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1866,16 +1881,16 @@ msgstr ""
"Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu sch�tzen.\n"
"\n"
-#: g10/keygen.c:1498 g10/keyedit.c:1005
+#: g10/keygen.c:1605 g10/keyedit.c:1005
msgid "passphrase not correctly repeated; try again"
msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen"
-#: g10/keygen.c:1499
+#: g10/keygen.c:1606
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1505
+#: g10/keygen.c:1612
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -1888,7 +1903,7 @@ msgstr ""
"aufrufen.\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1634
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1899,58 +1914,58 @@ msgstr ""
"unterst�tzen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
"tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
-#: g10/keygen.c:2084 g10/revoke.c:214 g10/revoke.c:414
+#: g10/keygen.c:2202 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
-#: g10/keygen.c:2145
+#: g10/keygen.c:2263
msgid "DSA keypair will have 1024 bits.\n"
msgstr "Das DSA-Schl�sselpaar wird 1024 Bit haben.\n"
-#: g10/keygen.c:2213
+#: g10/keygen.c:2331
msgid "Key generation canceled.\n"
msgstr "Schl�sselerzeugung abgebrochen.\n"
-#: g10/keygen.c:2321 g10/keygen.c:2446
+#: g10/keygen.c:2447 g10/keygen.c:2572
#, c-format
msgid "writing public key to `%s'\n"
msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
-#: g10/keygen.c:2323 g10/keygen.c:2449
+#: g10/keygen.c:2449 g10/keygen.c:2575
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "schreiben des geheimen Schl�ssel-Stubs nach '%s'\n"
-#: g10/keygen.c:2326 g10/keygen.c:2452
+#: g10/keygen.c:2452 g10/keygen.c:2578
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
-#: g10/keygen.c:2435
+#: g10/keygen.c:2561
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kein schreibbarer �ffentlicher Schl�sselbund gefunden: %s\n"
-#: g10/keygen.c:2441
+#: g10/keygen.c:2567
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kein schreibbarer geheimer Schl�sselbund gefunden: %s\n"
-#: g10/keygen.c:2459
+#: g10/keygen.c:2585
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des �ff. Schl�sselbundes `%s': %s\n"
-#: g10/keygen.c:2466
+#: g10/keygen.c:2592
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des geheimen Schl�sselbundes `%s': %s\n"
-#: g10/keygen.c:2489
+#: g10/keygen.c:2615
msgid "public and secret key created and signed.\n"
msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
-#: g10/keygen.c:2500
+#: g10/keygen.c:2626
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1959,12 +1974,12 @@ msgstr ""
"werden kann. Sie k�nnen aber mit dem Befehl \"--edit-key\" einen\n"
"Zweitschl�ssel f�r diesem Zweck erzeugen.\n"
-#: g10/keygen.c:2512 g10/keygen.c:2623
+#: g10/keygen.c:2638 g10/keygen.c:2751
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
-#: g10/keygen.c:2558 g10/sign.c:290
+#: g10/keygen.c:2687 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1972,7 +1987,7 @@ msgstr ""
"Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
"stimmen nicht �berein)\n"
-#: g10/keygen.c:2560 g10/sign.c:292
+#: g10/keygen.c:2689 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1980,11 +1995,11 @@ msgstr ""
"Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhren stimmen nicht �berein)\n"
-#: g10/keygen.c:2569
+#: g10/keygen.c:2698
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "HINWEIS: Unterschl�ssel f�r v3-Schl�ssen sind nicht OpenPGP-konform\n"
-#: g10/keygen.c:2598
+#: g10/keygen.c:2726
msgid "Really create? "
msgstr "Wirklich erzeugen? "
@@ -1998,7 +2013,7 @@ msgstr "--output funktioniert nicht bei diesem Kommando\n"
msgid "%s: can't open: %s\n"
msgstr "%s: kann nicht ge�ffnet werden: %s\n"
-#: g10/encode.c:203 g10/sign.c:1139
+#: g10/encode.c:203 g10/sign.c:1144
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "Fehler beim Erzeugen des Mantras: %s\n"
@@ -2049,7 +2064,7 @@ msgstr ""
"Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %s (%d) "
"verletzt die Empf�ngervoreinstellungen\n"
-#: g10/encode.c:634 g10/sign.c:858
+#: g10/encode.c:634 g10/sign.c:863
#, c-format
msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
msgstr ""
@@ -2061,37 +2076,32 @@ msgstr ""
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s verschl�sselt f�r: %s\n"
-#: g10/export.c:163 g10/keyedit.c:2700 g10/delkey.c:74 g10/revoke.c:224
+#: g10/export.c:162 g10/keyedit.c:2700 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
-#: g10/export.c:185 g10/delkey.c:82 g10/revoke.c:230 g10/revoke.c:435
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "Fehler beim Lesen des Schl�sselblocks: %s\n"
-#: g10/export.c:194
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "Schl�ssel %08lX: dies ist kein RFC2440-Sch�ssel - �bersprungen\n"
-
-#: g10/export.c:210
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
msgstr "Schl�ssel %08lX: ungesch�tzt - �bersprungen\n"
-#: g10/export.c:218
-#, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "Schl�ssel %08lX: PGP 2.x-artiger Schl�ssel - �bersprungen\n"
-#: g10/export.c:363
+#: g10/export.c:353
#, c-format
-msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr ""
-#: g10/export.c:395
+#: g10/export.c:385
msgid "WARNING: nothing exported\n"
msgstr "WARNUNG: Nichts exportiert\n"
@@ -2099,32 +2109,32 @@ msgstr "WARNUNG: Nichts exportiert\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "zu viele Eintr�ge im pk-Cache - abgeschaltet\n"
-#: g10/getkey.c:186 g10/getkey.c:2646
+#: g10/getkey.c:186 g10/getkey.c:2693
msgid "[User id not found]"
msgstr "[User-ID nicht gefunden]"
-#: g10/getkey.c:1620
-#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Ung�ltiger Schl�ssel %08lX, g�ltig gemacht per --allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2128
-#, c-format
-msgid "no secret subkey for public subkey %08lX - ignoring\n"
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr ""
"Es gibt keinen privaten Unterschl�ssel zu dem �ffentlichen Unterschl�ssel %-"
"8lX - ubergangen!\n"
-#: g10/getkey.c:2356
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
msgstr ""
"der Zweitschl�ssel %08lX wird anstelle des Hauptschl�ssels %08lX verwendet\n"
-#: g10/getkey.c:2403
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
msgstr ""
"Schl�ssel %08lX: geheimer Schl�ssel, aber ohne �ffentlichen Schl�ssel - "
"�bersprungen\n"
@@ -2209,399 +2219,403 @@ msgstr " unver�nderte geh.Schl.: %lu\n"
msgid " not imported: %lu\n"
msgstr " nicht importiert: %lu\n"
-#: g10/import.c:567 g10/import.c:581 g10/import.c:595
+#: g10/import.c:537
#, c-format
-msgid "WARNING: key %08lX contains preferences for unavailable algorithms:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
-#: g10/import.c:570
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Sie haben folgende User-IDs beglaubigt:\n"
+
+#: g10/import.c:576
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:584
+#: g10/import.c:588
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
-#: g10/import.c:598
+#: g10/import.c:600
#, fuzzy, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
-#: g10/import.c:611
+#: g10/import.c:613
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:613
+#: g10/import.c:615
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:637
+#: g10/import.c:639
#, c-format
-msgid ""
-"you can update your preferences with: gpg --edit-key %08lX updpref save\n"
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:682 g10/import.c:1026
-#, c-format
-msgid "key %08lX: no user ID\n"
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
msgstr "Schl�ssel %08lX: Keine User-ID\n"
-#: g10/import.c:702
-#, c-format
-msgid "key %08lX: PKS subkey corruption repaired\n"
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
msgstr "Schl�ssel %08lX: PKS Unterschl�sseldefekt repariert\n"
-#: g10/import.c:717
-#, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
msgstr "Schl�ssel %08lX: Nicht eigenbeglaubigte User-ID `%s' �bernommen\n"
-#: g10/import.c:723
-#, c-format
-msgid "key %08lX: no valid user IDs\n"
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
-#: g10/import.c:725
+#: g10/import.c:730
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:734 g10/import.c:1133
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
-#: g10/import.c:740
-#, c-format
-msgid "key %08lX: new key - skipped\n"
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
-#: g10/import.c:749
+#: g10/import.c:755
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "kein schreibbarer Schl�sselbund gefunden: %s\n"
-#: g10/import.c:754 g10/sign.c:765 g10/sign.c:1001 g10/openfile.c:253
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "Schreiben nach '%s'\n"
-#: g10/import.c:757 g10/import.c:843 g10/import.c:1055 g10/import.c:1193
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
-#: g10/import.c:775
-#, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
+#: g10/import.c:785
+#, fuzzy, c-format
+msgid "key %s: public key \"%s\" imported\n"
msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel \"%s\" importiert\n"
-#: g10/import.c:797
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
msgstr "Schl�ssel %08lX: Stimmt nicht mit unserer Kopie �berein\n"
-#: g10/import.c:814 g10/import.c:1150
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
msgstr ""
"Schl�ssel %08lX: der lokale originale Schl�sselblocks wurde nicht gefunden: %"
"s\n"
-#: g10/import.c:821 g10/import.c:1156
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
msgstr ""
"Schl�ssel %08lX: Lesefehler im lokalen originalen Schl�sselblocks: %s\n"
-#: g10/import.c:852
-#, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
+#: g10/import.c:866
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "Schl�ssel %08lX: \"%s\" 1 neue User-ID\n"
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
+#: g10/import.c:869
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
-#: g10/import.c:858
-#, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
+#: g10/import.c:872
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
msgstr "Schl�ssel %08lX: \"%s\" 1 neue Signatur\n"
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
+#: g10/import.c:875
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
-#: g10/import.c:864
-#, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
+#: g10/import.c:878
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "Schl�ssel %08lX: \"%s\" 1 neuer Unterschl�ssel\n"
-#: g10/import.c:867
-#, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "Schl�ssel %08lX: \"%s\" %d neue Unterschl�ssel\n"
-#: g10/import.c:888
-#, c-format
-msgid "key %08lX: \"%s\" not changed\n"
+#: g10/import.c:902
+#, fuzzy, c-format
+msgid "key %s: \"%s\" not changed\n"
msgstr "Schl�ssel %08lX: \"%s\" Nicht ge�ndert\n"
-#: g10/import.c:1032
-#, c-format
-msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
+#: g10/import.c:1047
+#, fuzzy, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
"Schl�ssel %08lX: geheimer Schl�ssel mit ung�ltigem Verschl�sselungsverfahren "
"%d - �bersprungen\n"
-#: g10/import.c:1049
+#: g10/import.c:1064
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "Kein voreingestellter geheimer Schl�sselbund: %s\n"
-#: g10/import.c:1060
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
msgstr "Schl�ssel %08lX: Geheimer Schl�ssel importiert\n"
-#: g10/import.c:1088
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
-#: g10/import.c:1098
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
msgstr "Schl�ssel %08lX: geheimer Schl�ssel nicht gefunden: %s\n"
-#: g10/import.c:1127
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: 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:1167
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - zur�ckgewiesen\n"
-#: g10/import.c:1199
-#, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
+#: g10/import.c:1219
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat importiert\n"
-#: g10/import.c:1263
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
msgstr "Schl�ssel %08lX: Keine User-ID f�r Signatur\n"
-#: g10/import.c:1278
-#, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
msgstr ""
"Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren f�r User-ID \"%s"
"\"\n"
-#: g10/import.c:1280
-#, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung f�r User-ID \"%s\"\n"
-#: g10/import.c:1297
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Schl�sselanbindung\n"
-#: g10/import.c:1306 g10/import.c:1350
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
msgstr "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren\n"
-#: g10/import.c:1307
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
-#: g10/import.c:1320
-#, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
+#: g10/import.c:1347
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey binding\n"
msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung entfernt\n"
-#: g10/import.c:1341
-#, c-format
-msgid "key %08lX: no subkey for key revocation\n"
+#: g10/import.c:1369
+#, fuzzy, c-format
+msgid "key %s: no subkey for key revocation\n"
msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r den Schl�sselwiderruf\n"
-#: g10/import.c:1351
-#, c-format
-msgid "key %08lX: invalid subkey revocation\n"
+#: g10/import.c:1382
+#, fuzzy, c-format
+msgid "key %s: invalid subkey revocation\n"
msgstr "Schl�ssel %08lX: Ung�ltiger Unterschl�sselwiderruf\n"
-#: g10/import.c:1364
-#, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
+#: g10/import.c:1397
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey revocation\n"
msgstr "Schl�ssel %08lX: Mehrfacher Unterschl�ssel-Widerruf entfernt\n"
-#: g10/import.c:1403
-#, c-format
-msgid "key %08lX: skipped user ID '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
msgstr "Schl�ssel %08lX: User-ID �bergangen '"
-#: g10/import.c:1426
-#, c-format
-msgid "key %08lX: skipped subkey\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
-#: g10/import.c:1453
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
msgstr ""
"Schl�ssel %08lX: Nicht exportf�hige Unterschrift (Klasse %02x) - �bergangen\n"
-#: g10/import.c:1462
-#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
-#: g10/import.c:1479
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
-#: g10/import.c:1492
-#, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
+#: g10/import.c:1528
+#, fuzzy, c-format
+msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
-#: g10/import.c:1500
-#, c-format
-msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr ""
"Schl�ssel %08lX: Nicht erwartete Unterschrift (Klasse %02x) - �bergangen\n"
-#: g10/import.c:1599
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
msgstr "Schl�ssel %08lX: Doppelte User-ID entdeckt - zusammengef�hrt\n"
-#: g10/import.c:1658
-#, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: hole Widerrufschl�ssel %08lX\n"
-#: g10/import.c:1672
-#, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: Widerrufschl�ssel %08lX ist "
"nicht vorhanden\n"
-#: g10/import.c:1730
-#, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
+#: g10/import.c:1770
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat hinzugef�gt\n"
-#: g10/import.c:1763
-#, c-format
-msgid "key %08lX: direct key signature added\n"
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
msgstr "Schl�ssel %08lX: \"direct-key\"-Signaturen hinzugef�gt\n"
-#: g10/keyedit.c:161
+#: g10/keyedit.c:159
msgid "[revocation]"
msgstr "[Widerruf]"
-#: g10/keyedit.c:162
+#: g10/keyedit.c:160
msgid "[self-signature]"
msgstr "[Eigenbeglaubigung]"
-#: g10/keyedit.c:236 g10/keylist.c:320
+#: g10/keyedit.c:237 g10/keylist.c:319
msgid "1 bad signature\n"
msgstr "1 falsche Beglaubigung\n"
-#: g10/keyedit.c:238 g10/keylist.c:322
+#: g10/keyedit.c:239 g10/keylist.c:321
#, c-format
msgid "%d bad signatures\n"
msgstr "%d falsche Beglaubigungen\n"
-#: g10/keyedit.c:240 g10/keylist.c:324
+#: g10/keyedit.c:241 g10/keylist.c:323
msgid "1 signature not checked due to a missing key\n"
msgstr "1 Beglaubigung wegen fehlendem Schl�ssel nicht gepr�ft\n"
-#: g10/keyedit.c:242 g10/keylist.c:326
+#: g10/keyedit.c:243 g10/keylist.c:325
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d Beglaubigungen wegen fehlenden Schl�sseln nicht gepr�ft\n"
-#: g10/keyedit.c:244 g10/keylist.c:328
+#: g10/keyedit.c:245 g10/keylist.c:327
msgid "1 signature not checked due to an error\n"
msgstr "1 Beglaubigung aufgrund von Fehler nicht gepr�ft\n"
-#: g10/keyedit.c:246 g10/keylist.c:330
+#: g10/keyedit.c:247 g10/keylist.c:329
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d Beglaubigungen aufgrund von Fehlern nicht gepr�ft\n"
-#: g10/keyedit.c:248
+#: g10/keyedit.c:249
msgid "1 user ID without valid self-signature detected\n"
msgstr "Eine User-ID ohne g�ltige Eigenbeglaubigung entdeckt\n"
-#: g10/keyedit.c:250
+#: g10/keyedit.c:251
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d User-IDs ohne g�ltige Eigenbeglaubigung entdeckt\n"
-#: g10/keyedit.c:313
+#: g10/keyedit.c:314
#, c-format
msgid " (%d) I trust marginally\n"
msgstr " (%d) Ich vertraue ihm einigerma�en\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:315
#, c-format
msgid " (%d) I trust fully\n"
msgstr " (%d) Ich vertraue ihm vollst�ndig\n"
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:351
+#: g10/keyedit.c:350
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:494
+#: g10/keyedit.c:493
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "User-ID \"%s\" ist widerrufen."
-#: g10/keyedit.c:501 g10/keyedit.c:521 g10/keyedit.c:542 g10/keyedit.c:692
-#: g10/keyedit.c:750 g10/keyedit.c:1355
+#: g10/keyedit.c:500 g10/keyedit.c:520 g10/keyedit.c:541 g10/keyedit.c:692
+#: g10/keyedit.c:750 g10/keyedit.c:1354
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) "
-#: g10/keyedit.c:509 g10/keyedit.c:529 g10/keyedit.c:550 g10/keyedit.c:698
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:508 g10/keyedit.c:528 g10/keyedit.c:549 g10/keyedit.c:698
+#: g10/keyedit.c:1360
msgid " Unable to sign.\n"
msgstr " Beglaubigen ist nicht m�glich.\n"
-#: g10/keyedit.c:514
+#: g10/keyedit.c:513
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "User-ID \"%s\" ist abgelaufen."
-#: g10/keyedit.c:534
+#: g10/keyedit.c:533
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "WARNUNG: User-ID \"%s\" ist nicht eigenbeglaubigt."
-#: g10/keyedit.c:569
+#: g10/keyedit.c:568
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2610,11 +2624,11 @@ msgstr ""
"Die Eigenbeglaubigung von \"%s\"\n"
"ist eine PGP 2.x artige Signatur.\n"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:577
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung ge�ndert werden? (j/N) "
-#: g10/keyedit.c:592
+#: g10/keyedit.c:591
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2623,13 +2637,13 @@ msgstr ""
"Ihre derzeitige Beglaubigung f�r \"%s\"\n"
"ist abgelaufen.\n"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:595
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"M�chten Sie eine neue Beglaubigung erzeugen, die die abgelaufene ersetzt? (j/"
"N) "
-#: g10/keyedit.c:617
+#: g10/keyedit.c:616
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2638,28 +2652,28 @@ msgstr ""
"Die derzeitige Beglaubigung von \"%s\"\n"
"ist nur f�r diesen Rechner g�ltig.\n"
-#: g10/keyedit.c:621
+#: g10/keyedit.c:620
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
-#: g10/keyedit.c:642
-#, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
+#: g10/keyedit.c:641
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX lokal beglaubigt\n"
-#: g10/keyedit.c:646
-#, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
+#: g10/keyedit.c:644
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX beglaubigt\n"
-#: g10/keyedit.c:651
+#: g10/keyedit.c:649
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Wollen Sie es immmer noch beglaubigen? (j/N) "
#: g10/keyedit.c:671
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
#: g10/keyedit.c:686
@@ -2798,7 +2812,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Wirklich unterschreiben? "
-#: g10/keyedit.c:906 g10/keyedit.c:3610 g10/keyedit.c:3701 g10/keyedit.c:3774
+#: g10/keyedit.c:906 g10/keyedit.c:3632 g10/keyedit.c:3723 g10/keyedit.c:3796
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
@@ -3157,159 +3171,159 @@ msgstr "showphoto"
msgid "show photo ID"
msgstr "Foto-ID anzeigen"
-#: g10/keyedit.c:1187 g10/delkey.c:120
+#: g10/keyedit.c:1186 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
-#: g10/keyedit.c:1218
+#: g10/keyedit.c:1217
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "Fehler beim Lesen des geheimen Schl�sselblocks `%s': %s\n"
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1234
msgid "Secret key is available.\n"
msgstr "Geheimer Schl�ssel ist vorhanden.\n"
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
msgid "Command> "
msgstr "Befehl> "
-#: g10/keyedit.c:1297
+#: g10/keyedit.c:1296
msgid "Need the secret key to do this.\n"
msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1300
msgid "Please use the command \"toggle\" first.\n"
msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
-#: g10/keyedit.c:1349
+#: g10/keyedit.c:1348
msgid "Key is revoked."
msgstr "Schl�ssel wurde widerrufen."
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
msgid "Really sign all user IDs? "
msgstr "Wirklich alle User-IDs beglaubigen? "
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
msgid "Hint: Select the user IDs to sign\n"
msgstr "Tip: W�hlen Sie die User-IDs, die beglaubigt werden sollen\n"
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1393
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Dieses Kommando ist im %s-Modus nicht erlaubt.\n"
-#: g10/keyedit.c:1414 g10/keyedit.c:1435 g10/keyedit.c:1494
+#: g10/keyedit.c:1415 g10/keyedit.c:1436 g10/keyedit.c:1495
msgid "You must select at least one user ID.\n"
msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
msgid "You can't delete the last user ID!\n"
msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
msgid "Really remove all selected user IDs? "
msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1421
msgid "Really remove this user ID? "
msgstr "Diese User-ID wirklich entfernen? "
-#: g10/keyedit.c:1458 g10/keyedit.c:1513
+#: g10/keyedit.c:1459 g10/keyedit.c:1514
msgid "You must select at least one key.\n"
msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1462
msgid "Do you really want to delete the selected keys? "
msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
-#: g10/keyedit.c:1462
+#: g10/keyedit.c:1463
msgid "Do you really want to delete this key? "
msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
-#: g10/keyedit.c:1497
+#: g10/keyedit.c:1498
msgid "Really revoke all selected user IDs? "
msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich widerrufen? "
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1499
msgid "Really revoke this user ID? "
msgstr "Diese User-ID wirklich widerrufen? "
-#: g10/keyedit.c:1517
+#: g10/keyedit.c:1518
msgid "Do you really want to revoke the selected keys? "
msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
-#: g10/keyedit.c:1518
+#: g10/keyedit.c:1519
msgid "Do you really want to revoke this key? "
msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1558
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1590
#, fuzzy
msgid "Set preference list to:\n"
msgstr "Liste der Voreinstellungen einstellen"
-#: g10/keyedit.c:1595
+#: g10/keyedit.c:1596
msgid "Really update the preferences for the selected user IDs? "
msgstr ""
"M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
msgid "Really update the preferences? "
msgstr "Die Voreinstellungen wirklich �ndern? "
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
msgid "Save changes? "
msgstr "�nderungen speichern? "
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1649
msgid "Quit without saving? "
msgstr "Beenden ohne zu speichern? "
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1659
#, c-format
msgid "update failed: %s\n"
msgstr "�nderung fehlgeschlagen: %s\n"
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1666
#, c-format
msgid "update secret failed: %s\n"
msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
-#: g10/keyedit.c:1670
+#: g10/keyedit.c:1673
msgid "Key not changed so no update needed.\n"
msgstr "Schl�ssel ist nicht ge�ndert worden, also ist kein Speichern n�tig.\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1685
msgid "Invalid command (try \"help\")\n"
msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
msgid "Digest: "
msgstr ""
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1796
msgid "Features: "
msgstr ""
-#: g10/keyedit.c:1804
+#: g10/keyedit.c:1807
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2047
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Dieser Schl�ssel k�nnte widerrufen worden sein von %s Schl�ssel "
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2051
msgid " (sensitive)"
msgstr "(empfindlich)"
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2065 g10/keyedit.c:2119 g10/keyedit.c:2222 g10/keyedit.c:2237
#, fuzzy, c-format
msgid "created: %s"
msgstr "erstellt: %s verf�llt: %s"
@@ -3324,30 +3338,25 @@ msgstr "widerrufen"
msgid "expired: %s"
msgstr " [verf�llt: %s]"
-#: g10/keyedit.c:2072
+#: g10/keyedit.c:2072 g10/keyedit.c:2121 g10/keyedit.c:2224 g10/keyedit.c:2239
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [verf�llt: %s]"
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:2087
#, fuzzy, c-format
msgid "trust: %s"
msgstr " Vertrauen: %-13s"
-#: g10/keyedit.c:2093
+#: g10/keyedit.c:2091
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
msgid "This key has been disabled"
msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
-#: g10/keyedit.c:2114 g10/keyedit.c:2217 g10/keyedit.c:2232
-#, c-format
-msgid "%s%c %4u%c/%08lX created: %s expires: %s"
-msgstr "%s%c %4u%c/%08lX erstellt: %s verf�llt: %s"
-
#: g10/keyedit.c:2130
#, c-format
msgid "rev! subkey has been revoked: %s\n"
@@ -3362,11 +3371,11 @@ msgstr "rev- gef�lschter Schl�sselwiderruf entdeckt\n"
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? Schwierigkeiten bei der Widerruf-�berpr�fung: %s\n"
-#: g10/keyedit.c:2160 g10/keylist.c:709 g10/mainproc.c:1516 g10/trustdb.c:1123
+#: g10/keyedit.c:2160 g10/keylist.c:696 g10/mainproc.c:1544 g10/trustdb.c:1124
msgid "revoked"
msgstr "widerrufen"
-#: g10/keyedit.c:2162 g10/keylist.c:709 g10/mainproc.c:1518 g10/trustdb.c:500
+#: g10/keyedit.c:2162 g10/keylist.c:698 g10/mainproc.c:1546 g10/trustdb.c:499
msgid "expired"
msgstr "abgelaufen"
@@ -3382,7 +3391,7 @@ msgstr ""
"Bitte beachten Sie, da� ohne einen Programmneustart die angezeigte\n"
"Schl�sselg�ltigkeit nicht notwendigerweise korrekt ist.\n"
-#: g10/keyedit.c:2256 g10/mainproc.c:924
+#: g10/keyedit.c:2256 g10/mainproc.c:923
#, fuzzy
msgid "[revoked] "
msgstr "revkey"
@@ -3398,7 +3407,7 @@ msgid ""
" cause a different user ID to become the assumed primary.\n"
msgstr ""
-#: g10/keyedit.c:2382
+#: g10/keyedit.c:2383
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3408,45 +3417,45 @@ msgstr ""
"k�nnte\n"
" bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
-#: g10/keyedit.c:2387 g10/keyedit.c:2660
+#: g10/keyedit.c:2388 g10/keyedit.c:2661
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Wollen Sie ihn immmer noch hinzuf�gen? (j/N) "
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2394
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Sie k�nnen einem PGP2-artigen Schl��sel keine Foto-ID hinzuf�gen.\n"
-#: g10/keyedit.c:2528
+#: g10/keyedit.c:2529
msgid "Delete this good signature? (y/N/q)"
msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
-#: g10/keyedit.c:2538
+#: g10/keyedit.c:2539
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2543
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
-#: g10/keyedit.c:2548
+#: g10/keyedit.c:2549
msgid "Really delete this self-signature? (y/N)"
msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
-#: g10/keyedit.c:2562
+#: g10/keyedit.c:2563
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d Beglaubigungen entfernt.\n"
-#: g10/keyedit.c:2563
+#: g10/keyedit.c:2564
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d Beglaubigungen entfernt.\n"
-#: g10/keyedit.c:2566
+#: g10/keyedit.c:2567
msgid "Nothing deleted.\n"
msgstr "Nichts entfernt.\n"
-#: g10/keyedit.c:2655
+#: g10/keyedit.c:2656
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3456,13 +3465,13 @@ msgstr ""
" Widerrufers kann bei einigen PGP-Versionen zur Zur�ckweisung des\n"
" Schl�ssels f�hren.\n"
-#: g10/keyedit.c:2666
+#: g10/keyedit.c:2667
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Sie k�nnen einem PGP2-artigen Schl��sel keinen vorgesehenen Widerrufer "
"hinzuf�gen.\n"
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2687
msgid "Enter the user ID of the designated revoker: "
msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
@@ -3481,221 +3490,221 @@ msgstr ""
msgid "this key has already been designated as a revoker\n"
msgstr "Ein Schl�ssel ist bereits als Widerrufer vorgesehen\n"
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2766
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"Einen Schl�ssel mit einem designierter Widerrufer zu versehen, kann nicht "
"r�ckg�ngig gemacht werden!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2772
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"M�chten diesen Schl�ssel wirklich als designiertern Widerrufer einstellen? "
"(j/N): "
-#: g10/keyedit.c:2843
+#: g10/keyedit.c:2833
msgid "Please remove selections from the secret keys.\n"
msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2839
msgid "Please select at most one secondary key.\n"
msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
-#: g10/keyedit.c:2853
+#: g10/keyedit.c:2843
msgid "Changing expiration time for a secondary key.\n"
msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:2846
msgid "Changing expiration time for the primary key.\n"
msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
-#: g10/keyedit.c:2900
+#: g10/keyedit.c:2892
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Sie k�nnen das Verfallsdatum eines v3-Schl�ssels nicht �ndern\n"
-#: g10/keyedit.c:2916
+#: g10/keyedit.c:2908
msgid "No corresponding signature in secret ring\n"
msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:2988
msgid "Please select exactly one user ID.\n"
msgstr "Bitte genau eine User-ID ausw�hlen.\n"
-#: g10/keyedit.c:3033 g10/keyedit.c:3142 g10/keyedit.c:3234
+#: g10/keyedit.c:3027 g10/keyedit.c:3137 g10/keyedit.c:3251
#, c-format
msgid "skipping v3 self-signature on user id \"%s\"\n"
msgstr "�berspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3199
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3296
+#: g10/keyedit.c:3315
#, c-format
msgid "No user ID with index %d\n"
msgstr "Keine User-ID mit Index %d\n"
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3361
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Kein Zweitschl�ssel mit Index %d\n"
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3475
msgid "user ID: \""
msgstr "User-ID: \""
-#: g10/keyedit.c:3461
-#, c-format
+#: g10/keyedit.c:3480
+#, fuzzy, c-format
msgid ""
"\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
msgstr ""
"\"\n"
"unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
-#: g10/keyedit.c:3464
-#, c-format
+#: g10/keyedit.c:3483
+#, fuzzy, c-format
msgid ""
"\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
msgstr ""
"\"\n"
"lokal unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3488
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Diese Unterschrift ist seit %s verfallen.\n"
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3492
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
-#: g10/keyedit.c:3477
+#: g10/keyedit.c:3496
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
-#: g10/keyedit.c:3502
+#: g10/keyedit.c:3521
msgid "You have signed these user IDs:\n"
msgstr "Sie haben folgende User-IDs beglaubigt:\n"
-#: g10/keyedit.c:3521
-#, c-format
-msgid " signed by %08lX at %s%s%s\n"
+#: g10/keyedit.c:3542
+#, fuzzy, c-format
+msgid " signed by %s on %s%s%s\n"
msgstr " beglaubigt durch %08lX um %s%s%s\n"
-#: g10/keyedit.c:3529
-#, c-format
-msgid " revoked by %08lX at %s\n"
+#: g10/keyedit.c:3551
+#, fuzzy, c-format
+msgid " revoked by %s on %s\n"
msgstr " widerrufen durch %08lX um %s\n"
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3571
msgid "You are about to revoke these signatures:\n"
msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
-#: g10/keyedit.c:3559
-#, c-format
-msgid " signed by %08lX at %s%s\n"
+#: g10/keyedit.c:3581
+#, fuzzy, c-format
+msgid " signed by %s on %s%s\n"
msgstr " beglaubigt durch %08lX am %s%s\n"
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3583
msgid " (non-exportable)"
msgstr " (nicht-exportierbar)"
-#: g10/keyedit.c:3568
+#: g10/keyedit.c:3590
msgid "Really create the revocation certificates? (y/N) "
msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3620
msgid "no secret key\n"
msgstr "Kein geheimer Schl�ssel\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3690
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "User-ID \"%s\" ist bereits widerrufen.\n"
-#: g10/keyedit.c:3685
+#: g10/keyedit.c:3707
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "WARNUNG: Eine User-ID Unterschrift liegt %d Sekunden in der Zukunft.\n"
-#: g10/keyedit.c:3858
-#, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+#: g10/keyedit.c:3876
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Anzeigen einer %s Photo ID (%ld Byte) f�r Schl�ssel %08lX (User-ID %d)\n"
-#: g10/keylist.c:192
+#: g10/keylist.c:179
msgid "Critical signature policy: "
msgstr "Krititische Beglaubigungsrichtlinie: "
-#: g10/keylist.c:194
+#: g10/keylist.c:181
msgid "Signature policy: "
msgstr "Beglaubigungsrichtlinie: "
-#: g10/keylist.c:233
+#: g10/keylist.c:220
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:235
+#: g10/keylist.c:222
msgid "Preferred keyserver: "
msgstr ""
-#: g10/keylist.c:274 g10/keylist.c:313
+#: g10/keylist.c:268 g10/keylist.c:312
msgid "WARNING: invalid notation data found\n"
msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
-#: g10/keylist.c:288
+#: g10/keylist.c:286
msgid "Critical signature notation: "
msgstr "Krititische Beglaubigungs-\"Notation\": "
-#: g10/keylist.c:290
+#: g10/keylist.c:288
msgid "Signature notation: "
msgstr "Beglaubigungs-\"Notation\": "
-#: g10/keylist.c:301
+#: g10/keylist.c:299
msgid "not human readable"
msgstr "nicht als Klartext darstellbar"
-#: g10/keylist.c:401
+#: g10/keylist.c:400
msgid "Keyring"
msgstr "Schl�sselbund"
-#: g10/keylist.c:638 g10/keylist.c:674 g10/keylist.c:776 g10/keylist.c:805
-#: g10/mainproc.c:926
+#: g10/keylist.c:629 g10/keylist.c:658 g10/keylist.c:756 g10/keylist.c:781
+#: g10/mainproc.c:925
#, c-format
msgid " [expires: %s]"
msgstr " [verf�llt: %s]"
-#: g10/keylist.c:670 g10/keylist.c:772
+#: g10/keylist.c:654 g10/keylist.c:752
#, fuzzy, c-format
msgid " [revoked: %s]"
msgstr "revkey"
-#: g10/keylist.c:672 g10/keylist.c:774
+#: g10/keylist.c:656 g10/keylist.c:754
#, fuzzy, c-format
msgid " [expired: %s]"
msgstr " [verf�llt: %s]"
-#: g10/keylist.c:1393
+#: g10/keylist.c:1366
msgid "Primary key fingerprint:"
msgstr "Haupt-Fingerabdruck ="
-#: g10/keylist.c:1395
+#: g10/keylist.c:1368
msgid " Subkey fingerprint:"
msgstr "Unter-Fingerabdruck ="
-#: g10/keylist.c:1402
+#: g10/keylist.c:1375
msgid " Primary key fingerprint:"
msgstr " Haupt-Fingerabdruck ="
-#: g10/keylist.c:1404
+#: g10/keylist.c:1377
msgid " Subkey fingerprint:"
msgstr " Unter-Fingerabdruck ="
-#: g10/keylist.c:1408 g10/keylist.c:1412
+#: g10/keylist.c:1381 g10/keylist.c:1385
msgid " Key fingerprint ="
msgstr " Schl.-Fingerabdruck ="
@@ -3725,177 +3734,177 @@ msgid "encrypted with unknown algorithm %d\n"
msgstr "Mit unbekanntem Verfahren verschl�sselt %d\n"
#: g10/mainproc.c:366
-#, c-format
-msgid "public key is %08lX\n"
+#, fuzzy, c-format
+msgid "public key is %s\n"
msgstr "�ffentlicher Schl�ssel ist %08lX\n"
#: g10/mainproc.c:421
msgid "public key encrypted data: good DEK\n"
msgstr "Mit �ffentlichem Sch�ssel verschl�sselte Daten: Korrekte DEK\n"
-#: g10/mainproc.c:454
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:455
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, 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:464
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
+#: g10/mainproc.c:465
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
msgstr "verschl�sselt mit %s Schl�ssel, ID %08lX\n"
-#: g10/mainproc.c:478
+#: g10/mainproc.c:479
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
-#: g10/mainproc.c:492
+#: g10/mainproc.c:493
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "Verschl�sselt mit %lu Passphrasen\n"
-#: g10/mainproc.c:494
+#: g10/mainproc.c:495
msgid "encrypted with 1 passphrase\n"
msgstr "Verschl�sselt mit 1 Passphrase\n"
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:523 g10/mainproc.c:545
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "vermutlich %s-verschl�sselte Daten\n"
-#: g10/mainproc.c:530
+#: g10/mainproc.c:531
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA-Verschl�sselung nicht verf�gbar; versucht wird stattdessen %s\n"
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
msgid "decryption okay\n"
msgstr "Entschl�sselung erfolgreich\n"
-#: g10/mainproc.c:566
+#: g10/mainproc.c:567
msgid "WARNING: message was not integrity protected\n"
msgstr "WARNUNG: Die Nachricht war nicht gegen Ver�nderungen gesch�tzt\n"
-#: g10/mainproc.c:579
+#: g10/mainproc.c:580
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
-#: g10/mainproc.c:585
+#: g10/mainproc.c:586
#, c-format
msgid "decryption failed: %s\n"
msgstr "Entschl�sselung fehlgeschlagen: %s\n"
-#: g10/mainproc.c:605
+#: g10/mainproc.c:606
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr ""
"Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
-#: g10/mainproc.c:607
+#: g10/mainproc.c:608
#, c-format
msgid "original file name='%.*s'\n"
msgstr "Urspr�nglicher Dateiname='%.*s'\n"
-#: g10/mainproc.c:779
+#: g10/mainproc.c:780
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
-#: g10/mainproc.c:1279
+#: g10/mainproc.c:1276
msgid "signature verification suppressed\n"
msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
-#: g10/mainproc.c:1321 g10/mainproc.c:1331
+#: g10/mainproc.c:1318 g10/mainproc.c:1328
msgid "can't handle these multiple signatures\n"
msgstr "diese Mehrfachunterschriften k�nnen nicht behandelt werden\n"
-#: g10/mainproc.c:1342
-#, c-format
-msgid "Signature made %.*s\n"
+#: g10/mainproc.c:1338
+#, fuzzy, c-format
+msgid "Signature made %s\n"
msgstr "Unterschrift erstellt durch %.*s\n"
-#: g10/mainproc.c:1343
-#, c-format
-msgid " using %s key %08lX%08lX\n"
+#: g10/mainproc.c:1339
+#, fuzzy, c-format
+msgid " using %s key %s\n"
msgstr " mittels %s Schl�ssel %08lX%08lX\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1347
-#, c-format
-msgid "Signature made %.*s using %s key ID %08lX\n"
+#: g10/mainproc.c:1343
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1363
msgid "Key available at: "
msgstr "Schl�ssel verf�gbar bei: "
-#: g10/mainproc.c:1435 g10/mainproc.c:1471
+#: g10/mainproc.c:1463 g10/mainproc.c:1499
msgid "BAD signature from \""
msgstr "FALSCHE Unterschrift von \""
-#: g10/mainproc.c:1436 g10/mainproc.c:1472
+#: g10/mainproc.c:1464 g10/mainproc.c:1500
msgid "Expired signature from \""
msgstr "Verfallene Unterschrift von \""
-#: g10/mainproc.c:1437 g10/mainproc.c:1473
+#: g10/mainproc.c:1465 g10/mainproc.c:1501
msgid "Good signature from \""
msgstr "Korrekte Unterschrift von \""
-#: g10/mainproc.c:1475
+#: g10/mainproc.c:1503
msgid "[uncertain]"
msgstr "[ungewi�] "
-#: g10/mainproc.c:1601
+#: g10/mainproc.c:1631
#, c-format
msgid "Signature expired %s\n"
msgstr "Diese Unterschrift ist seit %s verfallen.\n"
-#: g10/mainproc.c:1606
+#: g10/mainproc.c:1636
#, c-format
msgid "Signature expires %s\n"
msgstr "Diese Unterschrift verf�llt am %s.\n"
-#: g10/mainproc.c:1609
+#: g10/mainproc.c:1639
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
-#: g10/mainproc.c:1610
+#: g10/mainproc.c:1640
msgid "binary"
msgstr "bin�r"
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1641
msgid "textmode"
msgstr ""
-#: g10/mainproc.c:1611 g10/trustdb.c:499
+#: g10/mainproc.c:1641 g10/trustdb.c:498
msgid "unknown"
msgstr "unbekannt"
-#: g10/mainproc.c:1631
+#: g10/mainproc.c:1661
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
-#: g10/mainproc.c:1699 g10/mainproc.c:1715 g10/mainproc.c:1801
+#: g10/mainproc.c:1729 g10/mainproc.c:1745 g10/mainproc.c:1831
msgid "not a detached signature\n"
msgstr "keine abgetrennte Unterschrift\n"
-#: g10/mainproc.c:1742
+#: g10/mainproc.c:1772
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
-#: g10/mainproc.c:1750
+#: g10/mainproc.c:1780
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
-#: g10/mainproc.c:1807
+#: g10/mainproc.c:1837
msgid "old style (PGP 2.x) signature\n"
msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1847
msgid "invalid root packet detected in proc_tree()\n"
msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
@@ -3949,75 +3958,75 @@ msgstr "uncompressed|none|nicht"
msgid "this message may not be usable by %s\n"
msgstr "Diese Botschaft k�nnte f�r %s unbrauchbar sein\n"
-#: g10/misc.c:742
+#: g10/misc.c:777
#, c-format
msgid "ambiguous option `%s'\n"
msgstr "Mehrdeutige Optionen `%s'\n"
-#: g10/misc.c:767
+#: g10/misc.c:802
#, c-format
msgid "unknown option `%s'\n"
msgstr "Unbekannte Option '%s'\n"
-#: g10/parse-packet.c:121
+#: g10/parse-packet.c:120
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
-#: g10/parse-packet.c:690
+#: g10/parse-packet.c:703
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1103
+#: g10/parse-packet.c:1128
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
-#: g10/passphrase.c:460 g10/passphrase.c:507
+#: g10/passphrase.c:461 g10/passphrase.c:508
msgid "gpg-agent is not available in this session\n"
msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
-#: g10/passphrase.c:468
+#: g10/passphrase.c:469
msgid "can't set client pid for the agent\n"
msgstr "Client-PID f�r den Agent kann nicht gesetzt werden\n"
-#: g10/passphrase.c:476
+#: g10/passphrase.c:477
msgid "can't get server read FD for the agent\n"
msgstr "Server-Lese-Handle f�r den Agent nicht verf�gbar\n"
-#: g10/passphrase.c:483
+#: g10/passphrase.c:484
msgid "can't get server write FD for the agent\n"
msgstr "Server-Schreib-Handle f�r den Agent nicht verf�gbar\n"
-#: g10/passphrase.c:516
+#: g10/passphrase.c:517
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
-#: g10/passphrase.c:529
+#: g10/passphrase.c:530
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterst�tzt\n"
-#: g10/passphrase.c:550
+#: g10/passphrase.c:551
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
-#: g10/passphrase.c:572
+#: g10/passphrase.c:573
msgid "communication problem with gpg-agent\n"
msgstr "Kommunikationsproblem mit GPG-Agent\n"
-#: g10/passphrase.c:579 g10/passphrase.c:879 g10/passphrase.c:991
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
msgid "problem with the agent - disabling agent use\n"
msgstr ""
"Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n"
-#: g10/passphrase.c:680 g10/passphrase.c:1132
+#: g10/passphrase.c:681
#, c-format
msgid " (main key ID %08lX)"
msgstr " (Hauptschl�ssel-ID %08lX)"
-#: g10/passphrase.c:690
+#: g10/passphrase.c:691
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -4028,40 +4037,40 @@ msgstr ""
"Benutzer: \"\"%.*s\"\n"
"%u-bit %s Schl�ssel, ID %08lX, erzeugt %s%s\n"
-#: g10/passphrase.c:712
+#: g10/passphrase.c:713
msgid "Repeat passphrase\n"
msgstr "Geben Sie das Mantra nochmal ein\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:715
msgid "Enter passphrase\n"
msgstr "Geben Sie das Mantra ein\n"
-#: g10/passphrase.c:752
+#: g10/passphrase.c:753
msgid "passphrase too long\n"
msgstr "Mantra ist zu lang\n"
-#: g10/passphrase.c:765
+#: g10/passphrase.c:766
msgid "invalid response from agent\n"
msgstr "Falsche Antwort des Agenten\n"
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:781 g10/passphrase.c:874
msgid "cancelled by user\n"
msgstr "Abbruch durch Benutzer\n"
-#: g10/passphrase.c:785 g10/passphrase.c:962
+#: g10/passphrase.c:786 g10/passphrase.c:963
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
-#: g10/passphrase.c:1043 g10/passphrase.c:1179
+#: g10/passphrase.c:1044 g10/passphrase.c:1189
msgid "can't query password in batchmode\n"
msgstr "Mantra kann im Batchmodus nicht abgefragt werden\n"
-#: g10/passphrase.c:1048 g10/passphrase.c:1183
+#: g10/passphrase.c:1049 g10/passphrase.c:1193
msgid "Enter passphrase: "
msgstr "Geben Sie das Mantra ein: "
-#: g10/passphrase.c:1118
+#: g10/passphrase.c:1119
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4071,12 +4080,22 @@ msgstr ""
"Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu entsperren.\n"
"Benutzer: \""
-#: g10/passphrase.c:1127
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1128
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
-#: g10/passphrase.c:1187
+#: g10/passphrase.c:1137
+#, c-format
+msgid " (subkey on main key ID %s)"
+msgstr ""
+
+#: g10/passphrase.c:1141
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (Hauptschl�ssel-ID %08lX)"
+
+#: g10/passphrase.c:1197
msgid "Repeat passphrase: "
msgstr "Geben Sie das Mantra nochmal ein: "
@@ -4112,8 +4131,8 @@ msgid "can't open signed data `%s'\n"
msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
#: g10/pubkey-enc.c:103
-#, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
msgstr "Ungenannter Empf�nger; Versuch mit geheimen Schl�ssel %08lX ...\n"
#: g10/pubkey-enc.c:119
@@ -4135,8 +4154,8 @@ msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschl�sselungsverfahren\n"
#: g10/pubkey-enc.c:286
-#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
msgstr "Hinweis: geheimer Schl�ssel %08lX verf�llt am %s\n"
#: g10/pubkey-enc.c:292
@@ -4177,66 +4196,67 @@ msgstr ""
msgid "WARNING: signature digest conflict in message\n"
msgstr "WARNUNG: Widersprechende Hashverfahren in der signierten Nachricht\n"
-#: g10/sig-check.c:146
+#: g10/sig-check.c:99
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr ""
+
+#: g10/sig-check.c:102
#, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated Elgamal key which is NOT secure for "
-"signatures!\n"
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
-"Schl�ssel %08lX: Dieser durch PGP erzeugte ElGamal-Schl�ssel ist f�r "
-"Signaturen NICHT sicher genug!\n"
+"Einen Schl�ssel mit einem designierter Widerrufer zu versehen, kann nicht "
+"r�ckg�ngig gemacht werden!\n"
-#: g10/sig-check.c:155
-#, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
+#: g10/sig-check.c:168
+#, fuzzy, c-format
+msgid "public key %s is %lu second newer than the signature\n"
msgstr ""
"�ffentlicher Schl�ssel %08lX ist um %lu Sekunde j�nger als die Unterschrift\n"
-#: g10/sig-check.c:156
-#, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
+#: g10/sig-check.c:169
+#, fuzzy, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
msgstr ""
"�ffentlicher Schl�ssel %08lX ist um %lu Sekunden j�nger als die "
"Unterschrift\n"
-#: g10/sig-check.c:165
-#, c-format
+#: g10/sig-check.c:180
+#, fuzzy, c-format
msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
msgstr ""
-"Der Schl�ssel %08lX wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder "
-"Uhren stimmen nicht �berein)\n"
+"Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
+"stimmen nicht �berein)\n"
-#: g10/sig-check.c:167
-#, c-format
+#: g10/sig-check.c:182
+#, fuzzy, c-format
msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
msgstr ""
-"Der Schl�ssel %08lX wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise "
-"oder Uhren stimmen nicht �berein)\n"
+"Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
+"Uhren stimmen nicht �berein)\n"
-#: g10/sig-check.c:180
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
msgstr "Hinweis: Signaturschl�ssel %08lX ist am %s verfallen.\n"
-#: g10/sig-check.c:263
-#, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
+#: g10/sig-check.c:275
+#, fuzzy, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
"Vermutlich eine FALSCHE Unterschrift von Schl�ssel %08lX, wegen unbekanntem "
"\"critical bit\"\n"
-#: g10/sig-check.c:486
+#: g10/sig-check.c:532
#, fuzzy, c-format
-msgid "key %08lX: no subkey for subkey revocation signature\n"
+msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r den Schl�sselwiderruf\n"
-#: g10/sig-check.c:512
+#: g10/sig-check.c:558
#, fuzzy, c-format
-msgid "key %08lX: no subkey for subkey binding signature\n"
+msgid "key %s: no subkey for subkey binding signature\n"
msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Schl�sselanbindung\n"
#: g10/sign.c:85
@@ -4298,39 +4318,39 @@ msgstr "Pr�fung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s Unterschrift von: \"%s\"\n"
-#: g10/sign.c:548
+#: g10/sign.c:550
#, c-format
msgid "WARNING: `%s' is an empty file\n"
msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
-#: g10/sign.c:736
+#: g10/sign.c:741
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln eine abgetrennte "
"Unterschrift erzeugt werden\n"
-#: g10/sign.c:760 g10/sign.c:996
+#: g10/sign.c:765 g10/sign.c:1001
#, c-format
msgid "can't create %s: %s\n"
msgstr "%s kann nicht erzeugt werden: %s\n"
-#: g10/sign.c:789
+#: g10/sign.c:794
#, c-format
msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"Erzwingen des Hashverfahrens %s (%d) verletzt die Empf�ngervoreinstellungen\n"
-#: g10/sign.c:881
+#: g10/sign.c:886
msgid "signing:"
msgstr "unterschreibe:"
-#: g10/sign.c:980
+#: g10/sign.c:985
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"Im --pgp2-Modus k�nnen Sie Klartextunterschriften nur mit PGP-2.x-artigen "
"Schl�ssel machen\n"
-#: g10/sign.c:1133
+#: g10/sign.c:1138
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s Verschl�sselung wird verwendet\n"
@@ -4486,107 +4506,107 @@ msgid "`%s' is not a valid long keyID\n"
msgstr "'%s' ist keine g�ltige lange Schl�ssel-ID\n"
#: g10/trustdb.c:257
-#, c-format
-msgid "key %08lX: accepted as trusted key\n"
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
msgstr "Schl�ssel %08lX: Akzeptiert als vertrauensw�rdiger Schl�ssel\n"
#: g10/trustdb.c:295
-#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
msgstr "Schl�ssel %08lX tritt mehr als einmal in der \"trustdb\" auf\n"
#: g10/trustdb.c:310
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
msgstr ""
"Schl�ssel %08lX: kein �ffentlicher Schl�ssel f�r den vertrauensw�rdigen "
"Schl�ssel - �bersprungen\n"
-#: g10/trustdb.c:319
+#: g10/trustdb.c:320
#, fuzzy, c-format
-msgid "key %08lX marked as ultimately trusted\n"
+msgid "key %s marked as ultimately trusted\n"
msgstr "Schl�ssel ist als uneingeschr�nkt vertrauensw�rdig gekennzeichnet.\n"
-#: g10/trustdb.c:345
+#: g10/trustdb.c:344
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "trust record %lu, req type %d: read failed: %s\n"
-#: g10/trustdb.c:351
+#: g10/trustdb.c:350
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "Vertrauenssatz %lu ist nicht von der angeforderten Art %d\n"
-#: g10/trustdb.c:366 g10/tdbdump.c:59
+#: g10/trustdb.c:365 g10/tdbdump.c:59
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "trust record %lu, type %d: write failed: %s\n"
-#: g10/trustdb.c:381 g10/tdbdump.c:217
+#: g10/trustdb.c:380 g10/tdbdump.c:217
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
-#: g10/trustdb.c:446
+#: g10/trustdb.c:445
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
-#: g10/trustdb.c:452
+#: g10/trustdb.c:451
#, c-format
msgid "using %s trust model\n"
msgstr ""
-#: g10/trustdb.c:501
+#: g10/trustdb.c:500
msgid "undefined"
msgstr ""
-#: g10/trustdb.c:502
+#: g10/trustdb.c:501
msgid "never"
msgstr ""
-#: g10/trustdb.c:503
+#: g10/trustdb.c:502
msgid "marginal"
msgstr ""
-#: g10/trustdb.c:504
+#: g10/trustdb.c:503
msgid "full"
msgstr ""
-#: g10/trustdb.c:505
+#: g10/trustdb.c:504
#, fuzzy
msgid "ultimate"
msgstr "|KEYID|diesem Schl�ssel uneingeschr�nkt vertrauen"
-#: g10/trustdb.c:545
+#: g10/trustdb.c:544
msgid "no need for a trustdb check\n"
msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
-#: g10/trustdb.c:551 g10/trustdb.c:2103
+#: g10/trustdb.c:550 g10/trustdb.c:2103
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "n�chste \"Trust-DB\"-Pflicht�berpr�fung am %s\n"
-#: g10/trustdb.c:560
+#: g10/trustdb.c:559
#, fuzzy, c-format
msgid "no need for a trustdb check with \"%s\" trust model\n"
msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
-#: g10/trustdb.c:575
+#: g10/trustdb.c:574
#, fuzzy, c-format
msgid "no need for a trustdb update with \"%s\" trust model\n"
msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
-#: g10/trustdb.c:793 g10/trustdb.c:1221
-#, c-format
-msgid "public key %08lX not found: %s\n"
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
msgstr "�ffentlicher Schl�ssel %08lX nicht gefunden: %s\n"
-#: g10/trustdb.c:988
+#: g10/trustdb.c:987
msgid "please do a --check-trustdb\n"
msgstr ""
-#: g10/trustdb.c:992
+#: g10/trustdb.c:991
msgid "checking the trustdb\n"
msgstr "\"Trust-DB\" wird �berpr�ft\n"
@@ -4602,8 +4622,8 @@ msgstr ""
"�ff.Schl�ssel des uneingeschr�nkt vertrautem Schl�ssel %08lX nicht gefunden\n"
#: g10/trustdb.c:1925
-#, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
msgstr ""
"�ff.Schl�ssel des uneingeschr�nkt vertrautem Schl�ssel %08lX nicht gefunden\n"
@@ -5268,82 +5288,78 @@ msgstr ""
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr ""
-#: g10/keyid.c:370 g10/keyid.c:382 g10/keyid.c:394 g10/keyid.c:406
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
msgid "never "
msgstr ""
-#: g10/revoke.c:92
-msgid "key incomplete\n"
-msgstr ""
-
-#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:540
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
#, fuzzy, c-format
msgid "build_packet failed: %s\n"
msgstr "�nderung fehlgeschlagen: %s\n"
-#: g10/revoke.c:145
+#: g10/revoke.c:146
#, fuzzy, c-format
-msgid "key %08lX incomplete\n"
+msgid "key %s has no user IDs\n"
msgstr "Schl�ssel %08lX: Keine User-ID\n"
-#: g10/revoke.c:270
+#: g10/revoke.c:271
msgid "To be revoked by:\n"
msgstr ""
-#: g10/revoke.c:274
+#: g10/revoke.c:275
msgid "(This is a sensitive revocation key)\n"
msgstr ""
-#: g10/revoke.c:278 g10/revoke.c:475
+#: g10/revoke.c:279 g10/revoke.c:476
#, fuzzy
msgid "Create a revocation certificate for this key? "
msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
-#: g10/revoke.c:291 g10/revoke.c:506
+#: g10/revoke.c:292 g10/revoke.c:507
msgid "ASCII armored output forced.\n"
msgstr ""
-#: g10/revoke.c:305 g10/revoke.c:520
+#: g10/revoke.c:306 g10/revoke.c:521
#, fuzzy, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "enumerate Schl�sselblock fehlgeschlagen: %s\n"
-#: g10/revoke.c:368
+#: g10/revoke.c:369
#, fuzzy
msgid "Revocation certificate created.\n"
msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat hinzugef�gt\n"
-#: g10/revoke.c:374
+#: g10/revoke.c:375
#, c-format
msgid "no revocation keys found for `%s'\n"
msgstr ""
-#: g10/revoke.c:428
+#: g10/revoke.c:429
#, fuzzy, c-format
msgid "secret key `%s' not found: %s\n"
msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
-#: g10/revoke.c:457
+#: g10/revoke.c:458
#, fuzzy, c-format
msgid "no corresponding public key: %s\n"
msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
-#: g10/revoke.c:468
+#: g10/revoke.c:469
msgid "public key does not match secret key!\n"
msgstr ""
-#: g10/revoke.c:491
+#: g10/revoke.c:492
#, fuzzy
msgid "unknown protection algorithm\n"
msgstr "Unbekanntes Komprimierverfahren"
-#: g10/revoke.c:495
+#: g10/revoke.c:496
#, fuzzy
msgid "NOTE: This key is not protected!\n"
msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
-#: g10/revoke.c:546
+#: g10/revoke.c:547
msgid ""
"Revocation certificate created.\n"
"\n"
@@ -5354,37 +5370,37 @@ msgid ""
"your machine might store the data and make it available to others!\n"
msgstr ""
-#: g10/revoke.c:587
+#: g10/revoke.c:588
#, fuzzy
msgid "Please select the reason for the revocation:\n"
msgstr "Grund f�r Widerruf: "
-#: g10/revoke.c:597
+#: g10/revoke.c:598
msgid "Cancel"
msgstr ""
-#: g10/revoke.c:599
+#: g10/revoke.c:600
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr ""
-#: g10/revoke.c:640
+#: g10/revoke.c:641
#, fuzzy
msgid "Enter an optional description; end it with an empty line:\n"
msgstr ""
"\n"
"Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
-#: g10/revoke.c:668
+#: g10/revoke.c:669
#, fuzzy, c-format
msgid "Reason for revocation: %s\n"
msgstr "Grund f�r Widerruf: "
-#: g10/revoke.c:670
+#: g10/revoke.c:671
msgid "(No description given)\n"
msgstr ""
-#: g10/revoke.c:675
+#: g10/revoke.c:676
#, fuzzy
msgid "Is this okay? "
msgstr "Diesen Schl�ssel trotzdem benutzen? "
@@ -5430,6 +5446,43 @@ msgstr "Fehler beim Lesen des Verz.Satzes: %s\n"
msgid "read error: %s\n"
msgstr "ASCII-H�lle: %s\n"
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "Schl�ssel %08lX: dies ist kein RFC2440-Sch�ssel - �bersprungen\n"
+
+#~ msgid "%s%c %4u%c/%08lX created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX erstellt: %s verf�llt: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated Elgamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "Schl�ssel %08lX: Dieser durch PGP erzeugte ElGamal-Schl�ssel ist f�r "
+#~ "Signaturen NICHT sicher genug!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "Der Schl�ssel %08lX wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise "
+#~ "oder Uhren stimmen nicht �berein)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "Der Schl�ssel %08lX wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise "
+#~ "oder Uhren stimmen nicht �berein)\n"
+
+#, fuzzy
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr ""
+#~ "Schl�ssel ist als uneingeschr�nkt vertrauensw�rdig gekennzeichnet.\n"
+
+#, fuzzy
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "Schl�ssel %08lX: Keine User-ID\n"
+
#~ msgid "quit|quit"
#~ msgstr "quit"
@@ -5503,10 +5556,6 @@ msgstr "ASCII-H�lle: %s\n"
#~ msgid "Create anyway? "
#~ msgstr "Trotzdem erzeugen? "
-#~ msgid "key marked as ultimately trusted.\n"
-#~ msgstr ""
-#~ "Schl�ssel ist als uneingeschr�nkt vertrauensw�rdig gekennzeichnet.\n"
-
#~ msgid "invalid symkey algorithm detected (%d)\n"
#~ msgstr "Ung�ltiger Veschl�sselungsalgorithmus entdeckt (%d)\n"
diff --git a/po/[email protected] b/po/[email protected]
index d959f3a21..9b84cd42c 100644
--- a/po/[email protected]
+++ b/po/[email protected]
Binary files differ
diff --git a/po/[email protected] b/po/[email protected]
index cc1686be7..a86703e02 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -30,10 +30,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gnupg 1.3.5\n"
+"Project-Id-Version: gnupg 1.3.6\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-02-26 18:37+0100\n"
-"PO-Revision-Date: 2004-02-26 18:37+0100\n"
+"POT-Creation-Date: 2004-05-22 13:30+0200\n"
+"PO-Revision-Date: 2004-05-22 13:30+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -327,7 +327,7 @@ msgstr "you found a bug ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "no entropy gathering module detected\n"
-#: cipher/random.c:387 g10/keygen.c:1917 g10/import.c:169
+#: cipher/random.c:387 g10/keygen.c:2028 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "can't open ‘%s’: %s\n"
@@ -428,7 +428,7 @@ msgstr "can't gen prime with pbits=%u qbits=%u\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "can't generate a prime with less than %d bits\n"
-#: g10/g10.c:350
+#: g10/g10.c:354
msgid ""
"@Commands:\n"
" "
@@ -436,127 +436,127 @@ msgstr ""
"@Commands:\n"
" "
-#: g10/g10.c:352
+#: g10/g10.c:356
msgid "|[file]|make a signature"
msgstr "|[file]|make a signature"
-#: g10/g10.c:353
+#: g10/g10.c:357
msgid "|[file]|make a clear text signature"
msgstr "|[file]|make a clear text signature"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid "make a detached signature"
msgstr "make a detached signature"
-#: g10/g10.c:355
+#: g10/g10.c:359
msgid "encrypt data"
msgstr "encrypt data"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "encryption only with symmetric cipher"
msgstr "encryption only with symmetric cipher"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "decrypt data (default)"
msgstr "decrypt data (default)"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "verify a signature"
msgstr "verify a signature"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "list keys"
msgstr "list keys"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "list keys and signatures"
msgstr "list keys and signatures"
-#: g10/g10.c:366
+#: g10/g10.c:370
msgid "list and check key signatures"
msgstr "list and check key signatures"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys and fingerprints"
msgstr "list keys and fingerprints"
-#: g10/g10.c:368
+#: g10/g10.c:372
msgid "list secret keys"
msgstr "list secret keys"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "generate a new key pair"
msgstr "generate a new key pair"
-#: g10/g10.c:370
+#: g10/g10.c:374
msgid "remove keys from the public keyring"
msgstr "remove keys from the public keyring"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "remove keys from the secret keyring"
msgstr "remove keys from the secret keyring"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "sign a key"
msgstr "sign a key"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "sign a key locally"
msgstr "sign a key locally"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign or edit a key"
msgstr "sign or edit a key"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "generate a revocation certificate"
msgstr "generate a revocation certificate"
-#: g10/g10.c:380
+#: g10/g10.c:384
msgid "export keys"
msgstr "export keys"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "export keys to a key server"
msgstr "export keys to a key server"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "import keys from a key server"
msgstr "import keys from a key server"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "search for keys on a key server"
msgstr "search for keys on a key server"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "update all keys from a keyserver"
msgstr "update all keys from a keyserver"
-#: g10/g10.c:390
+#: g10/g10.c:393
msgid "import/merge keys"
msgstr "import/merge keys"
-#: g10/g10.c:393
+#: g10/g10.c:396
msgid "print the card status"
msgstr "print the card status"
-#: g10/g10.c:394
+#: g10/g10.c:397
msgid "change data on a card"
msgstr "change data on a card"
-#: g10/g10.c:395
+#: g10/g10.c:398
msgid "change a card's PIN"
msgstr "change a card's PIN"
-#: g10/g10.c:402
+#: g10/g10.c:406
msgid "update the trust database"
msgstr "update the trust database"
-#: g10/g10.c:409
+#: g10/g10.c:413
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|print message digests"
-#: g10/g10.c:413 g10/gpgv.c:64
+#: g10/g10.c:417 g10/gpgv.c:64
msgid ""
"@\n"
"Options:\n"
@@ -566,51 +566,55 @@ msgstr ""
"Options:\n"
" "
-#: g10/g10.c:415
+#: g10/g10.c:419
msgid "create ascii armored output"
msgstr "create ascii armored output"
-#: g10/g10.c:417
+#: g10/g10.c:421
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|encrypt for NAME"
-#: g10/g10.c:428
+#: g10/g10.c:432
msgid "use this user-id to sign or decrypt"
msgstr "use this user-id to sign or decrypt"
-#: g10/g10.c:429
+#: g10/g10.c:433
msgid "|N|set compress level N (0 disables)"
msgstr "|N|set compress level N (0 disables)"
-#: g10/g10.c:434
+#: g10/g10.c:438
msgid "use canonical text mode"
msgstr "use canonical text mode"
-#: g10/g10.c:444
+#: g10/g10.c:448
msgid "use as output file"
msgstr "use as output file"
-#: g10/g10.c:446 g10/gpgv.c:66
+#: g10/g10.c:450 g10/gpgv.c:66
msgid "verbose"
msgstr "verbose"
-#: g10/g10.c:457
+#: g10/g10.c:461
msgid "do not make any changes"
msgstr "do not make any changes"
-#: g10/g10.c:458
+#: g10/g10.c:462
msgid "prompt before overwriting"
msgstr "prompt before overwriting"
-#: g10/g10.c:502
+#: g10/g10.c:506
msgid "use strict OpenPGP behavior"
msgstr "use strict OpenPGP behavior"
-#: g10/g10.c:503
+#: g10/g10.c:507
msgid "generate PGP 2.x compatible messages"
msgstr "generate PGP 2.x compatible messages"
-#: g10/g10.c:526
+#: g10/g10.c:529
+msgid "allow the use of admin card commands"
+msgstr "allow the use of admin card commands"
+
+#: g10/g10.c:534
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -618,7 +622,7 @@ msgstr ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
-#: g10/g10.c:529
+#: g10/g10.c:537
msgid ""
"@\n"
"Examples:\n"
@@ -638,15 +642,15 @@ msgstr ""
" --list-keys [names] show keys\n"
" --fingerprint [names] show fingerprints\n"
-#: g10/g10.c:702 g10/gpgv.c:91
+#: g10/g10.c:712 g10/gpgv.c:91
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Please report bugs to <[email protected]>.\n"
-#: g10/g10.c:719
+#: g10/g10.c:729
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Usage: gpg [options] [files] (-h for help)"
-#: g10/g10.c:722
+#: g10/g10.c:732
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -656,7 +660,7 @@ msgstr ""
"sign, check, encrypt or decrypt\n"
"default operation depends on the input data\n"
-#: g10/g10.c:733
+#: g10/g10.c:743
msgid ""
"\n"
"Supported algorithms:\n"
@@ -664,71 +668,71 @@ msgstr ""
"\n"
"Supported algorithms:\n"
-#: g10/g10.c:736
+#: g10/g10.c:746
msgid "Pubkey: "
msgstr "Pubkey: "
-#: g10/g10.c:742 g10/keyedit.c:1718
+#: g10/g10.c:752 g10/keyedit.c:1721
msgid "Cipher: "
msgstr "Cipher: "
-#: g10/g10.c:748
+#: g10/g10.c:758
msgid "Hash: "
msgstr "Hash: "
-#: g10/g10.c:754 g10/keyedit.c:1764
+#: g10/g10.c:764 g10/keyedit.c:1767
msgid "Compression: "
msgstr "Compression: "
-#: g10/g10.c:837
+#: g10/g10.c:847
msgid "usage: gpg [options] "
msgstr "usage: gpg [options] "
-#: g10/g10.c:940
+#: g10/g10.c:950
msgid "conflicting commands\n"
msgstr "conflicting commands\n"
-#: g10/g10.c:958
+#: g10/g10.c:968
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "no = sign found in group definition “%s”\n"
-#: g10/g10.c:1155
+#: g10/g10.c:1165
#, c-format
msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
msgstr "WARNING: unsafe ownership on homedir “%s”\n"
-#: g10/g10.c:1158
+#: g10/g10.c:1168
#, c-format
msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
msgstr "WARNING: unsafe ownership on configuration file “%s”\n"
-#: g10/g10.c:1161
+#: g10/g10.c:1171
#, c-format
msgid "WARNING: unsafe ownership on extension \"%s\"\n"
msgstr "WARNING: unsafe ownership on extension “%s”\n"
-#: g10/g10.c:1167
+#: g10/g10.c:1177
#, c-format
msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
msgstr "WARNING: unsafe permissions on homedir “%s”\n"
-#: g10/g10.c:1170
+#: g10/g10.c:1180
#, c-format
msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
msgstr "WARNING: unsafe permissions on configuration file “%s”\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1183
#, c-format
msgid "WARNING: unsafe permissions on extension \"%s\"\n"
msgstr "WARNING: unsafe permissions on extension “%s”\n"
-#: g10/g10.c:1179
+#: g10/g10.c:1189
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
msgstr "WARNING: unsafe enclosing directory ownership on homedir “%s”\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1192
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
@@ -736,19 +740,19 @@ msgstr ""
"WARNING: unsafe enclosing directory ownership on configuration file “%s"
"[0m”\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1195
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
msgstr ""
"WARNING: unsafe enclosing directory ownership on extension “%s”\n"
-#: g10/g10.c:1191
+#: g10/g10.c:1201
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
msgstr ""
"WARNING: unsafe enclosing directory permissions on homedir “%s”\n"
-#: g10/g10.c:1194
+#: g10/g10.c:1204
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
@@ -757,364 +761,373 @@ msgstr ""
"WARNING: unsafe enclosing directory permissions on configuration file “%s"
"[0m”\n"
-#: g10/g10.c:1197
+#: g10/g10.c:1207
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
msgstr ""
"WARNING: unsafe enclosing directory permissions on extension “%s”\n"
-#: g10/g10.c:1323
+#: g10/g10.c:1333
#, c-format
msgid "unknown configuration item \"%s\"\n"
msgstr "unknown configuration item “%s”\n"
-#: g10/g10.c:1570
+#: g10/g10.c:1600
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTE: old default options file ‘%s’ ignored\n"
-#: g10/g10.c:1606
+#: g10/g10.c:1636
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTE: no default option file ‘%s’\n"
-#: g10/g10.c:1610
+#: g10/g10.c:1640
#, c-format
msgid "option file `%s': %s\n"
msgstr "option file ‘%s’: %s\n"
-#: g10/g10.c:1617
+#: g10/g10.c:1647
#, c-format
msgid "reading options from `%s'\n"
msgstr "reading options from ‘%s’\n"
-#: g10/g10.c:1842 g10/g10.c:2333 g10/g10.c:2344
+#: g10/g10.c:1873 g10/g10.c:2408 g10/g10.c:2419
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTE: %s is not for normal use!\n"
-#: g10/g10.c:1855
+#: g10/g10.c:1886
#, c-format
msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
msgstr "cipher extension “%s” not loaded due to unsafe permissions\n"
-#: g10/g10.c:2066
+#: g10/g10.c:2098
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s is not a valid character set\n"
-#: g10/g10.c:2084
-msgid "could not parse keyserver URI\n"
-msgstr "could not parse keyserver URI\n"
+#: g10/g10.c:2117 g10/keyedit.c:3212
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
+#: g10/g10.c:2123
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
+#: g10/g10.c:2126
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
-#: g10/g10.c:2093
+#: g10/g10.c:2133
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: invalid import options\n"
-#: g10/g10.c:2096
+#: g10/g10.c:2136
msgid "invalid import options\n"
msgstr "invalid import options\n"
-#: g10/g10.c:2103
+#: g10/g10.c:2143
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: invalid export options\n"
-#: g10/g10.c:2106
+#: g10/g10.c:2146
msgid "invalid export options\n"
msgstr "invalid export options\n"
-#: g10/g10.c:2129
+#: g10/g10.c:2171
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: invalid list options\n"
-#: g10/g10.c:2132
+#: g10/g10.c:2174
msgid "invalid list options\n"
msgstr "invalid list options\n"
-#: g10/g10.c:2153
+#: g10/g10.c:2197
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: invalid verify options\n"
-#: g10/g10.c:2156
+#: g10/g10.c:2200
msgid "invalid verify options\n"
msgstr "invalid verify options\n"
-#: g10/g10.c:2163
+#: g10/g10.c:2207
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "unable to set exec-path to %s\n"
-#: g10/g10.c:2322
+#: g10/g10.c:2397
msgid "WARNING: program may create a core file!\n"
msgstr "WARNING: program may create a core file!\n"
-#: g10/g10.c:2326
+#: g10/g10.c:2401
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WARNING: %s overrides %s\n"
-#: g10/g10.c:2335
+#: g10/g10.c:2410
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s not allowed with %s!\n"
-#: g10/g10.c:2338
+#: g10/g10.c:2413
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s makes no sense with %s!\n"
-#: g10/g10.c:2359
+#: g10/g10.c:2434
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "you can only make detached or clear signatures while in --pgp2 mode\n"
-#: g10/g10.c:2365
+#: g10/g10.c:2440
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-#: g10/g10.c:2371
+#: g10/g10.c:2446
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-#: g10/g10.c:2384
+#: g10/g10.c:2459
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-#: g10/g10.c:2452 g10/g10.c:2476
+#: g10/g10.c:2527 g10/g10.c:2551
msgid "selected cipher algorithm is invalid\n"
msgstr "selected cipher algorithm is invalid\n"
-#: g10/g10.c:2458 g10/g10.c:2482
+#: g10/g10.c:2533 g10/g10.c:2557
msgid "selected digest algorithm is invalid\n"
msgstr "selected digest algorithm is invalid\n"
-#: g10/g10.c:2464
+#: g10/g10.c:2539
msgid "selected compression algorithm is invalid\n"
msgstr "selected compression algorithm is invalid\n"
-#: g10/g10.c:2470
+#: g10/g10.c:2545
msgid "selected certification digest algorithm is invalid\n"
msgstr "selected certification digest algorithm is invalid\n"
-#: g10/g10.c:2485
+#: g10/g10.c:2560
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed must be greater than 0\n"
-#: g10/g10.c:2487
+#: g10/g10.c:2562
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed must be greater than 1\n"
-#: g10/g10.c:2489
+#: g10/g10.c:2564
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth must be in the range from 1 to 255\n"
-#: g10/g10.c:2491
+#: g10/g10.c:2566
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-#: g10/g10.c:2493
+#: g10/g10.c:2568
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
-#: g10/g10.c:2496
+#: g10/g10.c:2571
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTE: simple S2K mode (0) is strongly discouraged\n"
-#: g10/g10.c:2500
+#: g10/g10.c:2575
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "invalid S2K mode; must be 0, 1 or 3\n"
-#: g10/g10.c:2507
+#: g10/g10.c:2582
msgid "invalid default preferences\n"
msgstr "invalid default preferences\n"
-#: g10/g10.c:2516
+#: g10/g10.c:2591
msgid "invalid personal cipher preferences\n"
msgstr "invalid personal cipher preferences\n"
-#: g10/g10.c:2520
+#: g10/g10.c:2595
msgid "invalid personal digest preferences\n"
msgstr "invalid personal digest preferences\n"
-#: g10/g10.c:2524
+#: g10/g10.c:2599
msgid "invalid personal compress preferences\n"
msgstr "invalid personal compress preferences\n"
-#: g10/g10.c:2557
+#: g10/g10.c:2632
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s does not yet work with %s\n"
-#: g10/g10.c:2604
+#: g10/g10.c:2679
#, c-format
msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
msgstr "you may not use cipher algorithm “%s” while in %s mode\n"
-#: g10/g10.c:2609
+#: g10/g10.c:2684
#, c-format
msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
msgstr "you may not use digest algorithm “%s” while in %s mode\n"
-#: g10/g10.c:2614
+#: g10/g10.c:2689
#, c-format
msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
msgstr "you may not use compression algorithm “%s” while in %s mode\n"
-#: g10/g10.c:2702
+#: g10/g10.c:2777
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "failed to initialize the TrustDB: %s\n"
-#: g10/g10.c:2713
+#: g10/g10.c:2788
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "WARNING: recipients (-r) given without using public key encryption\n"
-#: g10/g10.c:2724
+#: g10/g10.c:2799
msgid "--store [filename]"
msgstr "--store [filename]"
-#: g10/g10.c:2731
+#: g10/g10.c:2806
msgid "--symmetric [filename]"
msgstr "--symmetric [filename]"
-#: g10/g10.c:2743
+#: g10/g10.c:2818
msgid "--encrypt [filename]"
msgstr "--encrypt [filename]"
-#: g10/g10.c:2756
+#: g10/g10.c:2831
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filename]"
-#: g10/g10.c:2758
+#: g10/g10.c:2833
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-#: g10/g10.c:2761
+#: g10/g10.c:2836
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
-#: g10/g10.c:2779
+#: g10/g10.c:2854
msgid "--sign [filename]"
msgstr "--sign [filename]"
-#: g10/g10.c:2792
+#: g10/g10.c:2867
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filename]"
-#: g10/g10.c:2807
+#: g10/g10.c:2882
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filename]"
-#: g10/g10.c:2809
+#: g10/g10.c:2884
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-#: g10/g10.c:2812
+#: g10/g10.c:2887
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-#: g10/g10.c:2832
+#: g10/g10.c:2907
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filename]"
-#: g10/g10.c:2841
+#: g10/g10.c:2916
msgid "--clearsign [filename]"
msgstr "--clearsign [filename]"
-#: g10/g10.c:2866
+#: g10/g10.c:2941
msgid "--decrypt [filename]"
msgstr "--decrypt [filename]"
-#: g10/g10.c:2874
+#: g10/g10.c:2949
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/g10.c:2878
+#: g10/g10.c:2953
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/g10.c:2882
+#: g10/g10.c:2957
msgid "--nrsign-key user-id"
msgstr "--nrsign-key user-id"
-#: g10/g10.c:2886
+#: g10/g10.c:2961
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key user-id"
-#: g10/g10.c:2910
+#: g10/g10.c:2985
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [commands]"
-#: g10/g10.c:2966 g10/encode.c:474 g10/sign.c:886
+#: g10/g10.c:3041 g10/encode.c:474 g10/sign.c:891
#, c-format
msgid "can't open %s: %s\n"
msgstr "can't open %s: %s\n"
-#: g10/g10.c:2981
+#: g10/g10.c:3056
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [keyring]"
-#: g10/g10.c:3018
+#: g10/g10.c:3093
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "keyserver send failed: %s\n"
-#: g10/g10.c:3020
+#: g10/g10.c:3095
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "keyserver receive failed: %s\n"
-#: g10/g10.c:3022
+#: g10/g10.c:3097
#, c-format
msgid "key export failed: %s\n"
msgstr "key export failed: %s\n"
-#: g10/g10.c:3033
+#: g10/g10.c:3108
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "keyserver search failed: %s\n"
-#: g10/g10.c:3043
+#: g10/g10.c:3118
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "keyserver refresh failed: %s\n"
-#: g10/g10.c:3084
+#: g10/g10.c:3159
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dearmoring failed: %s\n"
-#: g10/g10.c:3092
+#: g10/g10.c:3167
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enarmoring failed: %s\n"
-#: g10/g10.c:3179
+#: g10/g10.c:3254
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "invalid hash algorithm ‘%s’\n"
-#: g10/g10.c:3302
+#: g10/g10.c:3377
msgid "[filename]"
msgstr "[filename]"
-#: g10/g10.c:3306
+#: g10/g10.c:3381
msgid "Go ahead and type your message ...\n"
msgstr "Go ahead and type your message ...\n"
-#: g10/g10.c:3309 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3384 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "can't open ‘%s’\n"
-#: g10/g10.c:3583
+#: g10/g10.c:3658
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1122,23 +1135,23 @@ msgstr ""
"a notation name must have only printable characters or spaces, and end with "
"an ‘=’\n"
-#: g10/g10.c:3592
+#: g10/g10.c:3667
msgid "a user notation name must contain the '@' character\n"
msgstr "a user notation name must contain the ‘@’ character\n"
-#: g10/g10.c:3602
+#: g10/g10.c:3677
msgid "a notation value must not use any control characters\n"
msgstr "a notation value must not use any control characters\n"
-#: g10/g10.c:3636
+#: g10/g10.c:3711
msgid "the given certification policy URL is invalid\n"
msgstr "the given certification policy URL is invalid\n"
-#: g10/g10.c:3638
+#: g10/g10.c:3713
msgid "the given signature policy URL is invalid\n"
msgstr "the given signature policy URL is invalid\n"
-#: g10/g10.c:3671
+#: g10/g10.c:3746
msgid "the given signature preferred keyserver URL is invalid\n"
msgstr "the given signature preferred keyserver URL is invalid\n"
@@ -1191,76 +1204,76 @@ msgstr "invalid clearsig header\n"
msgid "nested clear text signatures\n"
msgstr "nested clear text signatures\n"
-#: g10/armor.c:540
+#: g10/armor.c:553
msgid "invalid dash escaped line: "
msgstr "invalid dash escaped line: "
-#: g10/armor.c:552
+#: g10/armor.c:565
msgid "unexpected armor:"
msgstr "unexpected armor:"
-#: g10/armor.c:678 g10/armor.c:1254
+#: g10/armor.c:695 g10/armor.c:1277
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "invalid radix64 character %02x skipped\n"
-#: g10/armor.c:721
+#: g10/armor.c:738
msgid "premature eof (no CRC)\n"
msgstr "premature eof (no CRC)\n"
-#: g10/armor.c:755
+#: g10/armor.c:772
msgid "premature eof (in CRC)\n"
msgstr "premature eof (in CRC)\n"
-#: g10/armor.c:759
+#: g10/armor.c:776
msgid "malformed CRC\n"
msgstr "malformed CRC\n"
-#: g10/armor.c:763 g10/armor.c:1291
+#: g10/armor.c:780 g10/armor.c:1314
#, c-format
msgid "CRC error; %06lx - %06lx\n"
msgstr "CRC error; %06lx - %06lx\n"
-#: g10/armor.c:783
+#: g10/armor.c:800
msgid "premature eof (in Trailer)\n"
msgstr "premature eof (in Trailer)\n"
-#: g10/armor.c:787
+#: g10/armor.c:804
msgid "error in trailer line\n"
msgstr "error in trailer line\n"
-#: g10/armor.c:1069
+#: g10/armor.c:1092
msgid "no valid OpenPGP data found.\n"
msgstr "no valid OpenPGP data found.\n"
-#: g10/armor.c:1074
+#: g10/armor.c:1097
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "invalid armor: line longer than %d characters\n"
-#: g10/armor.c:1078
+#: g10/armor.c:1101
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
-#: g10/pkclist.c:63 g10/revoke.c:575
+#: g10/pkclist.c:63 g10/revoke.c:576
msgid "No reason specified"
msgstr "No reason specified"
-#: g10/pkclist.c:65 g10/revoke.c:577
+#: g10/pkclist.c:65 g10/revoke.c:578
msgid "Key is superseded"
msgstr "Key is superseded"
-#: g10/pkclist.c:67 g10/revoke.c:576
+#: g10/pkclist.c:67 g10/revoke.c:577
msgid "Key has been compromised"
msgstr "Key has been compromised"
-#: g10/pkclist.c:69 g10/revoke.c:578
+#: g10/pkclist.c:69 g10/revoke.c:579
msgid "Key is no longer used"
msgstr "Key is no longer used"
-#: g10/pkclist.c:71 g10/revoke.c:579
+#: g10/pkclist.c:71 g10/revoke.c:580
msgid "User ID is no longer valid"
msgstr "User ID is no longer valid"
@@ -1272,11 +1285,11 @@ msgstr "reason for revocation: "
msgid "revocation comment: "
msgstr "revocation comment: "
-#: g10/pkclist.c:265
+#: g10/pkclist.c:197
msgid "iImMqQsS"
msgstr "iImMqQsS"
-#: g10/pkclist.c:273
+#: g10/pkclist.c:205
#, c-format
msgid ""
"No trust value assigned to:\n"
@@ -1285,11 +1298,11 @@ msgstr ""
"No trust value assigned to:\n"
"%4u%c/%08lX %s \""
-#: g10/pkclist.c:302 g10/mainproc.c:1508
+#: g10/pkclist.c:234 g10/mainproc.c:1536
msgid " aka \""
msgstr " aka \""
-#: g10/pkclist.c:313 g10/keyedit.c:310
+#: g10/pkclist.c:245 g10/keyedit.c:311
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1301,48 +1314,48 @@ msgstr ""
"checking fingerprints from different sources...)?\n"
"\n"
-#: g10/pkclist.c:317
+#: g10/pkclist.c:249
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = I don't know or won't say\n"
-#: g10/pkclist.c:319
+#: g10/pkclist.c:251
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = I do NOT trust\n"
-#: g10/pkclist.c:321
+#: g10/pkclist.c:253
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = I trust marginally\n"
-#: g10/pkclist.c:323
+#: g10/pkclist.c:255
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = I trust fully\n"
-#: g10/pkclist.c:325
+#: g10/pkclist.c:257
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = I trust ultimately\n"
-#: g10/pkclist.c:328
+#: g10/pkclist.c:260
msgid " i = please show me more information\n"
msgstr " i = please show me more information\n"
-#: g10/pkclist.c:331
+#: g10/pkclist.c:263
msgid " m = back to the main menu\n"
msgstr " m = back to the main menu\n"
-#: g10/pkclist.c:334
+#: g10/pkclist.c:266
msgid " s = skip this key\n"
msgstr " s = skip this key\n"
-#: g10/pkclist.c:335
+#: g10/pkclist.c:267
msgid " q = quit\n"
msgstr " q = quit\n"
-#: g10/pkclist.c:339
+#: g10/pkclist.c:271
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@ -1351,61 +1364,61 @@ msgstr ""
"The minimum trust level for this key is: %s\n"
"\n"
-#: g10/pkclist.c:345 g10/revoke.c:604
+#: g10/pkclist.c:277 g10/revoke.c:605
msgid "Your decision? "
msgstr "Your decision? "
-#: g10/pkclist.c:366
+#: g10/pkclist.c:298
msgid "Do you really want to set this key to ultimate trust? "
msgstr "Do you really want to set this key to ultimate trust? "
-#: g10/pkclist.c:380
+#: g10/pkclist.c:312
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certificates leading to an ultimately trusted key:\n"
-#: g10/pkclist.c:455
+#: g10/pkclist.c:386
#, c-format
msgid "key %08lX: key has been revoked!\n"
msgstr "key %08lX: key has been revoked!\n"
-#: g10/pkclist.c:462 g10/pkclist.c:474 g10/pkclist.c:573
+#: g10/pkclist.c:393 g10/pkclist.c:405 g10/pkclist.c:504
msgid "Use this key anyway? "
msgstr "Use this key anyway? "
-#: g10/pkclist.c:467
+#: g10/pkclist.c:398
#, c-format
msgid "key %08lX: subkey has been revoked!\n"
msgstr "key %08lX: subkey has been revoked!\n"
-#: g10/pkclist.c:488
+#: g10/pkclist.c:419
#, c-format
msgid "%08lX: key has expired\n"
msgstr "%08lX: key has expired\n"
-#: g10/pkclist.c:498
+#: g10/pkclist.c:429
#, c-format
msgid "%08lX: There is no assurance this key belongs to the named user\n"
msgstr "%08lX: There is no assurance this key belongs to the named user\n"
-#: g10/pkclist.c:504
+#: g10/pkclist.c:435
#, c-format
msgid "%08lX: We do NOT trust this key\n"
msgstr "%08lX: We do NOT trust this key\n"
-#: g10/pkclist.c:509
+#: g10/pkclist.c:440
#, c-format
msgid "%08lX: There is limited assurance this key belongs to the named user\n"
msgstr "%08lX: There is limited assurance this key belongs to the named user\n"
-#: g10/pkclist.c:515
+#: g10/pkclist.c:446
msgid "This key probably belongs to the named user\n"
msgstr "This key probably belongs to the named user\n"
-#: g10/pkclist.c:520
+#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "This key belongs to us\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:499
msgid ""
"It is NOT certain that the key belongs to the person named\n"
"in the user ID. If you *really* know what you are doing,\n"
@@ -1417,90 +1430,90 @@ msgstr ""
"you may answer the next question with yes\n"
"\n"
-#: g10/pkclist.c:582 g10/pkclist.c:612
+#: g10/pkclist.c:513 g10/pkclist.c:543
msgid "WARNING: Using untrusted key!\n"
msgstr "WARNING: Using untrusted key!\n"
-#: g10/pkclist.c:619
+#: g10/pkclist.c:550
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "WARNING: this key might be revoked (revocation key not present)\n"
-#: g10/pkclist.c:628
+#: g10/pkclist.c:559
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "WARNING: This key has been revoked by its designated revoker!\n"
-#: g10/pkclist.c:631
+#: g10/pkclist.c:562
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "WARNING: This key has been revoked by its owner!\n"
-#: g10/pkclist.c:632
+#: g10/pkclist.c:563
msgid " This could mean that the signature is forgery.\n"
msgstr " This could mean that the signature is forgery.\n"
-#: g10/pkclist.c:638
+#: g10/pkclist.c:569
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "WARNING: This subkey has been revoked by its owner!\n"
-#: g10/pkclist.c:643
+#: g10/pkclist.c:574
msgid "Note: This key has been disabled.\n"
msgstr "Note: This key has been disabled.\n"
-#: g10/pkclist.c:648
+#: g10/pkclist.c:579
msgid "Note: This key has expired!\n"
msgstr "Note: This key has expired!\n"
-#: g10/pkclist.c:659
+#: g10/pkclist.c:590
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "WARNING: This key is not certified with a trusted signature!\n"
-#: g10/pkclist.c:661
+#: g10/pkclist.c:592
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" There is no indication that the signature belongs to the owner.\n"
-#: g10/pkclist.c:669
+#: g10/pkclist.c:600
msgid "WARNING: We do NOT trust this key!\n"
msgstr "WARNING: We do NOT trust this key!\n"
-#: g10/pkclist.c:670
+#: g10/pkclist.c:601
msgid " The signature is probably a FORGERY.\n"
msgstr " The signature is probably a FORGERY.\n"
-#: g10/pkclist.c:678
+#: g10/pkclist.c:609
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
-#: g10/pkclist.c:680
+#: g10/pkclist.c:611
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " It is not certain that the signature belongs to the owner.\n"
-#: g10/pkclist.c:832 g10/pkclist.c:868 g10/encode.c:791
+#: g10/pkclist.c:763 g10/pkclist.c:799 g10/encode.c:791
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "you may not use %s while in %s mode\n"
-#: g10/pkclist.c:845 g10/pkclist.c:878 g10/pkclist.c:1047 g10/pkclist.c:1107
+#: g10/pkclist.c:776 g10/pkclist.c:809 g10/pkclist.c:978 g10/pkclist.c:1038
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: skipped: %s\n"
-#: g10/pkclist.c:855 g10/pkclist.c:1079
+#: g10/pkclist.c:786 g10/pkclist.c:1010
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: skipped: public key already present\n"
-#: g10/pkclist.c:897
+#: g10/pkclist.c:828
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "You did not specify a user ID. (you may use “-r”)\n"
-#: g10/pkclist.c:913
+#: g10/pkclist.c:844
msgid "Current recipients:\n"
msgstr "Current recipients:\n"
-#: g10/pkclist.c:939
+#: g10/pkclist.c:870
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -1508,123 +1521,123 @@ msgstr ""
"\n"
"Enter the user ID. End with an empty line: "
-#: g10/pkclist.c:955
+#: g10/pkclist.c:886
msgid "No such user ID.\n"
msgstr "No such user ID.\n"
-#: g10/pkclist.c:960 g10/pkclist.c:1022
+#: g10/pkclist.c:891 g10/pkclist.c:953
msgid "skipped: public key already set as default recipient\n"
msgstr "skipped: public key already set as default recipient\n"
-#: g10/pkclist.c:978
+#: g10/pkclist.c:909
msgid "Public key is disabled.\n"
msgstr "Public key is disabled.\n"
-#: g10/pkclist.c:985
+#: g10/pkclist.c:916
msgid "skipped: public key already set\n"
msgstr "skipped: public key already set\n"
-#: g10/pkclist.c:1014
+#: g10/pkclist.c:945
#, c-format
msgid "unknown default recipient `%s'\n"
msgstr "unknown default recipient ‘%s’\n"
-#: g10/pkclist.c:1059
+#: g10/pkclist.c:990
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: skipped: public key is disabled\n"
-#: g10/pkclist.c:1114
+#: g10/pkclist.c:1045
msgid "no valid addressees\n"
msgstr "no valid addressees\n"
-#: g10/keygen.c:204
+#: g10/keygen.c:207
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "preference ‘%s’ duplicated\n"
-#: g10/keygen.c:211
+#: g10/keygen.c:214
msgid "too many cipher preferences\n"
msgstr "too many cipher preferences\n"
-#: g10/keygen.c:213
+#: g10/keygen.c:216
msgid "too many digest preferences\n"
msgstr "too many digest preferences\n"
-#: g10/keygen.c:215
+#: g10/keygen.c:218
msgid "too many compression preferences\n"
msgstr "too many compression preferences\n"
-#: g10/keygen.c:312
+#: g10/keygen.c:315
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "invalid item ‘%s’ in preference string\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:734
msgid "writing direct signature\n"
msgstr "writing direct signature\n"
-#: g10/keygen.c:676
+#: g10/keygen.c:773
msgid "writing self signature\n"
msgstr "writing self signature\n"
-#: g10/keygen.c:720
+#: g10/keygen.c:819
msgid "writing key binding signature\n"
msgstr "writing key binding signature\n"
-#: g10/keygen.c:774 g10/keygen.c:858 g10/keygen.c:949
+#: g10/keygen.c:881 g10/keygen.c:965 g10/keygen.c:1056
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "keysize invalid; using %u bits\n"
-#: g10/keygen.c:779 g10/keygen.c:863 g10/keygen.c:954
+#: g10/keygen.c:886 g10/keygen.c:970 g10/keygen.c:1061
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "keysize rounded up to %u bits\n"
-#: g10/keygen.c:1054
+#: g10/keygen.c:1161
msgid "Please select what kind of key you want:\n"
msgstr "Please select what kind of key you want:\n"
-#: g10/keygen.c:1056
+#: g10/keygen.c:1163
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA and Elgamal (default)\n"
-#: g10/keygen.c:1057
+#: g10/keygen.c:1164
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (sign only)\n"
-#: g10/keygen.c:1059
+#: g10/keygen.c:1166
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (encrypt only)\n"
-#: g10/keygen.c:1060
+#: g10/keygen.c:1167
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (sign only)\n"
-#: g10/keygen.c:1062
+#: g10/keygen.c:1169
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (encrypt only)\n"
-#: g10/keygen.c:1064
+#: g10/keygen.c:1171
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (sign and encrypt)\n"
-#: g10/keygen.c:1067 g10/keyedit.c:319 g10/keyedit.c:340 g10/keyedit.c:356
+#: g10/keygen.c:1174 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
msgid "Your selection? "
msgstr "Your selection? "
-#: g10/keygen.c:1101 g10/keyedit.c:800 g10/revoke.c:637
+#: g10/keygen.c:1208 g10/keyedit.c:800 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Invalid selection.\n"
-#: g10/keygen.c:1114
+#: g10/keygen.c:1221
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1637,28 +1650,28 @@ msgstr ""
" default keysize is 1024 bits\n"
" highest suggested keysize is 2048 bits\n"
-#: g10/keygen.c:1123
+#: g10/keygen.c:1230
msgid "What keysize do you want? (1024) "
msgstr "What keysize do you want? (1024) "
-#: g10/keygen.c:1128
+#: g10/keygen.c:1235
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA only allows keysizes from 512 to 1024\n"
-#: g10/keygen.c:1130
+#: g10/keygen.c:1237
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "keysize too small; 1024 is smallest value allowed for RSA.\n"
-#: g10/keygen.c:1133
+#: g10/keygen.c:1240
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "keysize too small; 768 is smallest value allowed.\n"
-#: g10/keygen.c:1144
+#: g10/keygen.c:1251
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "keysize too large; %d is largest value allowed.\n"
-#: g10/keygen.c:1149
+#: g10/keygen.c:1256
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1666,11 +1679,11 @@ msgstr ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
-#: g10/keygen.c:1152
+#: g10/keygen.c:1259
msgid "Are you sure that you want this keysize? "
msgstr "Are you sure that you want this keysize? "
-#: g10/keygen.c:1153
+#: g10/keygen.c:1260
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1678,17 +1691,17 @@ msgstr ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
-#: g10/keygen.c:1162
+#: g10/keygen.c:1269
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Requested keysize is %u bits\n"
-#: g10/keygen.c:1165 g10/keygen.c:1169
+#: g10/keygen.c:1272 g10/keygen.c:1276
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rounded up to %u bits\n"
-#: g10/keygen.c:1220
+#: g10/keygen.c:1327
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1704,7 +1717,7 @@ msgstr ""
" <n>m = key expires in n months\n"
" <n>y = key expires in n years\n"
-#: g10/keygen.c:1229
+#: g10/keygen.c:1336
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1720,29 +1733,29 @@ msgstr ""
" <n>m = signature expires in n months\n"
" <n>y = signature expires in n years\n"
-#: g10/keygen.c:1251
+#: g10/keygen.c:1358
msgid "Key is valid for? (0) "
msgstr "Key is valid for? (0) "
-#: g10/keygen.c:1253
+#: g10/keygen.c:1360
msgid "Signature is valid for? (0) "
msgstr "Signature is valid for? (0) "
-#: g10/keygen.c:1258
+#: g10/keygen.c:1365
msgid "invalid value\n"
msgstr "invalid value\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1370
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s does not expire at all\n"
-#: g10/keygen.c:1270
+#: g10/keygen.c:1377
#, c-format
msgid "%s expires at %s\n"
msgstr "%s expires at %s\n"
-#: g10/keygen.c:1276
+#: g10/keygen.c:1383
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1750,11 +1763,11 @@ msgstr ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
-#: g10/keygen.c:1281
+#: g10/keygen.c:1388
msgid "Is this correct (y/n)? "
msgstr "Is this correct (y/n)? "
-#: g10/keygen.c:1324
+#: g10/keygen.c:1431
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1770,44 +1783,44 @@ msgstr ""
" “Heinrich Heine (Der Dichter) <[email protected]>”\n"
"\n"
-#: g10/keygen.c:1336
+#: g10/keygen.c:1443
msgid "Real name: "
msgstr "Real name: "
-#: g10/keygen.c:1344
+#: g10/keygen.c:1451
msgid "Invalid character in name\n"
msgstr "Invalid character in name\n"
-#: g10/keygen.c:1346
+#: g10/keygen.c:1453
msgid "Name may not start with a digit\n"
msgstr "Name may not start with a digit\n"
-#: g10/keygen.c:1348
+#: g10/keygen.c:1455
msgid "Name must be at least 5 characters long\n"
msgstr "Name must be at least 5 characters long\n"
-#: g10/keygen.c:1356
+#: g10/keygen.c:1463
msgid "Email address: "
msgstr "Email address: "
-#: g10/keygen.c:1367
+#: g10/keygen.c:1474
msgid "Not a valid email address\n"
msgstr "Not a valid email address\n"
-#: g10/keygen.c:1375
+#: g10/keygen.c:1482
msgid "Comment: "
msgstr "Comment: "
-#: g10/keygen.c:1381
+#: g10/keygen.c:1488
msgid "Invalid character in comment\n"
msgstr "Invalid character in comment\n"
-#: g10/keygen.c:1404
+#: g10/keygen.c:1511
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "You are using the ‘%s’ character set.\n"
-#: g10/keygen.c:1410
+#: g10/keygen.c:1517
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1818,27 +1831,27 @@ msgstr ""
" “%s”\n"
"\n"
-#: g10/keygen.c:1415
+#: g10/keygen.c:1522
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Please don't put the email address into the real name or the comment\n"
-#: g10/keygen.c:1420
+#: g10/keygen.c:1527
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1430
+#: g10/keygen.c:1537
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
-#: g10/keygen.c:1431
+#: g10/keygen.c:1538
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
-#: g10/keygen.c:1450
+#: g10/keygen.c:1557
msgid "Please correct the error first\n"
msgstr "Please correct the error first\n"
-#: g10/keygen.c:1489
+#: g10/keygen.c:1596
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1846,16 +1859,16 @@ msgstr ""
"You need a Passphrase to protect your secret key.\n"
"\n"
-#: g10/keygen.c:1498 g10/keyedit.c:1005
+#: g10/keygen.c:1605 g10/keyedit.c:1005
msgid "passphrase not correctly repeated; try again"
msgstr "passphrase not correctly repeated; try again"
-#: g10/keygen.c:1499
+#: g10/keygen.c:1606
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1505
+#: g10/keygen.c:1612
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -1867,7 +1880,7 @@ msgstr ""
"using this program with the option “--edit-key”.\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1634
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1879,58 +1892,58 @@ msgstr ""
"disks) during the prime generation; this gives the random number\n"
"generator a better chance to gain enough entropy.\n"
-#: g10/keygen.c:2084 g10/revoke.c:214 g10/revoke.c:414
+#: g10/keygen.c:2202 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "sorry, can't do this in batch mode\n"
-#: g10/keygen.c:2145
+#: g10/keygen.c:2263
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA keypair will have 1024 bits.\n"
-#: g10/keygen.c:2213
+#: g10/keygen.c:2331
msgid "Key generation canceled.\n"
msgstr "Key generation canceled.\n"
-#: g10/keygen.c:2321 g10/keygen.c:2446
+#: g10/keygen.c:2447 g10/keygen.c:2572
#, c-format
msgid "writing public key to `%s'\n"
msgstr "writing public key to ‘%s’\n"
-#: g10/keygen.c:2323 g10/keygen.c:2449
+#: g10/keygen.c:2449 g10/keygen.c:2575
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "writing secret key stub to ‘%s’\n"
-#: g10/keygen.c:2326 g10/keygen.c:2452
+#: g10/keygen.c:2452 g10/keygen.c:2578
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "writing secret key to ‘%s’\n"
-#: g10/keygen.c:2435
+#: g10/keygen.c:2561
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "no writable public keyring found: %s\n"
-#: g10/keygen.c:2441
+#: g10/keygen.c:2567
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "no writable secret keyring found: %s\n"
-#: g10/keygen.c:2459
+#: g10/keygen.c:2585
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "error writing public keyring ‘%s’: %s\n"
-#: g10/keygen.c:2466
+#: g10/keygen.c:2592
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "error writing secret keyring ‘%s’: %s\n"
-#: g10/keygen.c:2489
+#: g10/keygen.c:2615
msgid "public and secret key created and signed.\n"
msgstr "public and secret key created and signed.\n"
-#: g10/keygen.c:2500
+#: g10/keygen.c:2626
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1939,30 +1952,30 @@ msgstr ""
"the command “--edit-key” to generate a secondary key for this "
"purpose.\n"
-#: g10/keygen.c:2512 g10/keygen.c:2623
+#: g10/keygen.c:2638 g10/keygen.c:2751
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Key generation failed: %s\n"
-#: g10/keygen.c:2558 g10/sign.c:290
+#: g10/keygen.c:2687 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"key has been created %lu second in future (time warp or clock problem)\n"
-#: g10/keygen.c:2560 g10/sign.c:292
+#: g10/keygen.c:2689 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
-#: g10/keygen.c:2569
+#: g10/keygen.c:2698
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
-#: g10/keygen.c:2598
+#: g10/keygen.c:2726
msgid "Really create? "
msgstr "Really create? "
@@ -1976,7 +1989,7 @@ msgstr "--output doesn't work for this command\n"
msgid "%s: can't open: %s\n"
msgstr "%s: can't open: %s\n"
-#: g10/encode.c:203 g10/sign.c:1139
+#: g10/encode.c:203 g10/sign.c:1144
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error creating passphrase: %s\n"
@@ -2020,7 +2033,7 @@ msgstr ""
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-#: g10/encode.c:634 g10/sign.c:858
+#: g10/encode.c:634 g10/sign.c:863
#, c-format
msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
msgstr "forcing compression algorithm %s (%d) violates recipient preferences\n"
@@ -2030,37 +2043,32 @@ msgstr "forcing compression algorithm %s (%d) violates recipient preferences\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s encrypted for: “%s”\n"
-#: g10/export.c:163 g10/keyedit.c:2700 g10/delkey.c:74 g10/revoke.c:224
+#: g10/export.c:162 g10/keyedit.c:2700 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "key ‘%s’ not found: %s\n"
-#: g10/export.c:185 g10/delkey.c:82 g10/revoke.c:230 g10/revoke.c:435
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "error reading keyblock: %s\n"
-#: g10/export.c:194
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "key %08lX: not a rfc2440 key - skipped\n"
-
-#: g10/export.c:210
+#: g10/export.c:198
#, c-format
-msgid "key %08lX: not protected - skipped\n"
-msgstr "key %08lX: not protected - skipped\n"
+msgid "key %s: not protected - skipped\n"
+msgstr "key %s: not protected - skipped\n"
-#: g10/export.c:218
+#: g10/export.c:206
#, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
-msgstr "key %08lX: PGP 2.x style key - skipped\n"
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr "key %s: PGP 2.x style key - skipped\n"
-#: g10/export.c:363
+#: g10/export.c:353
#, c-format
-msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
-msgstr "WARNING: secret key %08lX does not have a simple SK checksum\n"
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "WARNING: secret key %s does not have a simple SK checksum\n"
-#: g10/export.c:395
+#: g10/export.c:385
msgid "WARNING: nothing exported\n"
msgstr "WARNING: nothing exported\n"
@@ -2068,29 +2076,29 @@ msgstr "WARNING: nothing exported\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "too many entries in pk cache - disabled\n"
-#: g10/getkey.c:186 g10/getkey.c:2646
+#: g10/getkey.c:186 g10/getkey.c:2693
msgid "[User id not found]"
msgstr "[User id not found]"
-#: g10/getkey.c:1620
+#: g10/getkey.c:1614
#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
-msgstr "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2128
+#: g10/getkey.c:2169
#, c-format
-msgid "no secret subkey for public subkey %08lX - ignoring\n"
-msgstr "no secret subkey for public subkey %08lX - ignoring\n"
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "no secret subkey for public subkey %s - ignoring\n"
-#: g10/getkey.c:2356
+#: g10/getkey.c:2400
#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
-msgstr "using secondary key %08lX instead of primary key %08lX\n"
+msgid "using secondary key %s instead of primary key %s\n"
+msgstr "using secondary key %s instead of primary key %s\n"
-#: g10/getkey.c:2403
+#: g10/getkey.c:2447
#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "key %08lX: secret key without public key - skipped\n"
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "key %s: secret key without public key - skipped\n"
#: g10/import.c:241
#, c-format
@@ -2172,351 +2180,353 @@ msgstr " secret keys unchanged: %lu\n"
msgid " not imported: %lu\n"
msgstr " not imported: %lu\n"
-#: g10/import.c:567 g10/import.c:581 g10/import.c:595
+#: g10/import.c:537
#, c-format
-msgid "WARNING: key %08lX contains preferences for unavailable algorithms:\n"
-msgstr "WARNING: key %08lX contains preferences for unavailable algorithms:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr "WARNING: key %s contains preferences for unavailable\n"
+
+#: g10/import.c:539
+msgid "algorithms on these user IDs:\n"
+msgstr "algorithms on these user IDs:\n"
-#: g10/import.c:570
+#: g10/import.c:576
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " “%s”: preference for cipher algorithm %s\n"
-#: g10/import.c:584
+#: g10/import.c:588
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " “%s”: preference for digest algorithm %s\n"
-#: g10/import.c:598
+#: g10/import.c:600
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " “%s”: preference for compression algorithm %s\n"
-#: g10/import.c:611
+#: g10/import.c:613
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "it is strongly suggested that you update your preferences and\n"
-#: g10/import.c:613
+#: g10/import.c:615
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"re-distribute this key to avoid potential algorithm mismatch problems\n"
-#: g10/import.c:637
+#: g10/import.c:639
#, c-format
-msgid ""
-"you can update your preferences with: gpg --edit-key %08lX updpref save\n"
-msgstr ""
-"you can update your preferences with: gpg --edit-key %08lX updpref save\n"
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr "you can update your preferences with: gpg --edit-key %s updpref save\n"
-#: g10/import.c:682 g10/import.c:1026
+#: g10/import.c:687 g10/import.c:1041
#, c-format
-msgid "key %08lX: no user ID\n"
-msgstr "key %08lX: no user ID\n"
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
-#: g10/import.c:702
+#: g10/import.c:707
#, c-format
-msgid "key %08lX: PKS subkey corruption repaired\n"
-msgstr "key %08lX: PKS subkey corruption repaired\n"
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
-#: g10/import.c:717
+#: g10/import.c:722
#, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "key %08lX: accepted non self-signed user ID ‘%s’\n"
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "key %s: accepted non self-signed user ID ‘%s’\n"
-#: g10/import.c:723
+#: g10/import.c:728
#, c-format
-msgid "key %08lX: no valid user IDs\n"
-msgstr "key %08lX: no valid user IDs\n"
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
-#: g10/import.c:725
+#: g10/import.c:730
msgid "this may be caused by a missing self-signature\n"
msgstr "this may be caused by a missing self-signature\n"
-#: g10/import.c:734 g10/import.c:1133
+#: g10/import.c:740 g10/import.c:1151
#, c-format
-msgid "key %08lX: public key not found: %s\n"
-msgstr "key %08lX: public key not found: %s\n"
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
-#: g10/import.c:740
+#: g10/import.c:746
#, c-format
-msgid "key %08lX: new key - skipped\n"
-msgstr "key %08lX: new key - skipped\n"
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
-#: g10/import.c:749
+#: g10/import.c:755
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "no writable keyring found: %s\n"
-#: g10/import.c:754 g10/sign.c:765 g10/sign.c:1001 g10/openfile.c:253
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "writing to ‘%s’\n"
-#: g10/import.c:757 g10/import.c:843 g10/import.c:1055 g10/import.c:1193
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "error writing keyring ‘%s’: %s\n"
-#: g10/import.c:775
+#: g10/import.c:785
#, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "key %08lX: public key “%s” imported\n"
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “%s” imported\n"
-#: g10/import.c:797
+#: g10/import.c:809
#, c-format
-msgid "key %08lX: doesn't match our copy\n"
-msgstr "key %08lX: doesn't match our copy\n"
+msgid "key %s: doesn't match our copy\n"
+msgstr "key %s: doesn't match our copy\n"
-#: g10/import.c:814 g10/import.c:1150
+#: g10/import.c:826 g10/import.c:1169
#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
-msgstr "key %08lX: can't locate original keyblock: %s\n"
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "key %s: can't locate original keyblock: %s\n"
-#: g10/import.c:821 g10/import.c:1156
+#: g10/import.c:834 g10/import.c:1176
#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
-msgstr "key %08lX: can't read original keyblock: %s\n"
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "key %s: can't read original keyblock: %s\n"
-#: g10/import.c:852
+#: g10/import.c:866
#, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "key %08lX: “%s” 1 new user ID\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "key %s: “%s” 1 new user ID\n"
-#: g10/import.c:855
+#: g10/import.c:869
#, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "key %08lX: “%s” %d new user IDs\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "key %s: “%s” %d new user IDs\n"
-#: g10/import.c:858
+#: g10/import.c:872
#, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "key %08lX: “%s” 1 new signature\n"
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “%s” 1 new signature\n"
-#: g10/import.c:861
+#: g10/import.c:875
#, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "key %08lX: “%s” %d new signatures\n"
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “%s” %d new signatures\n"
-#: g10/import.c:864
+#: g10/import.c:878
#, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "key %08lX: “%s” 1 new subkey\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “%s” 1 new subkey\n"
-#: g10/import.c:867
+#: g10/import.c:881
#, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "key %08lX: “%s” %d new subkeys\n"
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “%s” %d new subkeys\n"
-#: g10/import.c:888
+#: g10/import.c:902
#, c-format
-msgid "key %08lX: \"%s\" not changed\n"
-msgstr "key %08lX: “%s” not changed\n"
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “%s” not changed\n"
-#: g10/import.c:1032
+#: g10/import.c:1047
#, c-format
-msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
-msgstr "key %08lX: secret key with invalid cipher %d - skipped\n"
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "key %s: secret key with invalid cipher %d - skipped\n"
-#: g10/import.c:1049
+#: g10/import.c:1064
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "no default secret keyring: %s\n"
-#: g10/import.c:1060
+#: g10/import.c:1075
#, c-format
-msgid "key %08lX: secret key imported\n"
-msgstr "key %08lX: secret key imported\n"
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
-#: g10/import.c:1088
+#: g10/import.c:1104
#, c-format
-msgid "key %08lX: already in secret keyring\n"
-msgstr "key %08lX: already in secret keyring\n"
+msgid "key %s: already in secret keyring\n"
+msgstr "key %s: already in secret keyring\n"
-#: g10/import.c:1098
+#: g10/import.c:1114
#, c-format
-msgid "key %08lX: secret key not found: %s\n"
-msgstr "key %08lX: secret key not found: %s\n"
+msgid "key %s: secret key not found: %s\n"
+msgstr "key %s: secret key not found: %s\n"
-#: g10/import.c:1127
+#: g10/import.c:1144
#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
-msgstr "key %08lX: no public key - can't apply revocation certificate\n"
+msgid "key %s: no public key - can't apply revocation certificate\n"
+msgstr "key %s: no public key - can't apply revocation certificate\n"
-#: g10/import.c:1167
+#: g10/import.c:1187
#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
-msgstr "key %08lX: invalid revocation certificate: %s - rejected\n"
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
-#: g10/import.c:1199
+#: g10/import.c:1219
#, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "key %08lX: “%s” revocation certificate imported\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “%s” revocation certificate imported\n"
-#: g10/import.c:1263
+#: g10/import.c:1284
#, c-format
-msgid "key %08lX: no user ID for signature\n"
-msgstr "key %08lX: no user ID for signature\n"
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
-#: g10/import.c:1278
+#: g10/import.c:1299
#, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "key %08lX: unsupported public key algorithm on user id “%s”\n"
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr "key %s: unsupported public key algorithm on user id “%s”\n"
-#: g10/import.c:1280
+#: g10/import.c:1301
#, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
-msgstr "key %08lX: invalid self-signature on user id “%s”\n"
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr "key %s: invalid self-signature on user id “%s”\n"
-#: g10/import.c:1297
+#: g10/import.c:1319
#, c-format
-msgid "key %08lX: no subkey for key binding\n"
-msgstr "key %08lX: no subkey for key binding\n"
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
-#: g10/import.c:1306 g10/import.c:1350
+#: g10/import.c:1330 g10/import.c:1380
#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
-msgstr "key %08lX: unsupported public key algorithm\n"
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
-#: g10/import.c:1307
+#: g10/import.c:1332
#, c-format
-msgid "key %08lX: invalid subkey binding\n"
-msgstr "key %08lX: invalid subkey binding\n"
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
-#: g10/import.c:1320
+#: g10/import.c:1347
#, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "key %08lX: removed multiple subkey binding\n"
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
-#: g10/import.c:1341
+#: g10/import.c:1369
#, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "key %08lX: no subkey for key revocation\n"
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
-#: g10/import.c:1351
+#: g10/import.c:1382
#, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "key %08lX: invalid subkey revocation\n"
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
-#: g10/import.c:1364
+#: g10/import.c:1397
#, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "key %08lX: removed multiple subkey revocation\n"
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
-#: g10/import.c:1403
+#: g10/import.c:1439
#, c-format
-msgid "key %08lX: skipped user ID '"
-msgstr "key %08lX: skipped user ID '"
+msgid "key %s: skipped user ID '%s'\n"
+msgstr "key %s: skipped user ID ‘%s’\n"
-#: g10/import.c:1426
+#: g10/import.c:1460
#, c-format
-msgid "key %08lX: skipped subkey\n"
-msgstr "key %08lX: skipped subkey\n"
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
-#: g10/import.c:1453
+#: g10/import.c:1487
#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
-msgstr "key %08lX: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgstr "key %s: non exportable signature (class %02x) - skipped\n"
-#: g10/import.c:1462
+#: g10/import.c:1497
#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
-msgstr "key %08lX: revocation certificate at wrong place - skipped\n"
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr "key %s: revocation certificate at wrong place - skipped\n"
-#: g10/import.c:1479
+#: g10/import.c:1514
#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
-msgstr "key %08lX: invalid revocation certificate: %s - skipped\n"
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
-#: g10/import.c:1492
+#: g10/import.c:1528
#, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr "key %08lX: subkey signature in wrong place - skipped\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "key %s: subkey signature in wrong place - skipped\n"
-#: g10/import.c:1500
+#: g10/import.c:1536
#, c-format
-msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
-msgstr "key %08lX: unexpected signature class (0x%02X) - skipped\n"
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "key %s: unexpected signature class (0x%02X) - skipped\n"
-#: g10/import.c:1599
+#: g10/import.c:1636
#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
-msgstr "key %08lX: duplicated user ID detected - merged\n"
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
-#: g10/import.c:1658
+#: g10/import.c:1698
#, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
-msgstr "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
+msgstr "WARNING: key %s may be revoked: fetching revocation key %s\n"
-#: g10/import.c:1672
+#: g10/import.c:1711
#, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
-msgstr "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
+msgstr "WARNING: key %s may be revoked: revocation key %s not present.\n"
-#: g10/import.c:1730
+#: g10/import.c:1770
#, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "key %08lX: “%s” revocation certificate added\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “%s” revocation certificate added\n"
-#: g10/import.c:1763
+#: g10/import.c:1804
#, c-format
-msgid "key %08lX: direct key signature added\n"
-msgstr "key %08lX: direct key signature added\n"
+msgid "key %s: direct key signature added\n"
+msgstr "key %s: direct key signature added\n"
-#: g10/keyedit.c:161
+#: g10/keyedit.c:159
msgid "[revocation]"
msgstr "[revocation]"
-#: g10/keyedit.c:162
+#: g10/keyedit.c:160
msgid "[self-signature]"
msgstr "[self-signature]"
-#: g10/keyedit.c:236 g10/keylist.c:320
+#: g10/keyedit.c:237 g10/keylist.c:319
msgid "1 bad signature\n"
msgstr "1 bad signature\n"
-#: g10/keyedit.c:238 g10/keylist.c:322
+#: g10/keyedit.c:239 g10/keylist.c:321
#, c-format
msgid "%d bad signatures\n"
msgstr "%d bad signatures\n"
-#: g10/keyedit.c:240 g10/keylist.c:324
+#: g10/keyedit.c:241 g10/keylist.c:323
msgid "1 signature not checked due to a missing key\n"
msgstr "1 signature not checked due to a missing key\n"
-#: g10/keyedit.c:242 g10/keylist.c:326
+#: g10/keyedit.c:243 g10/keylist.c:325
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d signatures not checked due to missing keys\n"
-#: g10/keyedit.c:244 g10/keylist.c:328
+#: g10/keyedit.c:245 g10/keylist.c:327
msgid "1 signature not checked due to an error\n"
msgstr "1 signature not checked due to an error\n"
-#: g10/keyedit.c:246 g10/keylist.c:330
+#: g10/keyedit.c:247 g10/keylist.c:329
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d signatures not checked due to errors\n"
-#: g10/keyedit.c:248
+#: g10/keyedit.c:249
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 user ID without valid self-signature detected\n"
-#: g10/keyedit.c:250
+#: g10/keyedit.c:251
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d user IDs without valid self-signatures detected\n"
-#: g10/keyedit.c:313
+#: g10/keyedit.c:314
#, c-format
msgid " (%d) I trust marginally\n"
msgstr " (%d) I trust marginally\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:315
#, c-format
msgid " (%d) I trust fully\n"
msgstr " (%d) I trust fully\n"
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@ -2526,36 +2536,36 @@ msgstr ""
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
-#: g10/keyedit.c:351
+#: g10/keyedit.c:350
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "Please enter a domain to restrict this signature, or enter for none.\n"
-#: g10/keyedit.c:494
+#: g10/keyedit.c:493
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "User ID “%s” is revoked."
-#: g10/keyedit.c:501 g10/keyedit.c:521 g10/keyedit.c:542 g10/keyedit.c:692
-#: g10/keyedit.c:750 g10/keyedit.c:1355
+#: g10/keyedit.c:500 g10/keyedit.c:520 g10/keyedit.c:541 g10/keyedit.c:692
+#: g10/keyedit.c:750 g10/keyedit.c:1354
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Are you sure you still want to sign it? (y/N) "
-#: g10/keyedit.c:509 g10/keyedit.c:529 g10/keyedit.c:550 g10/keyedit.c:698
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:508 g10/keyedit.c:528 g10/keyedit.c:549 g10/keyedit.c:698
+#: g10/keyedit.c:1360
msgid " Unable to sign.\n"
msgstr " Unable to sign.\n"
-#: g10/keyedit.c:514
+#: g10/keyedit.c:513
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "User ID “%s” is expired."
-#: g10/keyedit.c:534
+#: g10/keyedit.c:533
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "User ID “%s” is not self-signed."
-#: g10/keyedit.c:569
+#: g10/keyedit.c:568
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2564,11 +2574,11 @@ msgstr ""
"The self-signature on “%s”\n"
"is a PGP 2.x-style signature.\n"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:577
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-#: g10/keyedit.c:592
+#: g10/keyedit.c:591
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2577,12 +2587,12 @@ msgstr ""
"Your current signature on “%s”\n"
"has expired.\n"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:595
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Do you want to issue a new signature to replace the expired one? (y/N) "
-#: g10/keyedit.c:617
+#: g10/keyedit.c:616
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2591,28 +2601,28 @@ msgstr ""
"Your current signature on “%s”\n"
"is a local signature.\n"
-#: g10/keyedit.c:621
+#: g10/keyedit.c:620
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Do you want to promote it to a full exportable signature? (y/N) "
-#: g10/keyedit.c:642
+#: g10/keyedit.c:641
#, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
-msgstr "“%s” was already locally signed by key %08lX\n"
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "“%s” was already locally signed by key %s\n"
-#: g10/keyedit.c:646
+#: g10/keyedit.c:644
#, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
-msgstr "“%s” was already signed by key %08lX\n"
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "“%s” was already signed by key %s\n"
-#: g10/keyedit.c:651
+#: g10/keyedit.c:649
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Do you want to sign it again anyway? (y/N) "
#: g10/keyedit.c:671
#, c-format
-msgid "Nothing to sign with key %08lX\n"
-msgstr "Nothing to sign with key %08lX\n"
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
#: g10/keyedit.c:686
msgid "This key has expired!"
@@ -2750,7 +2760,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Really sign? "
-#: g10/keyedit.c:906 g10/keyedit.c:3610 g10/keyedit.c:3701 g10/keyedit.c:3774
+#: g10/keyedit.c:906 g10/keyedit.c:3632 g10/keyedit.c:3723 g10/keyedit.c:3796
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
@@ -3109,158 +3119,158 @@ msgstr "showphoto"
msgid "show photo ID"
msgstr "show photo ID"
-#: g10/keyedit.c:1187 g10/delkey.c:120
+#: g10/keyedit.c:1186 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "can't do that in batchmode\n"
-#: g10/keyedit.c:1218
+#: g10/keyedit.c:1217
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "error reading secret keyblock ‘%s’: %s\n"
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1234
msgid "Secret key is available.\n"
msgstr "Secret key is available.\n"
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
msgid "Command> "
msgstr "Command> "
-#: g10/keyedit.c:1297
+#: g10/keyedit.c:1296
msgid "Need the secret key to do this.\n"
msgstr "Need the secret key to do this.\n"
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1300
msgid "Please use the command \"toggle\" first.\n"
msgstr "Please use the command “toggle” first.\n"
-#: g10/keyedit.c:1349
+#: g10/keyedit.c:1348
msgid "Key is revoked."
msgstr "Key is revoked."
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
msgid "Really sign all user IDs? "
msgstr "Really sign all user IDs? "
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
msgid "Hint: Select the user IDs to sign\n"
msgstr "Hint: Select the user IDs to sign\n"
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1393
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "This command is not allowed while in %s mode.\n"
-#: g10/keyedit.c:1414 g10/keyedit.c:1435 g10/keyedit.c:1494
+#: g10/keyedit.c:1415 g10/keyedit.c:1436 g10/keyedit.c:1495
msgid "You must select at least one user ID.\n"
msgstr "You must select at least one user ID.\n"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
msgid "You can't delete the last user ID!\n"
msgstr "You can't delete the last user ID!\n"
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
msgid "Really remove all selected user IDs? "
msgstr "Really remove all selected user IDs? "
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1421
msgid "Really remove this user ID? "
msgstr "Really remove this user ID? "
-#: g10/keyedit.c:1458 g10/keyedit.c:1513
+#: g10/keyedit.c:1459 g10/keyedit.c:1514
msgid "You must select at least one key.\n"
msgstr "You must select at least one key.\n"
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1462
msgid "Do you really want to delete the selected keys? "
msgstr "Do you really want to delete the selected keys? "
-#: g10/keyedit.c:1462
+#: g10/keyedit.c:1463
msgid "Do you really want to delete this key? "
msgstr "Do you really want to delete this key? "
-#: g10/keyedit.c:1497
+#: g10/keyedit.c:1498
msgid "Really revoke all selected user IDs? "
msgstr "Really revoke all selected user IDs? "
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1499
msgid "Really revoke this user ID? "
msgstr "Really revoke this user ID? "
-#: g10/keyedit.c:1517
+#: g10/keyedit.c:1518
msgid "Do you really want to revoke the selected keys? "
msgstr "Do you really want to revoke the selected keys? "
-#: g10/keyedit.c:1518
+#: g10/keyedit.c:1519
msgid "Do you really want to revoke this key? "
msgstr "Do you really want to revoke this key? "
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1558
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
"Owner trust may not be set while using an user provided trust database\n"
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1590
msgid "Set preference list to:\n"
msgstr "Set preference list to:\n"
-#: g10/keyedit.c:1595
+#: g10/keyedit.c:1596
msgid "Really update the preferences for the selected user IDs? "
msgstr "Really update the preferences for the selected user IDs? "
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
msgid "Really update the preferences? "
msgstr "Really update the preferences? "
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
msgid "Save changes? "
msgstr "Save changes? "
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1649
msgid "Quit without saving? "
msgstr "Quit without saving? "
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1659
#, c-format
msgid "update failed: %s\n"
msgstr "update failed: %s\n"
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1666
#, c-format
msgid "update secret failed: %s\n"
msgstr "update secret failed: %s\n"
-#: g10/keyedit.c:1670
+#: g10/keyedit.c:1673
msgid "Key not changed so no update needed.\n"
msgstr "Key not changed so no update needed.\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1685
msgid "Invalid command (try \"help\")\n"
msgstr "Invalid command (try “help”)\n"
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
msgid "Digest: "
msgstr "Digest: "
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1796
msgid "Features: "
msgstr "Features: "
-#: g10/keyedit.c:1804
+#: g10/keyedit.c:1807
msgid "Keyserver no-modify"
msgstr "Keyserver no-modify"
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2047
#, c-format
msgid "This key may be revoked by %s key "
msgstr "This key may be revoked by %s key "
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2051
msgid " (sensitive)"
msgstr " (sensitive)"
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2065 g10/keyedit.c:2119 g10/keyedit.c:2222 g10/keyedit.c:2237
#, c-format
msgid "created: %s"
msgstr "created: %s"
@@ -3275,30 +3285,25 @@ msgstr "revoked: %s"
msgid "expired: %s"
msgstr "expired: %s"
-#: g10/keyedit.c:2072
+#: g10/keyedit.c:2072 g10/keyedit.c:2121 g10/keyedit.c:2224 g10/keyedit.c:2239
#, c-format
msgid "expires: %s"
msgstr "expires: %s"
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:2087
#, c-format
msgid "trust: %s"
msgstr "trust: %s"
-#: g10/keyedit.c:2093
+#: g10/keyedit.c:2091
#, c-format
msgid "validity: %s"
msgstr "validity: %s"
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
msgid "This key has been disabled"
msgstr "This key has been disabled"
-#: g10/keyedit.c:2114 g10/keyedit.c:2217 g10/keyedit.c:2232
-#, c-format
-msgid "%s%c %4u%c/%08lX created: %s expires: %s"
-msgstr "%s%c %4u%c/%08lX created: %s expires: %s"
-
#: g10/keyedit.c:2130
#, c-format
msgid "rev! subkey has been revoked: %s\n"
@@ -3313,11 +3318,11 @@ msgstr "rev- faked revocation found\n"
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? problem checking revocation: %s\n"
-#: g10/keyedit.c:2160 g10/keylist.c:709 g10/mainproc.c:1516 g10/trustdb.c:1123
+#: g10/keyedit.c:2160 g10/keylist.c:696 g10/mainproc.c:1544 g10/trustdb.c:1124
msgid "revoked"
msgstr "revoked"
-#: g10/keyedit.c:2162 g10/keylist.c:709 g10/mainproc.c:1518 g10/trustdb.c:500
+#: g10/keyedit.c:2162 g10/keylist.c:698 g10/mainproc.c:1546 g10/trustdb.c:499
msgid "expired"
msgstr "expired"
@@ -3333,7 +3338,7 @@ msgstr ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
-#: g10/keyedit.c:2256 g10/mainproc.c:924
+#: g10/keyedit.c:2256 g10/mainproc.c:923
msgid "[revoked] "
msgstr "[revoked] "
@@ -3349,7 +3354,7 @@ msgstr ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
-#: g10/keyedit.c:2382
+#: g10/keyedit.c:2383
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3359,45 +3364,45 @@ msgstr ""
"versions\n"
" of PGP to reject this key.\n"
-#: g10/keyedit.c:2387 g10/keyedit.c:2660
+#: g10/keyedit.c:2388 g10/keyedit.c:2661
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Are you sure you still want to add it? (y/N) "
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2394
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "You may not add a photo ID to a PGP2-style key.\n"
-#: g10/keyedit.c:2528
+#: g10/keyedit.c:2529
msgid "Delete this good signature? (y/N/q)"
msgstr "Delete this good signature? (y/N/q)"
-#: g10/keyedit.c:2538
+#: g10/keyedit.c:2539
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Delete this invalid signature? (y/N/q)"
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2543
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Delete this unknown signature? (y/N/q)"
-#: g10/keyedit.c:2548
+#: g10/keyedit.c:2549
msgid "Really delete this self-signature? (y/N)"
msgstr "Really delete this self-signature? (y/N)"
-#: g10/keyedit.c:2562
+#: g10/keyedit.c:2563
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Deleted %d signature.\n"
-#: g10/keyedit.c:2563
+#: g10/keyedit.c:2564
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Deleted %d signatures.\n"
-#: g10/keyedit.c:2566
+#: g10/keyedit.c:2567
msgid "Nothing deleted.\n"
msgstr "Nothing deleted.\n"
-#: g10/keyedit.c:2655
+#: g10/keyedit.c:2656
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3407,11 +3412,11 @@ msgstr ""
"cause\n"
" some versions of PGP to reject this key.\n"
-#: g10/keyedit.c:2666
+#: g10/keyedit.c:2667
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2687
msgid "Enter the user ID of the designated revoker: "
msgstr "Enter the user ID of the designated revoker: "
@@ -3427,217 +3432,217 @@ msgstr "you cannot appoint a key as its own designated revoker\n"
msgid "this key has already been designated as a revoker\n"
msgstr "this key has already been designated as a revoker\n"
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2766
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2772
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
-#: g10/keyedit.c:2843
+#: g10/keyedit.c:2833
msgid "Please remove selections from the secret keys.\n"
msgstr "Please remove selections from the secret keys.\n"
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2839
msgid "Please select at most one secondary key.\n"
msgstr "Please select at most one secondary key.\n"
-#: g10/keyedit.c:2853
+#: g10/keyedit.c:2843
msgid "Changing expiration time for a secondary key.\n"
msgstr "Changing expiration time for a secondary key.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:2846
msgid "Changing expiration time for the primary key.\n"
msgstr "Changing expiration time for the primary key.\n"
-#: g10/keyedit.c:2900
+#: g10/keyedit.c:2892
msgid "You can't change the expiration date of a v3 key\n"
msgstr "You can't change the expiration date of a v3 key\n"
-#: g10/keyedit.c:2916
+#: g10/keyedit.c:2908
msgid "No corresponding signature in secret ring\n"
msgstr "No corresponding signature in secret ring\n"
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:2988
msgid "Please select exactly one user ID.\n"
msgstr "Please select exactly one user ID.\n"
-#: g10/keyedit.c:3033 g10/keyedit.c:3142 g10/keyedit.c:3234
+#: g10/keyedit.c:3027 g10/keyedit.c:3137 g10/keyedit.c:3251
#, c-format
msgid "skipping v3 self-signature on user id \"%s\"\n"
msgstr "skipping v3 self-signature on user id “%s”\n"
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3199
msgid "Enter your preferred keyserver URL: "
msgstr "Enter your preferred keyserver URL: "
-#: g10/keyedit.c:3296
+#: g10/keyedit.c:3315
#, c-format
msgid "No user ID with index %d\n"
msgstr "No user ID with index %d\n"
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3361
#, c-format
msgid "No secondary key with index %d\n"
msgstr "No secondary key with index %d\n"
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3475
msgid "user ID: \""
msgstr "user ID: \""
-#: g10/keyedit.c:3461
+#: g10/keyedit.c:3480
#, c-format
msgid ""
"\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
msgstr ""
"\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3483
#, c-format
msgid ""
"\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
msgstr ""
"\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3488
#, c-format
msgid "This signature expired on %s.\n"
msgstr "This signature expired on %s.\n"
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3492
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Are you sure you still want to revoke it? (y/N) "
-#: g10/keyedit.c:3477
+#: g10/keyedit.c:3496
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Create a revocation certificate for this signature? (y/N) "
-#: g10/keyedit.c:3502
+#: g10/keyedit.c:3521
msgid "You have signed these user IDs:\n"
msgstr "You have signed these user IDs:\n"
-#: g10/keyedit.c:3521
+#: g10/keyedit.c:3542
#, c-format
-msgid " signed by %08lX at %s%s%s\n"
-msgstr " signed by %08lX at %s%s%s\n"
+msgid " signed by %s on %s%s%s\n"
+msgstr " signed by %s on %s%s%s\n"
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3551
#, c-format
-msgid " revoked by %08lX at %s\n"
-msgstr " revoked by %08lX at %s\n"
+msgid " revoked by %s on %s\n"
+msgstr " revoked by %s on %s\n"
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3571
msgid "You are about to revoke these signatures:\n"
msgstr "You are about to revoke these signatures:\n"
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3581
#, c-format
-msgid " signed by %08lX at %s%s\n"
-msgstr " signed by %08lX at %s%s\n"
+msgid " signed by %s on %s%s\n"
+msgstr " signed by %s on %s%s\n"
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3583
msgid " (non-exportable)"
msgstr " (non-exportable)"
-#: g10/keyedit.c:3568
+#: g10/keyedit.c:3590
msgid "Really create the revocation certificates? (y/N) "
msgstr "Really create the revocation certificates? (y/N) "
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3620
msgid "no secret key\n"
msgstr "no secret key\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3690
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "user ID “%s” is already revoked\n"
-#: g10/keyedit.c:3685
+#: g10/keyedit.c:3707
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
-#: g10/keyedit.c:3858
+#: g10/keyedit.c:3876
#, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
-msgstr "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
-#: g10/keylist.c:192
+#: g10/keylist.c:179
msgid "Critical signature policy: "
msgstr "Critical signature policy: "
-#: g10/keylist.c:194
+#: g10/keylist.c:181
msgid "Signature policy: "
msgstr "Signature policy: "
-#: g10/keylist.c:233
+#: g10/keylist.c:220
msgid "Critical preferred keyserver: "
msgstr "Critical preferred keyserver: "
-#: g10/keylist.c:235
+#: g10/keylist.c:222
msgid "Preferred keyserver: "
msgstr "Preferred keyserver: "
-#: g10/keylist.c:274 g10/keylist.c:313
+#: g10/keylist.c:268 g10/keylist.c:312
msgid "WARNING: invalid notation data found\n"
msgstr "WARNING: invalid notation data found\n"
-#: g10/keylist.c:288
+#: g10/keylist.c:286
msgid "Critical signature notation: "
msgstr "Critical signature notation: "
-#: g10/keylist.c:290
+#: g10/keylist.c:288
msgid "Signature notation: "
msgstr "Signature notation: "
-#: g10/keylist.c:301
+#: g10/keylist.c:299
msgid "not human readable"
msgstr "not human readable"
-#: g10/keylist.c:401
+#: g10/keylist.c:400
msgid "Keyring"
msgstr "Keyring"
-#: g10/keylist.c:638 g10/keylist.c:674 g10/keylist.c:776 g10/keylist.c:805
-#: g10/mainproc.c:926
+#: g10/keylist.c:629 g10/keylist.c:658 g10/keylist.c:756 g10/keylist.c:781
+#: g10/mainproc.c:925
#, c-format
msgid " [expires: %s]"
msgstr " [expires: %s]"
-#: g10/keylist.c:670 g10/keylist.c:772
+#: g10/keylist.c:654 g10/keylist.c:752
#, c-format
msgid " [revoked: %s]"
msgstr " [revoked: %s]"
-#: g10/keylist.c:672 g10/keylist.c:774
+#: g10/keylist.c:656 g10/keylist.c:754
#, c-format
msgid " [expired: %s]"
msgstr " [expired: %s]"
-#: g10/keylist.c:1393
+#: g10/keylist.c:1366
msgid "Primary key fingerprint:"
msgstr "Primary key fingerprint:"
-#: g10/keylist.c:1395
+#: g10/keylist.c:1368
msgid " Subkey fingerprint:"
msgstr " Subkey fingerprint:"
-#: g10/keylist.c:1402
+#: g10/keylist.c:1375
msgid " Primary key fingerprint:"
msgstr " Primary key fingerprint:"
-#: g10/keylist.c:1404
+#: g10/keylist.c:1377
msgid " Subkey fingerprint:"
msgstr " Subkey fingerprint:"
-#: g10/keylist.c:1408 g10/keylist.c:1412
+#: g10/keylist.c:1381 g10/keylist.c:1385
msgid " Key fingerprint ="
msgstr " Key fingerprint ="
@@ -3668,172 +3673,172 @@ msgstr "encrypted with unknown algorithm %d\n"
#: g10/mainproc.c:366
#, c-format
-msgid "public key is %08lX\n"
-msgstr "public key is %08lX\n"
+msgid "public key is %s\n"
+msgstr "public key is %s\n"
#: g10/mainproc.c:421
msgid "public key encrypted data: good DEK\n"
msgstr "public key encrypted data: good DEK\n"
-#: g10/mainproc.c:454
+#: g10/mainproc.c:455
#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
-msgstr "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "encrypted with %u-bit %s key, ID %s, created %s\n"
-#: g10/mainproc.c:464
+#: g10/mainproc.c:465
#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
-msgstr "encrypted with %s key, ID %08lX\n"
+msgid "encrypted with %s key, ID %s\n"
+msgstr "encrypted with %s key, ID %s\n"
-#: g10/mainproc.c:478
+#: g10/mainproc.c:479
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "public key decryption failed: %s\n"
-#: g10/mainproc.c:492
+#: g10/mainproc.c:493
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "encrypted with %lu passphrases\n"
-#: g10/mainproc.c:494
+#: g10/mainproc.c:495
msgid "encrypted with 1 passphrase\n"
msgstr "encrypted with 1 passphrase\n"
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:523 g10/mainproc.c:545
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "assuming %s encrypted data\n"
-#: g10/mainproc.c:530
+#: g10/mainproc.c:531
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
msgid "decryption okay\n"
msgstr "decryption okay\n"
-#: g10/mainproc.c:566
+#: g10/mainproc.c:567
msgid "WARNING: message was not integrity protected\n"
msgstr "WARNING: message was not integrity protected\n"
-#: g10/mainproc.c:579
+#: g10/mainproc.c:580
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "WARNING: encrypted message has been manipulated!\n"
-#: g10/mainproc.c:585
+#: g10/mainproc.c:586
#, c-format
msgid "decryption failed: %s\n"
msgstr "decryption failed: %s\n"
-#: g10/mainproc.c:605
+#: g10/mainproc.c:606
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTE: sender requested “for-your-eyes-only”\n"
-#: g10/mainproc.c:607
+#: g10/mainproc.c:608
#, c-format
msgid "original file name='%.*s'\n"
msgstr "original file name='%.*s'\n"
-#: g10/mainproc.c:779
+#: g10/mainproc.c:780
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "standalone revocation - use “gpg --import” to apply\n"
-#: g10/mainproc.c:1279
+#: g10/mainproc.c:1276
msgid "signature verification suppressed\n"
msgstr "signature verification suppressed\n"
-#: g10/mainproc.c:1321 g10/mainproc.c:1331
+#: g10/mainproc.c:1318 g10/mainproc.c:1328
msgid "can't handle these multiple signatures\n"
msgstr "can't handle these multiple signatures\n"
-#: g10/mainproc.c:1342
+#: g10/mainproc.c:1338
#, c-format
-msgid "Signature made %.*s\n"
-msgstr "Signature made %.*s\n"
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
-#: g10/mainproc.c:1343
+#: g10/mainproc.c:1339
#, c-format
-msgid " using %s key %08lX%08lX\n"
-msgstr " using %s key %08lX%08lX\n"
+msgid " using %s key %s\n"
+msgstr " using %s key %s\n"
-#: g10/mainproc.c:1347
+#: g10/mainproc.c:1343
#, c-format
-msgid "Signature made %.*s using %s key ID %08lX\n"
-msgstr "Signature made %.*s using %s key ID %08lX\n"
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "Signature made %s using %s key ID %s\n"
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1363
msgid "Key available at: "
msgstr "Key available at: "
-#: g10/mainproc.c:1435 g10/mainproc.c:1471
+#: g10/mainproc.c:1463 g10/mainproc.c:1499
msgid "BAD signature from \""
msgstr "BAD signature from \""
-#: g10/mainproc.c:1436 g10/mainproc.c:1472
+#: g10/mainproc.c:1464 g10/mainproc.c:1500
msgid "Expired signature from \""
msgstr "Expired signature from \""
-#: g10/mainproc.c:1437 g10/mainproc.c:1473
+#: g10/mainproc.c:1465 g10/mainproc.c:1501
msgid "Good signature from \""
msgstr "Good signature from \""
-#: g10/mainproc.c:1475
+#: g10/mainproc.c:1503
msgid "[uncertain]"
msgstr "[uncertain]"
-#: g10/mainproc.c:1601
+#: g10/mainproc.c:1631
#, c-format
msgid "Signature expired %s\n"
msgstr "Signature expired %s\n"
-#: g10/mainproc.c:1606
+#: g10/mainproc.c:1636
#, c-format
msgid "Signature expires %s\n"
msgstr "Signature expires %s\n"
-#: g10/mainproc.c:1609
+#: g10/mainproc.c:1639
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s signature, digest algorithm %s\n"
-#: g10/mainproc.c:1610
+#: g10/mainproc.c:1640
msgid "binary"
msgstr "binary"
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1641
msgid "textmode"
msgstr "textmode"
-#: g10/mainproc.c:1611 g10/trustdb.c:499
+#: g10/mainproc.c:1641 g10/trustdb.c:498
msgid "unknown"
msgstr "unknown"
-#: g10/mainproc.c:1631
+#: g10/mainproc.c:1661
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Can't check signature: %s\n"
-#: g10/mainproc.c:1699 g10/mainproc.c:1715 g10/mainproc.c:1801
+#: g10/mainproc.c:1729 g10/mainproc.c:1745 g10/mainproc.c:1831
msgid "not a detached signature\n"
msgstr "not a detached signature\n"
-#: g10/mainproc.c:1742
+#: g10/mainproc.c:1772
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
-#: g10/mainproc.c:1750
+#: g10/mainproc.c:1780
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "standalone signature of class 0x%02x\n"
-#: g10/mainproc.c:1807
+#: g10/mainproc.c:1837
msgid "old style (PGP 2.x) signature\n"
msgstr "old style (PGP 2.x) signature\n"
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1847
msgid "invalid root packet detected in proc_tree()\n"
msgstr "invalid root packet detected in proc_tree()\n"
@@ -3888,74 +3893,74 @@ msgstr "uncompressed|none"
msgid "this message may not be usable by %s\n"
msgstr "this message may not be usable by %s\n"
-#: g10/misc.c:742
+#: g10/misc.c:777
#, c-format
msgid "ambiguous option `%s'\n"
msgstr "ambiguous option ‘%s’\n"
-#: g10/misc.c:767
+#: g10/misc.c:802
#, c-format
msgid "unknown option `%s'\n"
msgstr "unknown option ‘%s’\n"
-#: g10/parse-packet.c:121
+#: g10/parse-packet.c:120
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "can't handle public key algorithm %d\n"
-#: g10/parse-packet.c:690
+#: g10/parse-packet.c:703
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
-#: g10/parse-packet.c:1103
+#: g10/parse-packet.c:1128
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacket of type %d has critical bit set\n"
-#: g10/passphrase.c:460 g10/passphrase.c:507
+#: g10/passphrase.c:461 g10/passphrase.c:508
msgid "gpg-agent is not available in this session\n"
msgstr "gpg-agent is not available in this session\n"
-#: g10/passphrase.c:468
+#: g10/passphrase.c:469
msgid "can't set client pid for the agent\n"
msgstr "can't set client pid for the agent\n"
-#: g10/passphrase.c:476
+#: g10/passphrase.c:477
msgid "can't get server read FD for the agent\n"
msgstr "can't get server read FD for the agent\n"
-#: g10/passphrase.c:483
+#: g10/passphrase.c:484
msgid "can't get server write FD for the agent\n"
msgstr "can't get server write FD for the agent\n"
-#: g10/passphrase.c:516
+#: g10/passphrase.c:517
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "malformed GPG_AGENT_INFO environment variable\n"
-#: g10/passphrase.c:529
+#: g10/passphrase.c:530
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent protocol version %d is not supported\n"
-#: g10/passphrase.c:550
+#: g10/passphrase.c:551
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "can't connect to ‘%s’: %s\n"
-#: g10/passphrase.c:572
+#: g10/passphrase.c:573
msgid "communication problem with gpg-agent\n"
msgstr "communication problem with gpg-agent\n"
-#: g10/passphrase.c:579 g10/passphrase.c:879 g10/passphrase.c:991
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
msgid "problem with the agent - disabling agent use\n"
msgstr "problem with the agent - disabling agent use\n"
-#: g10/passphrase.c:680 g10/passphrase.c:1132
+#: g10/passphrase.c:681
#, c-format
msgid " (main key ID %08lX)"
msgstr " (main key ID %08lX)"
-#: g10/passphrase.c:690
+#: g10/passphrase.c:691
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -3966,40 +3971,40 @@ msgstr ""
"“%.*s”\n"
"%u-bit %s key, ID %08lX, created %s%s\n"
-#: g10/passphrase.c:712
+#: g10/passphrase.c:713
msgid "Repeat passphrase\n"
msgstr "Repeat passphrase\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:715
msgid "Enter passphrase\n"
msgstr "Enter passphrase\n"
-#: g10/passphrase.c:752
+#: g10/passphrase.c:753
msgid "passphrase too long\n"
msgstr "passphrase too long\n"
-#: g10/passphrase.c:765
+#: g10/passphrase.c:766
msgid "invalid response from agent\n"
msgstr "invalid response from agent\n"
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:781 g10/passphrase.c:874
msgid "cancelled by user\n"
msgstr "cancelled by user\n"
-#: g10/passphrase.c:785 g10/passphrase.c:962
+#: g10/passphrase.c:786 g10/passphrase.c:963
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "problem with the agent: agent returns 0x%lx\n"
-#: g10/passphrase.c:1043 g10/passphrase.c:1179
+#: g10/passphrase.c:1044 g10/passphrase.c:1189
msgid "can't query password in batchmode\n"
msgstr "can't query password in batchmode\n"
-#: g10/passphrase.c:1048 g10/passphrase.c:1183
+#: g10/passphrase.c:1049 g10/passphrase.c:1193
msgid "Enter passphrase: "
msgstr "Enter passphrase: "
-#: g10/passphrase.c:1118
+#: g10/passphrase.c:1119
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4009,12 +4014,22 @@ msgstr ""
"You need a passphrase to unlock the secret key for\n"
"user: \""
-#: g10/passphrase.c:1127
+#: g10/passphrase.c:1128
+#, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u-bit %s key, ID %s, created %s"
+
+#: g10/passphrase.c:1137
+#, c-format
+msgid " (subkey on main key ID %s)"
+msgstr " (subkey on main key ID %s)"
+
+#: g10/passphrase.c:1141
#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
-msgstr "%u-bit %s key, ID %08lX, created %s"
+msgid " (main key ID %s)"
+msgstr " (main key ID %s)"
-#: g10/passphrase.c:1187
+#: g10/passphrase.c:1197
msgid "Repeat passphrase: "
msgstr "Repeat passphrase: "
@@ -4050,8 +4065,8 @@ msgstr "can't open signed data ‘%s’\n"
#: g10/pubkey-enc.c:103
#, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
-msgstr "anonymous recipient; trying secret key %08lX ...\n"
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
#: g10/pubkey-enc.c:119
msgid "okay, we are the anonymous recipient.\n"
@@ -4073,8 +4088,8 @@ msgstr "WARNING: cipher algorithm %s not found in recipient preferences\n"
#: g10/pubkey-enc.c:286
#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
-msgstr "NOTE: secret key %08lX expired at %s\n"
+msgid "NOTE: secret key %s expired at %s\n"
+msgstr "NOTE: secret key %s expired at %s\n"
#: g10/pubkey-enc.c:292
msgid "NOTE: key has been revoked"
@@ -4110,62 +4125,59 @@ msgstr "generating the deprecated 16-bit checksum for secret key protection\n"
msgid "WARNING: signature digest conflict in message\n"
msgstr "WARNING: signature digest conflict in message\n"
-#: g10/sig-check.c:146
+#: g10/sig-check.c:99
#, c-format
-msgid ""
-"key %08lX: this is a PGP generated Elgamal key which is NOT secure for "
-"signatures!\n"
-msgstr ""
-"key %08lX: this is a PGP generated Elgamal key which is NOT secure for "
-"signatures!\n"
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr "WARNING: signing subkey %s is not cross-certified\n"
-#: g10/sig-check.c:155
+#: g10/sig-check.c:102
#, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "public key %08lX is %lu second newer than the signature\n"
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr "WARNING: signing subkey %s has an invalid cross-certification\n"
-#: g10/sig-check.c:156
+#: g10/sig-check.c:168
#, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "public key %08lX is %lu seconds newer than the signature\n"
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "public key %s is %lu second newer than the signature\n"
-#: g10/sig-check.c:165
+#: g10/sig-check.c:169
+#, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "public key %s is %lu seconds newer than the signature\n"
+
+#: g10/sig-check.c:180
#, c-format
msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
msgstr ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
-#: g10/sig-check.c:167
+#: g10/sig-check.c:182
#, c-format
msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
msgstr ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
-msgstr "NOTE: signature key %08lX expired %s\n"
+msgid "NOTE: signature key %s expired %s\n"
+msgstr "NOTE: signature key %s expired %s\n"
-#: g10/sig-check.c:263
+#: g10/sig-check.c:275
#, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
-msgstr "assuming bad signature from key %08lX due to an unknown critical bit\n"
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr "assuming bad signature from key %s due to an unknown critical bit\n"
-#: g10/sig-check.c:486
+#: g10/sig-check.c:532
#, c-format
-msgid "key %08lX: no subkey for subkey revocation signature\n"
-msgstr "key %08lX: no subkey for subkey revocation signature\n"
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "key %s: no subkey for subkey revocation signature\n"
-#: g10/sig-check.c:512
+#: g10/sig-check.c:558
#, c-format
-msgid "key %08lX: no subkey for subkey binding signature\n"
-msgstr "key %08lX: no subkey for subkey binding signature\n"
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "key %s: no subkey for subkey binding signature\n"
#: g10/sign.c:85
msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
@@ -4215,35 +4227,35 @@ msgstr "checking created signature failed: %s\n"
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s signature from: “%s”\n"
-#: g10/sign.c:548
+#: g10/sign.c:550
#, c-format
msgid "WARNING: `%s' is an empty file\n"
msgstr "WARNING: ‘%s’ is an empty file\n"
-#: g10/sign.c:736
+#: g10/sign.c:741
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
-#: g10/sign.c:760 g10/sign.c:996
+#: g10/sign.c:765 g10/sign.c:1001
#, c-format
msgid "can't create %s: %s\n"
msgstr "can't create %s: %s\n"
-#: g10/sign.c:789
+#: g10/sign.c:794
#, c-format
msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "forcing digest algorithm %s (%d) violates recipient preferences\n"
-#: g10/sign.c:881
+#: g10/sign.c:886
msgid "signing:"
msgstr "signing:"
-#: g10/sign.c:980
+#: g10/sign.c:985
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-#: g10/sign.c:1133
+#: g10/sign.c:1138
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s encryption will be used\n"
@@ -4398,103 +4410,103 @@ msgstr "‘%s’ is not a valid long keyID\n"
#: g10/trustdb.c:257
#, c-format
-msgid "key %08lX: accepted as trusted key\n"
-msgstr "key %08lX: accepted as trusted key\n"
+msgid "key %s: accepted as trusted key\n"
+msgstr "key %s: accepted as trusted key\n"
#: g10/trustdb.c:295
#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
-msgstr "key %08lX occurs more than once in the trustdb\n"
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "key %s occurs more than once in the trustdb\n"
#: g10/trustdb.c:310
#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "key %08lX: no public key for trusted key - skipped\n"
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr "key %s: no public key for trusted key - skipped\n"
-#: g10/trustdb.c:319
+#: g10/trustdb.c:320
#, c-format
-msgid "key %08lX marked as ultimately trusted\n"
-msgstr "key %08lX marked as ultimately trusted\n"
+msgid "key %s marked as ultimately trusted\n"
+msgstr "key %s marked as ultimately trusted\n"
-#: g10/trustdb.c:345
+#: g10/trustdb.c:344
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "trust record %lu, req type %d: read failed: %s\n"
-#: g10/trustdb.c:351
+#: g10/trustdb.c:350
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "trust record %lu is not of requested type %d\n"
-#: g10/trustdb.c:366 g10/tdbdump.c:59
+#: g10/trustdb.c:365 g10/tdbdump.c:59
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "trust record %lu, type %d: write failed: %s\n"
-#: g10/trustdb.c:381 g10/tdbdump.c:217
+#: g10/trustdb.c:380 g10/tdbdump.c:217
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync failed: %s\n"
-#: g10/trustdb.c:446
+#: g10/trustdb.c:445
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n"
-#: g10/trustdb.c:452
+#: g10/trustdb.c:451
#, c-format
msgid "using %s trust model\n"
msgstr "using %s trust model\n"
-#: g10/trustdb.c:501
+#: g10/trustdb.c:500
msgid "undefined"
msgstr "undefined"
-#: g10/trustdb.c:502
+#: g10/trustdb.c:501
msgid "never"
msgstr "never"
-#: g10/trustdb.c:503
+#: g10/trustdb.c:502
msgid "marginal"
msgstr "marginal"
-#: g10/trustdb.c:504
+#: g10/trustdb.c:503
msgid "full"
msgstr "full"
-#: g10/trustdb.c:505
+#: g10/trustdb.c:504
msgid "ultimate"
msgstr "ultimate"
-#: g10/trustdb.c:545
+#: g10/trustdb.c:544
msgid "no need for a trustdb check\n"
msgstr "no need for a trustdb check\n"
-#: g10/trustdb.c:551 g10/trustdb.c:2103
+#: g10/trustdb.c:550 g10/trustdb.c:2103
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "next trustdb check due at %s\n"
-#: g10/trustdb.c:560
+#: g10/trustdb.c:559
#, c-format
msgid "no need for a trustdb check with \"%s\" trust model\n"
msgstr "no need for a trustdb check with “%s” trust model\n"
-#: g10/trustdb.c:575
+#: g10/trustdb.c:574
#, c-format
msgid "no need for a trustdb update with \"%s\" trust model\n"
msgstr "no need for a trustdb update with “%s” trust model\n"
-#: g10/trustdb.c:793 g10/trustdb.c:1221
+#: g10/trustdb.c:792 g10/trustdb.c:1222
#, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "public key %08lX not found: %s\n"
+msgid "public key %s not found: %s\n"
+msgstr "public key %s not found: %s\n"
-#: g10/trustdb.c:988
+#: g10/trustdb.c:987
msgid "please do a --check-trustdb\n"
msgstr "please do a --check-trustdb\n"
-#: g10/trustdb.c:992
+#: g10/trustdb.c:991
msgid "checking the trustdb\n"
msgstr "checking the trustdb\n"
@@ -4509,8 +4521,8 @@ msgstr "no ultimately trusted keys found\n"
#: g10/trustdb.c:1925
#, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
-msgstr "public key of ultimately trusted key %08lX not found\n"
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr "public key of ultimately trusted key %s not found\n"
#: g10/trustdb.c:1948
#, c-format
@@ -5163,78 +5175,74 @@ msgstr "WARNING: unable to remove tempfile (%s) ‘%s’: %s\n"
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "WARNING: unable to remove temp directory ‘%s’: %s\n"
-#: g10/keyid.c:370 g10/keyid.c:382 g10/keyid.c:394 g10/keyid.c:406
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
msgid "never "
msgstr "never "
-#: g10/revoke.c:92
-msgid "key incomplete\n"
-msgstr "key incomplete\n"
-
-#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:540
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet failed: %s\n"
-#: g10/revoke.c:145
+#: g10/revoke.c:146
#, c-format
-msgid "key %08lX incomplete\n"
-msgstr "key %08lX incomplete\n"
+msgid "key %s has no user IDs\n"
+msgstr "key %s has no user IDs\n"
-#: g10/revoke.c:270
+#: g10/revoke.c:271
msgid "To be revoked by:\n"
msgstr "To be revoked by:\n"
-#: g10/revoke.c:274
+#: g10/revoke.c:275
msgid "(This is a sensitive revocation key)\n"
msgstr "(This is a sensitive revocation key)\n"
-#: g10/revoke.c:278 g10/revoke.c:475
+#: g10/revoke.c:279 g10/revoke.c:476
msgid "Create a revocation certificate for this key? "
msgstr "Create a revocation certificate for this key? "
-#: g10/revoke.c:291 g10/revoke.c:506
+#: g10/revoke.c:292 g10/revoke.c:507
msgid "ASCII armored output forced.\n"
msgstr "ASCII armored output forced.\n"
-#: g10/revoke.c:305 g10/revoke.c:520
+#: g10/revoke.c:306 g10/revoke.c:521
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet failed: %s\n"
-#: g10/revoke.c:368
+#: g10/revoke.c:369
msgid "Revocation certificate created.\n"
msgstr "Revocation certificate created.\n"
-#: g10/revoke.c:374
+#: g10/revoke.c:375
#, c-format
msgid "no revocation keys found for `%s'\n"
msgstr "no revocation keys found for ‘%s’\n"
-#: g10/revoke.c:428
+#: g10/revoke.c:429
#, c-format
msgid "secret key `%s' not found: %s\n"
msgstr "secret key ‘%s’ not found: %s\n"
-#: g10/revoke.c:457
+#: g10/revoke.c:458
#, c-format
msgid "no corresponding public key: %s\n"
msgstr "no corresponding public key: %s\n"
-#: g10/revoke.c:468
+#: g10/revoke.c:469
msgid "public key does not match secret key!\n"
msgstr "public key does not match secret key!\n"
-#: g10/revoke.c:491
+#: g10/revoke.c:492
msgid "unknown protection algorithm\n"
msgstr "unknown protection algorithm\n"
-#: g10/revoke.c:495
+#: g10/revoke.c:496
msgid "NOTE: This key is not protected!\n"
msgstr "NOTE: This key is not protected!\n"
-#: g10/revoke.c:546
+#: g10/revoke.c:547
msgid ""
"Revocation certificate created.\n"
"\n"
@@ -5252,33 +5260,33 @@ msgstr ""
"your media become unreadable. But have some caution: The print system of\n"
"your machine might store the data and make it available to others!\n"
-#: g10/revoke.c:587
+#: g10/revoke.c:588
msgid "Please select the reason for the revocation:\n"
msgstr "Please select the reason for the revocation:\n"
-#: g10/revoke.c:597
+#: g10/revoke.c:598
msgid "Cancel"
msgstr "Cancel"
-#: g10/revoke.c:599
+#: g10/revoke.c:600
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Probably you want to select %d here)\n"
-#: g10/revoke.c:640
+#: g10/revoke.c:641
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Enter an optional description; end it with an empty line:\n"
-#: g10/revoke.c:668
+#: g10/revoke.c:669
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Reason for revocation: %s\n"
-#: g10/revoke.c:670
+#: g10/revoke.c:671
msgid "(No description given)\n"
msgstr "(No description given)\n"
-#: g10/revoke.c:675
+#: g10/revoke.c:676
msgid "Is this okay? "
msgstr "Is this okay? "
diff --git a/po/[email protected] b/po/[email protected]
index 0998dd911..8dec4e75a 100644
--- a/po/[email protected]
+++ b/po/[email protected]
Binary files differ
diff --git a/po/[email protected] b/po/[email protected]
index 77a81ce79..86b0c7980 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -27,10 +27,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gnupg 1.3.5\n"
+"Project-Id-Version: gnupg 1.3.6\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-02-26 18:37+0100\n"
-"PO-Revision-Date: 2004-02-26 18:37+0100\n"
+"POT-Creation-Date: 2004-05-22 13:30+0200\n"
+"PO-Revision-Date: 2004-05-22 13:30+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -324,7 +324,7 @@ msgstr "you found a bug ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "no entropy gathering module detected\n"
-#: cipher/random.c:387 g10/keygen.c:1917 g10/import.c:169
+#: cipher/random.c:387 g10/keygen.c:2028 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "can't open ‘%s’: %s\n"
@@ -425,7 +425,7 @@ msgstr "can't gen prime with pbits=%u qbits=%u\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "can't generate a prime with less than %d bits\n"
-#: g10/g10.c:350
+#: g10/g10.c:354
msgid ""
"@Commands:\n"
" "
@@ -433,127 +433,127 @@ msgstr ""
"@Commands:\n"
" "
-#: g10/g10.c:352
+#: g10/g10.c:356
msgid "|[file]|make a signature"
msgstr "|[file]|make a signature"
-#: g10/g10.c:353
+#: g10/g10.c:357
msgid "|[file]|make a clear text signature"
msgstr "|[file]|make a clear text signature"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid "make a detached signature"
msgstr "make a detached signature"
-#: g10/g10.c:355
+#: g10/g10.c:359
msgid "encrypt data"
msgstr "encrypt data"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "encryption only with symmetric cipher"
msgstr "encryption only with symmetric cipher"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "decrypt data (default)"
msgstr "decrypt data (default)"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "verify a signature"
msgstr "verify a signature"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "list keys"
msgstr "list keys"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "list keys and signatures"
msgstr "list keys and signatures"
-#: g10/g10.c:366
+#: g10/g10.c:370
msgid "list and check key signatures"
msgstr "list and check key signatures"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys and fingerprints"
msgstr "list keys and fingerprints"
-#: g10/g10.c:368
+#: g10/g10.c:372
msgid "list secret keys"
msgstr "list secret keys"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "generate a new key pair"
msgstr "generate a new key pair"
-#: g10/g10.c:370
+#: g10/g10.c:374
msgid "remove keys from the public keyring"
msgstr "remove keys from the public keyring"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "remove keys from the secret keyring"
msgstr "remove keys from the secret keyring"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "sign a key"
msgstr "sign a key"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "sign a key locally"
msgstr "sign a key locally"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign or edit a key"
msgstr "sign or edit a key"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "generate a revocation certificate"
msgstr "generate a revocation certificate"
-#: g10/g10.c:380
+#: g10/g10.c:384
msgid "export keys"
msgstr "export keys"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "export keys to a key server"
msgstr "export keys to a key server"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "import keys from a key server"
msgstr "import keys from a key server"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "search for keys on a key server"
msgstr "search for keys on a key server"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "update all keys from a keyserver"
msgstr "update all keys from a keyserver"
-#: g10/g10.c:390
+#: g10/g10.c:393
msgid "import/merge keys"
msgstr "import/merge keys"
-#: g10/g10.c:393
+#: g10/g10.c:396
msgid "print the card status"
msgstr "print the card status"
-#: g10/g10.c:394
+#: g10/g10.c:397
msgid "change data on a card"
msgstr "change data on a card"
-#: g10/g10.c:395
+#: g10/g10.c:398
msgid "change a card's PIN"
msgstr "change a card's PIN"
-#: g10/g10.c:402
+#: g10/g10.c:406
msgid "update the trust database"
msgstr "update the trust database"
-#: g10/g10.c:409
+#: g10/g10.c:413
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|print message digests"
-#: g10/g10.c:413 g10/gpgv.c:64
+#: g10/g10.c:417 g10/gpgv.c:64
msgid ""
"@\n"
"Options:\n"
@@ -563,51 +563,55 @@ msgstr ""
"Options:\n"
" "
-#: g10/g10.c:415
+#: g10/g10.c:419
msgid "create ascii armored output"
msgstr "create ascii armored output"
-#: g10/g10.c:417
+#: g10/g10.c:421
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|encrypt for NAME"
-#: g10/g10.c:428
+#: g10/g10.c:432
msgid "use this user-id to sign or decrypt"
msgstr "use this user-id to sign or decrypt"
-#: g10/g10.c:429
+#: g10/g10.c:433
msgid "|N|set compress level N (0 disables)"
msgstr "|N|set compress level N (0 disables)"
-#: g10/g10.c:434
+#: g10/g10.c:438
msgid "use canonical text mode"
msgstr "use canonical text mode"
-#: g10/g10.c:444
+#: g10/g10.c:448
msgid "use as output file"
msgstr "use as output file"
-#: g10/g10.c:446 g10/gpgv.c:66
+#: g10/g10.c:450 g10/gpgv.c:66
msgid "verbose"
msgstr "verbose"
-#: g10/g10.c:457
+#: g10/g10.c:461
msgid "do not make any changes"
msgstr "do not make any changes"
-#: g10/g10.c:458
+#: g10/g10.c:462
msgid "prompt before overwriting"
msgstr "prompt before overwriting"
-#: g10/g10.c:502
+#: g10/g10.c:506
msgid "use strict OpenPGP behavior"
msgstr "use strict OpenPGP behavior"
-#: g10/g10.c:503
+#: g10/g10.c:507
msgid "generate PGP 2.x compatible messages"
msgstr "generate PGP 2.x compatible messages"
-#: g10/g10.c:526
+#: g10/g10.c:529
+msgid "allow the use of admin card commands"
+msgstr "allow the use of admin card commands"
+
+#: g10/g10.c:534
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -615,7 +619,7 @@ msgstr ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
-#: g10/g10.c:529
+#: g10/g10.c:537
msgid ""
"@\n"
"Examples:\n"
@@ -635,15 +639,15 @@ msgstr ""
" --list-keys [names] show keys\n"
" --fingerprint [names] show fingerprints\n"
-#: g10/g10.c:702 g10/gpgv.c:91
+#: g10/g10.c:712 g10/gpgv.c:91
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Please report bugs to <[email protected]>.\n"
-#: g10/g10.c:719
+#: g10/g10.c:729
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Usage: gpg [options] [files] (-h for help)"
-#: g10/g10.c:722
+#: g10/g10.c:732
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -653,7 +657,7 @@ msgstr ""
"sign, check, encrypt or decrypt\n"
"default operation depends on the input data\n"
-#: g10/g10.c:733
+#: g10/g10.c:743
msgid ""
"\n"
"Supported algorithms:\n"
@@ -661,88 +665,88 @@ msgstr ""
"\n"
"Supported algorithms:\n"
-#: g10/g10.c:736
+#: g10/g10.c:746
msgid "Pubkey: "
msgstr "Pubkey: "
-#: g10/g10.c:742 g10/keyedit.c:1718
+#: g10/g10.c:752 g10/keyedit.c:1721
msgid "Cipher: "
msgstr "Cipher: "
-#: g10/g10.c:748
+#: g10/g10.c:758
msgid "Hash: "
msgstr "Hash: "
-#: g10/g10.c:754 g10/keyedit.c:1764
+#: g10/g10.c:764 g10/keyedit.c:1767
msgid "Compression: "
msgstr "Compression: "
-#: g10/g10.c:837
+#: g10/g10.c:847
msgid "usage: gpg [options] "
msgstr "usage: gpg [options] "
-#: g10/g10.c:940
+#: g10/g10.c:950
msgid "conflicting commands\n"
msgstr "conflicting commands\n"
-#: g10/g10.c:958
+#: g10/g10.c:968
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "no = sign found in group definition “%s”\n"
-#: g10/g10.c:1155
+#: g10/g10.c:1165
#, c-format
msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
msgstr "WARNING: unsafe ownership on homedir “%s”\n"
-#: g10/g10.c:1158
+#: g10/g10.c:1168
#, c-format
msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
msgstr "WARNING: unsafe ownership on configuration file “%s”\n"
-#: g10/g10.c:1161
+#: g10/g10.c:1171
#, c-format
msgid "WARNING: unsafe ownership on extension \"%s\"\n"
msgstr "WARNING: unsafe ownership on extension “%s”\n"
-#: g10/g10.c:1167
+#: g10/g10.c:1177
#, c-format
msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
msgstr "WARNING: unsafe permissions on homedir “%s”\n"
-#: g10/g10.c:1170
+#: g10/g10.c:1180
#, c-format
msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
msgstr "WARNING: unsafe permissions on configuration file “%s”\n"
-#: g10/g10.c:1173
+#: g10/g10.c:1183
#, c-format
msgid "WARNING: unsafe permissions on extension \"%s\"\n"
msgstr "WARNING: unsafe permissions on extension “%s”\n"
-#: g10/g10.c:1179
+#: g10/g10.c:1189
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
msgstr "WARNING: unsafe enclosing directory ownership on homedir “%s”\n"
-#: g10/g10.c:1182
+#: g10/g10.c:1192
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
msgstr ""
"WARNING: unsafe enclosing directory ownership on configuration file “%s”\n"
-#: g10/g10.c:1185
+#: g10/g10.c:1195
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
msgstr "WARNING: unsafe enclosing directory ownership on extension “%s”\n"
-#: g10/g10.c:1191
+#: g10/g10.c:1201
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
msgstr "WARNING: unsafe enclosing directory permissions on homedir “%s”\n"
-#: g10/g10.c:1194
+#: g10/g10.c:1204
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
@@ -750,363 +754,372 @@ msgid ""
msgstr ""
"WARNING: unsafe enclosing directory permissions on configuration file “%s”\n"
-#: g10/g10.c:1197
+#: g10/g10.c:1207
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
msgstr "WARNING: unsafe enclosing directory permissions on extension “%s”\n"
-#: g10/g10.c:1323
+#: g10/g10.c:1333
#, c-format
msgid "unknown configuration item \"%s\"\n"
msgstr "unknown configuration item “%s”\n"
-#: g10/g10.c:1570
+#: g10/g10.c:1600
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTE: old default options file ‘%s’ ignored\n"
-#: g10/g10.c:1606
+#: g10/g10.c:1636
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTE: no default option file ‘%s’\n"
-#: g10/g10.c:1610
+#: g10/g10.c:1640
#, c-format
msgid "option file `%s': %s\n"
msgstr "option file ‘%s’: %s\n"
-#: g10/g10.c:1617
+#: g10/g10.c:1647
#, c-format
msgid "reading options from `%s'\n"
msgstr "reading options from ‘%s’\n"
-#: g10/g10.c:1842 g10/g10.c:2333 g10/g10.c:2344
+#: g10/g10.c:1873 g10/g10.c:2408 g10/g10.c:2419
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTE: %s is not for normal use!\n"
-#: g10/g10.c:1855
+#: g10/g10.c:1886
#, c-format
msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
msgstr "cipher extension “%s” not loaded due to unsafe permissions\n"
-#: g10/g10.c:2066
+#: g10/g10.c:2098
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s is not a valid character set\n"
-#: g10/g10.c:2084
-msgid "could not parse keyserver URI\n"
-msgstr "could not parse keyserver URI\n"
+#: g10/g10.c:2117 g10/keyedit.c:3212
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
+#: g10/g10.c:2123
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
+#: g10/g10.c:2126
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
-#: g10/g10.c:2093
+#: g10/g10.c:2133
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: invalid import options\n"
-#: g10/g10.c:2096
+#: g10/g10.c:2136
msgid "invalid import options\n"
msgstr "invalid import options\n"
-#: g10/g10.c:2103
+#: g10/g10.c:2143
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: invalid export options\n"
-#: g10/g10.c:2106
+#: g10/g10.c:2146
msgid "invalid export options\n"
msgstr "invalid export options\n"
-#: g10/g10.c:2129
+#: g10/g10.c:2171
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: invalid list options\n"
-#: g10/g10.c:2132
+#: g10/g10.c:2174
msgid "invalid list options\n"
msgstr "invalid list options\n"
-#: g10/g10.c:2153
+#: g10/g10.c:2197
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: invalid verify options\n"
-#: g10/g10.c:2156
+#: g10/g10.c:2200
msgid "invalid verify options\n"
msgstr "invalid verify options\n"
-#: g10/g10.c:2163
+#: g10/g10.c:2207
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "unable to set exec-path to %s\n"
-#: g10/g10.c:2322
+#: g10/g10.c:2397
msgid "WARNING: program may create a core file!\n"
msgstr "WARNING: program may create a core file!\n"
-#: g10/g10.c:2326
+#: g10/g10.c:2401
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WARNING: %s overrides %s\n"
-#: g10/g10.c:2335
+#: g10/g10.c:2410
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s not allowed with %s!\n"
-#: g10/g10.c:2338
+#: g10/g10.c:2413
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s makes no sense with %s!\n"
-#: g10/g10.c:2359
+#: g10/g10.c:2434
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "you can only make detached or clear signatures while in --pgp2 mode\n"
-#: g10/g10.c:2365
+#: g10/g10.c:2440
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-#: g10/g10.c:2371
+#: g10/g10.c:2446
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-#: g10/g10.c:2384
+#: g10/g10.c:2459
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-#: g10/g10.c:2452 g10/g10.c:2476
+#: g10/g10.c:2527 g10/g10.c:2551
msgid "selected cipher algorithm is invalid\n"
msgstr "selected cipher algorithm is invalid\n"
-#: g10/g10.c:2458 g10/g10.c:2482
+#: g10/g10.c:2533 g10/g10.c:2557
msgid "selected digest algorithm is invalid\n"
msgstr "selected digest algorithm is invalid\n"
-#: g10/g10.c:2464
+#: g10/g10.c:2539
msgid "selected compression algorithm is invalid\n"
msgstr "selected compression algorithm is invalid\n"
-#: g10/g10.c:2470
+#: g10/g10.c:2545
msgid "selected certification digest algorithm is invalid\n"
msgstr "selected certification digest algorithm is invalid\n"
-#: g10/g10.c:2485
+#: g10/g10.c:2560
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed must be greater than 0\n"
-#: g10/g10.c:2487
+#: g10/g10.c:2562
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed must be greater than 1\n"
-#: g10/g10.c:2489
+#: g10/g10.c:2564
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth must be in the range from 1 to 255\n"
-#: g10/g10.c:2491
+#: g10/g10.c:2566
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-#: g10/g10.c:2493
+#: g10/g10.c:2568
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
-#: g10/g10.c:2496
+#: g10/g10.c:2571
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTE: simple S2K mode (0) is strongly discouraged\n"
-#: g10/g10.c:2500
+#: g10/g10.c:2575
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "invalid S2K mode; must be 0, 1 or 3\n"
-#: g10/g10.c:2507
+#: g10/g10.c:2582
msgid "invalid default preferences\n"
msgstr "invalid default preferences\n"
-#: g10/g10.c:2516
+#: g10/g10.c:2591
msgid "invalid personal cipher preferences\n"
msgstr "invalid personal cipher preferences\n"
-#: g10/g10.c:2520
+#: g10/g10.c:2595
msgid "invalid personal digest preferences\n"
msgstr "invalid personal digest preferences\n"
-#: g10/g10.c:2524
+#: g10/g10.c:2599
msgid "invalid personal compress preferences\n"
msgstr "invalid personal compress preferences\n"
-#: g10/g10.c:2557
+#: g10/g10.c:2632
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s does not yet work with %s\n"
-#: g10/g10.c:2604
+#: g10/g10.c:2679
#, c-format
msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
msgstr "you may not use cipher algorithm “%s” while in %s mode\n"
-#: g10/g10.c:2609
+#: g10/g10.c:2684
#, c-format
msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
msgstr "you may not use digest algorithm “%s” while in %s mode\n"
-#: g10/g10.c:2614
+#: g10/g10.c:2689
#, c-format
msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
msgstr "you may not use compression algorithm “%s” while in %s mode\n"
-#: g10/g10.c:2702
+#: g10/g10.c:2777
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "failed to initialize the TrustDB: %s\n"
-#: g10/g10.c:2713
+#: g10/g10.c:2788
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "WARNING: recipients (-r) given without using public key encryption\n"
-#: g10/g10.c:2724
+#: g10/g10.c:2799
msgid "--store [filename]"
msgstr "--store [filename]"
-#: g10/g10.c:2731
+#: g10/g10.c:2806
msgid "--symmetric [filename]"
msgstr "--symmetric [filename]"
-#: g10/g10.c:2743
+#: g10/g10.c:2818
msgid "--encrypt [filename]"
msgstr "--encrypt [filename]"
-#: g10/g10.c:2756
+#: g10/g10.c:2831
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filename]"
-#: g10/g10.c:2758
+#: g10/g10.c:2833
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-#: g10/g10.c:2761
+#: g10/g10.c:2836
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
-#: g10/g10.c:2779
+#: g10/g10.c:2854
msgid "--sign [filename]"
msgstr "--sign [filename]"
-#: g10/g10.c:2792
+#: g10/g10.c:2867
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filename]"
-#: g10/g10.c:2807
+#: g10/g10.c:2882
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filename]"
-#: g10/g10.c:2809
+#: g10/g10.c:2884
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-#: g10/g10.c:2812
+#: g10/g10.c:2887
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-#: g10/g10.c:2832
+#: g10/g10.c:2907
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filename]"
-#: g10/g10.c:2841
+#: g10/g10.c:2916
msgid "--clearsign [filename]"
msgstr "--clearsign [filename]"
-#: g10/g10.c:2866
+#: g10/g10.c:2941
msgid "--decrypt [filename]"
msgstr "--decrypt [filename]"
-#: g10/g10.c:2874
+#: g10/g10.c:2949
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/g10.c:2878
+#: g10/g10.c:2953
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/g10.c:2882
+#: g10/g10.c:2957
msgid "--nrsign-key user-id"
msgstr "--nrsign-key user-id"
-#: g10/g10.c:2886
+#: g10/g10.c:2961
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key user-id"
-#: g10/g10.c:2910
+#: g10/g10.c:2985
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [commands]"
-#: g10/g10.c:2966 g10/encode.c:474 g10/sign.c:886
+#: g10/g10.c:3041 g10/encode.c:474 g10/sign.c:891
#, c-format
msgid "can't open %s: %s\n"
msgstr "can't open %s: %s\n"
-#: g10/g10.c:2981
+#: g10/g10.c:3056
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [keyring]"
-#: g10/g10.c:3018
+#: g10/g10.c:3093
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "keyserver send failed: %s\n"
-#: g10/g10.c:3020
+#: g10/g10.c:3095
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "keyserver receive failed: %s\n"
-#: g10/g10.c:3022
+#: g10/g10.c:3097
#, c-format
msgid "key export failed: %s\n"
msgstr "key export failed: %s\n"
-#: g10/g10.c:3033
+#: g10/g10.c:3108
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "keyserver search failed: %s\n"
-#: g10/g10.c:3043
+#: g10/g10.c:3118
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "keyserver refresh failed: %s\n"
-#: g10/g10.c:3084
+#: g10/g10.c:3159
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dearmoring failed: %s\n"
-#: g10/g10.c:3092
+#: g10/g10.c:3167
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enarmoring failed: %s\n"
-#: g10/g10.c:3179
+#: g10/g10.c:3254
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "invalid hash algorithm ‘%s’\n"
-#: g10/g10.c:3302
+#: g10/g10.c:3377
msgid "[filename]"
msgstr "[filename]"
-#: g10/g10.c:3306
+#: g10/g10.c:3381
msgid "Go ahead and type your message ...\n"
msgstr "Go ahead and type your message ...\n"
-#: g10/g10.c:3309 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3384 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "can't open ‘%s’\n"
-#: g10/g10.c:3583
+#: g10/g10.c:3658
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1114,23 +1127,23 @@ msgstr ""
"a notation name must have only printable characters or spaces, and end with "
"an ‘=’\n"
-#: g10/g10.c:3592
+#: g10/g10.c:3667
msgid "a user notation name must contain the '@' character\n"
msgstr "a user notation name must contain the ‘@’ character\n"
-#: g10/g10.c:3602
+#: g10/g10.c:3677
msgid "a notation value must not use any control characters\n"
msgstr "a notation value must not use any control characters\n"
-#: g10/g10.c:3636
+#: g10/g10.c:3711
msgid "the given certification policy URL is invalid\n"
msgstr "the given certification policy URL is invalid\n"
-#: g10/g10.c:3638
+#: g10/g10.c:3713
msgid "the given signature policy URL is invalid\n"
msgstr "the given signature policy URL is invalid\n"
-#: g10/g10.c:3671
+#: g10/g10.c:3746
msgid "the given signature preferred keyserver URL is invalid\n"
msgstr "the given signature preferred keyserver URL is invalid\n"
@@ -1183,76 +1196,76 @@ msgstr "invalid clearsig header\n"
msgid "nested clear text signatures\n"
msgstr "nested clear text signatures\n"
-#: g10/armor.c:540
+#: g10/armor.c:553
msgid "invalid dash escaped line: "
msgstr "invalid dash escaped line: "
-#: g10/armor.c:552
+#: g10/armor.c:565
msgid "unexpected armor:"
msgstr "unexpected armor:"
-#: g10/armor.c:678 g10/armor.c:1254
+#: g10/armor.c:695 g10/armor.c:1277
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "invalid radix64 character %02x skipped\n"
-#: g10/armor.c:721
+#: g10/armor.c:738
msgid "premature eof (no CRC)\n"
msgstr "premature eof (no CRC)\n"
-#: g10/armor.c:755
+#: g10/armor.c:772
msgid "premature eof (in CRC)\n"
msgstr "premature eof (in CRC)\n"
-#: g10/armor.c:759
+#: g10/armor.c:776
msgid "malformed CRC\n"
msgstr "malformed CRC\n"
-#: g10/armor.c:763 g10/armor.c:1291
+#: g10/armor.c:780 g10/armor.c:1314
#, c-format
msgid "CRC error; %06lx - %06lx\n"
msgstr "CRC error; %06lx - %06lx\n"
-#: g10/armor.c:783
+#: g10/armor.c:800
msgid "premature eof (in Trailer)\n"
msgstr "premature eof (in Trailer)\n"
-#: g10/armor.c:787
+#: g10/armor.c:804
msgid "error in trailer line\n"
msgstr "error in trailer line\n"
-#: g10/armor.c:1069
+#: g10/armor.c:1092
msgid "no valid OpenPGP data found.\n"
msgstr "no valid OpenPGP data found.\n"
-#: g10/armor.c:1074
+#: g10/armor.c:1097
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "invalid armor: line longer than %d characters\n"
-#: g10/armor.c:1078
+#: g10/armor.c:1101
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
-#: g10/pkclist.c:63 g10/revoke.c:575
+#: g10/pkclist.c:63 g10/revoke.c:576
msgid "No reason specified"
msgstr "No reason specified"
-#: g10/pkclist.c:65 g10/revoke.c:577
+#: g10/pkclist.c:65 g10/revoke.c:578
msgid "Key is superseded"
msgstr "Key is superseded"
-#: g10/pkclist.c:67 g10/revoke.c:576
+#: g10/pkclist.c:67 g10/revoke.c:577
msgid "Key has been compromised"
msgstr "Key has been compromised"
-#: g10/pkclist.c:69 g10/revoke.c:578
+#: g10/pkclist.c:69 g10/revoke.c:579
msgid "Key is no longer used"
msgstr "Key is no longer used"
-#: g10/pkclist.c:71 g10/revoke.c:579
+#: g10/pkclist.c:71 g10/revoke.c:580
msgid "User ID is no longer valid"
msgstr "User ID is no longer valid"
@@ -1264,11 +1277,11 @@ msgstr "reason for revocation: "
msgid "revocation comment: "
msgstr "revocation comment: "
-#: g10/pkclist.c:265
+#: g10/pkclist.c:197
msgid "iImMqQsS"
msgstr "iImMqQsS"
-#: g10/pkclist.c:273
+#: g10/pkclist.c:205
#, c-format
msgid ""
"No trust value assigned to:\n"
@@ -1277,11 +1290,11 @@ msgstr ""
"No trust value assigned to:\n"
"%4u%c/%08lX %s \""
-#: g10/pkclist.c:302 g10/mainproc.c:1508
+#: g10/pkclist.c:234 g10/mainproc.c:1536
msgid " aka \""
msgstr " aka \""
-#: g10/pkclist.c:313 g10/keyedit.c:310
+#: g10/pkclist.c:245 g10/keyedit.c:311
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1293,48 +1306,48 @@ msgstr ""
"checking fingerprints from different sources...)?\n"
"\n"
-#: g10/pkclist.c:317
+#: g10/pkclist.c:249
#, c-format
msgid " %d = I don't know or won't say\n"
msgstr " %d = I don't know or won't say\n"
-#: g10/pkclist.c:319
+#: g10/pkclist.c:251
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = I do NOT trust\n"
-#: g10/pkclist.c:321
+#: g10/pkclist.c:253
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = I trust marginally\n"
-#: g10/pkclist.c:323
+#: g10/pkclist.c:255
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = I trust fully\n"
-#: g10/pkclist.c:325
+#: g10/pkclist.c:257
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = I trust ultimately\n"
-#: g10/pkclist.c:328
+#: g10/pkclist.c:260
msgid " i = please show me more information\n"
msgstr " i = please show me more information\n"
-#: g10/pkclist.c:331
+#: g10/pkclist.c:263
msgid " m = back to the main menu\n"
msgstr " m = back to the main menu\n"
-#: g10/pkclist.c:334
+#: g10/pkclist.c:266
msgid " s = skip this key\n"
msgstr " s = skip this key\n"
-#: g10/pkclist.c:335
+#: g10/pkclist.c:267
msgid " q = quit\n"
msgstr " q = quit\n"
-#: g10/pkclist.c:339
+#: g10/pkclist.c:271
#, c-format
msgid ""
"The minimum trust level for this key is: %s\n"
@@ -1343,61 +1356,61 @@ msgstr ""
"The minimum trust level for this key is: %s\n"
"\n"
-#: g10/pkclist.c:345 g10/revoke.c:604
+#: g10/pkclist.c:277 g10/revoke.c:605
msgid "Your decision? "
msgstr "Your decision? "
-#: g10/pkclist.c:366
+#: g10/pkclist.c:298
msgid "Do you really want to set this key to ultimate trust? "
msgstr "Do you really want to set this key to ultimate trust? "
-#: g10/pkclist.c:380
+#: g10/pkclist.c:312
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Certificates leading to an ultimately trusted key:\n"
-#: g10/pkclist.c:455
+#: g10/pkclist.c:386
#, c-format
msgid "key %08lX: key has been revoked!\n"
msgstr "key %08lX: key has been revoked!\n"
-#: g10/pkclist.c:462 g10/pkclist.c:474 g10/pkclist.c:573
+#: g10/pkclist.c:393 g10/pkclist.c:405 g10/pkclist.c:504
msgid "Use this key anyway? "
msgstr "Use this key anyway? "
-#: g10/pkclist.c:467
+#: g10/pkclist.c:398
#, c-format
msgid "key %08lX: subkey has been revoked!\n"
msgstr "key %08lX: subkey has been revoked!\n"
-#: g10/pkclist.c:488
+#: g10/pkclist.c:419
#, c-format
msgid "%08lX: key has expired\n"
msgstr "%08lX: key has expired\n"
-#: g10/pkclist.c:498
+#: g10/pkclist.c:429
#, c-format
msgid "%08lX: There is no assurance this key belongs to the named user\n"
msgstr "%08lX: There is no assurance this key belongs to the named user\n"
-#: g10/pkclist.c:504
+#: g10/pkclist.c:435
#, c-format
msgid "%08lX: We do NOT trust this key\n"
msgstr "%08lX: We do NOT trust this key\n"
-#: g10/pkclist.c:509
+#: g10/pkclist.c:440
#, c-format
msgid "%08lX: There is limited assurance this key belongs to the named user\n"
msgstr "%08lX: There is limited assurance this key belongs to the named user\n"
-#: g10/pkclist.c:515
+#: g10/pkclist.c:446
msgid "This key probably belongs to the named user\n"
msgstr "This key probably belongs to the named user\n"
-#: g10/pkclist.c:520
+#: g10/pkclist.c:451
msgid "This key belongs to us\n"
msgstr "This key belongs to us\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:499
msgid ""
"It is NOT certain that the key belongs to the person named\n"
"in the user ID. If you *really* know what you are doing,\n"
@@ -1409,90 +1422,90 @@ msgstr ""
"you may answer the next question with yes\n"
"\n"
-#: g10/pkclist.c:582 g10/pkclist.c:612
+#: g10/pkclist.c:513 g10/pkclist.c:543
msgid "WARNING: Using untrusted key!\n"
msgstr "WARNING: Using untrusted key!\n"
-#: g10/pkclist.c:619
+#: g10/pkclist.c:550
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "WARNING: this key might be revoked (revocation key not present)\n"
-#: g10/pkclist.c:628
+#: g10/pkclist.c:559
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "WARNING: This key has been revoked by its designated revoker!\n"
-#: g10/pkclist.c:631
+#: g10/pkclist.c:562
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "WARNING: This key has been revoked by its owner!\n"
-#: g10/pkclist.c:632
+#: g10/pkclist.c:563
msgid " This could mean that the signature is forgery.\n"
msgstr " This could mean that the signature is forgery.\n"
-#: g10/pkclist.c:638
+#: g10/pkclist.c:569
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "WARNING: This subkey has been revoked by its owner!\n"
-#: g10/pkclist.c:643
+#: g10/pkclist.c:574
msgid "Note: This key has been disabled.\n"
msgstr "Note: This key has been disabled.\n"
-#: g10/pkclist.c:648
+#: g10/pkclist.c:579
msgid "Note: This key has expired!\n"
msgstr "Note: This key has expired!\n"
-#: g10/pkclist.c:659
+#: g10/pkclist.c:590
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "WARNING: This key is not certified with a trusted signature!\n"
-#: g10/pkclist.c:661
+#: g10/pkclist.c:592
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr ""
" There is no indication that the signature belongs to the owner.\n"
-#: g10/pkclist.c:669
+#: g10/pkclist.c:600
msgid "WARNING: We do NOT trust this key!\n"
msgstr "WARNING: We do NOT trust this key!\n"
-#: g10/pkclist.c:670
+#: g10/pkclist.c:601
msgid " The signature is probably a FORGERY.\n"
msgstr " The signature is probably a FORGERY.\n"
-#: g10/pkclist.c:678
+#: g10/pkclist.c:609
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
-#: g10/pkclist.c:680
+#: g10/pkclist.c:611
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " It is not certain that the signature belongs to the owner.\n"
-#: g10/pkclist.c:832 g10/pkclist.c:868 g10/encode.c:791
+#: g10/pkclist.c:763 g10/pkclist.c:799 g10/encode.c:791
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "you may not use %s while in %s mode\n"
-#: g10/pkclist.c:845 g10/pkclist.c:878 g10/pkclist.c:1047 g10/pkclist.c:1107
+#: g10/pkclist.c:776 g10/pkclist.c:809 g10/pkclist.c:978 g10/pkclist.c:1038
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: skipped: %s\n"
-#: g10/pkclist.c:855 g10/pkclist.c:1079
+#: g10/pkclist.c:786 g10/pkclist.c:1010
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: skipped: public key already present\n"
-#: g10/pkclist.c:897
+#: g10/pkclist.c:828
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "You did not specify a user ID. (you may use “-r”)\n"
-#: g10/pkclist.c:913
+#: g10/pkclist.c:844
msgid "Current recipients:\n"
msgstr "Current recipients:\n"
-#: g10/pkclist.c:939
+#: g10/pkclist.c:870
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -1500,123 +1513,123 @@ msgstr ""
"\n"
"Enter the user ID. End with an empty line: "
-#: g10/pkclist.c:955
+#: g10/pkclist.c:886
msgid "No such user ID.\n"
msgstr "No such user ID.\n"
-#: g10/pkclist.c:960 g10/pkclist.c:1022
+#: g10/pkclist.c:891 g10/pkclist.c:953
msgid "skipped: public key already set as default recipient\n"
msgstr "skipped: public key already set as default recipient\n"
-#: g10/pkclist.c:978
+#: g10/pkclist.c:909
msgid "Public key is disabled.\n"
msgstr "Public key is disabled.\n"
-#: g10/pkclist.c:985
+#: g10/pkclist.c:916
msgid "skipped: public key already set\n"
msgstr "skipped: public key already set\n"
-#: g10/pkclist.c:1014
+#: g10/pkclist.c:945
#, c-format
msgid "unknown default recipient `%s'\n"
msgstr "unknown default recipient ‘%s’\n"
-#: g10/pkclist.c:1059
+#: g10/pkclist.c:990
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: skipped: public key is disabled\n"
-#: g10/pkclist.c:1114
+#: g10/pkclist.c:1045
msgid "no valid addressees\n"
msgstr "no valid addressees\n"
-#: g10/keygen.c:204
+#: g10/keygen.c:207
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "preference ‘%s’ duplicated\n"
-#: g10/keygen.c:211
+#: g10/keygen.c:214
msgid "too many cipher preferences\n"
msgstr "too many cipher preferences\n"
-#: g10/keygen.c:213
+#: g10/keygen.c:216
msgid "too many digest preferences\n"
msgstr "too many digest preferences\n"
-#: g10/keygen.c:215
+#: g10/keygen.c:218
msgid "too many compression preferences\n"
msgstr "too many compression preferences\n"
-#: g10/keygen.c:312
+#: g10/keygen.c:315
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "invalid item ‘%s’ in preference string\n"
-#: g10/keygen.c:637
+#: g10/keygen.c:734
msgid "writing direct signature\n"
msgstr "writing direct signature\n"
-#: g10/keygen.c:676
+#: g10/keygen.c:773
msgid "writing self signature\n"
msgstr "writing self signature\n"
-#: g10/keygen.c:720
+#: g10/keygen.c:819
msgid "writing key binding signature\n"
msgstr "writing key binding signature\n"
-#: g10/keygen.c:774 g10/keygen.c:858 g10/keygen.c:949
+#: g10/keygen.c:881 g10/keygen.c:965 g10/keygen.c:1056
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "keysize invalid; using %u bits\n"
-#: g10/keygen.c:779 g10/keygen.c:863 g10/keygen.c:954
+#: g10/keygen.c:886 g10/keygen.c:970 g10/keygen.c:1061
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "keysize rounded up to %u bits\n"
-#: g10/keygen.c:1054
+#: g10/keygen.c:1161
msgid "Please select what kind of key you want:\n"
msgstr "Please select what kind of key you want:\n"
-#: g10/keygen.c:1056
+#: g10/keygen.c:1163
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA and Elgamal (default)\n"
-#: g10/keygen.c:1057
+#: g10/keygen.c:1164
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (sign only)\n"
-#: g10/keygen.c:1059
+#: g10/keygen.c:1166
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (encrypt only)\n"
-#: g10/keygen.c:1060
+#: g10/keygen.c:1167
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (sign only)\n"
-#: g10/keygen.c:1062
+#: g10/keygen.c:1169
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (encrypt only)\n"
-#: g10/keygen.c:1064
+#: g10/keygen.c:1171
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (sign and encrypt)\n"
-#: g10/keygen.c:1067 g10/keyedit.c:319 g10/keyedit.c:340 g10/keyedit.c:356
+#: g10/keygen.c:1174 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
msgid "Your selection? "
msgstr "Your selection? "
-#: g10/keygen.c:1101 g10/keyedit.c:800 g10/revoke.c:637
+#: g10/keygen.c:1208 g10/keyedit.c:800 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Invalid selection.\n"
-#: g10/keygen.c:1114
+#: g10/keygen.c:1221
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1629,28 +1642,28 @@ msgstr ""
" default keysize is 1024 bits\n"
" highest suggested keysize is 2048 bits\n"
-#: g10/keygen.c:1123
+#: g10/keygen.c:1230
msgid "What keysize do you want? (1024) "
msgstr "What keysize do you want? (1024) "
-#: g10/keygen.c:1128
+#: g10/keygen.c:1235
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA only allows keysizes from 512 to 1024\n"
-#: g10/keygen.c:1130
+#: g10/keygen.c:1237
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "keysize too small; 1024 is smallest value allowed for RSA.\n"
-#: g10/keygen.c:1133
+#: g10/keygen.c:1240
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "keysize too small; 768 is smallest value allowed.\n"
-#: g10/keygen.c:1144
+#: g10/keygen.c:1251
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "keysize too large; %d is largest value allowed.\n"
-#: g10/keygen.c:1149
+#: g10/keygen.c:1256
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1658,11 +1671,11 @@ msgstr ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
-#: g10/keygen.c:1152
+#: g10/keygen.c:1259
msgid "Are you sure that you want this keysize? "
msgstr "Are you sure that you want this keysize? "
-#: g10/keygen.c:1153
+#: g10/keygen.c:1260
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1670,17 +1683,17 @@ msgstr ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
-#: g10/keygen.c:1162
+#: g10/keygen.c:1269
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Requested keysize is %u bits\n"
-#: g10/keygen.c:1165 g10/keygen.c:1169
+#: g10/keygen.c:1272 g10/keygen.c:1276
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rounded up to %u bits\n"
-#: g10/keygen.c:1220
+#: g10/keygen.c:1327
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1696,7 +1709,7 @@ msgstr ""
" <n>m = key expires in n months\n"
" <n>y = key expires in n years\n"
-#: g10/keygen.c:1229
+#: g10/keygen.c:1336
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1712,29 +1725,29 @@ msgstr ""
" <n>m = signature expires in n months\n"
" <n>y = signature expires in n years\n"
-#: g10/keygen.c:1251
+#: g10/keygen.c:1358
msgid "Key is valid for? (0) "
msgstr "Key is valid for? (0) "
-#: g10/keygen.c:1253
+#: g10/keygen.c:1360
msgid "Signature is valid for? (0) "
msgstr "Signature is valid for? (0) "
-#: g10/keygen.c:1258
+#: g10/keygen.c:1365
msgid "invalid value\n"
msgstr "invalid value\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1370
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s does not expire at all\n"
-#: g10/keygen.c:1270
+#: g10/keygen.c:1377
#, c-format
msgid "%s expires at %s\n"
msgstr "%s expires at %s\n"
-#: g10/keygen.c:1276
+#: g10/keygen.c:1383
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1742,11 +1755,11 @@ msgstr ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
-#: g10/keygen.c:1281
+#: g10/keygen.c:1388
msgid "Is this correct (y/n)? "
msgstr "Is this correct (y/n)? "
-#: g10/keygen.c:1324
+#: g10/keygen.c:1431
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1762,44 +1775,44 @@ msgstr ""
" “Heinrich Heine (Der Dichter) <[email protected]>”\n"
"\n"
-#: g10/keygen.c:1336
+#: g10/keygen.c:1443
msgid "Real name: "
msgstr "Real name: "
-#: g10/keygen.c:1344
+#: g10/keygen.c:1451
msgid "Invalid character in name\n"
msgstr "Invalid character in name\n"
-#: g10/keygen.c:1346
+#: g10/keygen.c:1453
msgid "Name may not start with a digit\n"
msgstr "Name may not start with a digit\n"
-#: g10/keygen.c:1348
+#: g10/keygen.c:1455
msgid "Name must be at least 5 characters long\n"
msgstr "Name must be at least 5 characters long\n"
-#: g10/keygen.c:1356
+#: g10/keygen.c:1463
msgid "Email address: "
msgstr "Email address: "
-#: g10/keygen.c:1367
+#: g10/keygen.c:1474
msgid "Not a valid email address\n"
msgstr "Not a valid email address\n"
-#: g10/keygen.c:1375
+#: g10/keygen.c:1482
msgid "Comment: "
msgstr "Comment: "
-#: g10/keygen.c:1381
+#: g10/keygen.c:1488
msgid "Invalid character in comment\n"
msgstr "Invalid character in comment\n"
-#: g10/keygen.c:1404
+#: g10/keygen.c:1511
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "You are using the ‘%s’ character set.\n"
-#: g10/keygen.c:1410
+#: g10/keygen.c:1517
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1810,27 +1823,27 @@ msgstr ""
" “%s”\n"
"\n"
-#: g10/keygen.c:1415
+#: g10/keygen.c:1522
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Please don't put the email address into the real name or the comment\n"
-#: g10/keygen.c:1420
+#: g10/keygen.c:1527
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1430
+#: g10/keygen.c:1537
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
-#: g10/keygen.c:1431
+#: g10/keygen.c:1538
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
-#: g10/keygen.c:1450
+#: g10/keygen.c:1557
msgid "Please correct the error first\n"
msgstr "Please correct the error first\n"
-#: g10/keygen.c:1489
+#: g10/keygen.c:1596
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1838,16 +1851,16 @@ msgstr ""
"You need a Passphrase to protect your secret key.\n"
"\n"
-#: g10/keygen.c:1498 g10/keyedit.c:1005
+#: g10/keygen.c:1605 g10/keyedit.c:1005
msgid "passphrase not correctly repeated; try again"
msgstr "passphrase not correctly repeated; try again"
-#: g10/keygen.c:1499
+#: g10/keygen.c:1606
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1505
+#: g10/keygen.c:1612
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -1859,7 +1872,7 @@ msgstr ""
"using this program with the option “--edit-key”.\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1634
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1871,58 +1884,58 @@ msgstr ""
"disks) during the prime generation; this gives the random number\n"
"generator a better chance to gain enough entropy.\n"
-#: g10/keygen.c:2084 g10/revoke.c:214 g10/revoke.c:414
+#: g10/keygen.c:2202 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "sorry, can't do this in batch mode\n"
-#: g10/keygen.c:2145
+#: g10/keygen.c:2263
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA keypair will have 1024 bits.\n"
-#: g10/keygen.c:2213
+#: g10/keygen.c:2331
msgid "Key generation canceled.\n"
msgstr "Key generation canceled.\n"
-#: g10/keygen.c:2321 g10/keygen.c:2446
+#: g10/keygen.c:2447 g10/keygen.c:2572
#, c-format
msgid "writing public key to `%s'\n"
msgstr "writing public key to ‘%s’\n"
-#: g10/keygen.c:2323 g10/keygen.c:2449
+#: g10/keygen.c:2449 g10/keygen.c:2575
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "writing secret key stub to ‘%s’\n"
-#: g10/keygen.c:2326 g10/keygen.c:2452
+#: g10/keygen.c:2452 g10/keygen.c:2578
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "writing secret key to ‘%s’\n"
-#: g10/keygen.c:2435
+#: g10/keygen.c:2561
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "no writable public keyring found: %s\n"
-#: g10/keygen.c:2441
+#: g10/keygen.c:2567
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "no writable secret keyring found: %s\n"
-#: g10/keygen.c:2459
+#: g10/keygen.c:2585
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "error writing public keyring ‘%s’: %s\n"
-#: g10/keygen.c:2466
+#: g10/keygen.c:2592
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "error writing secret keyring ‘%s’: %s\n"
-#: g10/keygen.c:2489
+#: g10/keygen.c:2615
msgid "public and secret key created and signed.\n"
msgstr "public and secret key created and signed.\n"
-#: g10/keygen.c:2500
+#: g10/keygen.c:2626
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1930,30 +1943,30 @@ msgstr ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command “--edit-key” to generate a secondary key for this purpose.\n"
-#: g10/keygen.c:2512 g10/keygen.c:2623
+#: g10/keygen.c:2638 g10/keygen.c:2751
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Key generation failed: %s\n"
-#: g10/keygen.c:2558 g10/sign.c:290
+#: g10/keygen.c:2687 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"key has been created %lu second in future (time warp or clock problem)\n"
-#: g10/keygen.c:2560 g10/sign.c:292
+#: g10/keygen.c:2689 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
-#: g10/keygen.c:2569
+#: g10/keygen.c:2698
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
-#: g10/keygen.c:2598
+#: g10/keygen.c:2726
msgid "Really create? "
msgstr "Really create? "
@@ -1967,7 +1980,7 @@ msgstr "--output doesn't work for this command\n"
msgid "%s: can't open: %s\n"
msgstr "%s: can't open: %s\n"
-#: g10/encode.c:203 g10/sign.c:1139
+#: g10/encode.c:203 g10/sign.c:1144
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error creating passphrase: %s\n"
@@ -2011,7 +2024,7 @@ msgstr ""
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-#: g10/encode.c:634 g10/sign.c:858
+#: g10/encode.c:634 g10/sign.c:863
#, c-format
msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
msgstr "forcing compression algorithm %s (%d) violates recipient preferences\n"
@@ -2021,37 +2034,32 @@ msgstr "forcing compression algorithm %s (%d) violates recipient preferences\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s encrypted for: “%s”\n"
-#: g10/export.c:163 g10/keyedit.c:2700 g10/delkey.c:74 g10/revoke.c:224
+#: g10/export.c:162 g10/keyedit.c:2700 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "key ‘%s’ not found: %s\n"
-#: g10/export.c:185 g10/delkey.c:82 g10/revoke.c:230 g10/revoke.c:435
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "error reading keyblock: %s\n"
-#: g10/export.c:194
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "key %08lX: not a rfc2440 key - skipped\n"
-
-#: g10/export.c:210
+#: g10/export.c:198
#, c-format
-msgid "key %08lX: not protected - skipped\n"
-msgstr "key %08lX: not protected - skipped\n"
+msgid "key %s: not protected - skipped\n"
+msgstr "key %s: not protected - skipped\n"
-#: g10/export.c:218
+#: g10/export.c:206
#, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
-msgstr "key %08lX: PGP 2.x style key - skipped\n"
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr "key %s: PGP 2.x style key - skipped\n"
-#: g10/export.c:363
+#: g10/export.c:353
#, c-format
-msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
-msgstr "WARNING: secret key %08lX does not have a simple SK checksum\n"
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "WARNING: secret key %s does not have a simple SK checksum\n"
-#: g10/export.c:395
+#: g10/export.c:385
msgid "WARNING: nothing exported\n"
msgstr "WARNING: nothing exported\n"
@@ -2059,29 +2067,29 @@ msgstr "WARNING: nothing exported\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "too many entries in pk cache - disabled\n"
-#: g10/getkey.c:186 g10/getkey.c:2646
+#: g10/getkey.c:186 g10/getkey.c:2693
msgid "[User id not found]"
msgstr "[User id not found]"
-#: g10/getkey.c:1620
+#: g10/getkey.c:1614
#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
-msgstr "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2128
+#: g10/getkey.c:2169
#, c-format
-msgid "no secret subkey for public subkey %08lX - ignoring\n"
-msgstr "no secret subkey for public subkey %08lX - ignoring\n"
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "no secret subkey for public subkey %s - ignoring\n"
-#: g10/getkey.c:2356
+#: g10/getkey.c:2400
#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
-msgstr "using secondary key %08lX instead of primary key %08lX\n"
+msgid "using secondary key %s instead of primary key %s\n"
+msgstr "using secondary key %s instead of primary key %s\n"
-#: g10/getkey.c:2403
+#: g10/getkey.c:2447
#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "key %08lX: secret key without public key - skipped\n"
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "key %s: secret key without public key - skipped\n"
#: g10/import.c:241
#, c-format
@@ -2163,351 +2171,353 @@ msgstr " secret keys unchanged: %lu\n"
msgid " not imported: %lu\n"
msgstr " not imported: %lu\n"
-#: g10/import.c:567 g10/import.c:581 g10/import.c:595
+#: g10/import.c:537
#, c-format
-msgid "WARNING: key %08lX contains preferences for unavailable algorithms:\n"
-msgstr "WARNING: key %08lX contains preferences for unavailable algorithms:\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr "WARNING: key %s contains preferences for unavailable\n"
+
+#: g10/import.c:539
+msgid "algorithms on these user IDs:\n"
+msgstr "algorithms on these user IDs:\n"
-#: g10/import.c:570
+#: g10/import.c:576
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " “%s”: preference for cipher algorithm %s\n"
-#: g10/import.c:584
+#: g10/import.c:588
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " “%s”: preference for digest algorithm %s\n"
-#: g10/import.c:598
+#: g10/import.c:600
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " “%s”: preference for compression algorithm %s\n"
-#: g10/import.c:611
+#: g10/import.c:613
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "it is strongly suggested that you update your preferences and\n"
-#: g10/import.c:613
+#: g10/import.c:615
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"re-distribute this key to avoid potential algorithm mismatch problems\n"
-#: g10/import.c:637
+#: g10/import.c:639
#, c-format
-msgid ""
-"you can update your preferences with: gpg --edit-key %08lX updpref save\n"
-msgstr ""
-"you can update your preferences with: gpg --edit-key %08lX updpref save\n"
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr "you can update your preferences with: gpg --edit-key %s updpref save\n"
-#: g10/import.c:682 g10/import.c:1026
+#: g10/import.c:687 g10/import.c:1041
#, c-format
-msgid "key %08lX: no user ID\n"
-msgstr "key %08lX: no user ID\n"
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
-#: g10/import.c:702
+#: g10/import.c:707
#, c-format
-msgid "key %08lX: PKS subkey corruption repaired\n"
-msgstr "key %08lX: PKS subkey corruption repaired\n"
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
-#: g10/import.c:717
+#: g10/import.c:722
#, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "key %08lX: accepted non self-signed user ID ‘%s’\n"
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "key %s: accepted non self-signed user ID ‘%s’\n"
-#: g10/import.c:723
+#: g10/import.c:728
#, c-format
-msgid "key %08lX: no valid user IDs\n"
-msgstr "key %08lX: no valid user IDs\n"
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
-#: g10/import.c:725
+#: g10/import.c:730
msgid "this may be caused by a missing self-signature\n"
msgstr "this may be caused by a missing self-signature\n"
-#: g10/import.c:734 g10/import.c:1133
+#: g10/import.c:740 g10/import.c:1151
#, c-format
-msgid "key %08lX: public key not found: %s\n"
-msgstr "key %08lX: public key not found: %s\n"
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
-#: g10/import.c:740
+#: g10/import.c:746
#, c-format
-msgid "key %08lX: new key - skipped\n"
-msgstr "key %08lX: new key - skipped\n"
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
-#: g10/import.c:749
+#: g10/import.c:755
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "no writable keyring found: %s\n"
-#: g10/import.c:754 g10/sign.c:765 g10/sign.c:1001 g10/openfile.c:253
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "writing to ‘%s’\n"
-#: g10/import.c:757 g10/import.c:843 g10/import.c:1055 g10/import.c:1193
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "error writing keyring ‘%s’: %s\n"
-#: g10/import.c:775
+#: g10/import.c:785
#, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "key %08lX: public key “%s” imported\n"
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “%s” imported\n"
-#: g10/import.c:797
+#: g10/import.c:809
#, c-format
-msgid "key %08lX: doesn't match our copy\n"
-msgstr "key %08lX: doesn't match our copy\n"
+msgid "key %s: doesn't match our copy\n"
+msgstr "key %s: doesn't match our copy\n"
-#: g10/import.c:814 g10/import.c:1150
+#: g10/import.c:826 g10/import.c:1169
#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
-msgstr "key %08lX: can't locate original keyblock: %s\n"
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "key %s: can't locate original keyblock: %s\n"
-#: g10/import.c:821 g10/import.c:1156
+#: g10/import.c:834 g10/import.c:1176
#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
-msgstr "key %08lX: can't read original keyblock: %s\n"
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "key %s: can't read original keyblock: %s\n"
-#: g10/import.c:852
+#: g10/import.c:866
#, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "key %08lX: “%s” 1 new user ID\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "key %s: “%s” 1 new user ID\n"
-#: g10/import.c:855
+#: g10/import.c:869
#, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "key %08lX: “%s” %d new user IDs\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "key %s: “%s” %d new user IDs\n"
-#: g10/import.c:858
+#: g10/import.c:872
#, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "key %08lX: “%s” 1 new signature\n"
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “%s” 1 new signature\n"
-#: g10/import.c:861
+#: g10/import.c:875
#, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "key %08lX: “%s” %d new signatures\n"
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “%s” %d new signatures\n"
-#: g10/import.c:864
+#: g10/import.c:878
#, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "key %08lX: “%s” 1 new subkey\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “%s” 1 new subkey\n"
-#: g10/import.c:867
+#: g10/import.c:881
#, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "key %08lX: “%s” %d new subkeys\n"
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “%s” %d new subkeys\n"
-#: g10/import.c:888
+#: g10/import.c:902
#, c-format
-msgid "key %08lX: \"%s\" not changed\n"
-msgstr "key %08lX: “%s” not changed\n"
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “%s” not changed\n"
-#: g10/import.c:1032
+#: g10/import.c:1047
#, c-format
-msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
-msgstr "key %08lX: secret key with invalid cipher %d - skipped\n"
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "key %s: secret key with invalid cipher %d - skipped\n"
-#: g10/import.c:1049
+#: g10/import.c:1064
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "no default secret keyring: %s\n"
-#: g10/import.c:1060
+#: g10/import.c:1075
#, c-format
-msgid "key %08lX: secret key imported\n"
-msgstr "key %08lX: secret key imported\n"
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
-#: g10/import.c:1088
+#: g10/import.c:1104
#, c-format
-msgid "key %08lX: already in secret keyring\n"
-msgstr "key %08lX: already in secret keyring\n"
+msgid "key %s: already in secret keyring\n"
+msgstr "key %s: already in secret keyring\n"
-#: g10/import.c:1098
+#: g10/import.c:1114
#, c-format
-msgid "key %08lX: secret key not found: %s\n"
-msgstr "key %08lX: secret key not found: %s\n"
+msgid "key %s: secret key not found: %s\n"
+msgstr "key %s: secret key not found: %s\n"
-#: g10/import.c:1127
+#: g10/import.c:1144
#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
-msgstr "key %08lX: no public key - can't apply revocation certificate\n"
+msgid "key %s: no public key - can't apply revocation certificate\n"
+msgstr "key %s: no public key - can't apply revocation certificate\n"
-#: g10/import.c:1167
+#: g10/import.c:1187
#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
-msgstr "key %08lX: invalid revocation certificate: %s - rejected\n"
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
-#: g10/import.c:1199
+#: g10/import.c:1219
#, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "key %08lX: “%s” revocation certificate imported\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “%s” revocation certificate imported\n"
-#: g10/import.c:1263
+#: g10/import.c:1284
#, c-format
-msgid "key %08lX: no user ID for signature\n"
-msgstr "key %08lX: no user ID for signature\n"
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
-#: g10/import.c:1278
+#: g10/import.c:1299
#, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "key %08lX: unsupported public key algorithm on user id “%s”\n"
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr "key %s: unsupported public key algorithm on user id “%s”\n"
-#: g10/import.c:1280
+#: g10/import.c:1301
#, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
-msgstr "key %08lX: invalid self-signature on user id “%s”\n"
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr "key %s: invalid self-signature on user id “%s”\n"
-#: g10/import.c:1297
+#: g10/import.c:1319
#, c-format
-msgid "key %08lX: no subkey for key binding\n"
-msgstr "key %08lX: no subkey for key binding\n"
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
-#: g10/import.c:1306 g10/import.c:1350
+#: g10/import.c:1330 g10/import.c:1380
#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
-msgstr "key %08lX: unsupported public key algorithm\n"
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
-#: g10/import.c:1307
+#: g10/import.c:1332
#, c-format
-msgid "key %08lX: invalid subkey binding\n"
-msgstr "key %08lX: invalid subkey binding\n"
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
-#: g10/import.c:1320
+#: g10/import.c:1347
#, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "key %08lX: removed multiple subkey binding\n"
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
-#: g10/import.c:1341
+#: g10/import.c:1369
#, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "key %08lX: no subkey for key revocation\n"
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
-#: g10/import.c:1351
+#: g10/import.c:1382
#, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "key %08lX: invalid subkey revocation\n"
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
-#: g10/import.c:1364
+#: g10/import.c:1397
#, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "key %08lX: removed multiple subkey revocation\n"
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
-#: g10/import.c:1403
+#: g10/import.c:1439
#, c-format
-msgid "key %08lX: skipped user ID '"
-msgstr "key %08lX: skipped user ID '"
+msgid "key %s: skipped user ID '%s'\n"
+msgstr "key %s: skipped user ID ‘%s’\n"
-#: g10/import.c:1426
+#: g10/import.c:1460
#, c-format
-msgid "key %08lX: skipped subkey\n"
-msgstr "key %08lX: skipped subkey\n"
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
-#: g10/import.c:1453
+#: g10/import.c:1487
#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
-msgstr "key %08lX: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgstr "key %s: non exportable signature (class %02x) - skipped\n"
-#: g10/import.c:1462
+#: g10/import.c:1497
#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
-msgstr "key %08lX: revocation certificate at wrong place - skipped\n"
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr "key %s: revocation certificate at wrong place - skipped\n"
-#: g10/import.c:1479
+#: g10/import.c:1514
#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
-msgstr "key %08lX: invalid revocation certificate: %s - skipped\n"
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
-#: g10/import.c:1492
+#: g10/import.c:1528
#, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr "key %08lX: subkey signature in wrong place - skipped\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "key %s: subkey signature in wrong place - skipped\n"
-#: g10/import.c:1500
+#: g10/import.c:1536
#, c-format
-msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
-msgstr "key %08lX: unexpected signature class (0x%02X) - skipped\n"
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "key %s: unexpected signature class (0x%02X) - skipped\n"
-#: g10/import.c:1599
+#: g10/import.c:1636
#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
-msgstr "key %08lX: duplicated user ID detected - merged\n"
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
-#: g10/import.c:1658
+#: g10/import.c:1698
#, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
-msgstr "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
+msgstr "WARNING: key %s may be revoked: fetching revocation key %s\n"
-#: g10/import.c:1672
+#: g10/import.c:1711
#, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
-msgstr "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
+msgstr "WARNING: key %s may be revoked: revocation key %s not present.\n"
-#: g10/import.c:1730
+#: g10/import.c:1770
#, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "key %08lX: “%s” revocation certificate added\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “%s” revocation certificate added\n"
-#: g10/import.c:1763
+#: g10/import.c:1804
#, c-format
-msgid "key %08lX: direct key signature added\n"
-msgstr "key %08lX: direct key signature added\n"
+msgid "key %s: direct key signature added\n"
+msgstr "key %s: direct key signature added\n"
-#: g10/keyedit.c:161
+#: g10/keyedit.c:159
msgid "[revocation]"
msgstr "[revocation]"
-#: g10/keyedit.c:162
+#: g10/keyedit.c:160
msgid "[self-signature]"
msgstr "[self-signature]"
-#: g10/keyedit.c:236 g10/keylist.c:320
+#: g10/keyedit.c:237 g10/keylist.c:319
msgid "1 bad signature\n"
msgstr "1 bad signature\n"
-#: g10/keyedit.c:238 g10/keylist.c:322
+#: g10/keyedit.c:239 g10/keylist.c:321
#, c-format
msgid "%d bad signatures\n"
msgstr "%d bad signatures\n"
-#: g10/keyedit.c:240 g10/keylist.c:324
+#: g10/keyedit.c:241 g10/keylist.c:323
msgid "1 signature not checked due to a missing key\n"
msgstr "1 signature not checked due to a missing key\n"
-#: g10/keyedit.c:242 g10/keylist.c:326
+#: g10/keyedit.c:243 g10/keylist.c:325
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d signatures not checked due to missing keys\n"
-#: g10/keyedit.c:244 g10/keylist.c:328
+#: g10/keyedit.c:245 g10/keylist.c:327
msgid "1 signature not checked due to an error\n"
msgstr "1 signature not checked due to an error\n"
-#: g10/keyedit.c:246 g10/keylist.c:330
+#: g10/keyedit.c:247 g10/keylist.c:329
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d signatures not checked due to errors\n"
-#: g10/keyedit.c:248
+#: g10/keyedit.c:249
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 user ID without valid self-signature detected\n"
-#: g10/keyedit.c:250
+#: g10/keyedit.c:251
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d user IDs without valid self-signatures detected\n"
-#: g10/keyedit.c:313
+#: g10/keyedit.c:314
#, c-format
msgid " (%d) I trust marginally\n"
msgstr " (%d) I trust marginally\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:315
#, c-format
msgid " (%d) I trust fully\n"
msgstr " (%d) I trust fully\n"
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@ -2517,36 +2527,36 @@ msgstr ""
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
-#: g10/keyedit.c:351
+#: g10/keyedit.c:350
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "Please enter a domain to restrict this signature, or enter for none.\n"
-#: g10/keyedit.c:494
+#: g10/keyedit.c:493
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "User ID “%s” is revoked."
-#: g10/keyedit.c:501 g10/keyedit.c:521 g10/keyedit.c:542 g10/keyedit.c:692
-#: g10/keyedit.c:750 g10/keyedit.c:1355
+#: g10/keyedit.c:500 g10/keyedit.c:520 g10/keyedit.c:541 g10/keyedit.c:692
+#: g10/keyedit.c:750 g10/keyedit.c:1354
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Are you sure you still want to sign it? (y/N) "
-#: g10/keyedit.c:509 g10/keyedit.c:529 g10/keyedit.c:550 g10/keyedit.c:698
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:508 g10/keyedit.c:528 g10/keyedit.c:549 g10/keyedit.c:698
+#: g10/keyedit.c:1360
msgid " Unable to sign.\n"
msgstr " Unable to sign.\n"
-#: g10/keyedit.c:514
+#: g10/keyedit.c:513
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "User ID “%s” is expired."
-#: g10/keyedit.c:534
+#: g10/keyedit.c:533
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "User ID “%s” is not self-signed."
-#: g10/keyedit.c:569
+#: g10/keyedit.c:568
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2555,11 +2565,11 @@ msgstr ""
"The self-signature on “%s”\n"
"is a PGP 2.x-style signature.\n"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:577
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-#: g10/keyedit.c:592
+#: g10/keyedit.c:591
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2568,12 +2578,12 @@ msgstr ""
"Your current signature on “%s”\n"
"has expired.\n"
-#: g10/keyedit.c:596
+#: g10/keyedit.c:595
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Do you want to issue a new signature to replace the expired one? (y/N) "
-#: g10/keyedit.c:617
+#: g10/keyedit.c:616
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2582,28 +2592,28 @@ msgstr ""
"Your current signature on “%s”\n"
"is a local signature.\n"
-#: g10/keyedit.c:621
+#: g10/keyedit.c:620
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Do you want to promote it to a full exportable signature? (y/N) "
-#: g10/keyedit.c:642
+#: g10/keyedit.c:641
#, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
-msgstr "“%s” was already locally signed by key %08lX\n"
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "“%s” was already locally signed by key %s\n"
-#: g10/keyedit.c:646
+#: g10/keyedit.c:644
#, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
-msgstr "“%s” was already signed by key %08lX\n"
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "“%s” was already signed by key %s\n"
-#: g10/keyedit.c:651
+#: g10/keyedit.c:649
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Do you want to sign it again anyway? (y/N) "
#: g10/keyedit.c:671
#, c-format
-msgid "Nothing to sign with key %08lX\n"
-msgstr "Nothing to sign with key %08lX\n"
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
#: g10/keyedit.c:686
msgid "This key has expired!"
@@ -2740,7 +2750,7 @@ msgstr ""
msgid "Really sign? "
msgstr "Really sign? "
-#: g10/keyedit.c:906 g10/keyedit.c:3610 g10/keyedit.c:3701 g10/keyedit.c:3774
+#: g10/keyedit.c:906 g10/keyedit.c:3632 g10/keyedit.c:3723 g10/keyedit.c:3796
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
@@ -3099,158 +3109,158 @@ msgstr "showphoto"
msgid "show photo ID"
msgstr "show photo ID"
-#: g10/keyedit.c:1187 g10/delkey.c:120
+#: g10/keyedit.c:1186 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "can't do that in batchmode\n"
-#: g10/keyedit.c:1218
+#: g10/keyedit.c:1217
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "error reading secret keyblock ‘%s’: %s\n"
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1234
msgid "Secret key is available.\n"
msgstr "Secret key is available.\n"
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
msgid "Command> "
msgstr "Command> "
-#: g10/keyedit.c:1297
+#: g10/keyedit.c:1296
msgid "Need the secret key to do this.\n"
msgstr "Need the secret key to do this.\n"
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1300
msgid "Please use the command \"toggle\" first.\n"
msgstr "Please use the command “toggle” first.\n"
-#: g10/keyedit.c:1349
+#: g10/keyedit.c:1348
msgid "Key is revoked."
msgstr "Key is revoked."
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
msgid "Really sign all user IDs? "
msgstr "Really sign all user IDs? "
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
msgid "Hint: Select the user IDs to sign\n"
msgstr "Hint: Select the user IDs to sign\n"
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1393
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "This command is not allowed while in %s mode.\n"
-#: g10/keyedit.c:1414 g10/keyedit.c:1435 g10/keyedit.c:1494
+#: g10/keyedit.c:1415 g10/keyedit.c:1436 g10/keyedit.c:1495
msgid "You must select at least one user ID.\n"
msgstr "You must select at least one user ID.\n"
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1417
msgid "You can't delete the last user ID!\n"
msgstr "You can't delete the last user ID!\n"
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1420
msgid "Really remove all selected user IDs? "
msgstr "Really remove all selected user IDs? "
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1421
msgid "Really remove this user ID? "
msgstr "Really remove this user ID? "
-#: g10/keyedit.c:1458 g10/keyedit.c:1513
+#: g10/keyedit.c:1459 g10/keyedit.c:1514
msgid "You must select at least one key.\n"
msgstr "You must select at least one key.\n"
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1462
msgid "Do you really want to delete the selected keys? "
msgstr "Do you really want to delete the selected keys? "
-#: g10/keyedit.c:1462
+#: g10/keyedit.c:1463
msgid "Do you really want to delete this key? "
msgstr "Do you really want to delete this key? "
-#: g10/keyedit.c:1497
+#: g10/keyedit.c:1498
msgid "Really revoke all selected user IDs? "
msgstr "Really revoke all selected user IDs? "
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1499
msgid "Really revoke this user ID? "
msgstr "Really revoke this user ID? "
-#: g10/keyedit.c:1517
+#: g10/keyedit.c:1518
msgid "Do you really want to revoke the selected keys? "
msgstr "Do you really want to revoke the selected keys? "
-#: g10/keyedit.c:1518
+#: g10/keyedit.c:1519
msgid "Do you really want to revoke this key? "
msgstr "Do you really want to revoke this key? "
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1558
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
"Owner trust may not be set while using an user provided trust database\n"
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1590
msgid "Set preference list to:\n"
msgstr "Set preference list to:\n"
-#: g10/keyedit.c:1595
+#: g10/keyedit.c:1596
msgid "Really update the preferences for the selected user IDs? "
msgstr "Really update the preferences for the selected user IDs? "
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1598
msgid "Really update the preferences? "
msgstr "Really update the preferences? "
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
msgid "Save changes? "
msgstr "Save changes? "
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1649
msgid "Quit without saving? "
msgstr "Quit without saving? "
-#: g10/keyedit.c:1656
+#: g10/keyedit.c:1659
#, c-format
msgid "update failed: %s\n"
msgstr "update failed: %s\n"
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1666
#, c-format
msgid "update secret failed: %s\n"
msgstr "update secret failed: %s\n"
-#: g10/keyedit.c:1670
+#: g10/keyedit.c:1673
msgid "Key not changed so no update needed.\n"
msgstr "Key not changed so no update needed.\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1685
msgid "Invalid command (try \"help\")\n"
msgstr "Invalid command (try “help”)\n"
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
msgid "Digest: "
msgstr "Digest: "
-#: g10/keyedit.c:1793
+#: g10/keyedit.c:1796
msgid "Features: "
msgstr "Features: "
-#: g10/keyedit.c:1804
+#: g10/keyedit.c:1807
msgid "Keyserver no-modify"
msgstr "Keyserver no-modify"
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2047
#, c-format
msgid "This key may be revoked by %s key "
msgstr "This key may be revoked by %s key "
-#: g10/keyedit.c:2048
+#: g10/keyedit.c:2051
msgid " (sensitive)"
msgstr " (sensitive)"
-#: g10/keyedit.c:2065
+#: g10/keyedit.c:2065 g10/keyedit.c:2119 g10/keyedit.c:2222 g10/keyedit.c:2237
#, c-format
msgid "created: %s"
msgstr "created: %s"
@@ -3265,30 +3275,25 @@ msgstr "revoked: %s"
msgid "expired: %s"
msgstr "expired: %s"
-#: g10/keyedit.c:2072
+#: g10/keyedit.c:2072 g10/keyedit.c:2121 g10/keyedit.c:2224 g10/keyedit.c:2239
#, c-format
msgid "expires: %s"
msgstr "expires: %s"
-#: g10/keyedit.c:2089
+#: g10/keyedit.c:2087
#, c-format
msgid "trust: %s"
msgstr "trust: %s"
-#: g10/keyedit.c:2093
+#: g10/keyedit.c:2091
#, c-format
msgid "validity: %s"
msgstr "validity: %s"
-#: g10/keyedit.c:2100
+#: g10/keyedit.c:2098
msgid "This key has been disabled"
msgstr "This key has been disabled"
-#: g10/keyedit.c:2114 g10/keyedit.c:2217 g10/keyedit.c:2232
-#, c-format
-msgid "%s%c %4u%c/%08lX created: %s expires: %s"
-msgstr "%s%c %4u%c/%08lX created: %s expires: %s"
-
#: g10/keyedit.c:2130
#, c-format
msgid "rev! subkey has been revoked: %s\n"
@@ -3303,11 +3308,11 @@ msgstr "rev- faked revocation found\n"
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? problem checking revocation: %s\n"
-#: g10/keyedit.c:2160 g10/keylist.c:709 g10/mainproc.c:1516 g10/trustdb.c:1123
+#: g10/keyedit.c:2160 g10/keylist.c:696 g10/mainproc.c:1544 g10/trustdb.c:1124
msgid "revoked"
msgstr "revoked"
-#: g10/keyedit.c:2162 g10/keylist.c:709 g10/mainproc.c:1518 g10/trustdb.c:500
+#: g10/keyedit.c:2162 g10/keylist.c:698 g10/mainproc.c:1546 g10/trustdb.c:499
msgid "expired"
msgstr "expired"
@@ -3323,7 +3328,7 @@ msgstr ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
-#: g10/keyedit.c:2256 g10/mainproc.c:924
+#: g10/keyedit.c:2256 g10/mainproc.c:923
msgid "[revoked] "
msgstr "[revoked] "
@@ -3339,7 +3344,7 @@ msgstr ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
-#: g10/keyedit.c:2382
+#: g10/keyedit.c:2383
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3349,45 +3354,45 @@ msgstr ""
"versions\n"
" of PGP to reject this key.\n"
-#: g10/keyedit.c:2387 g10/keyedit.c:2660
+#: g10/keyedit.c:2388 g10/keyedit.c:2661
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Are you sure you still want to add it? (y/N) "
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2394
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "You may not add a photo ID to a PGP2-style key.\n"
-#: g10/keyedit.c:2528
+#: g10/keyedit.c:2529
msgid "Delete this good signature? (y/N/q)"
msgstr "Delete this good signature? (y/N/q)"
-#: g10/keyedit.c:2538
+#: g10/keyedit.c:2539
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Delete this invalid signature? (y/N/q)"
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2543
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Delete this unknown signature? (y/N/q)"
-#: g10/keyedit.c:2548
+#: g10/keyedit.c:2549
msgid "Really delete this self-signature? (y/N)"
msgstr "Really delete this self-signature? (y/N)"
-#: g10/keyedit.c:2562
+#: g10/keyedit.c:2563
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Deleted %d signature.\n"
-#: g10/keyedit.c:2563
+#: g10/keyedit.c:2564
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Deleted %d signatures.\n"
-#: g10/keyedit.c:2566
+#: g10/keyedit.c:2567
msgid "Nothing deleted.\n"
msgstr "Nothing deleted.\n"
-#: g10/keyedit.c:2655
+#: g10/keyedit.c:2656
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3397,11 +3402,11 @@ msgstr ""
"cause\n"
" some versions of PGP to reject this key.\n"
-#: g10/keyedit.c:2666
+#: g10/keyedit.c:2667
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
-#: g10/keyedit.c:2689
+#: g10/keyedit.c:2687
msgid "Enter the user ID of the designated revoker: "
msgstr "Enter the user ID of the designated revoker: "
@@ -3417,217 +3422,217 @@ msgstr "you cannot appoint a key as its own designated revoker\n"
msgid "this key has already been designated as a revoker\n"
msgstr "this key has already been designated as a revoker\n"
-#: g10/keyedit.c:2776
+#: g10/keyedit.c:2766
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2772
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
-#: g10/keyedit.c:2843
+#: g10/keyedit.c:2833
msgid "Please remove selections from the secret keys.\n"
msgstr "Please remove selections from the secret keys.\n"
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2839
msgid "Please select at most one secondary key.\n"
msgstr "Please select at most one secondary key.\n"
-#: g10/keyedit.c:2853
+#: g10/keyedit.c:2843
msgid "Changing expiration time for a secondary key.\n"
msgstr "Changing expiration time for a secondary key.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:2846
msgid "Changing expiration time for the primary key.\n"
msgstr "Changing expiration time for the primary key.\n"
-#: g10/keyedit.c:2900
+#: g10/keyedit.c:2892
msgid "You can't change the expiration date of a v3 key\n"
msgstr "You can't change the expiration date of a v3 key\n"
-#: g10/keyedit.c:2916
+#: g10/keyedit.c:2908
msgid "No corresponding signature in secret ring\n"
msgstr "No corresponding signature in secret ring\n"
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:2988
msgid "Please select exactly one user ID.\n"
msgstr "Please select exactly one user ID.\n"
-#: g10/keyedit.c:3033 g10/keyedit.c:3142 g10/keyedit.c:3234
+#: g10/keyedit.c:3027 g10/keyedit.c:3137 g10/keyedit.c:3251
#, c-format
msgid "skipping v3 self-signature on user id \"%s\"\n"
msgstr "skipping v3 self-signature on user id “%s”\n"
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3199
msgid "Enter your preferred keyserver URL: "
msgstr "Enter your preferred keyserver URL: "
-#: g10/keyedit.c:3296
+#: g10/keyedit.c:3315
#, c-format
msgid "No user ID with index %d\n"
msgstr "No user ID with index %d\n"
-#: g10/keyedit.c:3342
+#: g10/keyedit.c:3361
#, c-format
msgid "No secondary key with index %d\n"
msgstr "No secondary key with index %d\n"
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3475
msgid "user ID: \""
msgstr "user ID: \""
-#: g10/keyedit.c:3461
+#: g10/keyedit.c:3480
#, c-format
msgid ""
"\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
msgstr ""
"\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
-#: g10/keyedit.c:3464
+#: g10/keyedit.c:3483
#, c-format
msgid ""
"\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
msgstr ""
"\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3488
#, c-format
msgid "This signature expired on %s.\n"
msgstr "This signature expired on %s.\n"
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3492
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Are you sure you still want to revoke it? (y/N) "
-#: g10/keyedit.c:3477
+#: g10/keyedit.c:3496
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Create a revocation certificate for this signature? (y/N) "
-#: g10/keyedit.c:3502
+#: g10/keyedit.c:3521
msgid "You have signed these user IDs:\n"
msgstr "You have signed these user IDs:\n"
-#: g10/keyedit.c:3521
+#: g10/keyedit.c:3542
#, c-format
-msgid " signed by %08lX at %s%s%s\n"
-msgstr " signed by %08lX at %s%s%s\n"
+msgid " signed by %s on %s%s%s\n"
+msgstr " signed by %s on %s%s%s\n"
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3551
#, c-format
-msgid " revoked by %08lX at %s\n"
-msgstr " revoked by %08lX at %s\n"
+msgid " revoked by %s on %s\n"
+msgstr " revoked by %s on %s\n"
-#: g10/keyedit.c:3549
+#: g10/keyedit.c:3571
msgid "You are about to revoke these signatures:\n"
msgstr "You are about to revoke these signatures:\n"
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3581
#, c-format
-msgid " signed by %08lX at %s%s\n"
-msgstr " signed by %08lX at %s%s\n"
+msgid " signed by %s on %s%s\n"
+msgstr " signed by %s on %s%s\n"
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3583
msgid " (non-exportable)"
msgstr " (non-exportable)"
-#: g10/keyedit.c:3568
+#: g10/keyedit.c:3590
msgid "Really create the revocation certificates? (y/N) "
msgstr "Really create the revocation certificates? (y/N) "
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3620
msgid "no secret key\n"
msgstr "no secret key\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3690
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "user ID “%s” is already revoked\n"
-#: g10/keyedit.c:3685
+#: g10/keyedit.c:3707
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
-#: g10/keyedit.c:3858
+#: g10/keyedit.c:3876
#, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
-msgstr "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
-#: g10/keylist.c:192
+#: g10/keylist.c:179
msgid "Critical signature policy: "
msgstr "Critical signature policy: "
-#: g10/keylist.c:194
+#: g10/keylist.c:181
msgid "Signature policy: "
msgstr "Signature policy: "
-#: g10/keylist.c:233
+#: g10/keylist.c:220
msgid "Critical preferred keyserver: "
msgstr "Critical preferred keyserver: "
-#: g10/keylist.c:235
+#: g10/keylist.c:222
msgid "Preferred keyserver: "
msgstr "Preferred keyserver: "
-#: g10/keylist.c:274 g10/keylist.c:313
+#: g10/keylist.c:268 g10/keylist.c:312
msgid "WARNING: invalid notation data found\n"
msgstr "WARNING: invalid notation data found\n"
-#: g10/keylist.c:288
+#: g10/keylist.c:286
msgid "Critical signature notation: "
msgstr "Critical signature notation: "
-#: g10/keylist.c:290
+#: g10/keylist.c:288
msgid "Signature notation: "
msgstr "Signature notation: "
-#: g10/keylist.c:301
+#: g10/keylist.c:299
msgid "not human readable"
msgstr "not human readable"
-#: g10/keylist.c:401
+#: g10/keylist.c:400
msgid "Keyring"
msgstr "Keyring"
-#: g10/keylist.c:638 g10/keylist.c:674 g10/keylist.c:776 g10/keylist.c:805
-#: g10/mainproc.c:926
+#: g10/keylist.c:629 g10/keylist.c:658 g10/keylist.c:756 g10/keylist.c:781
+#: g10/mainproc.c:925
#, c-format
msgid " [expires: %s]"
msgstr " [expires: %s]"
-#: g10/keylist.c:670 g10/keylist.c:772
+#: g10/keylist.c:654 g10/keylist.c:752
#, c-format
msgid " [revoked: %s]"
msgstr " [revoked: %s]"
-#: g10/keylist.c:672 g10/keylist.c:774
+#: g10/keylist.c:656 g10/keylist.c:754
#, c-format
msgid " [expired: %s]"
msgstr " [expired: %s]"
-#: g10/keylist.c:1393
+#: g10/keylist.c:1366
msgid "Primary key fingerprint:"
msgstr "Primary key fingerprint:"
-#: g10/keylist.c:1395
+#: g10/keylist.c:1368
msgid " Subkey fingerprint:"
msgstr " Subkey fingerprint:"
-#: g10/keylist.c:1402
+#: g10/keylist.c:1375
msgid " Primary key fingerprint:"
msgstr " Primary key fingerprint:"
-#: g10/keylist.c:1404
+#: g10/keylist.c:1377
msgid " Subkey fingerprint:"
msgstr " Subkey fingerprint:"
-#: g10/keylist.c:1408 g10/keylist.c:1412
+#: g10/keylist.c:1381 g10/keylist.c:1385
msgid " Key fingerprint ="
msgstr " Key fingerprint ="
@@ -3658,172 +3663,172 @@ msgstr "encrypted with unknown algorithm %d\n"
#: g10/mainproc.c:366
#, c-format
-msgid "public key is %08lX\n"
-msgstr "public key is %08lX\n"
+msgid "public key is %s\n"
+msgstr "public key is %s\n"
#: g10/mainproc.c:421
msgid "public key encrypted data: good DEK\n"
msgstr "public key encrypted data: good DEK\n"
-#: g10/mainproc.c:454
+#: g10/mainproc.c:455
#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
-msgstr "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "encrypted with %u-bit %s key, ID %s, created %s\n"
-#: g10/mainproc.c:464
+#: g10/mainproc.c:465
#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
-msgstr "encrypted with %s key, ID %08lX\n"
+msgid "encrypted with %s key, ID %s\n"
+msgstr "encrypted with %s key, ID %s\n"
-#: g10/mainproc.c:478
+#: g10/mainproc.c:479
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "public key decryption failed: %s\n"
-#: g10/mainproc.c:492
+#: g10/mainproc.c:493
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "encrypted with %lu passphrases\n"
-#: g10/mainproc.c:494
+#: g10/mainproc.c:495
msgid "encrypted with 1 passphrase\n"
msgstr "encrypted with 1 passphrase\n"
-#: g10/mainproc.c:522 g10/mainproc.c:544
+#: g10/mainproc.c:523 g10/mainproc.c:545
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "assuming %s encrypted data\n"
-#: g10/mainproc.c:530
+#: g10/mainproc.c:531
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
msgid "decryption okay\n"
msgstr "decryption okay\n"
-#: g10/mainproc.c:566
+#: g10/mainproc.c:567
msgid "WARNING: message was not integrity protected\n"
msgstr "WARNING: message was not integrity protected\n"
-#: g10/mainproc.c:579
+#: g10/mainproc.c:580
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "WARNING: encrypted message has been manipulated!\n"
-#: g10/mainproc.c:585
+#: g10/mainproc.c:586
#, c-format
msgid "decryption failed: %s\n"
msgstr "decryption failed: %s\n"
-#: g10/mainproc.c:605
+#: g10/mainproc.c:606
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTE: sender requested “for-your-eyes-only”\n"
-#: g10/mainproc.c:607
+#: g10/mainproc.c:608
#, c-format
msgid "original file name='%.*s'\n"
msgstr "original file name='%.*s'\n"
-#: g10/mainproc.c:779
+#: g10/mainproc.c:780
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "standalone revocation - use “gpg --import” to apply\n"
-#: g10/mainproc.c:1279
+#: g10/mainproc.c:1276
msgid "signature verification suppressed\n"
msgstr "signature verification suppressed\n"
-#: g10/mainproc.c:1321 g10/mainproc.c:1331
+#: g10/mainproc.c:1318 g10/mainproc.c:1328
msgid "can't handle these multiple signatures\n"
msgstr "can't handle these multiple signatures\n"
-#: g10/mainproc.c:1342
+#: g10/mainproc.c:1338
#, c-format
-msgid "Signature made %.*s\n"
-msgstr "Signature made %.*s\n"
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
-#: g10/mainproc.c:1343
+#: g10/mainproc.c:1339
#, c-format
-msgid " using %s key %08lX%08lX\n"
-msgstr " using %s key %08lX%08lX\n"
+msgid " using %s key %s\n"
+msgstr " using %s key %s\n"
-#: g10/mainproc.c:1347
+#: g10/mainproc.c:1343
#, c-format
-msgid "Signature made %.*s using %s key ID %08lX\n"
-msgstr "Signature made %.*s using %s key ID %08lX\n"
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "Signature made %s using %s key ID %s\n"
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1363
msgid "Key available at: "
msgstr "Key available at: "
-#: g10/mainproc.c:1435 g10/mainproc.c:1471
+#: g10/mainproc.c:1463 g10/mainproc.c:1499
msgid "BAD signature from \""
msgstr "BAD signature from \""
-#: g10/mainproc.c:1436 g10/mainproc.c:1472
+#: g10/mainproc.c:1464 g10/mainproc.c:1500
msgid "Expired signature from \""
msgstr "Expired signature from \""
-#: g10/mainproc.c:1437 g10/mainproc.c:1473
+#: g10/mainproc.c:1465 g10/mainproc.c:1501
msgid "Good signature from \""
msgstr "Good signature from \""
-#: g10/mainproc.c:1475
+#: g10/mainproc.c:1503
msgid "[uncertain]"
msgstr "[uncertain]"
-#: g10/mainproc.c:1601
+#: g10/mainproc.c:1631
#, c-format
msgid "Signature expired %s\n"
msgstr "Signature expired %s\n"
-#: g10/mainproc.c:1606
+#: g10/mainproc.c:1636
#, c-format
msgid "Signature expires %s\n"
msgstr "Signature expires %s\n"
-#: g10/mainproc.c:1609
+#: g10/mainproc.c:1639
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s signature, digest algorithm %s\n"
-#: g10/mainproc.c:1610
+#: g10/mainproc.c:1640
msgid "binary"
msgstr "binary"
-#: g10/mainproc.c:1611
+#: g10/mainproc.c:1641
msgid "textmode"
msgstr "textmode"
-#: g10/mainproc.c:1611 g10/trustdb.c:499
+#: g10/mainproc.c:1641 g10/trustdb.c:498
msgid "unknown"
msgstr "unknown"
-#: g10/mainproc.c:1631
+#: g10/mainproc.c:1661
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Can't check signature: %s\n"
-#: g10/mainproc.c:1699 g10/mainproc.c:1715 g10/mainproc.c:1801
+#: g10/mainproc.c:1729 g10/mainproc.c:1745 g10/mainproc.c:1831
msgid "not a detached signature\n"
msgstr "not a detached signature\n"
-#: g10/mainproc.c:1742
+#: g10/mainproc.c:1772
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
-#: g10/mainproc.c:1750
+#: g10/mainproc.c:1780
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "standalone signature of class 0x%02x\n"
-#: g10/mainproc.c:1807
+#: g10/mainproc.c:1837
msgid "old style (PGP 2.x) signature\n"
msgstr "old style (PGP 2.x) signature\n"
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1847
msgid "invalid root packet detected in proc_tree()\n"
msgstr "invalid root packet detected in proc_tree()\n"
@@ -3878,74 +3883,74 @@ msgstr "uncompressed|none"
msgid "this message may not be usable by %s\n"
msgstr "this message may not be usable by %s\n"
-#: g10/misc.c:742
+#: g10/misc.c:777
#, c-format
msgid "ambiguous option `%s'\n"
msgstr "ambiguous option ‘%s’\n"
-#: g10/misc.c:767
+#: g10/misc.c:802
#, c-format
msgid "unknown option `%s'\n"
msgstr "unknown option ‘%s’\n"
-#: g10/parse-packet.c:121
+#: g10/parse-packet.c:120
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "can't handle public key algorithm %d\n"
-#: g10/parse-packet.c:690
+#: g10/parse-packet.c:703
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
-#: g10/parse-packet.c:1103
+#: g10/parse-packet.c:1128
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacket of type %d has critical bit set\n"
-#: g10/passphrase.c:460 g10/passphrase.c:507
+#: g10/passphrase.c:461 g10/passphrase.c:508
msgid "gpg-agent is not available in this session\n"
msgstr "gpg-agent is not available in this session\n"
-#: g10/passphrase.c:468
+#: g10/passphrase.c:469
msgid "can't set client pid for the agent\n"
msgstr "can't set client pid for the agent\n"
-#: g10/passphrase.c:476
+#: g10/passphrase.c:477
msgid "can't get server read FD for the agent\n"
msgstr "can't get server read FD for the agent\n"
-#: g10/passphrase.c:483
+#: g10/passphrase.c:484
msgid "can't get server write FD for the agent\n"
msgstr "can't get server write FD for the agent\n"
-#: g10/passphrase.c:516
+#: g10/passphrase.c:517
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "malformed GPG_AGENT_INFO environment variable\n"
-#: g10/passphrase.c:529
+#: g10/passphrase.c:530
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent protocol version %d is not supported\n"
-#: g10/passphrase.c:550
+#: g10/passphrase.c:551
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "can't connect to ‘%s’: %s\n"
-#: g10/passphrase.c:572
+#: g10/passphrase.c:573
msgid "communication problem with gpg-agent\n"
msgstr "communication problem with gpg-agent\n"
-#: g10/passphrase.c:579 g10/passphrase.c:879 g10/passphrase.c:991
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
msgid "problem with the agent - disabling agent use\n"
msgstr "problem with the agent - disabling agent use\n"
-#: g10/passphrase.c:680 g10/passphrase.c:1132
+#: g10/passphrase.c:681
#, c-format
msgid " (main key ID %08lX)"
msgstr " (main key ID %08lX)"
-#: g10/passphrase.c:690
+#: g10/passphrase.c:691
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -3956,40 +3961,40 @@ msgstr ""
"“%.*s”\n"
"%u-bit %s key, ID %08lX, created %s%s\n"
-#: g10/passphrase.c:712
+#: g10/passphrase.c:713
msgid "Repeat passphrase\n"
msgstr "Repeat passphrase\n"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:715
msgid "Enter passphrase\n"
msgstr "Enter passphrase\n"
-#: g10/passphrase.c:752
+#: g10/passphrase.c:753
msgid "passphrase too long\n"
msgstr "passphrase too long\n"
-#: g10/passphrase.c:765
+#: g10/passphrase.c:766
msgid "invalid response from agent\n"
msgstr "invalid response from agent\n"
-#: g10/passphrase.c:780 g10/passphrase.c:873
+#: g10/passphrase.c:781 g10/passphrase.c:874
msgid "cancelled by user\n"
msgstr "cancelled by user\n"
-#: g10/passphrase.c:785 g10/passphrase.c:962
+#: g10/passphrase.c:786 g10/passphrase.c:963
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "problem with the agent: agent returns 0x%lx\n"
-#: g10/passphrase.c:1043 g10/passphrase.c:1179
+#: g10/passphrase.c:1044 g10/passphrase.c:1189
msgid "can't query password in batchmode\n"
msgstr "can't query password in batchmode\n"
-#: g10/passphrase.c:1048 g10/passphrase.c:1183
+#: g10/passphrase.c:1049 g10/passphrase.c:1193
msgid "Enter passphrase: "
msgstr "Enter passphrase: "
-#: g10/passphrase.c:1118
+#: g10/passphrase.c:1119
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -3999,12 +4004,22 @@ msgstr ""
"You need a passphrase to unlock the secret key for\n"
"user: \""
-#: g10/passphrase.c:1127
+#: g10/passphrase.c:1128
+#, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u-bit %s key, ID %s, created %s"
+
+#: g10/passphrase.c:1137
+#, c-format
+msgid " (subkey on main key ID %s)"
+msgstr " (subkey on main key ID %s)"
+
+#: g10/passphrase.c:1141
#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
-msgstr "%u-bit %s key, ID %08lX, created %s"
+msgid " (main key ID %s)"
+msgstr " (main key ID %s)"
-#: g10/passphrase.c:1187
+#: g10/passphrase.c:1197
msgid "Repeat passphrase: "
msgstr "Repeat passphrase: "
@@ -4040,8 +4055,8 @@ msgstr "can't open signed data ‘%s’\n"
#: g10/pubkey-enc.c:103
#, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
-msgstr "anonymous recipient; trying secret key %08lX ...\n"
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
#: g10/pubkey-enc.c:119
msgid "okay, we are the anonymous recipient.\n"
@@ -4063,8 +4078,8 @@ msgstr "WARNING: cipher algorithm %s not found in recipient preferences\n"
#: g10/pubkey-enc.c:286
#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
-msgstr "NOTE: secret key %08lX expired at %s\n"
+msgid "NOTE: secret key %s expired at %s\n"
+msgstr "NOTE: secret key %s expired at %s\n"
#: g10/pubkey-enc.c:292
msgid "NOTE: key has been revoked"
@@ -4100,62 +4115,59 @@ msgstr "generating the deprecated 16-bit checksum for secret key protection\n"
msgid "WARNING: signature digest conflict in message\n"
msgstr "WARNING: signature digest conflict in message\n"
-#: g10/sig-check.c:146
+#: g10/sig-check.c:99
#, c-format
-msgid ""
-"key %08lX: this is a PGP generated Elgamal key which is NOT secure for "
-"signatures!\n"
-msgstr ""
-"key %08lX: this is a PGP generated Elgamal key which is NOT secure for "
-"signatures!\n"
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr "WARNING: signing subkey %s is not cross-certified\n"
-#: g10/sig-check.c:155
+#: g10/sig-check.c:102
#, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "public key %08lX is %lu second newer than the signature\n"
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr "WARNING: signing subkey %s has an invalid cross-certification\n"
-#: g10/sig-check.c:156
+#: g10/sig-check.c:168
#, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "public key %08lX is %lu seconds newer than the signature\n"
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "public key %s is %lu second newer than the signature\n"
-#: g10/sig-check.c:165
+#: g10/sig-check.c:169
+#, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "public key %s is %lu seconds newer than the signature\n"
+
+#: g10/sig-check.c:180
#, c-format
msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
msgstr ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
-#: g10/sig-check.c:167
+#: g10/sig-check.c:182
#, c-format
msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
msgstr ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
-#: g10/sig-check.c:180
+#: g10/sig-check.c:192
#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
-msgstr "NOTE: signature key %08lX expired %s\n"
+msgid "NOTE: signature key %s expired %s\n"
+msgstr "NOTE: signature key %s expired %s\n"
-#: g10/sig-check.c:263
+#: g10/sig-check.c:275
#, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
-msgstr "assuming bad signature from key %08lX due to an unknown critical bit\n"
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr "assuming bad signature from key %s due to an unknown critical bit\n"
-#: g10/sig-check.c:486
+#: g10/sig-check.c:532
#, c-format
-msgid "key %08lX: no subkey for subkey revocation signature\n"
-msgstr "key %08lX: no subkey for subkey revocation signature\n"
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "key %s: no subkey for subkey revocation signature\n"
-#: g10/sig-check.c:512
+#: g10/sig-check.c:558
#, c-format
-msgid "key %08lX: no subkey for subkey binding signature\n"
-msgstr "key %08lX: no subkey for subkey binding signature\n"
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "key %s: no subkey for subkey binding signature\n"
#: g10/sign.c:85
msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
@@ -4205,35 +4217,35 @@ msgstr "checking created signature failed: %s\n"
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s signature from: “%s”\n"
-#: g10/sign.c:548
+#: g10/sign.c:550
#, c-format
msgid "WARNING: `%s' is an empty file\n"
msgstr "WARNING: ‘%s’ is an empty file\n"
-#: g10/sign.c:736
+#: g10/sign.c:741
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
-#: g10/sign.c:760 g10/sign.c:996
+#: g10/sign.c:765 g10/sign.c:1001
#, c-format
msgid "can't create %s: %s\n"
msgstr "can't create %s: %s\n"
-#: g10/sign.c:789
+#: g10/sign.c:794
#, c-format
msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "forcing digest algorithm %s (%d) violates recipient preferences\n"
-#: g10/sign.c:881
+#: g10/sign.c:886
msgid "signing:"
msgstr "signing:"
-#: g10/sign.c:980
+#: g10/sign.c:985
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-#: g10/sign.c:1133
+#: g10/sign.c:1138
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s encryption will be used\n"
@@ -4388,103 +4400,103 @@ msgstr "‘%s’ is not a valid long keyID\n"
#: g10/trustdb.c:257
#, c-format
-msgid "key %08lX: accepted as trusted key\n"
-msgstr "key %08lX: accepted as trusted key\n"
+msgid "key %s: accepted as trusted key\n"
+msgstr "key %s: accepted as trusted key\n"
#: g10/trustdb.c:295
#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
-msgstr "key %08lX occurs more than once in the trustdb\n"
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "key %s occurs more than once in the trustdb\n"
#: g10/trustdb.c:310
#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "key %08lX: no public key for trusted key - skipped\n"
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr "key %s: no public key for trusted key - skipped\n"
-#: g10/trustdb.c:319
+#: g10/trustdb.c:320
#, c-format
-msgid "key %08lX marked as ultimately trusted\n"
-msgstr "key %08lX marked as ultimately trusted\n"
+msgid "key %s marked as ultimately trusted\n"
+msgstr "key %s marked as ultimately trusted\n"
-#: g10/trustdb.c:345
+#: g10/trustdb.c:344
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "trust record %lu, req type %d: read failed: %s\n"
-#: g10/trustdb.c:351
+#: g10/trustdb.c:350
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "trust record %lu is not of requested type %d\n"
-#: g10/trustdb.c:366 g10/tdbdump.c:59
+#: g10/trustdb.c:365 g10/tdbdump.c:59
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "trust record %lu, type %d: write failed: %s\n"
-#: g10/trustdb.c:381 g10/tdbdump.c:217
+#: g10/trustdb.c:380 g10/tdbdump.c:217
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync failed: %s\n"
-#: g10/trustdb.c:446
+#: g10/trustdb.c:445
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n"
-#: g10/trustdb.c:452
+#: g10/trustdb.c:451
#, c-format
msgid "using %s trust model\n"
msgstr "using %s trust model\n"
-#: g10/trustdb.c:501
+#: g10/trustdb.c:500
msgid "undefined"
msgstr "undefined"
-#: g10/trustdb.c:502
+#: g10/trustdb.c:501
msgid "never"
msgstr "never"
-#: g10/trustdb.c:503
+#: g10/trustdb.c:502
msgid "marginal"
msgstr "marginal"
-#: g10/trustdb.c:504
+#: g10/trustdb.c:503
msgid "full"
msgstr "full"
-#: g10/trustdb.c:505
+#: g10/trustdb.c:504
msgid "ultimate"
msgstr "ultimate"
-#: g10/trustdb.c:545
+#: g10/trustdb.c:544
msgid "no need for a trustdb check\n"
msgstr "no need for a trustdb check\n"
-#: g10/trustdb.c:551 g10/trustdb.c:2103
+#: g10/trustdb.c:550 g10/trustdb.c:2103
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "next trustdb check due at %s\n"
-#: g10/trustdb.c:560
+#: g10/trustdb.c:559
#, c-format
msgid "no need for a trustdb check with \"%s\" trust model\n"
msgstr "no need for a trustdb check with “%s” trust model\n"
-#: g10/trustdb.c:575
+#: g10/trustdb.c:574
#, c-format
msgid "no need for a trustdb update with \"%s\" trust model\n"
msgstr "no need for a trustdb update with “%s” trust model\n"
-#: g10/trustdb.c:793 g10/trustdb.c:1221
+#: g10/trustdb.c:792 g10/trustdb.c:1222
#, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "public key %08lX not found: %s\n"
+msgid "public key %s not found: %s\n"
+msgstr "public key %s not found: %s\n"
-#: g10/trustdb.c:988
+#: g10/trustdb.c:987
msgid "please do a --check-trustdb\n"
msgstr "please do a --check-trustdb\n"
-#: g10/trustdb.c:992
+#: g10/trustdb.c:991
msgid "checking the trustdb\n"
msgstr "checking the trustdb\n"
@@ -4499,8 +4511,8 @@ msgstr "no ultimately trusted keys found\n"
#: g10/trustdb.c:1925
#, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
-msgstr "public key of ultimately trusted key %08lX not found\n"
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr "public key of ultimately trusted key %s not found\n"
#: g10/trustdb.c:1948
#, c-format
@@ -5148,78 +5160,74 @@ msgstr "WARNING: unable to remove tempfile (%s) ‘%s’: %s\n"
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "WARNING: unable to remove temp directory ‘%s’: %s\n"
-#: g10/keyid.c:370 g10/keyid.c:382 g10/keyid.c:394 g10/keyid.c:406
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
msgid "never "
msgstr "never "
-#: g10/revoke.c:92
-msgid "key incomplete\n"
-msgstr "key incomplete\n"
-
-#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:540
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet failed: %s\n"
-#: g10/revoke.c:145
+#: g10/revoke.c:146
#, c-format
-msgid "key %08lX incomplete\n"
-msgstr "key %08lX incomplete\n"
+msgid "key %s has no user IDs\n"
+msgstr "key %s has no user IDs\n"
-#: g10/revoke.c:270
+#: g10/revoke.c:271
msgid "To be revoked by:\n"
msgstr "To be revoked by:\n"
-#: g10/revoke.c:274
+#: g10/revoke.c:275
msgid "(This is a sensitive revocation key)\n"
msgstr "(This is a sensitive revocation key)\n"
-#: g10/revoke.c:278 g10/revoke.c:475
+#: g10/revoke.c:279 g10/revoke.c:476
msgid "Create a revocation certificate for this key? "
msgstr "Create a revocation certificate for this key? "
-#: g10/revoke.c:291 g10/revoke.c:506
+#: g10/revoke.c:292 g10/revoke.c:507
msgid "ASCII armored output forced.\n"
msgstr "ASCII armored output forced.\n"
-#: g10/revoke.c:305 g10/revoke.c:520
+#: g10/revoke.c:306 g10/revoke.c:521
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet failed: %s\n"
-#: g10/revoke.c:368
+#: g10/revoke.c:369
msgid "Revocation certificate created.\n"
msgstr "Revocation certificate created.\n"
-#: g10/revoke.c:374
+#: g10/revoke.c:375
#, c-format
msgid "no revocation keys found for `%s'\n"
msgstr "no revocation keys found for ‘%s’\n"
-#: g10/revoke.c:428
+#: g10/revoke.c:429
#, c-format
msgid "secret key `%s' not found: %s\n"
msgstr "secret key ‘%s’ not found: %s\n"
-#: g10/revoke.c:457
+#: g10/revoke.c:458
#, c-format
msgid "no corresponding public key: %s\n"
msgstr "no corresponding public key: %s\n"
-#: g10/revoke.c:468
+#: g10/revoke.c:469
msgid "public key does not match secret key!\n"
msgstr "public key does not match secret key!\n"
-#: g10/revoke.c:491
+#: g10/revoke.c:492
msgid "unknown protection algorithm\n"
msgstr "unknown protection algorithm\n"
-#: g10/revoke.c:495
+#: g10/revoke.c:496
msgid "NOTE: This key is not protected!\n"
msgstr "NOTE: This key is not protected!\n"
-#: g10/revoke.c:546
+#: g10/revoke.c:547
msgid ""
"Revocation certificate created.\n"
"\n"
@@ -5237,33 +5245,33 @@ msgstr ""
"your media become unreadable. But have some caution: The print system of\n"
"your machine might store the data and make it available to others!\n"
-#: g10/revoke.c:587
+#: g10/revoke.c:588
msgid "Please select the reason for the revocation:\n"
msgstr "Please select the reason for the revocation:\n"
-#: g10/revoke.c:597
+#: g10/revoke.c:598
msgid "Cancel"
msgstr "Cancel"
-#: g10/revoke.c:599
+#: g10/revoke.c:600
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Probably you want to select %d here)\n"
-#: g10/revoke.c:640
+#: g10/revoke.c:641
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "Enter an optional description; end it with an empty line:\n"
-#: g10/revoke.c:668
+#: g10/revoke.c:669
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "Reason for revocation: %s\n"
-#: g10/revoke.c:670
+#: g10/revoke.c:671
msgid "(No description given)\n"
msgstr "(No description given)\n"
-#: g10/revoke.c:675
+#: g10/revoke.c:676
msgid "Is this okay? "
msgstr "Is this okay? "
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-02 21:18:22 +0000