Add dirmngr options to gpgconf and updated the DE translation

4 files changed, 118 insertions, 107 deletions

diff --git a/doc/debugging.texi b/doc/debugging.texi
index b9ae06e2b..49ab70bde 100644
--- a/doc/debugging.texi
+++ b/doc/debugging.texi
@@ -101,7 +101,7 @@ i.e. @samp{GPG_TTY=tty} is plainly wrong; what you want is
 this environment variable gets exported, that is you should follow up
 the setting with an @samp{export GPG_TTY} (assuming a Bourne style
 shell). Even for GUI based Pinentries; you should have set
-@code{GPG_TTY}. See the section on installing the @program{gpg-agent}
+@code{GPG_TTY}. See the section on installing the @command{gpg-agent}
 on how to do it.
 
 
diff --git a/po/de.po b/po/de.po
index 16d945418..1c85954d8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg2 1.9.10\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2004-10-22 15:02+0200\n"
-"PO-Revision-Date: 2004-10-22 15:02+0200\n"
+"POT-Creation-Date: 2004-11-24 15:41+0100\n"
+"PO-Revision-Date: 2004-11-24 15:43+0100\n"
 "Last-Translator: Werner Koch <wk@gnupg.org>\n"
 "Language-Team: de\n"
 "MIME-Version: 1.0\n"
@@ -34,12 +34,12 @@ msgstr "Im Server Modus ausführen"
 msgid "run in daemon mode (background)"
 msgstr "Im Daemon Modus ausführen"
 
-#: agent/gpg-agent.c:101 kbx/kbxutil.c:81 scd/scdaemon.c:97 sm/gpgsm.c:315
+#: agent/gpg-agent.c:101 kbx/kbxutil.c:81 scd/scdaemon.c:97 sm/gpgsm.c:317
 #: tools/gpgconf.c:62
 msgid "verbose"
 msgstr "ausführlich"
 
-#: agent/gpg-agent.c:102 kbx/kbxutil.c:82 scd/scdaemon.c:98 sm/gpgsm.c:316
+#: agent/gpg-agent.c:102 kbx/kbxutil.c:82 scd/scdaemon.c:98 sm/gpgsm.c:318
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Ausgaben erzeugen"
 
@@ -63,7 +63,7 @@ msgstr "Im Vordergrund laufen lassen"
 msgid "do not grab keyboard and mouse"
 msgstr "Tastatur und Maus nicht \"grabben\""
 
-#: agent/gpg-agent.c:112 scd/scdaemon.c:108 sm/gpgsm.c:318
+#: agent/gpg-agent.c:112 scd/scdaemon.c:108 sm/gpgsm.c:320
 msgid "use a log file for the server"
 msgstr "Logausgaben in eine Datei umlenken"
 
@@ -100,12 +100,12 @@ msgid "allow clients to mark keys as \"trusted\""
 msgstr "erlaube Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
 
 #: agent/gpg-agent.c:195 agent/protect-tool.c:134 scd/scdaemon.c:168
-#: sm/gpgsm.c:485 tools/gpgconf.c:85
+#: sm/gpgsm.c:487 tools/gpgconf.c:85
 msgid "Please report bugs to <"
 msgstr "Fehlerberichte bitte an <"
 
 #: agent/gpg-agent.c:195 agent/protect-tool.c:134 scd/scdaemon.c:168
-#: sm/gpgsm.c:485 tools/gpgconf.c:85
+#: sm/gpgsm.c:487 tools/gpgconf.c:85
 msgid ">.\n"
 msgstr ">.\n"
 
@@ -121,30 +121,30 @@ msgstr ""
 "Syntax: gpg-agent [Optionen] [Kommando [Argumente]]\n"
 "Verwaltung von geheimen Schlüssel für GnuPG\n"
 
-#: agent/gpg-agent.c:271 scd/scdaemon.c:242 sm/gpgsm.c:603
+#: agent/gpg-agent.c:271 scd/scdaemon.c:242 sm/gpgsm.c:605
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
 #: agent/gpg-agent.c:448 agent/protect-tool.c:1050 kbx/kbxutil.c:431
-#: scd/scdaemon.c:357 sm/gpgsm.c:726
+#: scd/scdaemon.c:357 sm/gpgsm.c:728
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 "Die Bibliothek \"libgcrypt\" is zu alt (benötigt wird %s, vorhanden ist %s)\n"
 
