[git] GnuPG - branch, master, updated. gnupg-2.1.0beta1-45-g62842cc
by Werner Koch
cvs at cvs.gnupg.org
Thu Jan 20 15:45:39 CET 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 62842cc7fe614e278638c008d0192d68a05a555a (commit)
via 2b933ae8f6324115e1ede81996ab18fe2ac90715 (commit)
from 49d25d3185636237b356781cdde7960f234f2d11 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 62842cc7fe614e278638c008d0192d68a05a555a
Author: Werner Koch <wk at gnupg.org>
Date: Thu Jan 20 15:25:47 2011 +0100
Remove keyserver/ from the build system.
diff --git a/ChangeLog b/ChangeLog
index d36c23c..11b37eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-20 Werner Koch <wk at g10code.com>
+
+ * configure.ac (AC_CONFIG_FILES): Remove keyserver/.
+
2011-01-19 Werner Koch <wk at g10code.com>
* configure.ac: Add new option --enable-gpg2-is-gpg.
diff --git a/configure.ac b/configure.ac
index 82d1509..b108d19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1683,9 +1683,6 @@ agent/Makefile
scd/Makefile
g13/Makefile
dirmngr/Makefile
-keyserver/Makefile
-keyserver/gpg2keys_mailto
-keyserver/gpg2keys_test
tools/gpg-zip
tools/Makefile
doc/Makefile
@@ -1693,6 +1690,11 @@ tests/Makefile
tests/openpgp/Makefile
tests/pkits/Makefile
])
+#keyserver/Makefile
+#keyserver/gpg2keys_mailto
+#keyserver/gpg2keys_test
+
+
AC_OUTPUT
diff --git a/po/de.po b/po/de.po
index 59da727..3f4a978 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2011-01-20 14:32+0100\n"
+"POT-Creation-Date: 2011-01-20 15:15+0100\n"
"PO-Revision-Date: 2011-01-20 15:10+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
@@ -894,12 +894,12 @@ msgstr "Fehler bei Ausführung von `%s': beendet\n"
msgid "error getting exit code of process %d: %s\n"
msgstr "Fehler beim Holen des Exitwerte des Prozesses %d: %s\n"
-#: common/http.c:1597
+#: common/http.c:1607
#, c-format
msgid "error creating socket: %s\n"
msgstr "Fehler beim Erstellen des Sockets: %s\n"
-#: common/http.c:1641
+#: common/http.c:1651
msgid "host not found"
msgstr "Host nicht gefunden"
commit 2b933ae8f6324115e1ede81996ab18fe2ac90715
Author: Werner Koch <wk at gnupg.org>
Date: Thu Jan 20 15:11:25 2011 +0100
Fix for bug#1313. de.po update.
diff --git a/NEWS b/NEWS
index 2153733..5f9fd0a 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,9 @@ Noteworthy changes in version 2.1.0beta2 (unreleased)
* Fixed TTY management for pinentries and session variable update
problem.
+ * Dirmngr has taken over the function of the keyserver helpers. Thus
+ we now have a specified direct interface to keyservers via Dirmngr.
+
Noteworthy changes in version 2.1.0beta1 (2010-10-26)
-----------------------------------------------------
diff --git a/common/ChangeLog b/common/ChangeLog
index 88e91f9..0150658 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,5 +1,16 @@
2011-01-20 Werner Koch <wk at g10code.com>
+ Fix bug#1313.
+
+ * http.c (my_select): New. Define to pth_select if building with Pth.
+ (start_server, write_server, cookie_read, cookie_write): Use it.
+ (my_connect): New. Define to pth_connect if building with Pth.
+ (connect_server): Use it.
+ (my_accept): New. Define to pth_accept if building with Pth.
+ (start_server): Use it.
+
+2011-01-20 Werner Koch <wk at g10code.com>
+
* util.h (struct b64state): Add field LASTERR.
* b64enc.c (enc_start, b64enc_write, b64enc_finish): Handle
LASTERR. This is to make sure that we don't leak strduped data.
diff --git a/common/http.c b/common/http.c
index 4d35361..b50b6b8 100644
--- a/common/http.c
+++ b/common/http.c
@@ -105,6 +105,16 @@ struct srventry
#endif/*!USE_DNS_SRV*/
+#ifdef HAVE_PTH
+# define my_select(a,b,c,d,e) pth_select ((a), (b), (c), (d), (e))
+# define my_connect(a,b,c) pth_connect ((a), (b), (c))
+# define my_accept(a,b,c) pth_accept ((a), (b), (c))
+#else
+# define my_select(a,b,c,d,e) select ((a), (b), (c), (d), (e))
+# define my_connect(a,b,c) connect ((a), (b), (c))
+# define my_accept(a,b,c) accept ((a), (b), (c))
+#endif
+
#ifdef HAVE_W32_SYSTEM
#define sock_close(a) closesocket(a)
#else
@@ -1421,14 +1431,14 @@ start_server ()
FD_ZERO (&rfds);
FD_SET (fd, &rfds);
- if (select (fd + 1, &rfds, NULL, NULL, NULL) <= 0)
+ if (my_select (fd + 1, &rfds, NULL, NULL, NULL) <= 0)
continue; /* ignore any errors */
if (!FD_ISSET (fd, &rfds))
continue;
addrlen = sizeof peer;
- client = accept (fd, (struct sockaddr *) &peer, &addrlen);
+ client = my_accept (fd, (struct sockaddr *) &peer, &addrlen);
if (client == -1)
continue; /* oops */
@@ -1498,7 +1508,7 @@ connect_server (const char *server, unsigned short port,
addr.sin_port = htons(port);
memcpy (&addr.sin_addr,&inaddr,sizeof(inaddr));
- if (!connect (sock,(struct sockaddr *)&addr,sizeof(addr)) )
+ if (!my_connect (sock,(struct sockaddr *)&addr,sizeof(addr)) )
return sock;
sock_close(sock);
return -1;
@@ -1566,7 +1576,7 @@ connect_server (const char *server, unsigned short port,
return -1;
}
- if (connect (sock, ai->ai_addr, ai->ai_addrlen))
+ if (my_connect (sock, ai->ai_addr, ai->ai_addrlen))
last_errno = errno;
else
connected = 1;
@@ -1620,7 +1630,7 @@ connect_server (const char *server, unsigned short port,
for (i = 0; host->h_addr_list[i] && !connected; i++)
{
memcpy (&addr.sin_addr, host->h_addr_list[i], host->h_length);
- if (connect (sock, (struct sockaddr *) &addr, sizeof (addr)))
+ if (my_connect (sock, (struct sockaddr *) &addr, sizeof (addr)))
last_errno = errno;
else
{
@@ -1660,7 +1670,6 @@ write_server (int sock, const char *data, size_t length)
int nleft;
int nwritten;
- /* FIXME: We would better use pth I/O functions. */
nleft = length;
while (nleft > 0)
{
@@ -1687,7 +1696,7 @@ write_server (int sock, const char *data, size_t length)
tv.tv_sec = 0;
tv.tv_usec = 50000;
- select (0, NULL, NULL, NULL, &tv);
+ my_select (0, NULL, NULL, NULL, &tv);
continue;
}
log_info ("network write failed: %s\n", strerror (errno));
@@ -1733,7 +1742,7 @@ cookie_read (void *cookie, void *buffer, size_t size)
tv.tv_sec = 0;
tv.tv_usec = 50000;
- select (0, NULL, NULL, NULL, &tv);
+ my_select (0, NULL, NULL, NULL, &tv);
goto again;
}
if (nread == GNUTLS_E_REHANDSHAKE)
@@ -1795,7 +1804,7 @@ cookie_write (void *cookie, const void *buffer, size_t size)
tv.tv_sec = 0;
tv.tv_usec = 50000;
- select (0, NULL, NULL, NULL, &tv);
+ my_select (0, NULL, NULL, NULL, &tv);
continue;
}
log_info ("TLS network write failed: %s\n",
diff --git a/po/ChangeLog b/po/ChangeLog
index c0f6240..d8e9c42 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-20 Werner Koch <wk at g10code.com>
+
+ * de.po: Fix two fuzzies.
+
2010-10-21 Werner Koch <wk at g10code.com>
* POTFILES.in: Add files in dirmngr/.
diff --git a/po/de.po b/po/de.po
index 8545431..59da727 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"POT-Creation-Date: 2011-01-14 21:03+0100\n"
-"PO-Revision-Date: 2010-11-23 19:38+0100\n"
+"POT-Creation-Date: 2011-01-20 14:32+0100\n"
+"PO-Revision-Date: 2011-01-20 15:10+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"MIME-Version: 1.0\n"
@@ -696,45 +696,45 @@ msgstr "Vom Benutzer abgebrochen\n"
msgid "error while asking for the passphrase: %s\n"
msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
-#: agent/trustlist.c:135 agent/trustlist.c:332 dirmngr/dirmngr.c:1374
+#: agent/trustlist.c:135 agent/trustlist.c:335 dirmngr/dirmngr.c:1374
#, c-format
msgid "error opening `%s': %s\n"
msgstr "Fehler beim Öffnen von `%s': %s\n"
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 common/helpfile.c:63 common/helpfile.c:79
#, c-format
msgid "file `%s', line %d: %s\n"
msgstr "Datei `%s', Zeile %d: %s\n"
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:173 agent/trustlist.c:181
#, c-format
msgid "statement \"%s\" ignored in `%s', line %d\n"
msgstr ""
"Anweisung \"%s\" in `%s', Zeile %d\n"
" ignoriert\n"
-#: agent/trustlist.c:184
+#: agent/trustlist.c:187
#, c-format
msgid "system trustlist `%s' not available\n"
msgstr ""
"Systemliste der vertrauenswürdigen Zertifikate '%s' ist nicht vorhanden\n"
-#: agent/trustlist.c:228
+#: agent/trustlist.c:231
#, c-format
msgid "bad fingerprint in `%s', line %d\n"
msgstr "fehlerhafter Fingerabdruck in `%s', Zeile %d\n"
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:256 agent/trustlist.c:263
#, c-format
msgid "invalid keyflag in `%s', line %d\n"
msgstr "Ungültiges Schlüsselflag in `%s', Zeile %d\n"
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:297 common/helpfile.c:126
#, c-format
msgid "error reading `%s', line %d: %s\n"
msgstr "Fehler beim Lesen von `%s', Zeile %d: %s\n"
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:401 agent/trustlist.c:451
msgid "error reading list of trusted root certificates\n"
msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
@@ -746,7 +746,7 @@ msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as stored in the
#. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:612
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
@@ -755,11 +755,11 @@ msgstr ""
"Wenn Sie vollständiges Vertrauen haben, daß%%0A \"%s\"%%"
"0ABenutzerzertifikate verläßlich zertifiziert, so antworten Sie mit \"Ja\"."
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:621 common/audit.c:467
msgid "Yes"
msgstr "Ja"
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:621 common/audit.c:469
msgid "No"
msgstr "Nein"
@@ -771,7 +771,7 @@ msgstr "Nein"
#. "%%25". The second "%s" gets replaced by a hexdecimal
#. fingerprint string whereas the first one receives the name
#. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:655
#, c-format
msgid ""
"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
@@ -783,11 +783,11 @@ msgstr ""
#. TRANSLATORS: "Correct" is the label of a button and intended
#. to be hit if the fingerprint matches the one of the CA. The
#. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:669
msgid "Correct"
msgstr "Korrekt"
-#: agent/trustlist.c:666
+#: agent/trustlist.c:669
msgid "Wrong"
msgstr "Falsch"
@@ -894,12 +894,12 @@ msgstr "Fehler bei Ausführung von `%s': beendet\n"
msgid "error getting exit code of process %d: %s\n"
msgstr "Fehler beim Holen des Exitwerte des Prozesses %d: %s\n"
-#: common/http.c:1568
+#: common/http.c:1597
#, c-format
msgid "error creating socket: %s\n"
msgstr "Fehler beim Erstellen des Sockets: %s\n"
-#: common/http.c:1612
+#: common/http.c:1641
msgid "host not found"
msgstr "Host nicht gefunden"
@@ -1005,9 +1005,9 @@ msgid "no running gpg-agent - starting `%s'\n"
msgstr "Kein aktiver gpg-agent - `%s' wird gestartet\n"
#: common/asshelp.c:436
-#, fuzzy, c-format
+#, c-format
msgid "waiting for the agent to come up ... (%ds)\n"
-msgstr "Warte %d Sekunden bis der gpg-agent bereit ist\n"
+msgstr "Warte bis der gpg-agent bereit ist ... (%ds)\n"
#: common/asshelp.c:445 common/asshelp.c:534
msgid "connection to agent established\n"
@@ -1023,9 +1023,9 @@ msgid "no running Dirmngr - starting `%s'\n"
msgstr "Kein aktiver Dirmngr - `%s' wird gestartet\n"
#: common/asshelp.c:630
-#, fuzzy, c-format
+#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
-msgstr "Warte %d Sekunden bis der Dirmngr bereit ist\n"
+msgstr "Warte bis der Dirmngr bereit ist ... (%ds)\n"
#: common/asshelp.c:639 common/asshelp.c:668
msgid "connection to the dirmngr established\n"
@@ -1552,7 +1552,7 @@ msgstr "Fehler: URL ist zu lang (Grenze beträgt %d Zeichen).\n"
msgid "error allocating enough memory: %s\n"
msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n"
-#: g10/card-util.c:814 g10/import.c:291 dirmngr/crlcache.c:649
+#: g10/card-util.c:814 g10/import.c:317 dirmngr/crlcache.c:649
#: dirmngr/crlcache.c:654 dirmngr/crlcache.c:908 dirmngr/crlcache.c:914
#: dirmngr/dirmngr.c:1412
#, c-format
@@ -1817,13 +1817,13 @@ msgstr "--output funktioniert nicht bei diesem Befehl\n"
msgid "can't open `%s'\n"
msgstr "'%s' kann nicht geöffnet werden\n"
-#: g10/delkey.c:73 g10/export.c:637 g10/keyedit.c:3355 g10/keyserver.c:1751
+#: g10/delkey.c:73 g10/export.c:691 g10/keyedit.c:3355 g10/keyserver.c:1134
#: g10/revoke.c:227
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
-#: g10/delkey.c:81 g10/export.c:701 g10/getkey.c:2881 g10/keyserver.c:1765
+#: g10/delkey.c:81 g10/export.c:755 g10/getkey.c:2881 g10/keyserver.c:1148
#: g10/revoke.c:233 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
@@ -2044,25 +2044,25 @@ msgstr "Während des Exports soviel wie möglich vom Schlüssel entfernen"
msgid "export keys in an S-expression based format"
msgstr "Exportiere Schlüssel in einem auf S-Ausdrücken basierenden Format"
-#: g10/export.c:652
+#: g10/export.c:706
msgid "exporting secret keys not allowed\n"
msgstr "Exportieren geheimer Schlüssel ist nicht erlaubt\n"
-#: g10/export.c:725
+#: g10/export.c:779
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "Schlüssel %s: PGP 2.x-artiger Schlüssel - übersprungen\n"
-#: g10/export.c:909
+#: g10/export.c:963
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "Schlüssel %s: Schlüsselmaterial ist auf einer Karte - übersprungen\n"
-#: g10/export.c:1008
+#: g10/export.c:1062
msgid " - skipped"
msgstr " - übersprungen"
-#: g10/export.c:1079
+#: g10/export.c:1133
msgid "WARNING: nothing exported\n"
msgstr "WARNUNG: Nichts exportiert\n"
@@ -2833,7 +2833,7 @@ msgstr "--edit-key User-ID [Befehle]"
msgid "--passwd <user-id>"
msgstr "--passwd User-ID"
-#: g10/gpg.c:3744
+#: g10/gpg.c:3744 g10/keyserver.c:1634
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
@@ -2950,92 +2950,92 @@ msgstr "entferne nach dem Import unbrauchbare Teile des Schlüssels"
msgid "remove as much as possible from key after import"
msgstr "nach dem Import soviel wie möglich aus dem Schlüssel entfernen"
-#: g10/import.c:277
+#: g10/import.c:303
#, c-format
msgid "skipping block of type %d\n"
msgstr "überspringe den Block vom Typ %d\n"
-#: g10/import.c:286
+#: g10/import.c:312
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu Schlüssel bislang bearbeitet\n"
-#: g10/import.c:303
+#: g10/import.c:329
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n"
-#: g10/import.c:305
+#: g10/import.c:331
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignorierte neue Schlüssel: %lu\n"
-#: g10/import.c:308
+#: g10/import.c:334
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ohne User-ID: %lu\n"
-#: g10/import.c:310 sm/import.c:130
+#: g10/import.c:336 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importiert: %lu"
-#: g10/import.c:316 sm/import.c:134
+#: g10/import.c:342 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " unverändert: %lu\n"
-#: g10/import.c:318
+#: g10/import.c:344
#, c-format
msgid " new user IDs: %lu\n"
msgstr " neue User-IDs: %lu\n"
-#: g10/import.c:320
+#: g10/import.c:346
#, c-format
msgid " new subkeys: %lu\n"
msgstr " neue Unterschlüssel: %lu\n"
-#: g10/import.c:322
+#: g10/import.c:348
#, c-format
msgid " new signatures: %lu\n"
msgstr " neue Signaturen: %lu\n"
-#: g10/import.c:324
+#: g10/import.c:350
#, c-format
msgid " new key revocations: %lu\n"
msgstr " neue Schlüsselwiderrufe: %lu\n"
-#: g10/import.c:326 sm/import.c:136
+#: g10/import.c:352 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " gelesene geheime Schlüssel: %lu\n"
-#: g10/import.c:328 sm/import.c:138
+#: g10/import.c:354 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " geheime Schlüssel importiert: %lu\n"
-#: g10/import.c:330 sm/import.c:140
+#: g10/import.c:356 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " unveränderte geh. Schl.: %lu\n"
-#: g10/import.c:332 sm/import.c:142
+#: g10/import.c:358 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " nicht importiert: %lu\n"
-#: g10/import.c:334
+#: g10/import.c:360
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " Signaturen bereinigt: %lu\n"
-#: g10/import.c:336
+#: g10/import.c:362
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " User-IDs bereinigt: %lu\n"
-#: g10/import.c:614
+#: g10/import.c:640
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@ -3044,328 +3044,328 @@ msgstr ""
"WARNUNG: Schlüssel %s hat Einstellungen zu nicht verfügbaren\n"
"Verfahren für folgende User-ID:\n"
-#: g10/import.c:655
+#: g10/import.c:681
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": Einstellungen des Verschlüsselungsverfahren %s\n"
-#: g10/import.c:670
+#: g10/import.c:696
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": Einstellungen der Hashmethode %s\n"
-#: g10/import.c:682
+#: g10/import.c:708
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": Einstellungen der Komprimierungsverfahren %s\n"
-#: g10/import.c:695
+#: g10/import.c:721
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "es ist extrem empfehlenswert Ihre Einstellungen zu ändern und\n"
-#: g10/import.c:697
+#: g10/import.c:723
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"diesen Schlüssel wieder zu verteilen, um mögliche Probleme durch unpassende "
"Verfahrenskombinationen zu vermeiden\n"
-#: g10/import.c:721
+#: g10/import.c:747
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"Sie können Ihren Einstellungen mittels \"gpg --edit-key %s updpref save\" "
"ändern\n"
-#: g10/import.c:775 g10/import.c:1403
+#: g10/import.c:801 g10/import.c:1429
#, c-format
msgid "key %s: no user ID\n"
msgstr "Schlüssel %s: Keine User-ID\n"
-#: g10/import.c:804
+#: g10/import.c:830
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "Schlüssel %s: PKS Unterschlüsseldefekt repariert\n"
-#: g10/import.c:819
+#: g10/import.c:845
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "Schlüssel %s: Nicht eigenbeglaubigte User-ID `%s' übernommen\n"
-#: g10/import.c:825
+#: g10/import.c:851
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "Schlüssel %s: Keine gültigen User-IDs\n"
-#: g10/import.c:827
+#: g10/import.c:853
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:837 g10/import.c:1523
+#: g10/import.c:863 g10/import.c:1549
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "Schlüssel %s: Öffentlicher Schlüssel nicht gefunden: %s\n"
-#: g10/import.c:843
+#: g10/import.c:869
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "Schlüssel %s: neuer Schlüssel - übersprungen\n"
-#: g10/import.c:852
+#: g10/import.c:878
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
-#: g10/import.c:857 g10/openfile.c:202 g10/openfile.c:293 g10/sign.c:874
+#: g10/import.c:883 g10/openfile.c:202 g10/openfile.c:293 g10/sign.c:874
#: g10/sign.c:1185
#, c-format
msgid "writing to `%s'\n"
msgstr "Schreiben nach '%s'\n"
-#: g10/import.c:861 g10/import.c:961 g10/import.c:1584
+#: g10/import.c:887 g10/import.c:987 g10/import.c:1610
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
-#: g10/import.c:880
+#: g10/import.c:906
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "Schlüssel %s: Öffentlicher Schlüssel \"%s\" importiert\n"
-#: g10/import.c:904
+#: g10/import.c:930
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "Schlüssel %s: Stimmt nicht mit unserer Kopie überein\n"
-#: g10/import.c:921 g10/import.c:1541
+#: g10/import.c:947 g10/import.c:1567
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "Schlüssel %s: der originale Schlüsselblock wurde nicht gefunden: %s\n"
-#: g10/import.c:929 g10/import.c:1548
+#: g10/import.c:955 g10/import.c:1574
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "Schlüssel %s: Lesefehler im originalen Schlüsselblock: %s\n"
-#: g10/import.c:971
+#: g10/import.c:997
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "Schlüssel %s: \"%s\" 1 neue User-ID\n"
-#: g10/import.c:974
+#: g10/import.c:1000
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "Schlüssel %s: \"%s\" %d neue User-IDs\n"
-#: g10/import.c:977
+#: g10/import.c:1003
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "Schlüssel %s: \"%s\" 1 neue Signatur\n"
-#: g10/import.c:980
+#: g10/import.c:1006
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "Schlüssel %s: \"%s\" %d neue Signaturen\n"
-#: g10/import.c:983
+#: g10/import.c:1009
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "Schlüssel %s: \"%s\" 1 neuer Unterschlüssel\n"
-#: g10/import.c:986
+#: g10/import.c:1012
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "Schlüssel %s: \"%s\" %d neue Unterschlüssel\n"
-#: g10/import.c:989
+#: g10/import.c:1015
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
-#: g10/import.c:992
+#: g10/import.c:1018
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
-#: g10/import.c:995
+#: g10/import.c:1021
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d User-ID bereinigt\n"
-#: g10/import.c:998
+#: g10/import.c:1024
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d User-IDs bereinigt\n"
-#: g10/import.c:1021
+#: g10/import.c:1047
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "Schlüssel %s: \"%s\" nicht geändert\n"
-#: g10/import.c:1275 g10/import.c:1468
+#: g10/import.c:1301 g10/import.c:1494
#, c-format
msgid "key %s: secret key imported\n"
msgstr "Schlüssel %s: geheimer Schlüssel importiert\n"
-#: g10/import.c:1282
+#: g10/import.c:1308
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "Schlüssel %s: geheimer Schlüssel bereits vorhanden\n"
-#: g10/import.c:1289
+#: g10/import.c:1315
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "Schlüssel %s: Fehler beim Senden zum gpg-agent: %s\n"
-#: g10/import.c:1419
+#: g10/import.c:1445
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
"Schlüssel %s: geheimer Schlüssel mit ungültiger Verschlüsselung %d - "
"übersprungen\n"
-#: g10/import.c:1430
+#: g10/import.c:1456
msgid "importing secret keys not allowed\n"
msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
-#: g10/import.c:1481
+#: g10/import.c:1507
#, c-format
msgid "key %s: secret key part already available\n"
msgstr "Schlüssel %s: Die geheimen Teile sind bereits vorhanden\n"
-#: g10/import.c:1516
+#: g10/import.c:1542
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"Schlüssel %s: Kein öffentlicher Schlüssel - der Schlüsselwiderruf kann nicht "
"angebracht werden\n"
-#: g10/import.c:1559
+#: g10/import.c:1585
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n"
-#: g10/import.c:1591
+#: g10/import.c:1617
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat importiert\n"
-#: g10/import.c:1667
+#: g10/import.c:1693
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "Schlüssel %s: Keine User-ID für Signatur\n"
-#: g10/import.c:1684
+#: g10/import.c:1710
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren für User-ID \"%s\"\n"
-#: g10/import.c:1686
+#: g10/import.c:1712
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "Schlüssel %s: Ungültige Eigenbeglaubigung für User-ID \"%s\"\n"
-#: g10/import.c:1703 g10/import.c:1729 g10/import.c:1780
+#: g10/import.c:1729 g10/import.c:1755 g10/import.c:1806
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren\n"
-#: g10/import.c:1704
+#: g10/import.c:1730
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "Schlüssel %s: Ungültige \"direct-key\"-Signatur\n"
-#: g10/import.c:1718
+#: g10/import.c:1744
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselanbindung\n"
-#: g10/import.c:1731
+#: g10/import.c:1757
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "Schlüssel %s: Ungültige Unterschlüssel-Anbindung\n"
-#: g10/import.c:1747
+#: g10/import.c:1773
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "Schlüssel %s: Mehrfache Unterschlüssel-Anbindung entfernt\n"
-#: g10/import.c:1769
+#: g10/import.c:1795
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "Schlüssel %s: Kein Unterschlüssel für Schlüsselwiderruf\n"
-#: g10/import.c:1782
+#: g10/import.c:1808
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "Schlüssel %s: Ungültiger Unterschlüsselwiderruf\n"
-#: g10/import.c:1797
+#: g10/import.c:1823
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "Schlüssel %s: Mehrfacher Unterschlüsselwiderruf entfernt\n"
-#: g10/import.c:1839
+#: g10/import.c:1865
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "Schlüssel %s: User-ID übersprungen \"%s\"\n"
-#: g10/import.c:1860
+#: g10/import.c:1886
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "Schlüssel %s: Unterschlüssel übersprungen\n"
-#: g10/import.c:1887
+#: g10/import.c:1913
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr ""
"Schlüssel %s: Nicht exportfähige Signatur (Klasse %02x) - übersprungen\n"
-#: g10/import.c:1897
+#: g10/import.c:1923
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "Schlüssel %s: Widerrufzertifikat an falschem Platz - übersprungen\n"
-#: g10/import.c:1914
+#: g10/import.c:1940
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - übersprungen\n"
-#: g10/import.c:1928
+#: g10/import.c:1954
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr ""
"Schlüssel %s: Unterschlüssel-Widerrufzertifikat an falschem Platz - "
"übersprungen\n"
-#: g10/import.c:1936
+#: g10/import.c:1962
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "Schlüssel %s: unerwartete Signaturklasse (0x%02x) - übersprungen\n"
-#: g10/import.c:2065
+#: g10/import.c:2091
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "Schlüssel %s: Doppelte User-ID entdeckt - zusammengeführt\n"
-#: g10/import.c:2127
+#: g10/import.c:2153
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "WARNUNG: Schlüssel %s ist u.U. widerrufen: hole Widerrufschlüssel %s\n"
-#: g10/import.c:2142
+#: g10/import.c:2168
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"WARNUNG: Schlüssel %s ist u.U. widerrufen: Widerrufschlüssel %s ist nicht "
"vorhanden\n"
-#: g10/import.c:2201
+#: g10/import.c:2227
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat hinzugefügt\n"
-#: g10/import.c:2235
+#: g10/import.c:2261
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "Schlüssel %s: \"direct-key\"-Signaturen hinzugefügt\n"
@@ -4048,7 +4048,7 @@ msgstr ""
msgid "(sensitive)"
msgstr "(empfindlich)"
-#: g10/keyedit.c:2775 g10/keyedit.c:2888 g10/keyserver.c:552
+#: g10/keyedit.c:2775 g10/keyedit.c:2888 g10/keyserver.c:557
#, c-format
msgid "created: %s"
msgstr "erzeugt: %s"
@@ -4064,7 +4064,7 @@ msgid "expired: %s"
msgstr "verfallen: %s"
#: g10/keyedit.c:2782 g10/keyedit.c:2890 g10/keylist.c:822 g10/keylist.c:945
-#: g10/keyserver.c:558 g10/mainproc.c:1014
+#: g10/keyserver.c:563 g10/mainproc.c:1014
#, c-format
msgid "expires: %s"
msgstr "verfällt: %s"
@@ -4100,13 +4100,13 @@ msgstr ""
"Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
"Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
-#: g10/keyedit.c:2907 g10/keyedit.c:3219 g10/keyserver.c:562
+#: g10/keyedit.c:2907 g10/keyedit.c:3219 g10/keyserver.c:567
#: g10/mainproc.c:1874 g10/trustdb.c:1202 g10/trustdb.c:1731
#: dirmngr/ocsp.c:699
msgid "revoked"
msgstr "widerrufen"
-#: g10/keyedit.c:2909 g10/keyedit.c:3221 g10/keyserver.c:566
+#: g10/keyedit.c:2909 g10/keyedit.c:3221 g10/keyserver.c:571
#: g10/mainproc.c:1876 g10/trustdb.c:549 g10/trustdb.c:1733
msgid "expired"
msgstr "verfallen"
@@ -4975,179 +4975,122 @@ msgstr "%lu Schlüssel gepuffert (%lu Beglaubigungen)\n"
msgid "%s: keyring created\n"
msgstr "%s: Schlüsselbund erstellt\n"
-#: g10/keyserver.c:94
+#: g10/keyserver.c:97
msgid "include revoked keys in search results"
msgstr "Widerrufene Schlüssel in den Suchergebnissen aufführen"
-#: g10/keyserver.c:95
+#: g10/keyserver.c:98
msgid "include subkeys when searching by key ID"
msgstr "Unterschlüssel in der Suche über Schlüssel-IDs aufführen"
-#: g10/keyserver.c:97
+#: g10/keyserver.c:100
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
"verwende temporäre Dateien, um Daten an die Schlüsselserverhilfsprogramme zu "
"geben"
-#: g10/keyserver.c:99
+#: g10/keyserver.c:102
msgid "do not delete temporary files after using them"
msgstr "Temporäre Dateien nach Nutzung nicht löschen"
-#: g10/keyserver.c:103
+#: g10/keyserver.c:106
msgid "automatically retrieve keys when verifying signatures"
msgstr "Schlüssel für die Signaturprüfung automatisch holen"
-#: g10/keyserver.c:105
+#: g10/keyserver.c:108
msgid "honor the preferred keyserver URL set on the key"
msgstr ""
"Die im Schlüssel enthaltene bevorzugte URL für Schlüsselserver beachten"
-#: g10/keyserver.c:107
+#: g10/keyserver.c:110
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "Die im Schlüssel enthaltenen PKA-Daten beim Schlüsselholen beachten"
-#: g10/keyserver.c:173
+#: g10/keyserver.c:178
#, c-format
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr ""
"WARNUNG: Schlüsselserver-Option `%s' wird auf dieser Plattform nicht "
"verwendet\n"
-#: g10/keyserver.c:564
+#: g10/keyserver.c:569
msgid "disabled"
msgstr "abgeschaltet"
-#: g10/keyserver.c:764
+#: g10/keyserver.c:773
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Eingabe von Nummern, Nächste (N) oder Abbrechen (Q) > "
-#: g10/keyserver.c:834 g10/keyserver.c:1471
+#: g10/keyserver.c:867
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "Ungültiges Schlüsselserverprotokoll (wir %d!=Handhabungsroutine %d)\n"
-#: g10/keyserver.c:1190
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "fordere Schlüssel %s von %s-Server %s an\n"
-
-#: g10/keyserver.c:1194
-#, c-format
-msgid "requesting key %s from %s\n"
-msgstr "fordere Schlüssel %s von %s an\n"
-
-#: g10/keyserver.c:1218
-#, c-format
-msgid "searching for names from %s server %s\n"
-msgstr "suche Namen auf %s-Server %s\n"
-
-#: g10/keyserver.c:1221
-#, c-format
-msgid "searching for names from %s\n"
-msgstr "suche Namen auf %s\n"
-
-#: g10/keyserver.c:1374
+#: g10/keyserver.c:1008 g10/keyserver.c:1043
#, c-format
-msgid "sending key %s to %s server %s\n"
-msgstr "sende Schlüssel %s auf den %s-Server %s\n"
-
-#: g10/keyserver.c:1378
-#, c-format
-msgid "sending key %s to %s\n"
-msgstr "sende Schlüssel %s auf %s\n"
+msgid "\"%s\" not a key ID: skipping\n"
+msgstr "\"%s\" ist keine Schlüssel-ID: überspringe\n"
-#: g10/keyserver.c:1421
+#: g10/keyserver.c:1303
#, c-format
-msgid "searching for \"%s\" from %s server %s\n"
-msgstr "suche nach \"%s\" auf %s-Server %s\n"
+msgid "WARNING: unable to refresh key %s via %s: %s\n"
+msgstr "WARNUNG: Schlüssel %s kann per %s nicht aktualisiert werden: %s\n"
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1325
#, c-format
-msgid "searching for \"%s\" from %s\n"
-msgstr "suche nach \"%s\" auf %s\n"
-
-#: g10/keyserver.c:1431 g10/keyserver.c:1528
-msgid "no keyserver action!\n"
-msgstr "Kein Schlüsselserver-Vorgang\n"
+msgid "refreshing 1 key from %s\n"
+msgstr "ein Schlüssel wird per %s aktualisiert\n"
-#: g10/keyserver.c:1479
+#: g10/keyserver.c:1327
#, c-format
-msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
-msgstr ""
-"WARNUNG: Die Schlüsselserver-Handhabungsroutine stammt von einer anderen "
-"GnuPG-Version (%s)\n"
-
-#: g10/keyserver.c:1488
-msgid "keyserver did not send VERSION\n"
-msgstr "Schlüsselserver sendete VERSION nicht\n"
+msgid "refreshing %d keys from %s\n"
+msgstr "%d Schlüssel werden per %s aktualisiert\n"
-#: g10/keyserver.c:1553 g10/keyserver.c:1983 g10/keyserver.c:2180
+#: g10/keyserver.c:1363 g10/keyserver.c:1415 g10/keyserver.c:1604
+#: g10/keyserver.c:1754
msgid "no keyserver known (use option --keyserver)\n"
msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1408
#, c-format
-msgid "no handler for keyserver scheme `%s'\n"
-msgstr "Keine Handhabungsroutine für Schlüsselserverschema `%s'\n"
-
-#: g10/keyserver.c:1570
-#, c-format
-msgid "action `%s' not supported with keyserver scheme `%s'\n"
-msgstr "Vorgang `%s' wird vom Schlüsselserverschema `%s' nicht unterstützt\n"
-
-#: g10/keyserver.c:1578
-#, c-format
-msgid "%s does not support handler version %d\n"
-msgstr "%s unterstützt Hilfsroutinenversion %d nicht\n"
-
-#: g10/keyserver.c:1585
-msgid "keyserver timed out\n"
-msgstr "Schlüsselserver-Zeitüberschreitung\n"
-
-#: g10/keyserver.c:1590
-msgid "keyserver internal error\n"
-msgstr "interner Fehler Schlüsselserver\n"
+msgid "key \"%s\" not found on keyserver\n"
+msgstr "Schlüssel \"%s\" wurde auf dem Schlüsselserver nicht gefunden\n"
-#: g10/keyserver.c:1599
-#, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "Schlüsselserver-Datenübertragunsfehler: %s\n"
+#: g10/keyserver.c:1411
+msgid "key not found on keyserver\n"
+msgstr "Schlüssel wurde auf dem Schlüsselserver nicht gefunden\n"
-#: g10/keyserver.c:1624 g10/keyserver.c:1659
+#: g10/keyserver.c:1548
#, c-format
-msgid "\"%s\" not a key ID: skipping\n"
-msgstr "\"%s\" ist keine Schlüssel-ID: überspringe\n"
+msgid "requesting key %s from %s server %s\n"
+msgstr "fordere Schlüssel %s von %s-Server %s an\n"
-#: g10/keyserver.c:1922
+#: g10/keyserver.c:1552
#, c-format
-msgid "WARNING: unable to refresh key %s via %s: %s\n"
-msgstr "WARNUNG: Schlüssel %s kann per %s nicht aktualisiert werden: %s\n"
+msgid "requesting key %s from %s\n"
+msgstr "fordere Schlüssel %s von %s an\n"
-#: g10/keyserver.c:1944
+#: g10/keyserver.c:1618 g10/skclist.c:191 g10/skclist.c:219
#, c-format
-msgid "refreshing 1 key from %s\n"
-msgstr "ein Schlüssel wird per %s aktualisiert\n"
+msgid "skipped \"%s\": %s\n"
+msgstr "übersprungen \"%s\": %s\n"
-#: g10/keyserver.c:1946
+#: g10/keyserver.c:1622
#, c-format
-msgid "refreshing %d keys from %s\n"
-msgstr "%d Schlüssel werden per %s aktualisiert\n"
+msgid "sending key %s to %s server %s\n"
+msgstr "sende Schlüssel %s auf den %s-Server %s\n"
-#: g10/keyserver.c:2028
+#: g10/keyserver.c:1626
#, c-format
-msgid "key \"%s\" not found on keyserver\n"
-msgstr "Schlüssel \"%s\" wurde auf dem Schlüsselserver nicht gefunden\n"
-
-#: g10/keyserver.c:2031
-msgid "key not found on keyserver\n"
-msgstr "Schlüssel wurde auf dem Schlüsselserver nicht gefunden\n"
+msgid "sending key %s to %s\n"
+msgstr "sende Schlüssel %s auf %s\n"
-#: g10/keyserver.c:2099
+#: g10/keyserver.c:1673
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "WARNUNG: die URI %s kann nicht geholt werden: %s\n"
-#: g10/keyserver.c:2105
+#: g10/keyserver.c:1679
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "WARNUNG: die URI %s kann nicht analysiert werden\n"
@@ -6266,11 +6209,6 @@ msgstr ""
msgid "skipped \"%s\": duplicated\n"
msgstr "übersprungen \"%s\": doppelt\n"
-#: g10/skclist.c:191 g10/skclist.c:219
-#, c-format
-msgid "skipped \"%s\": %s\n"
-msgstr "übersprungen \"%s\": %s\n"
-
#: g10/skclist.c:201
msgid "skipped: secret key already present\n"
msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n"
@@ -8706,7 +8644,7 @@ msgstr "Erhielt Status: `%s'\n"
msgid "error writing base64 encoding: %s\n"
msgstr "Fehler beim Schreiben der Base-64 Darstellung: %s\n"
-#: dirmngr/dirmngr-client.c:453 dirmngr/server.c:1672
+#: dirmngr/dirmngr-client.c:453 dirmngr/server.c:1804
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "Fehler beim Bereitstellen eines Assuan Kontext: %s\n"
@@ -8883,12 +8821,12 @@ msgstr "Gebrauch: dirmngr [Optionen] "
msgid "colons are not allowed in the socket name\n"
msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n"
-#: dirmngr/dirmngr.c:1164 dirmngr/server.c:1179
+#: dirmngr/dirmngr.c:1164 dirmngr/server.c:1185
#, c-format
msgid "fetching CRL from `%s' failed: %s\n"
msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
-#: dirmngr/dirmngr.c:1170 dirmngr/server.c:1185
+#: dirmngr/dirmngr.c:1170 dirmngr/server.c:1191
#, c-format
msgid "processing CRL from `%s' failed: %s\n"
msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
@@ -9377,71 +9315,71 @@ msgstr "OCSP Responder gab einen nicht aktuellen Status zurück\n"
msgid "OCSP responder returned an too old status\n"
msgstr "OCSP Responder gab einen zu alten Status zurück\n"
-#: dirmngr/server.c:285 dirmngr/server.c:397 dirmngr/server.c:443
+#: dirmngr/server.c:291 dirmngr/server.c:403 dirmngr/server.c:449
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assuan_inquire(%s) fehlgeschlagen: %s\n"
-#: dirmngr/server.c:540
+#: dirmngr/server.c:546
msgid "ldapserver missing"
msgstr "LDAP Server fehlt"
-#: dirmngr/server.c:610
+#: dirmngr/server.c:616
msgid "serialno missing in cert ID"
msgstr "Seriennummer fehlt in der Cert-ID"
-#: dirmngr/server.c:746 dirmngr/server.c:832 dirmngr/server.c:1264
-#: dirmngr/server.c:1315
+#: dirmngr/server.c:752 dirmngr/server.c:838 dirmngr/server.c:1270
+#: dirmngr/server.c:1321 dirmngr/server.c:1578 dirmngr/server.c:1594
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assuan_inquire fehlgeschlagen: %s\n"
-#: dirmngr/server.c:875
+#: dirmngr/server.c:881
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fetch_cert_by_url() fehlgeschlagen: %s\n"
-#: dirmngr/server.c:887 dirmngr/server.c:918 dirmngr/server.c:1074
+#: dirmngr/server.c:893 dirmngr/server.c:924 dirmngr/server.c:1080
#, c-format
msgid "error sending data: %s\n"
msgstr "Fehler beim Senden der Daten: %s\n"
-#: dirmngr/server.c:1022
+#: dirmngr/server.c:1028
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "start_cert_fetch fehlgeschlagen: %s\n"
-#: dirmngr/server.c:1055
+#: dirmngr/server.c:1061
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fetch_next_cert fehlgeschlagen: %s\n"
-#: dirmngr/server.c:1082
+#: dirmngr/server.c:1088
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d überschritten\n"
-#: dirmngr/server.c:1661
+#: dirmngr/server.c:1793
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "Fehler beim Erzeugen der Kontrollstruktur: %s\n"
-#: dirmngr/server.c:1693
+#: dirmngr/server.c:1825
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "Fehler beim Initialisieren des Servers: %s\n"
-#: dirmngr/server.c:1701
+#: dirmngr/server.c:1833
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "Fehler beim Registrieren der Kommandos gegen Assuan: %s\n"
-#: dirmngr/server.c:1741
+#: dirmngr/server.c:1873
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan accept Problem: %s\n"
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1892
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuan Verarbeitung fehlgeschlagen: %s\n"
@@ -9971,6 +9909,48 @@ msgstr ""
"Syntax: gpg-check-pattern [optionen] Musterdatei\n"
"Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
+#~ msgid "searching for names from %s server %s\n"
+#~ msgstr "suche Namen auf %s-Server %s\n"
+
+#~ msgid "searching for names from %s\n"
+#~ msgstr "suche Namen auf %s\n"
+
+#~ msgid "searching for \"%s\" from %s server %s\n"
+#~ msgstr "suche nach \"%s\" auf %s-Server %s\n"
+
+#~ msgid "searching for \"%s\" from %s\n"
+#~ msgstr "suche nach \"%s\" auf %s\n"
+
+#~ msgid "no keyserver action!\n"
+#~ msgstr "Kein Schlüsselserver-Vorgang\n"
+
+#~ msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
+#~ msgstr ""
+#~ "WARNUNG: Die Schlüsselserver-Handhabungsroutine stammt von einer anderen "
+#~ "GnuPG-Version (%s)\n"
+
+#~ msgid "keyserver did not send VERSION\n"
+#~ msgstr "Schlüsselserver sendete VERSION nicht\n"
+
+#~ msgid "no handler for keyserver scheme `%s'\n"
+#~ msgstr "Keine Handhabungsroutine für Schlüsselserverschema `%s'\n"
+
+#~ msgid "action `%s' not supported with keyserver scheme `%s'\n"
+#~ msgstr ""
+#~ "Vorgang `%s' wird vom Schlüsselserverschema `%s' nicht unterstützt\n"
+
+#~ msgid "%s does not support handler version %d\n"
+#~ msgstr "%s unterstützt Hilfsroutinenversion %d nicht\n"
+
+#~ msgid "keyserver timed out\n"
+#~ msgstr "Schlüsselserver-Zeitüberschreitung\n"
+
+#~ msgid "keyserver internal error\n"
+#~ msgstr "interner Fehler Schlüsselserver\n"
+
+#~ msgid "keyserver communications error: %s\n"
+#~ msgstr "Schlüsselserver-Datenübertragunsfehler: %s\n"
+
#~ msgid "connection to agent established (%ds)\n"
#~ msgstr "Verbindung zum gpg-agent aufgebaut (%ds)\n"
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 +
NEWS | 3 +
common/ChangeLog | 11 ++
common/http.c | 27 ++-
configure.ac | 8 +-
po/ChangeLog | 4 +
po/de.po | 468 ++++++++++++++++++++++++++----------------------------
7 files changed, 269 insertions(+), 256 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list