-#: agent/gpg-agent.c:521 scd/scdaemon.c:437 sm/gpgsm.c:824
+#: agent/gpg-agent.c:521 scd/scdaemon.c:437 sm/gpgsm.c:826
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Notiz: Voreingestellte Konfigurationsdatei `%s' fehlt\n"
 
 #: agent/gpg-agent.c:526 agent/gpg-agent.c:1000 scd/scdaemon.c:442
-#: sm/gpgsm.c:828
+#: sm/gpgsm.c:830
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Konfigurationsdatei `%s': %s\n"
 
-#: agent/gpg-agent.c:534 scd/scdaemon.c:450 sm/gpgsm.c:835
+#: agent/gpg-agent.c:534 scd/scdaemon.c:450 sm/gpgsm.c:837
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus `%s' gelesen\n"
@@ -327,12 +327,12 @@ msgstr "Vom Benutzer abgebrochen\n"
 msgid "problem with the agent\n"
 msgstr "Problem mit dem Agenten\n"
 
-#: jnlib/logging.c:621
+#: jnlib/logging.c:625
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben einen Bug (Softwarefehler) gefunden ... (%s:%d)\n"
 
-#: kbx/kbxutil.c:68 sm/gpgsm.c:226 tools/gpgconf.c:53
+#: kbx/kbxutil.c:68 sm/gpgsm.c:227 tools/gpgconf.c:53
 msgid ""
 "@Commands:\n"
 " "
@@ -340,7 +340,7 @@ msgstr ""
 "@Kommandos:\n"
 " "
 
-#: kbx/kbxutil.c:76 sm/gpgsm.c:261 tools/gpgconf.c:59
+#: kbx/kbxutil.c:76 sm/gpgsm.c:262 tools/gpgconf.c:59
 msgid ""
 "@\n"
 "Options:\n"
@@ -350,7 +350,7 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: kbx/kbxutil.c:83 sm/gpgsm.c:323 tools/gpgconf.c:64
+#: kbx/kbxutil.c:83 sm/gpgsm.c:325 tools/gpgconf.c:64
 msgid "do not make any changes"
 msgstr "Keine Änderungen durchführen"
 
@@ -382,7 +382,7 @@ msgstr ""
 "Syntax: kbxutil [Optionen] [Dateien]\n"
 "Anlistem exportieren und Importieren von KeyBox Dateien\n"
 
-#: scd/scdaemon.c:101 sm/gpgsm.c:335
+#: scd/scdaemon.c:101 sm/gpgsm.c:337
 msgid "read options from file"
 msgstr "Konfigurationsoptionen aus Datei lesen"
 
@@ -529,20 +529,20 @@ msgstr "Kein aktiver gpg-agent - es wird einer gestarted\n"
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "Verbindung zum gpg-agent nicht möglich - Ersatzmethode wird versucht\n"
 
-#: sm/call-dirmngr.c:164
+#: sm/call-dirmngr.c:173
 msgid "no running dirmngr - starting one\n"
 msgstr "Kein aktiver Dirmngr - es wird einer gestartet\n"
 
-#: sm/call-dirmngr.c:202
+#: sm/call-dirmngr.c:213
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "Die Variable DIRMNGR_INFO ist fehlerhaft\n"
 
-#: sm/call-dirmngr.c:214
+#: sm/call-dirmngr.c:225
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "Die Dirmngr Protokollversion %d wird nicht unterstützt\n"
 
-#: sm/call-dirmngr.c:225
+#: sm/call-dirmngr.c:239
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 "Verbindung zum Dirmngr kann nicht aufgebaut werden - Ersatzmethode wird "
@@ -788,239 +788,243 @@ msgstr "Schwacher Schlüssel - es wird erneut versucht\n"
 msgid "no valid recipients given\n"
 msgstr "Keine gültigen Empfänger angegeben\n"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:229
 msgid "|[FILE]|make a signature"
 msgstr "|[DATEI]|Erzeuge eine Signatur"
 
-#: sm/gpgsm.c:229
+#: sm/gpgsm.c:230
 msgid "|[FILE]|make a clear text signature"
 msgstr "|[DATEI]|Erzeuge eine Klartextsignatur"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "make a detached signature"
 msgstr "Erzeuge eine abgetrennte Signatur"
 
-#: sm/gpgsm.c:231
+#: sm/gpgsm.c:232
 msgid "encrypt data"
 msgstr "Verschlüssele die Daten"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "encryption only with symmetric cipher"
 msgstr "Verschlüsselung nur mit symmetrischem Algrithmus"
 
-#: sm/gpgsm.c:233
+#: sm/gpgsm.c:234
 msgid "decrypt data (default)"
 msgstr "Enschlüssele die Daten"
 
-#: sm/gpgsm.c:234
+#: sm/gpgsm.c:235
 msgid "verify a signature"
 msgstr "Überprüfen einer Signatur"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:237
 msgid "list keys"
 msgstr "Schlüssel anzeigen"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:238
 msgid "list external keys"
 msgstr "Externe Schlüssel anzeigen"
 
-#: sm/gpgsm.c:238
+#: sm/gpgsm.c:239
 msgid "list secret keys"
 msgstr "Geheime Schlüssel anzeigen"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:240
 msgid "list certificate chain"
 msgstr "Schlüssel mit Zertifikatekette anzeigen"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "list keys and fingerprints"
 msgstr "Schlüssel und Fingerprint anzeigen"
 
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:243
 msgid "generate a new key pair"
 msgstr "Neues Schlüsselpaar erzeugen"
 
-#: sm/gpgsm.c:243
+#: sm/gpgsm.c:244
 msgid "remove key from the public keyring"
 msgstr "Schlüssel aus dem öffentlichen Schlüsselbund löschen"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:245
 msgid "export keys to a key server"
 msgstr "Schlüssen an eine Schlüsselserver exportieren"
 
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:246
 msgid "import keys from a key server"
 msgstr "Schlüssel von einem Schlüsselserver importieren"
 
-#: sm/gpgsm.c:246
+#: sm/gpgsm.c:247
 msgid "import certificates"
 msgstr "Zertifikate importieren"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:248
 msgid "export certificates"
 msgstr "Zertifikate exportieren"
 
-#: sm/gpgsm.c:248
+#: sm/gpgsm.c:249
 msgid "register a smartcard"
 msgstr "Smartcard registrieren"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "run in server mode"
 msgstr "Im Server Modus ausführen"
 
-#: sm/gpgsm.c:250
+#: sm/gpgsm.c:251
 msgid "pass a command to the dirmngr"
 msgstr "Das Kommand an den Dirmngr durchreichen"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "invoke gpg-protect-tool"
 msgstr "Rufe das gpg-protect-tool auf"
 
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:254
 msgid "change a passphrase"
 msgstr "Das Mantra (Passphrase) ändern"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:264
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII Hülle wird erzeugt"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:266
 msgid "create base-64 encoded output"
 msgstr "Ausgabe im Basis-64 format erzeugen"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:268
 msgid "assume input is in PEM format"
 msgstr "Eingabedaten sind im PEM Format"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:270
 msgid "assume input is in base-64 format"
 msgstr "Eingabedaten sind im Basis-64 Format"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:272
 msgid "assume input is in binary format"
 msgstr "Eingabedaten sind im Binärformat"
 
-#: sm/gpgsm.c:273
+#: sm/gpgsm.c:274
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschlüsseln für NAME"
 
-#: sm/gpgsm.c:276
+#: sm/gpgsm.c:277
+msgid "use system's dirmngr if available"
+msgstr "Benutze den System Dirmngr when verfügbar"
+
+#: sm/gpgsm.c:278
 msgid "never consult a CRL"
 msgstr "Niemals eine CRL konsultieren"
 
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
 msgid "check validity using OCSP"
 msgstr "Die Gültigkeit mittels OCSP prüfen"
 
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:286
 msgid "|N|number of certificates to include"
 msgstr "|N|Sende N Zertifikate mit"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "|FILE|take policy information from FILE"
 msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:292
 msgid "do not check certificate policies"
 msgstr "Zertikikatrichtlinien nicht überprüfen"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:296
 msgid "fetch missing issuer certificates"
 msgstr "Fehlende Zertifikate automatisch holen"
 
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:300
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|Benutze NAME als voreingestellten Empfänger"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:302
 msgid "use the default key as default recipient"
 msgstr "Benuzte voreingestellten Schlüssel als Standardempfänger"
 
-#: sm/gpgsm.c:306
+#: sm/gpgsm.c:308
 msgid "use this user-id to sign or decrypt"
 msgstr "Benuzte diese Benutzer ID zum Signieren oder Entschlüsseln"
 
-#: sm/gpgsm.c:309
+#: sm/gpgsm.c:311
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|Benutze Komprimierungsstufe N"
 
-#: sm/gpgsm.c:311
+#: sm/gpgsm.c:313
 msgid "use canonical text mode"
 msgstr "Kanonischen Textmodus benutzen"
 
-#: sm/gpgsm.c:314 tools/gpgconf.c:61
+#: sm/gpgsm.c:316 tools/gpgconf.c:61
 msgid "use as output file"
 msgstr "als Ausgabedatei benutzen"
 
-#: sm/gpgsm.c:317
+#: sm/gpgsm.c:319
 msgid "don't use the terminal at all"
 msgstr "Das Terminal überhaupt nicht benutzen"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "force v3 signatures"
 msgstr "Version 3 Signaturen erzwingen"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:323
 msgid "always use a MDC for encryption"
 msgstr "Immer das MDC Verfahren zum verschlüsseln mitbenutzen"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:328
 msgid "batch mode: never ask"
 msgstr "Stapelverarbeitungs Modus: Nie nachfragen"
 
-#: sm/gpgsm.c:327
+#: sm/gpgsm.c:329
 msgid "assume yes on most questions"
 msgstr "\"Ja\" auf die meisten Anfragen annehmen"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:330
 msgid "assume no on most questions"
 msgstr "\"Nein\" auf die meisten Anfragen annehmen"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:332
 msgid "add this keyring to the list of keyrings"
 msgstr "Diesen Keyring in die Liste der Keyrings aufnehmen"
 
-#: sm/gpgsm.c:331
+#: sm/gpgsm.c:333
 msgid "add this secret keyring to the list"
 msgstr "Diese geheimen Keyring in die Liste aufnehmen"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:334
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|Benutze NAME als voreingestellten Schlüssel"
 
-#: sm/gpgsm.c:333
+#: sm/gpgsm.c:335
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Benutze HOST als Schlüsselserver"
 
-#: sm/gpgsm.c:334
+#: sm/gpgsm.c:336
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Den Zeichensatz für das Terminal auf NAME setzen"
 
-#: sm/gpgsm.c:338
+#: sm/gpgsm.c:340
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NAME|Die Debugstufe auf NAME setzen"
 
-#: sm/gpgsm.c:345
+#: sm/gpgsm.c:347
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinformationen auf Dateidescriptor FD schreiben"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:354
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Das Erweiterungsmodul DATEI laden"
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:360
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Den Verschlüsselungsalgrithmus NAME benutzen"
 
-#: sm/gpgsm.c:360
+#: sm/gpgsm.c:362
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Den Hashalgorithmus NAME benutzen"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:364
 msgid "|N|use compress algorithm N"
 msgstr "|N|Den Kompressionsalgorithmus Nummer N benutzen"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:372
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1028,7 +1032,7 @@ msgstr ""
 "@\n"
 "(Die \"man\" Seite beschreibt alle Kommands und Optionen)\n"
 
-#: sm/gpgsm.c:373
+#: sm/gpgsm.c:375
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1048,11 +1052,11 @@ msgstr ""
 " --list-keys [Namen]        Schlüssel anzeigenn\n"
 " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\\n\n"
 
-#: sm/gpgsm.c:488
+#: sm/gpgsm.c:490
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Gebrauch: gpgsm [Optionen] [Dateien] (-h für Hilfe)"
 
-#: sm/gpgsm.c:491
+#: sm/gpgsm.c:493
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -1061,7 +1065,7 @@ msgstr ""
 "Gebrauch: gpgsm [Optionen] [Dateien]\n"
 "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME protocol\n"
 
-#: sm/gpgsm.c:498
+#: sm/gpgsm.c:500
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1069,50 +1073,50 @@ msgstr ""
 "\n"
 "Unterstützte Algorithmen:\n"
 
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:576
 msgid "usage: gpgsm [options] "
 msgstr "Gebrauch: gpgsm [Optionen] "
 
-#: sm/gpgsm.c:640
+#: sm/gpgsm.c:642
 msgid "conflicting commands\n"
 msgstr "Widersprechende Kommandos\n"
 
-#: sm/gpgsm.c:656
+#: sm/gpgsm.c:658
 #, c-format
 msgid "can't encrypt to `%s': %s\n"
 msgstr "Verschlüsseln für `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:731
+#: sm/gpgsm.c:733
 #, c-format
 msgid "libksba is too old (need %s, have %s)\n"
 msgstr "Die Bibliothek Libksba is nicht aktuell (benötige %s, habe %s)\n"
 
-#: sm/gpgsm.c:1178
+#: sm/gpgsm.c:1181
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: sm/gpgsm.c:1190
+#: sm/gpgsm.c:1193
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: sm/gpgsm.c:1216
+#: sm/gpgsm.c:1219
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: sm/gpgsm.c:1224
+#: sm/gpgsm.c:1227
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: sm/gpgsm.c:1254
+#: sm/gpgsm.c:1257
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "Signieren mit `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1423
 msgid "this command has not yet been implemented\n"
 msgstr "Diee Kommando wurde noch nicht implementiert\n"
 
-#: sm/gpgsm.c:1641 sm/gpgsm.c:1674
+#: sm/gpgsm.c:1646 sm/gpgsm.c:1679
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Datei `%s' kann nicht geöffnet werden: %s\n"
@@ -1334,26 +1338,26 @@ msgid "Component not found"
 msgstr "Komponente nicht gefunden"
 
 #: tools/gpgconf-comp.c:435 tools/gpgconf-comp.c:496 tools/gpgconf-comp.c:561
-#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:680
 msgid "Options controlling the diagnostic output"
 msgstr "Optionen zur Einstellung Diagnoseausgaben"
 
 #: tools/gpgconf-comp.c:448 tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:574
-#: tools/gpgconf-comp.c:627 tools/gpgconf-comp.c:700
+#: tools/gpgconf-comp.c:627 tools/gpgconf-comp.c:703
 msgid "Options controlling the configuration"
 msgstr "Optionen zur Einstellung der Konfiguration"
 
 #: tools/gpgconf-comp.c:455 tools/gpgconf-comp.c:532 tools/gpgconf-comp.c:581
-#: tools/gpgconf-comp.c:634 tools/gpgconf-comp.c:707
+#: tools/gpgconf-comp.c:637 tools/gpgconf-comp.c:710
 msgid "Options useful for debugging"
 msgstr "Nützliche Optionen zum Debuggen"
 
 #: tools/gpgconf-comp.c:460 tools/gpgconf-comp.c:537 tools/gpgconf-comp.c:586
-#: tools/gpgconf-comp.c:639 tools/gpgconf-comp.c:715
+#: tools/gpgconf-comp.c:642 tools/gpgconf-comp.c:718
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
-#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:647
+#: tools/gpgconf-comp.c:468 tools/gpgconf-comp.c:542 tools/gpgconf-comp.c:650
 msgid "Options controlling the security"
 msgstr "Optionen zur Einstellung der Sicherheit"
 
@@ -1361,19 +1365,23 @@ msgstr "Optionen zur Einstellung der Sicherheit"
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration der Schlüsselserver"
 
-#: tools/gpgconf-comp.c:690
+#: tools/gpgconf-comp.c:693
 msgid "Options controlling the format of the output"
 msgstr "Optionen zum Einstellen der Ausgabeformate"
 
-#: tools/gpgconf-comp.c:726
+#: tools/gpgconf-comp.c:729
 msgid "Options controlling the interactivity and enforcement"
 msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
 
-#: tools/gpgconf-comp.c:736
+#: tools/gpgconf-comp.c:739
+msgid "Configuration for HTTP servers"
+msgstr "Konfiguration für HTTP Server"
+
+#: tools/gpgconf-comp.c:752
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguration der zu nutzenden LDAP-Server"
 
-#: tools/gpgconf-comp.c:761
+#: tools/gpgconf-comp.c:789
 msgid "Configuration for OCSP"
 msgstr "Konfiguration zu OCSP"
 
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 201a496a8..ac8d54a47 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,7 +1,7 @@
 2004-11-24  Werner Koch  <wk@g10code.com>
 
-	* gpgconf-comp.c <dirmngr>: Add --ignore-http-dp and
-        --ignore-ldap-dp.
+	* gpgconf-comp.c <dirmngr>: Add --ignore-http-dp, --ignore-ldap-dp
+	and --ignore-ocsp-service-url.
 
 2004-11-23  Werner Koch  <wk@g10code.com>
 
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index d2eac7dd9..8873cdf13 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -790,6 +790,9 @@ static gc_option_t gc_options_dirmngr[] =
    { "allow-ocsp", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
      "dirmngr", "allow sending OCSP requests",
      GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
+   { "ignore-ocsp-servic-url", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
+     "dirmngr", "ignore certificate contained OCSP service URLs",
+      GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
    { "ocsp-responder", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
      "dirmngr", "|URL|use OCSP responder at URL",
      GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },